Avoid cyclic dependency between classes.

ZachBray · ZachBray · commit a7733e177495 · 2023-12-05T18:53:31.000Z
Move defaults out of property evaluation and into context.
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/TargetCodeGeneratorLoader.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/TargetCodeGeneratorLoader.java
@@ -15,15 +15,15 @@
  */
 package uk.co.real_logic.sbe.generation;
 
-import uk.co.real_logic.sbe.generation.common.PrecedenceChecks;
-import uk.co.real_logic.sbe.generation.java.JavaOutputManager;
 import uk.co.real_logic.sbe.generation.c.CGenerator;
 import uk.co.real_logic.sbe.generation.c.COutputManager;
+import uk.co.real_logic.sbe.generation.common.PrecedenceChecks;
 import uk.co.real_logic.sbe.generation.cpp.CppGenerator;
 import uk.co.real_logic.sbe.generation.cpp.NamespaceOutputManager;
 import uk.co.real_logic.sbe.generation.golang.GolangGenerator;
 import uk.co.real_logic.sbe.generation.golang.GolangOutputManager;
 import uk.co.real_logic.sbe.generation.java.JavaGenerator;
+import uk.co.real_logic.sbe.generation.java.JavaOutputManager;
 import uk.co.real_logic.sbe.generation.rust.RustGenerator;
 import uk.co.real_logic.sbe.generation.rust.RustOutputManager;
 import uk.co.real_logic.sbe.ir.Ir;
@@ -121,26 +121,27 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir)
         }
     };
 
