From 8d2842d475342afdc2f54d72e44c5c2290f6be2f Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 6 Jan 2023 11:11:50 -0500 Subject: [PATCH] refactoring --- .../main/java/com/rusefi/ldmp/LiveDataProcessor.java | 4 ++-- .../java/com/rusefi/output/BaseCHeaderConsumer.java | 2 +- .../java/com/rusefi/output/ConfigurationConsumer.java | 4 ++-- .../main/java/com/rusefi/output/DataLogConsumer.java | 4 ++-- .../java/com/rusefi/output/FragmentDialogConsumer.java | 4 ++-- .../src/main/java/com/rusefi/output/GaugeConsumer.java | 4 ++-- .../java/com/rusefi/output/GetConfigValueConsumer.java | 8 ++++---- .../java/com/rusefi/output/GetOutputValueConsumer.java | 8 ++++---- .../java/com/rusefi/output/JavaFieldsConsumer.java | 2 +- .../java/com/rusefi/output/JavaSensorsConsumer.java | 4 ++-- .../java/com/rusefi/output/OutputsSectionConsumer.java | 4 ++-- .../rusefi/output/PerFieldWithStructuresIterator.java | 10 +++++----- .../java/com/rusefi/output/SdCardFieldsConsumer.java | 4 ++-- .../java/com/rusefi/output/SdCardFieldsContent.java | 4 ++-- .../main/java/com/rusefi/output/SignatureConsumer.java | 2 +- .../main/java/com/rusefi/output/TSProjectConsumer.java | 2 +- .../src/main/java/com/rusefi/output/TsOutput.java | 3 ++- 17 files changed, 37 insertions(+), 36 deletions(-) diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java index 25314acec8..a4ae2b5981 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java @@ -121,10 +121,10 @@ public class LiveDataProcessor { if (constexpr != null) { sdCardFieldsConsumer.home = constexpr; - state.addDestination(sdCardFieldsConsumer::handleEndStruct); + state.addDestination((state1, structure) -> sdCardFieldsConsumer.handleEndStruct(state1, structure)); outputValueConsumer.currentSectionPrefix = constexpr; - state.addDestination(outputValueConsumer::handleEndStruct); + state.addDestination((state1, structure) -> outputValueConsumer.handleEndStruct(state1, structure)); } state.doJob(); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java index 52d97272d5..f7246cdbb0 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java @@ -62,7 +62,7 @@ public class BaseCHeaderConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) { if (structure.getComment() != null) { content.append("/**" + EOL + packComment(structure.getComment(), "") + EOL + "*/" + EOL); } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java index 5d661804a3..aa11f20f87 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java @@ -1,6 +1,6 @@ package com.rusefi.output; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import java.io.IOException; @@ -13,5 +13,5 @@ public interface ConfigurationConsumer { } - void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException; + void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException; } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java index 56169ea8ff..c0b993e721 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import com.rusefi.TypesHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ public class DataLogConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { if (readerState.isStackEmpty()) { PerFieldWithStructuresIterator iterator = new PerFieldWithStructuresIterator(readerState, structure.getTsFields(), "", (configField, prefix, prefix2) -> handle(prefix, prefix2)); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java index 56bc8cd935..d02f487275 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -32,7 +32,7 @@ public class FragmentDialogConsumer implements ConfigurationConsumer { @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { FieldsStrategy fieldsStrategy = new FieldsStrategy() { @Override int writeOneField(FieldIterator iterator, String prefix, int tsPosition) { diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java index 7c962b9f03..ecf4b99c28 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import java.io.FileWriter; import java.io.IOException; @@ -18,7 +18,7 @@ public class GaugeConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { if (readerState.isStackEmpty()) { PerFieldWithStructuresIterator iterator = new PerFieldWithStructuresIterator(readerState, structure.getTsFields(), "", (state, configField, prefix) -> handle(configField, prefix)); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java index 98e1ddc5d1..21c5366648 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import com.rusefi.TypesHelper; import com.rusefi.core.Tuple; import org.jetbrains.annotations.NotNull; @@ -60,10 +60,10 @@ public class GetConfigValueConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState state, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState state, ConfigStructure structure) throws IOException { if (state.isStackEmpty()) { PerFieldWithStructuresIterator iterator = new PerFieldWithStructuresIterator(state, structure.getTsFields(), "", - this::processConfig, "."); + (readerState, cf, prefix) -> processConfig(cf, prefix), "."); iterator.loop(); } } @@ -74,7 +74,7 @@ public class GetConfigValueConsumer implements ConfigurationConsumer { writeStringToFile(mdOutputFileName, getMdContent()); } - private String processConfig(ReaderState readerState, ConfigField cf, String prefix) { + private String processConfig(ConfigField cf, String prefix) { if (cf.getName().contains(UNUSED) || cf.getName().contains(ALIGNMENT_FILL_AT)) return ""; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java index c2e8a43d08..8239ba2b73 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import com.rusefi.TypesHelper; import com.rusefi.core.Pair; import org.jetbrains.annotations.NotNull; @@ -33,15 +33,15 @@ public class GetOutputValueConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState state, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState state, ConfigStructure structure) throws IOException { if (state.isStackEmpty()) { PerFieldWithStructuresIterator iterator = new PerFieldWithStructuresIterator(state, structure.getTsFields(), "", - this::processOutput, "."); + (readerState, cf, prefix) -> processOutput(cf, prefix), "."); iterator.loop(); } } - private String processOutput(ReaderState readerState, ConfigField cf, String prefix) { + private String processOutput(ConfigField cf, String prefix) { if (cf.getName().contains(UNUSED) || cf.getName().contains(ALIGNMENT_FILL_AT)) return ""; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java index 507f304ef5..a3f78caa71 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java @@ -51,7 +51,7 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { FieldsStrategy fieldsStrategy = new FieldsStrategy() { protected int writeOneField(FieldIterator iterator, String prefix, int tsPosition) { ConfigField prev = iterator.getPrev(); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java index 4830b57db7..dc90de7f95 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import java.io.IOException; @@ -19,7 +19,7 @@ public class JavaSensorsConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { FieldsStrategy fieldsStrategy = new FieldsStrategy() { public int writeOneField(FieldIterator iterator, String prefix, int tsPosition) { ConfigField configField = iterator.cf; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java index d5b6169297..cdb734cfc7 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java @@ -1,6 +1,6 @@ package com.rusefi.output; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import java.io.*; @@ -27,7 +27,7 @@ public class OutputsSectionConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { System.out.println("handleEndStruct"); sensorTsPosition = tsOutput.run(readerState, structure, sensorTsPosition); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java index 327a2665cd..6873984365 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/PerFieldWithStructuresIterator.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import java.util.List; @@ -10,13 +10,13 @@ import java.util.List; * @see FieldIterator is there a duplication? */ class PerFieldWithStructuresIterator extends FieldIterator { - private final ReaderState state; + private final IReaderState state; private final String prefix; private final Strategy strategy; private final String prefixSeparator; private final StringBuilder sb = new StringBuilder(); - public PerFieldWithStructuresIterator(ReaderState state, List fields, String prefix, Strategy strategy, String prefixSeparator) { + public PerFieldWithStructuresIterator(IReaderState state, List fields, String prefix, Strategy strategy, String prefixSeparator) { super(fields); this.state = state; this.prefix = prefix; @@ -24,7 +24,7 @@ class PerFieldWithStructuresIterator extends FieldIterator { this.prefixSeparator = prefixSeparator; } - public PerFieldWithStructuresIterator(ReaderState state, List fields, String prefix, Strategy strategy) { + public PerFieldWithStructuresIterator(IReaderState state, List fields, String prefix, Strategy strategy) { this(state, fields, prefix, strategy, "_"); } @@ -55,6 +55,6 @@ class PerFieldWithStructuresIterator extends FieldIterator { } interface Strategy { - String process(ReaderState state, ConfigField configField, String prefix); + String process(IReaderState state, ConfigField configField, String prefix); } } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsConsumer.java index b9b748218d..57ffe6110c 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsConsumer.java @@ -1,6 +1,6 @@ package com.rusefi.output; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import com.rusefi.util.LazyFile; import java.io.IOException; @@ -31,7 +31,7 @@ public class SdCardFieldsConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState state, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState state, ConfigStructure structure) throws IOException { content.handleEndStruct(state, structure); } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java index f14d219853..ae158c3cf0 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SdCardFieldsContent.java @@ -1,7 +1,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; -import com.rusefi.ReaderState; +import com.rusefi.IReaderState; import java.io.IOException; @@ -12,7 +12,7 @@ public class SdCardFieldsContent { public String home = "engine->outputChannels"; - public void handleEndStruct(ReaderState state, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState state, ConfigStructure structure) throws IOException { if (state.isStackEmpty()) { PerFieldWithStructuresIterator iterator = new PerFieldWithStructuresIterator(state, structure.getTsFields(), "", (configField, prefix, prefix2) -> processOutput(prefix, prefix2), "."); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java index 007d9f0cee..6ea0ca419c 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java @@ -31,7 +31,7 @@ public class SignatureConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { ExtraUtil.writeDefinesToFile(registry, destHeader, "by SignatureConsumer"); } } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java index c5581c41ee..1750133407 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java @@ -143,7 +143,7 @@ public class TSProjectConsumer implements ConfigurationConsumer { } @Override - public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { + public void handleEndStruct(IReaderState readerState, ConfigStructure structure) throws IOException { state.getVariableRegistry().register(structure.getName() + "_size", structure.getTotalSize()); totalTsSize = tsOutput.run(readerState, structure, 0); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java index e6ba91183c..2d60750e02 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java @@ -2,6 +2,7 @@ package com.rusefi.output; import com.opensr5.ini.field.IniField; import com.rusefi.ConfigField; +import com.rusefi.IReaderState; import com.rusefi.ReaderState; import com.rusefi.TypesHelper; import com.rusefi.newparse.parsing.Type; @@ -34,7 +35,7 @@ public class TsOutput { return settingContextHelp.toString(); } - public int run(ReaderState state, ConfigStructure structure, int sensorTsPosition) { + public int run(IReaderState state, ConfigStructure structure, int sensorTsPosition) { FieldsStrategy strategy = new FieldsStrategy() { @Override public int writeOneField(FieldIterator it, String prefix, int tsPosition) {