From cc3ea3a8f0b6cff325cf05f6fc912bad58d141a0 Mon Sep 17 00:00:00 2001 From: mjpt777 Date: Wed, 31 Jul 2024 14:03:50 +0100 Subject: [PATCH] [Java] Style consistency. --- .../common/FieldPrecedenceModel.java | 187 ++++++++---------- 1 file changed, 78 insertions(+), 109 deletions(-) diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/common/FieldPrecedenceModel.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/common/FieldPrecedenceModel.java index 58a68c17ff..40e5ac7441 100644 --- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/common/FieldPrecedenceModel.java +++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/common/FieldPrecedenceModel.java @@ -136,7 +136,7 @@ public void forEachTerminalEncoderState(final Consumer consumer) public void forEachStateOrderedByStateNumber(final Consumer consumer) { transitionsByState.keySet().stream() - .sorted(Comparator.comparingInt(s -> s.number)) + .sorted(Comparator.comparingInt((s) -> s.number)) .forEach(consumer); } @@ -208,27 +208,31 @@ public void forEachTransitionFrom(final State state, final Consumer - { - transitionsForContext.forEach(transition -> + transitionsByInteraction.values().forEach( + (transitionsForContext) -> { - transition.forEachStartState(startState -> - { - sb.append(indent).append(" ") - .append(startState.name) - .append(" -> ") - .append(transition.endState().name) - .append(" [label=\" ").append(transition.interaction.exampleCode()); - - if (!transition.interaction.exampleConditions().isEmpty()) + transitionsForContext.forEach( + (transition) -> { - sb.append("\\n").append(" where ").append(transition.interaction.exampleConditions()); - } - - sb.append(" \"];\n"); - }); + transition.forEachStartState( + (startState) -> + { + sb.append(indent).append(" ") + .append(startState.name) + .append(" -> ") + .append(transition.endState().name) + .append(" [label=\" ").append(transition.interaction.exampleCode()); + + if (!transition.interaction.exampleConditions().isEmpty()) + { + sb.append("\\n").append(" where ") + .append(transition.interaction.exampleConditions()); + } + + sb.append(" \"];\n"); + }); + }); }); - }); sb.append(indent).append("}\n"); } @@ -244,34 +248,33 @@ private void findTransitions( walkSchemaLevel(new VersionCollector(versions), fields, groups, varData); walkSchemaLevel(new PathCollector(topLevelBlockFields, groupPathsByField), fields, groups, varData); - final IntStream selectedVersions = versionsSelector.apply(versions.stream().mapToInt(i -> i)); - selectedVersions.sorted().forEach(version -> - { - final State versionWrappedState = allocateState("V" + version + "_BLOCK"); + final IntStream selectedVersions = versionsSelector.apply(versions.stream().mapToInt((i) -> i)); + selectedVersions.sorted().forEach( + (version) -> + { + final State versionWrappedState = allocateState("V" + version + "_BLOCK"); - versionWrappedStates.put(version, versionWrappedState); + versionWrappedStates.put(version, versionWrappedState); - final CodecInteraction wrapInteraction = interactionFactory.wrap(version); + final CodecInteraction wrapInteraction = interactionFactory.wrap(version); - allocateTransitions( - wrapInteraction, - Collections.singletonList(notWrappedState), - versionWrappedState - ); + allocateTransitions( + wrapInteraction, + Collections.singletonList(notWrappedState), + versionWrappedState); - final TransitionCollector transitionCollector = new TransitionCollector( - "V" + version + "_", - Collections.singleton(versionWrappedState), - versionWrappedState, - token -> token.version() <= version - ); + final TransitionCollector transitionCollector = new TransitionCollector( + "V" + version + "_", + Collections.singleton(versionWrappedState), + versionWrappedState, + (token) -> token.version() <= version); - walkSchemaLevel(transitionCollector, fields, groups, varData); + walkSchemaLevel(transitionCollector, fields, groups, varData); - // Last writer (highest version) wins when there are multiple versions - encoderWrappedState = versionWrappedState; - terminalEncoderStates = transitionCollector.exitStates(); - }); + // Last writer (highest version) wins when there are multiple versions + encoderWrappedState = versionWrappedState; + terminalEncoderStates = transitionCollector.exitStates(); + }); } private State allocateState(final String name) @@ -287,11 +290,11 @@ private void allocateTransitions( final State to) { final TransitionGroup transitionGroup = new TransitionGroup(interaction, from, to); - final List transitionsForInteraction = - transitionsByInteraction.computeIfAbsent(interaction, ignored -> new ArrayList<>()); + final List transitionsForInteraction = transitionsByInteraction.computeIfAbsent( + interaction, (ignored) -> new ArrayList<>()); final boolean duplicateEndState = - transitionsForInteraction.stream().anyMatch(t -> t.to.number == transitionGroup.to.number); + transitionsForInteraction.stream().anyMatch((t) -> t.to.number == transitionGroup.to.number); if (duplicateEndState) { @@ -299,7 +302,7 @@ private void allocateTransitions( } final Optional conflictingTransition = transitionsForInteraction.stream() - .filter(t -> t.from.stream().anyMatch(transitionGroup.from::contains)) + .filter((t) -> t.from.stream().anyMatch(transitionGroup.from::contains)) .findAny(); if (conflictingTransition.isPresent()) @@ -310,7 +313,7 @@ private void allocateTransitions( transitionsForInteraction.add(transitionGroup); - from.forEach(fromState -> transitionsByState.get(fromState).add(transitionGroup)); + from.forEach((fromState) -> transitionsByState.get(fromState).add(transitionGroup)); } private static void walkSchemaLevel( @@ -394,7 +397,6 @@ public void onBlockField(final Token token) groupPathsByField.put(token, currentGroupPath()); } - @Override public void onEnterRepeatingGroup( final Token token, final List groupFields, @@ -407,7 +409,6 @@ public void onEnterRepeatingGroup( groupPath.removeLast(); } - @Override public void onVarData(final Token token) { groupPathsByField.put(token, currentGroupPath()); @@ -416,15 +417,15 @@ public void onVarData(final Token token) private String currentGroupPath() { final StringBuilder sb = new StringBuilder(); - groupPath.forEach(token -> - { - sb.append(token.name()).append('.'); - }); + groupPath.forEach( + (token) -> + { + sb.append(token.name()).append('.'); + }); return sb.toString(); } } - @SuppressWarnings("ClassCanBeRecord") private static final class VersionCollector implements SchemaConsumer { private final IntHashSet versions; @@ -434,13 +435,11 @@ private static final class VersionCollector implements SchemaConsumer this.versions = versions; } - @Override public void onBlockField(final Token token) { versions.add(token.version()); } - @Override public void onEnterRepeatingGroup( final Token token, final List groupFields, @@ -451,7 +450,6 @@ public void onEnterRepeatingGroup( walkSchemaLevel(this, groupFields, groupGroups, groupVarData); } - @Override public void onVarData(final Token token) { versions.add(token.version()); @@ -479,7 +477,6 @@ private TransitionCollector( currentStates.add(blockState); } - @Override public void onBlockField(final Token token) { if (filter.test(token)) @@ -489,7 +486,6 @@ public void onBlockField(final Token token) } } - @Override public void onEnterRepeatingGroup( final Token token, final List groupFields, @@ -521,8 +517,7 @@ public void onEnterRepeatingGroup( groupPrefix + "N_", currentStates, nRemainingGroupElement, - filter - ); + filter); walkSchemaLevel(nRemainingCollector, groupFields, groupGroups, groupVarData); currentStates.clear(); @@ -548,8 +543,7 @@ public void onEnterRepeatingGroup( groupPrefix + "1_", currentStates, oneRemainingGroupElement, - filter - ); + filter); walkSchemaLevel(oneRemainingCollector, groupFields, groupGroups, groupVarData); final CodecInteraction resetCountToIndexInteraction = interactionFactory.resetCountToIndex(token); @@ -566,16 +560,13 @@ public void onEnterRepeatingGroup( } } - @Override public void onVarData(final Token token) { if (filter.test(token)) { final CodecInteraction lengthAccessInteraction = interactionFactory.accessVarDataLength(token); - currentStates.forEach(state -> - { - allocateTransitions(lengthAccessInteraction, Collections.singleton(state), state); - }); + currentStates.forEach( + (state) -> allocateTransitions(lengthAccessInteraction, Collections.singleton(state), state)); final CodecInteraction codecInteraction = interactionFactory.accessField(token); final State accessedState = allocateState(statePrefix + token.name().toUpperCase() + "_DONE"); @@ -624,7 +615,9 @@ public String name() return name; } - @Override + /** + * {@inheritDoc} + */ public String toString() { return "State{" + @@ -690,7 +683,9 @@ public String exampleCode() return interaction.exampleCode(); } - @Override + /** + * {@inheritDoc} + */ public String toString() { return "Transition{" + @@ -724,7 +719,6 @@ public final boolean isTopLevelBlockFieldAccess() { if (this instanceof AccessField) { - //noinspection PatternVariableCanBeUsed final AccessField accessField = (AccessField)this; return accessField.isTopLevelBlockField(); } @@ -744,19 +738,16 @@ private static final class Wrap extends CodecInteraction this.version = version; } - @Override public String groupQualifiedName() { return "wrap"; } - @Override public String exampleCode() { return "wrap(version=" + version + ")"; } - @Override public String exampleConditions() { return ""; @@ -786,19 +777,16 @@ boolean isTopLevelBlockField() return isTopLevelBlockField; } - @Override public String groupQualifiedName() { return groupPath + token.name(); } - @Override public String exampleCode() { return groupPath + token.name() + "(?)"; } - @Override public String exampleConditions() { return ""; @@ -821,19 +809,16 @@ private DetermineGroupIsEmpty(final String groupPath, final Token token) this.token = token; } - @Override public String groupQualifiedName() { return groupPath + token.name(); } - @Override String exampleCode() { return groupPath + token.name() + "Count(0)"; } - @Override String exampleConditions() { return ""; @@ -856,19 +841,16 @@ private DetermineGroupHasElements(final String groupPath, final Token token) this.token = token; } - @Override public String groupQualifiedName() { return groupPath + token.name(); } - @Override String exampleCode() { return groupPath + token.name() + "Count(>0)"; } - @Override String exampleConditions() { return ""; @@ -892,19 +874,16 @@ private MoveToNextElement(final String groupPath, final Token token) this.token = token; } - @Override public String groupQualifiedName() { return groupPath + token.name(); } - @Override String exampleCode() { return groupPath + token.name() + ".next()"; } - @Override String exampleConditions() { return "count - newIndex > 1"; @@ -928,19 +907,16 @@ private MoveToLastElement(final String groupPath, final Token token) this.token = token; } - @Override public String groupQualifiedName() { return groupPath + token.name(); } - @Override String exampleCode() { return groupPath + token.name() + ".next()"; } - @Override String exampleConditions() { return "count - newIndex == 1"; @@ -963,19 +939,16 @@ private ResetCountToIndex(final String groupPath, final Token token) this.token = token; } - @Override public String groupQualifiedName() { return groupPath + token.name(); } - @Override String exampleCode() { return groupPath + token.name() + ".resetCountToIndex()"; } - @Override String exampleConditions() { return ""; @@ -998,26 +971,22 @@ private AccessVarDataLength(final String groupPath, final Token token) this.token = token; } - @Override public String groupQualifiedName() { return groupPath + token.name(); } - @Override String exampleCode() { return groupPath + token.name() + "Length()"; } - @Override String exampleConditions() { return ""; } } - /** * Factory for creating {@link CodecInteraction} instances. This factory * is used to hash-cons the instances, so that they can be compared by @@ -1068,8 +1037,8 @@ public CodecInteraction wrap(final int version) */ public CodecInteraction accessField(final Token token) { - return accessFieldInteractions.computeIfAbsent(token, - t -> new AccessField(groupPathsByField.get(t), t, topLevelBlockFields.contains(t))); + return accessFieldInteractions.computeIfAbsent( + token, (t) -> new AccessField(groupPathsByField.get(t), t, topLevelBlockFields.contains(t))); } /** @@ -1089,8 +1058,8 @@ public CodecInteraction accessField(final Token token) */ public CodecInteraction determineGroupIsEmpty(final Token token) { - return determineGroupIsEmptyInteractions.computeIfAbsent(token, - t -> new DetermineGroupIsEmpty(groupPathsByField.get(t), t)); + return determineGroupIsEmptyInteractions.computeIfAbsent( + token, (t) -> new DetermineGroupIsEmpty(groupPathsByField.get(t), t)); } /** @@ -1110,8 +1079,8 @@ public CodecInteraction determineGroupIsEmpty(final Token token) */ public CodecInteraction determineGroupHasElements(final Token token) { - return determineGroupHasElementsInteractions.computeIfAbsent(token, - t -> new DetermineGroupHasElements(groupPathsByField.get(t), t)); + return determineGroupHasElementsInteractions.computeIfAbsent( + token, (t) -> new DetermineGroupHasElements(groupPathsByField.get(t), t)); } /** @@ -1128,8 +1097,8 @@ public CodecInteraction determineGroupHasElements(final Token token) */ public CodecInteraction moveToNextElement(final Token token) { - return moveToNextElementInteractions.computeIfAbsent(token, - t -> new MoveToNextElement(groupPathsByField.get(t), t)); + return moveToNextElementInteractions.computeIfAbsent( + token, (t) -> new MoveToNextElement(groupPathsByField.get(t), t)); } /** @@ -1144,8 +1113,8 @@ public CodecInteraction moveToNextElement(final Token token) */ public CodecInteraction moveToLastElement(final Token token) { - return moveToLastElementInteractions.computeIfAbsent(token, - t -> new MoveToLastElement(groupPathsByField.get(t), t)); + return moveToLastElementInteractions.computeIfAbsent( + token, (t) -> new MoveToLastElement(groupPathsByField.get(t), t)); } /** @@ -1162,8 +1131,8 @@ public CodecInteraction moveToLastElement(final Token token) */ public CodecInteraction resetCountToIndex(final Token token) { - return resetCountToIndexInteractions.computeIfAbsent(token, - t -> new ResetCountToIndex(groupPathsByField.get(t), t)); + return resetCountToIndexInteractions.computeIfAbsent( + token, (t) -> new ResetCountToIndex(groupPathsByField.get(t), t)); } /** @@ -1180,8 +1149,8 @@ public CodecInteraction resetCountToIndex(final Token token) */ public CodecInteraction accessVarDataLength(final Token token) { - return accessVarDataLengthInteractions.computeIfAbsent(token, - t -> new AccessVarDataLength(groupPathsByField.get(t), t)); + return accessVarDataLengthInteractions.computeIfAbsent( + token, (t) -> new AccessVarDataLength(groupPathsByField.get(t), t)); } } }