-    /**
-     * Returns the configured precedence checks.
-     *
-     * @return the configured precedence checks.
-     */
-    public static PrecedenceChecks precedenceChecks()
+    private static PrecedenceChecks precedenceChecks()
     {
-        final boolean shouldGeneratePrecedenceChecks =
-            Boolean.parseBoolean(System.getProperty(GENERATE_PRECEDENCE_CHECKS, "false"));
+        final PrecedenceChecks.Context context = new PrecedenceChecks.Context();
 
-        final String precedenceChecksFlagName =
-            System.getProperty(PRECEDENCE_CHECKS_FLAG_NAME, "SBE_ENABLE_PRECEDENCE_CHECKS");
+        final String shouldGeneratePrecedenceChecks = System.getProperty(GENERATE_PRECEDENCE_CHECKS);
+        if (shouldGeneratePrecedenceChecks != null)
+        {
+            context.shouldGeneratePrecedenceChecks(Boolean.parseBoolean(shouldGeneratePrecedenceChecks));
+        }
 
-        final String precedenceChecksPropName =
-            System.getProperty(JAVA_PRECEDENCE_CHECKS_PROPERTY_NAME, "sbe.enable.precedence.checks");
+        final String precedenceChecksFlagName = System.getProperty(PRECEDENCE_CHECKS_FLAG_NAME);
+        if (precedenceChecksFlagName != null)
+        {
+            context.precedenceChecksFlagName(precedenceChecksFlagName);
+        }
 
-        final PrecedenceChecks.Context context = new PrecedenceChecks.Context()
-            .shouldGeneratePrecedenceChecks(shouldGeneratePrecedenceChecks)
-            .precedenceChecksFlagName(precedenceChecksFlagName)
-            .precedenceChecksPropName(precedenceChecksPropName);
+        final String precedenceChecksPropName = System.getProperty(JAVA_PRECEDENCE_CHECKS_PROPERTY_NAME);
+        if (precedenceChecksPropName != null)
+        {
+            context.precedenceChecksPropName(precedenceChecksPropName);
+        }
 
         return PrecedenceChecks.newInstance(context);
     }
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/common/PrecedenceChecks.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/common/PrecedenceChecks.java
@@ -166,8 +166,8 @@ private FieldPrecedenceModel createModel(
     public static final class Context
     {
         private boolean shouldGeneratePrecedenceChecks;
-        private String precedenceChecksFlagName;
-        private String precedenceChecksPropName;
+        private String precedenceChecksFlagName = "SBE_ENABLE_PRECEDENCE_CHECKS";
+        private String precedenceChecksPropName = "sbe.enable.precedence.checks";
 
         /**
          * Returns {@code true} if precedence checks should be generated; {@code false} otherwise.
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
@@ -18,7 +18,6 @@
 import uk.co.real_logic.sbe.PrimitiveType;
 import uk.co.real_logic.sbe.generation.CodeGenerator;
 import uk.co.real_logic.sbe.generation.Generators;
-import uk.co.real_logic.sbe.generation.TargetCodeGeneratorLoader;
 import uk.co.real_logic.sbe.generation.common.FieldPrecedenceModel;
 import uk.co.real_logic.sbe.generation.common.PrecedenceChecks;
 import uk.co.real_logic.sbe.ir.Encoding;
@@ -72,7 +71,7 @@ public CppGenerator(final Ir ir, final boolean shouldDecodeUnknownEnumValues, fi
         this(
             ir,
             shouldDecodeUnknownEnumValues,
-            TargetCodeGeneratorLoader.precedenceChecks(),
+            PrecedenceChecks.newInstance(new PrecedenceChecks.Context()),
             outputManager
         );
     }
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharp.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharp.java
@@ -18,7 +18,7 @@
 
 import uk.co.real_logic.sbe.generation.CodeGenerator;
 import uk.co.real_logic.sbe.generation.TargetCodeGenerator;
-import uk.co.real_logic.sbe.generation.TargetCodeGeneratorLoader;
+import uk.co.real_logic.sbe.generation.common.PrecedenceChecks;
 import uk.co.real_logic.sbe.ir.Ir;
 
 /**
@@ -33,7 +33,7 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir)
     {
         return new CSharpGenerator(
             ir,
-            TargetCodeGeneratorLoader.precedenceChecks(),
+            PrecedenceChecks.newInstance(new PrecedenceChecks.Context()),
             new CSharpNamespaceOutputManager(outputDir, ir.applicableNamespace()));
     }
 }
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharpGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/csharp/CSharpGenerator.java
@@ -20,7 +20,6 @@
 import uk.co.real_logic.sbe.PrimitiveValue;
 import uk.co.real_logic.sbe.generation.CodeGenerator;
 import uk.co.real_logic.sbe.generation.Generators;
-import uk.co.real_logic.sbe.generation.TargetCodeGeneratorLoader;
 import uk.co.real_logic.sbe.generation.common.FieldPrecedenceModel;
 import uk.co.real_logic.sbe.generation.common.PrecedenceChecks;
 import uk.co.real_logic.sbe.ir.Encoding;
@@ -72,7 +71,7 @@ public CSharpGenerator(final Ir ir, final OutputManager outputManager)
     {
         this(
             ir,
-            TargetCodeGeneratorLoader.precedenceChecks(),
+            PrecedenceChecks.newInstance(new PrecedenceChecks.Context()),
             outputManager
         );
     }
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
@@ -18,7 +18,6 @@
 import uk.co.real_logic.sbe.PrimitiveType;
 import uk.co.real_logic.sbe.generation.CodeGenerator;
 import uk.co.real_logic.sbe.generation.Generators;
-import uk.co.real_logic.sbe.generation.TargetCodeGeneratorLoader;
 import uk.co.real_logic.sbe.generation.common.FieldPrecedenceModel;
 import uk.co.real_logic.sbe.generation.common.PrecedenceChecks;
 import uk.co.real_logic.sbe.ir.*;
@@ -131,7 +130,7 @@ public JavaGenerator(
             shouldGenerateInterfaces,
             shouldDecodeUnknownEnumValues,
             shouldSupportTypesPackageNames,
-            TargetCodeGeneratorLoader.precedenceChecks(),
+            PrecedenceChecks.newInstance(new PrecedenceChecks.Context()),
             outputManager
         );
     }
diff --git a/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/JavaGeneratorTest.java b/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/JavaGeneratorTest.java
@@ -260,10 +260,7 @@ void shouldGenerateBasicMessage() throws Exception
     @Test
     void shouldGenerateWithoutPrecedenceChecksByDefault() throws Exception
     {
-        final PrecedenceChecks.Context context = new PrecedenceChecks.Context()
-            .shouldGeneratePrecedenceChecks(false)
-            .precedenceChecksPropName("sbe.enable.precedence.checks")
-            .precedenceChecksFlagName("SBE_ENABLE_PRECEDENCE_CHECKS");
+        final PrecedenceChecks.Context context = new PrecedenceChecks.Context();
         final PrecedenceChecks precedenceChecks = PrecedenceChecks.newInstance(context);
         generator(precedenceChecks).generate();
 
@@ -279,9 +276,7 @@ void shouldGenerateWithoutPrecedenceChecksByDefault() throws Exception
     void shouldGeneratePrecedenceChecksWhenEnabled() throws Exception
     {
         final PrecedenceChecks.Context context = new PrecedenceChecks.Context()
-            .shouldGeneratePrecedenceChecks(true)
-            .precedenceChecksPropName("sbe.enable.precedence.checks")
-            .precedenceChecksFlagName("SBE_ENABLE_PRECEDENCE_CHECKS");
+            .shouldGeneratePrecedenceChecks(true);
         final PrecedenceChecks precedenceChecks = PrecedenceChecks.newInstance(context);
         generator(precedenceChecks).generate();
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`import uk.co.real_logic.sbe.generation.CodeGenerator;`
`20`	`20`	`import uk.co.real_logic.sbe.generation.TargetCodeGenerator;`
`21`		`-import uk.co.real_logic.sbe.generation.TargetCodeGeneratorLoader;`
	`21`	`+import uk.co.real_logic.sbe.generation.common.PrecedenceChecks;`
`22`	`22`	`import uk.co.real_logic.sbe.ir.Ir;`
`23`	`23`
`24`	`24`	`/**`
`@@ -33,7 +33,7 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir)`
`33`	`33`	`{`
`34`	`34`	`return new CSharpGenerator(`
`35`	`35`	`ir,`
`36`		`- TargetCodeGeneratorLoader.precedenceChecks(),`
	`36`	`+ PrecedenceChecks.newInstance(new PrecedenceChecks.Context()),`
`37`	`37`	`new CSharpNamespaceOutputManager(outputDir, ir.applicableNamespace()));`
`38`	`38`	`}`
`39`	`39`	`}`