feat(java): render constants. (stellar#160)

lightsail-network · Aug 9, 2023 · 6f040d2 · 6f040d2
1 parent fda5de3
commit 6f040d2
Show file tree

Hide file tree

Showing 48 changed files with 147 additions and 45 deletions.
diff --git a/lib/xdrgen/generators/java.rb b/lib/xdrgen/generators/java.rb
@@ -6,8 +6,10 @@ module Generators
     class Java < Xdrgen::Generators::Base
 
       def generate
+        constants_container = Set[]
         render_lib
-        render_definitions(@top)
+        render_definitions(@top, constants_container)
+        render_constants constants_container
       end
 
       def render_lib
@@ -36,9 +38,9 @@ def render_lib
         @output.write  "XdrUnsignedInteger.java", result
       end
 
-      def render_definitions(node)
-        node.namespaces.each{|n| render_definitions n }
-        node.definitions.each(&method(:render_definition))
+      def render_definitions(node, constants_container)
+        node.namespaces.each{|n| render_definitions n, constants_container }
+        node.definitions.each { |defn| render_definition(defn, constants_container) }
       end
 
       def add_imports_for_definition(defn, imports)
@@ -100,7 +102,7 @@ def add_imports_for_definition(defn, imports)
         end
       end
 
-      def render_definition(defn)
+      def render_definition(defn, constants_container)
         imports = Set[]
         add_imports_for_definition(defn, imports)
 
@@ -123,6 +125,10 @@ def render_definition(defn)
           render_element "public class", imports, defn do |out|
             render_typedef defn, out
           end
+        when AST::Definitions::Const ;
+          const_name = defn.name
+          const_value = defn.value
+          constants_container.add([const_name, const_value])
         end
       end
 
@@ -169,6 +175,7 @@ def render_element(type, imports, element, post_name="implements XdrElement")
         name = name_string element.name
         out  = @output.open(path)
         render_top_matter out
+        out.puts "import static #{@namespace}.Constants.*;"
         imports.each do |import|
           out.puts "import #{import};"
         end
@@ -182,6 +189,19 @@ def render_element(type, imports, element, post_name="implements XdrElement")
         out.puts "}"
       end
 
+      def render_constants(constants_container)
+        out = @output.open("Constants.java")
+        render_top_matter out
+        out.puts "public final class Constants {"
+        out.indent do
+          out.puts "private Constants() {}"
+          constants_container.each do |const_name, const_value|
+            out.puts "public static final int #{const_name} = #{const_value};"
+          end
+        end
+        out.puts "}"
+      end
+
       def render_enum(enum, out)
         out.balance_after /,[\s]*/ do
           enum.members.each do |em|
@@ -664,7 +684,6 @@ def render_top_matter(out)
 
           package #{@namespace};
 
-
           import java.io.IOException;
         EOS
         out.break

diff --git a/spec/output/generator_spec_java/block_comments.x/AccountFlags.java b/spec/output/generator_spec_java/block_comments.x/AccountFlags.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 
 // === xdr source ============================================================
 

diff --git a/spec/output/generator_spec_java/block_comments.x/Constants.java b/spec/output/generator_spec_java/block_comments.x/Constants.java
@@ -0,0 +1,10 @@
+// Automatically generated by xdrgen
+// DO NOT EDIT or your changes may be overwritten
+
+package MyXDR;
+
+import java.io.IOException;
+
+public final class Constants {
+  private Constants() {}
+}
diff --git a/spec/output/generator_spec_java/const.x/Constants.java b/spec/output/generator_spec_java/const.x/Constants.java
@@ -0,0 +1,11 @@
+// Automatically generated by xdrgen
+// DO NOT EDIT or your changes may be overwritten
+
+package MyXDR;
+
+import java.io.IOException;
+
+public final class Constants {
+  private Constants() {}
+  public static final int FOO = 1;
+}
diff --git a/spec/output/generator_spec_java/const.x/TestArray.java b/spec/output/generator_spec_java/const.x/TestArray.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import java.util.Arrays;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/const.x/TestArray2.java b/spec/output/generator_spec_java/const.x/TestArray2.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import java.util.Arrays;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/enum.x/Color.java b/spec/output/generator_spec_java/enum.x/Color.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 
 // === xdr source ============================================================
 

diff --git a/spec/output/generator_spec_java/enum.x/Color2.java b/spec/output/generator_spec_java/enum.x/Color2.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 
 // === xdr source ============================================================
 

diff --git a/spec/output/generator_spec_java/enum.x/Constants.java b/spec/output/generator_spec_java/enum.x/Constants.java
@@ -0,0 +1,10 @@
+// Automatically generated by xdrgen
+// DO NOT EDIT or your changes may be overwritten
+
+package MyXDR;
+
+import java.io.IOException;
+
+public final class Constants {
+  private Constants() {}
+}
diff --git a/spec/output/generator_spec_java/enum.x/MessageType.java b/spec/output/generator_spec_java/enum.x/MessageType.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 
 // === xdr source ============================================================
 

diff --git a/spec/output/generator_spec_java/nesting.x/Constants.java b/spec/output/generator_spec_java/nesting.x/Constants.java
@@ -0,0 +1,10 @@
+// Automatically generated by xdrgen
+// DO NOT EDIT or your changes may be overwritten
+
+package MyXDR;
+
+import java.io.IOException;
+
+public final class Constants {
+  private Constants() {}
+}
diff --git a/spec/output/generator_spec_java/nesting.x/Foo.java b/spec/output/generator_spec_java/nesting.x/Foo.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/nesting.x/MyUnion.java b/spec/output/generator_spec_java/nesting.x/MyUnion.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/nesting.x/UnionKey.java b/spec/output/generator_spec_java/nesting.x/UnionKey.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 
 // === xdr source ============================================================
 

diff --git a/spec/output/generator_spec_java/optional.x/Arr.java b/spec/output/generator_spec_java/optional.x/Arr.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import java.util.Arrays;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/optional.x/Constants.java b/spec/output/generator_spec_java/optional.x/Constants.java
@@ -0,0 +1,10 @@
+// Automatically generated by xdrgen
+// DO NOT EDIT or your changes may be overwritten
+
+package MyXDR;
+
+import java.io.IOException;
+
+public final class Constants {
+  private Constants() {}
+}
diff --git a/spec/output/generator_spec_java/optional.x/HasOptions.java b/spec/output/generator_spec_java/optional.x/HasOptions.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/struct.x/Constants.java b/spec/output/generator_spec_java/struct.x/Constants.java
@@ -0,0 +1,10 @@
+// Automatically generated by xdrgen
+// DO NOT EDIT or your changes may be overwritten
+
+package MyXDR;
+
+import java.io.IOException;
+
+public final class Constants {
+  private Constants() {}
+}
diff --git a/spec/output/generator_spec_java/struct.x/Int64.java b/spec/output/generator_spec_java/struct.x/Int64.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/struct.x/MyStruct.java b/spec/output/generator_spec_java/struct.x/MyStruct.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 import java.util.Arrays;
 

diff --git a/spec/output/generator_spec_java/test.x/Color.java b/spec/output/generator_spec_java/test.x/Color.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 
 // === xdr source ============================================================
 

diff --git a/spec/output/generator_spec_java/test.x/Constants.java b/spec/output/generator_spec_java/test.x/Constants.java
@@ -0,0 +1,12 @@
+// Automatically generated by xdrgen
+// DO NOT EDIT or your changes may be overwritten
+
+package MyXDR;
+
+import java.io.IOException;
+
+public final class Constants {
+  private Constants() {}
+  public static final int FOO = 1244;
+  public static final int BAR = FOO;
+}
diff --git a/spec/output/generator_spec_java/test.x/HasStuff.java b/spec/output/generator_spec_java/test.x/HasStuff.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/test.x/Hash.java b/spec/output/generator_spec_java/test.x/Hash.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import java.util.Arrays;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/test.x/Hashes1.java b/spec/output/generator_spec_java/test.x/Hashes1.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import java.util.Arrays;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/test.x/Hashes2.java b/spec/output/generator_spec_java/test.x/Hashes2.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import java.util.Arrays;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/test.x/Hashes3.java b/spec/output/generator_spec_java/test.x/Hashes3.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import java.util.Arrays;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/test.x/Int1.java b/spec/output/generator_spec_java/test.x/Int1.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 
 // === xdr source ============================================================

diff --git a/spec/output/generator_spec_java/test.x/Int2.java b/spec/output/generator_spec_java/test.x/Int2.java
@@ -3,9 +3,9 @@
 
 package MyXDR;
 
-
 import java.io.IOException;
 
+import static MyXDR.Constants.*;
 import com.google.common.base.Objects;
 
 // === xdr source ============================================================