From a1886634c9ae894f79f0e157473d7b6c4e059680 Mon Sep 17 00:00:00 2001 From: overcat <4catcode@gmail.com> Date: Mon, 11 Sep 2023 14:42:08 +0800 Subject: [PATCH 1/2] refactor(java): Remove the dependency on third-party libraries. --- lib/xdrgen/generators/java.rb | 44 +++++++++---------- lib/xdrgen/generators/java/XdrString.erb | 8 ++-- .../java/XdrUnsignedHyperInteger.erb | 15 +++---- .../generators/java/XdrUnsignedInteger.erb | 15 +++---- .../block_comments.x/AccountFlags.java | 8 ++-- .../block_comments.x/XdrString.java | 8 ++-- .../XdrUnsignedHyperInteger.java | 15 +++---- .../block_comments.x/XdrUnsignedInteger.java | 15 +++---- .../const.x/TestArray.java | 8 ++-- .../const.x/TestArray2.java | 8 ++-- .../const.x/XdrString.java | 8 ++-- .../const.x/XdrUnsignedHyperInteger.java | 15 +++---- .../const.x/XdrUnsignedInteger.java | 15 +++---- .../generator_spec_java/enum.x/Color.java | 8 ++-- .../generator_spec_java/enum.x/Color2.java | 8 ++-- .../enum.x/MessageType.java | 8 ++-- .../generator_spec_java/enum.x/XdrString.java | 8 ++-- .../enum.x/XdrUnsignedHyperInteger.java | 15 +++---- .../enum.x/XdrUnsignedInteger.java | 15 +++---- .../generator_spec_java/nesting.x/Foo.java | 14 +++--- .../nesting.x/MyUnion.java | 34 ++++++-------- .../nesting.x/UnionKey.java | 8 ++-- .../nesting.x/XdrString.java | 8 ++-- .../nesting.x/XdrUnsignedHyperInteger.java | 15 +++---- .../nesting.x/XdrUnsignedInteger.java | 15 +++---- .../generator_spec_java/optional.x/Arr.java | 8 ++-- .../optional.x/HasOptions.java | 14 +++--- .../optional.x/XdrString.java | 8 ++-- .../optional.x/XdrUnsignedHyperInteger.java | 15 +++---- .../optional.x/XdrUnsignedInteger.java | 15 +++---- .../generator_spec_java/struct.x/Int64.java | 14 +++--- .../struct.x/MyStruct.java | 14 +++--- .../struct.x/XdrString.java | 8 ++-- .../struct.x/XdrUnsignedHyperInteger.java | 15 +++---- .../struct.x/XdrUnsignedInteger.java | 15 +++---- .../generator_spec_java/test.x/Color.java | 8 ++-- .../generator_spec_java/test.x/HasStuff.java | 14 +++--- .../generator_spec_java/test.x/Hash.java | 8 ++-- .../generator_spec_java/test.x/Hashes1.java | 8 ++-- .../generator_spec_java/test.x/Hashes2.java | 8 ++-- .../generator_spec_java/test.x/Hashes3.java | 8 ++-- .../generator_spec_java/test.x/Int1.java | 14 +++--- .../generator_spec_java/test.x/Int2.java | 14 +++--- .../generator_spec_java/test.x/Int3.java | 14 +++--- .../generator_spec_java/test.x/Int4.java | 14 +++--- .../test.x/LotsOfMyStructs.java | 8 ++-- .../generator_spec_java/test.x/MyStruct.java | 14 +++--- .../generator_spec_java/test.x/Nester.java | 40 +++++++---------- .../generator_spec_java/test.x/OptHash1.java | 14 +++--- .../generator_spec_java/test.x/OptHash2.java | 14 +++--- .../generator_spec_java/test.x/Str.java | 14 +++--- .../generator_spec_java/test.x/Str2.java | 14 +++--- .../generator_spec_java/test.x/Uint512.java | 8 ++-- .../generator_spec_java/test.x/Uint513.java | 8 ++-- .../generator_spec_java/test.x/Uint514.java | 8 ++-- .../generator_spec_java/test.x/XdrString.java | 8 ++-- .../test.x/XdrUnsignedHyperInteger.java | 15 +++---- .../test.x/XdrUnsignedInteger.java | 15 +++---- .../generator_spec_java/union.x/Error.java | 14 +++--- .../generator_spec_java/union.x/IntUnion.java | 14 +++--- .../union.x/IntUnion2.java | 14 +++--- .../generator_spec_java/union.x/Multi.java | 14 +++--- .../generator_spec_java/union.x/MyUnion.java | 14 +++--- .../generator_spec_java/union.x/UnionKey.java | 8 ++-- .../union.x/XdrString.java | 8 ++-- .../union.x/XdrUnsignedHyperInteger.java | 15 +++---- .../union.x/XdrUnsignedInteger.java | 15 +++---- 67 files changed, 354 insertions(+), 516 deletions(-) diff --git a/lib/xdrgen/generators/java.rb b/lib/xdrgen/generators/java.rb index 43eddb0f7..f0d6369b0 100644 --- a/lib/xdrgen/generators/java.rb +++ b/lib/xdrgen/generators/java.rb @@ -43,7 +43,7 @@ def render_definitions(node, constants_container) end def add_imports_for_definition(defn, imports) - imports.add("com.google.common.io.BaseEncoding") + imports.add("java.util.Base64;") imports.add("java.io.ByteArrayInputStream") imports.add("java.io.ByteArrayOutputStream") @@ -53,15 +53,15 @@ def add_imports_for_definition(defn, imports) if is_decl_array(m.declaration) imports.add('java.util.Arrays') else - imports.add('com.google.common.base.Objects') + imports.add('java.util.Objects') end end # if we have more than one member field then the # hash code will be computed by - # Objects.hashCode(field1, field2, ..., fieldN) - # therefore, we should always import com.google.common.base.Objects + # Objects.hash(field1, field2, ..., fieldN) + # therefore, we should always import java.util.Objects if defn.members.length > 1 - imports.add("com.google.common.base.Objects") + imports.add("java.util.Objects") end when AST::Definitions::Enum ; # no imports required for enums @@ -73,30 +73,30 @@ def add_imports_for_definition(defn, imports) if is_type_array(defn.discriminant.type) imports.add('java.util.Arrays') else - imports.add('com.google.common.base.Objects') + imports.add('java.util.Objects') end nonVoidArms.each do |a| if is_decl_array(a.declaration) imports.add('java.util.Arrays') else - imports.add('com.google.common.base.Objects') + imports.add('java.util.Objects') end end # if we have more than one field then the # hash code will be computed by - # Objects.hashCode(field1, field2, ..., fieldN) - # therefore, we should always import com.google.common.base.Objects + # Objects.hash(field1, field2, ..., fieldN) + # therefore, we should always import java.util.Objects # if we have more than one field if totalFields > 1 - imports.add("com.google.common.base.Objects") + imports.add("java.util.Objects") end when AST::Definitions::Typedef ; if is_decl_array(defn.declaration) imports.add('java.util.Arrays') else - imports.add('com.google.common.base.Objects') + imports.add('java.util.Objects') end end @@ -300,10 +300,10 @@ def render_struct(struct, out) if is_decl_array(struct.members[0].declaration) "Arrays.hashCode(this.#{struct.members[0].name})" else - "Objects.hashCode(this.#{struct.members[0].name})" + "Objects.hash(this.#{struct.members[0].name})" end else - "Objects.hashCode(#{ + "Objects.hash(#{ (struct.members.map { |m| if is_decl_array(m.declaration) "Arrays.hashCode(this.#{m.name})" @@ -324,7 +324,7 @@ def render_struct(struct, out) if is_decl_array(m.declaration) "Arrays.equals(this.#{m.name}, other.#{m.name})" else - "Objects.equal(this.#{m.name}, other.#{m.name})" + "Objects.equals(this.#{m.name}, other.#{m.name})" end } equalExpression = case equalParts.length @@ -432,7 +432,7 @@ def render_typedef(typedef, out) if is_decl_array(typedef.declaration) "Arrays.hashCode" else - "Objects.hashCode" + "Objects.hash" end out.puts <<-EOS.strip_heredoc @Override @@ -446,7 +446,7 @@ def render_typedef(typedef, out) if is_decl_array(typedef.declaration) "Arrays.equals" else - "Objects.equal" + "Objects.equals" end type = name_string typedef.name out.puts <<-EOS.strip_heredoc @@ -639,7 +639,7 @@ def render_union(union, out) } parts.append(discriminantPart) - hashCodeExpression = "Objects.hashCode(#{parts.join(", ")})" + hashCodeExpression = "Objects.hash(#{parts.join(", ")})" out.puts <<-EOS.strip_heredoc @Override public int hashCode() { @@ -651,14 +651,14 @@ def render_union(union, out) if is_decl_array(a.declaration) "Arrays.equals(this.#{a.name}, other.#{a.name})" else - "Objects.equal(this.#{a.name}, other.#{a.name})" + "Objects.equals(this.#{a.name}, other.#{a.name})" end } equalParts.append( if is_type_array(union.discriminant.type) "Arrays.equals(this.#{union.discriminant.name}, other.#{union.discriminant.name})" else - "Objects.equal(this.#{union.discriminant.name}, other.#{union.discriminant.name})" + "Objects.equals(this.#{union.discriminant.name}, other.#{union.discriminant.name})" end ) @@ -716,8 +716,7 @@ def render_base64(return_type, out) out.puts <<-EOS.strip_heredoc @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -729,8 +728,7 @@ def render_base64(return_type, out) } public static #{return_type} fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/lib/xdrgen/generators/java/XdrString.erb b/lib/xdrgen/generators/java/XdrString.erb index c56b62a16..74b19c481 100644 --- a/lib/xdrgen/generators/java/XdrString.erb +++ b/lib/xdrgen/generators/java/XdrString.erb @@ -1,12 +1,12 @@ package <%= @namespace %>; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public class XdrString implements XdrElement { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public class XdrString implements XdrElement { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/lib/xdrgen/generators/java/XdrUnsignedHyperInteger.erb b/lib/xdrgen/generators/java/XdrUnsignedHyperInteger.erb index c74d29f9f..36f8c668d 100644 --- a/lib/xdrgen/generators/java/XdrUnsignedHyperInteger.erb +++ b/lib/xdrgen/generators/java/XdrUnsignedHyperInteger.erb @@ -1,12 +1,11 @@ package <%= @namespace %>; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public class XdrUnsignedHyperInteger implements XdrElement { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public class XdrUnsignedHyperInteger implements XdrElement { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public class XdrUnsignedHyperInteger implements XdrElement { @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public class XdrUnsignedHyperInteger implements XdrElement { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/lib/xdrgen/generators/java/XdrUnsignedInteger.erb b/lib/xdrgen/generators/java/XdrUnsignedInteger.erb index 5b1056527..00f258072 100644 --- a/lib/xdrgen/generators/java/XdrUnsignedInteger.erb +++ b/lib/xdrgen/generators/java/XdrUnsignedInteger.erb @@ -1,11 +1,10 @@ package <%= @namespace %>; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public class XdrUnsignedInteger implements XdrElement { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public class XdrUnsignedInteger implements XdrElement { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public class XdrUnsignedInteger implements XdrElement { @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public class XdrUnsignedInteger implements XdrElement { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/block_comments.x/AccountFlags.java b/spec/output/generator_spec_java/block_comments.x/AccountFlags.java index d0b607443..29310df42 100644 --- a/spec/output/generator_spec_java/block_comments.x/AccountFlags.java +++ b/spec/output/generator_spec_java/block_comments.x/AccountFlags.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -49,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -62,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static AccountFlags fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/block_comments.x/XdrString.java b/spec/output/generator_spec_java/block_comments.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/block_comments.x/XdrString.java +++ b/spec/output/generator_spec_java/block_comments.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/block_comments.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/block_comments.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/block_comments.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/block_comments.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/block_comments.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/block_comments.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/block_comments.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/block_comments.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/const.x/TestArray.java b/spec/output/generator_spec_java/const.x/TestArray.java index 00f31b454..cc2f17b82 100644 --- a/spec/output/generator_spec_java/const.x/TestArray.java +++ b/spec/output/generator_spec_java/const.x/TestArray.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -69,8 +69,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -82,8 +81,7 @@ public byte[] toXdrByteArray() throws IOException { } public static TestArray fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/const.x/TestArray2.java b/spec/output/generator_spec_java/const.x/TestArray2.java index 7be8cb5a7..953485df0 100644 --- a/spec/output/generator_spec_java/const.x/TestArray2.java +++ b/spec/output/generator_spec_java/const.x/TestArray2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -70,8 +70,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -83,8 +82,7 @@ public byte[] toXdrByteArray() throws IOException { } public static TestArray2 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/const.x/XdrString.java b/spec/output/generator_spec_java/const.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/const.x/XdrString.java +++ b/spec/output/generator_spec_java/const.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/const.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/const.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/const.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/const.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/const.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/const.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/const.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/const.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/enum.x/Color.java b/spec/output/generator_spec_java/enum.x/Color.java index 147d42a4b..e8ef8b0f3 100644 --- a/spec/output/generator_spec_java/enum.x/Color.java +++ b/spec/output/generator_spec_java/enum.x/Color.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -54,8 +54,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -67,8 +66,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Color fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/enum.x/Color2.java b/spec/output/generator_spec_java/enum.x/Color2.java index 855462321..f5bacf769 100644 --- a/spec/output/generator_spec_java/enum.x/Color2.java +++ b/spec/output/generator_spec_java/enum.x/Color2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -54,8 +54,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -67,8 +66,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Color2 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/enum.x/MessageType.java b/spec/output/generator_spec_java/enum.x/MessageType.java index 9540adde0..866b40aad 100644 --- a/spec/output/generator_spec_java/enum.x/MessageType.java +++ b/spec/output/generator_spec_java/enum.x/MessageType.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -94,8 +94,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -107,8 +106,7 @@ public byte[] toXdrByteArray() throws IOException { } public static MessageType fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/enum.x/XdrString.java b/spec/output/generator_spec_java/enum.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/enum.x/XdrString.java +++ b/spec/output/generator_spec_java/enum.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/enum.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/enum.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/enum.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/enum.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/enum.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/enum.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/enum.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/enum.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/nesting.x/Foo.java b/spec/output/generator_spec_java/nesting.x/Foo.java index 706124313..59d4d74ee 100644 --- a/spec/output/generator_spec_java/nesting.x/Foo.java +++ b/spec/output/generator_spec_java/nesting.x/Foo.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Foo decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.Foo); + return Objects.hash(this.Foo); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Foo other = (Foo) object; - return Objects.equal(this.Foo, other.Foo); + return Objects.equals(this.Foo, other.Foo); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Foo fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/nesting.x/MyUnion.java b/spec/output/generator_spec_java/nesting.x/MyUnion.java index 99b29134b..f0ea8a18f 100644 --- a/spec/output/generator_spec_java/nesting.x/MyUnion.java +++ b/spec/output/generator_spec_java/nesting.x/MyUnion.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -120,7 +120,7 @@ public static MyUnion decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.one, this.two, this.type); + return Objects.hash(this.one, this.two, this.type); } @Override public boolean equals(Object object) { @@ -129,12 +129,11 @@ public boolean equals(Object object) { } MyUnion other = (MyUnion) object; - return Objects.equal(this.one, other.one) && Objects.equal(this.two, other.two) && Objects.equal(this.type, other.type); + return Objects.equals(this.one, other.one) && Objects.equals(this.two, other.two) && Objects.equals(this.type, other.type); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -146,8 +145,7 @@ public byte[] toXdrByteArray() throws IOException { } public static MyUnion fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -179,7 +177,7 @@ public static MyUnionOne decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.someInt); + return Objects.hash(this.someInt); } @Override public boolean equals(Object object) { @@ -188,13 +186,12 @@ public boolean equals(Object object) { } MyUnionOne other = (MyUnionOne) object; - return Objects.equal(this.someInt, other.someInt); + return Objects.equals(this.someInt, other.someInt); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -206,8 +203,7 @@ public byte[] toXdrByteArray() throws IOException { } public static MyUnionOne fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -263,7 +259,7 @@ public static MyUnionTwo decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.someInt, this.foo); + return Objects.hash(this.someInt, this.foo); } @Override public boolean equals(Object object) { @@ -272,13 +268,12 @@ public boolean equals(Object object) { } MyUnionTwo other = (MyUnionTwo) object; - return Objects.equal(this.someInt, other.someInt) && Objects.equal(this.foo, other.foo); + return Objects.equals(this.someInt, other.someInt) && Objects.equals(this.foo, other.foo); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -290,8 +285,7 @@ public byte[] toXdrByteArray() throws IOException { } public static MyUnionTwo fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/nesting.x/UnionKey.java b/spec/output/generator_spec_java/nesting.x/UnionKey.java index 0ce21576b..b67cb48da 100644 --- a/spec/output/generator_spec_java/nesting.x/UnionKey.java +++ b/spec/output/generator_spec_java/nesting.x/UnionKey.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -54,8 +54,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -67,8 +66,7 @@ public byte[] toXdrByteArray() throws IOException { } public static UnionKey fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/nesting.x/XdrString.java b/spec/output/generator_spec_java/nesting.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/nesting.x/XdrString.java +++ b/spec/output/generator_spec_java/nesting.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/nesting.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/nesting.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/nesting.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/nesting.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/nesting.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/nesting.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/nesting.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/nesting.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/optional.x/Arr.java b/spec/output/generator_spec_java/optional.x/Arr.java index 90661a94b..47dcea65c 100644 --- a/spec/output/generator_spec_java/optional.x/Arr.java +++ b/spec/output/generator_spec_java/optional.x/Arr.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -69,8 +69,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -82,8 +81,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Arr fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/optional.x/HasOptions.java b/spec/output/generator_spec_java/optional.x/HasOptions.java index 59594c86d..61be39ace 100644 --- a/spec/output/generator_spec_java/optional.x/HasOptions.java +++ b/spec/output/generator_spec_java/optional.x/HasOptions.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -85,7 +85,7 @@ public static HasOptions decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.firstOption, this.secondOption, this.thirdOption); + return Objects.hash(this.firstOption, this.secondOption, this.thirdOption); } @Override public boolean equals(Object object) { @@ -94,13 +94,12 @@ public boolean equals(Object object) { } HasOptions other = (HasOptions) object; - return Objects.equal(this.firstOption, other.firstOption) && Objects.equal(this.secondOption, other.secondOption) && Objects.equal(this.thirdOption, other.thirdOption); + return Objects.equals(this.firstOption, other.firstOption) && Objects.equals(this.secondOption, other.secondOption) && Objects.equals(this.thirdOption, other.thirdOption); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -112,8 +111,7 @@ public byte[] toXdrByteArray() throws IOException { } public static HasOptions fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/optional.x/XdrString.java b/spec/output/generator_spec_java/optional.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/optional.x/XdrString.java +++ b/spec/output/generator_spec_java/optional.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/optional.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/optional.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/optional.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/optional.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/optional.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/optional.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/optional.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/optional.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/struct.x/Int64.java b/spec/output/generator_spec_java/struct.x/Int64.java index 5d79c1c59..70bb344c8 100644 --- a/spec/output/generator_spec_java/struct.x/Int64.java +++ b/spec/output/generator_spec_java/struct.x/Int64.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Int64 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.int64); + return Objects.hash(this.int64); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Int64 other = (Int64) object; - return Objects.equal(this.int64, other.int64); + return Objects.equals(this.int64, other.int64); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Int64 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/struct.x/MyStruct.java b/spec/output/generator_spec_java/struct.x/MyStruct.java index b9390e6fc..d8f81103a 100644 --- a/spec/output/generator_spec_java/struct.x/MyStruct.java +++ b/spec/output/generator_spec_java/struct.x/MyStruct.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; import java.util.Arrays; // === xdr source ============================================================ @@ -85,7 +85,7 @@ public static MyStruct decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.someInt, this.aBigInt, Arrays.hashCode(this.someOpaque), this.someString, this.maxString); + return Objects.hash(this.someInt, this.aBigInt, Arrays.hashCode(this.someOpaque), this.someString, this.maxString); } @Override public boolean equals(Object object) { @@ -94,13 +94,12 @@ public boolean equals(Object object) { } MyStruct other = (MyStruct) object; - return Objects.equal(this.someInt, other.someInt) && Objects.equal(this.aBigInt, other.aBigInt) && Arrays.equals(this.someOpaque, other.someOpaque) && Objects.equal(this.someString, other.someString) && Objects.equal(this.maxString, other.maxString); + return Objects.equals(this.someInt, other.someInt) && Objects.equals(this.aBigInt, other.aBigInt) && Arrays.equals(this.someOpaque, other.someOpaque) && Objects.equals(this.someString, other.someString) && Objects.equals(this.maxString, other.maxString); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -112,8 +111,7 @@ public byte[] toXdrByteArray() throws IOException { } public static MyStruct fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/struct.x/XdrString.java b/spec/output/generator_spec_java/struct.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/struct.x/XdrString.java +++ b/spec/output/generator_spec_java/struct.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/struct.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/struct.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/struct.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/struct.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/struct.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/struct.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/struct.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/struct.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/test.x/Color.java b/spec/output/generator_spec_java/test.x/Color.java index 1072a998a..097d31562 100644 --- a/spec/output/generator_spec_java/test.x/Color.java +++ b/spec/output/generator_spec_java/test.x/Color.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -54,8 +54,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -67,8 +66,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Color fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/HasStuff.java b/spec/output/generator_spec_java/test.x/HasStuff.java index de5231a95..60a7a6a78 100644 --- a/spec/output/generator_spec_java/test.x/HasStuff.java +++ b/spec/output/generator_spec_java/test.x/HasStuff.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -41,7 +41,7 @@ public static HasStuff decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.data); + return Objects.hash(this.data); } @Override public boolean equals(Object object) { @@ -50,13 +50,12 @@ public boolean equals(Object object) { } HasStuff other = (HasStuff) object; - return Objects.equal(this.data, other.data); + return Objects.equals(this.data, other.data); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -68,8 +67,7 @@ public byte[] toXdrByteArray() throws IOException { } public static HasStuff fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Hash.java b/spec/output/generator_spec_java/test.x/Hash.java index 7dffc3307..f281d0047 100644 --- a/spec/output/generator_spec_java/test.x/Hash.java +++ b/spec/output/generator_spec_java/test.x/Hash.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -65,8 +65,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -78,8 +77,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Hash fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Hashes1.java b/spec/output/generator_spec_java/test.x/Hashes1.java index 54283c146..95643c932 100644 --- a/spec/output/generator_spec_java/test.x/Hashes1.java +++ b/spec/output/generator_spec_java/test.x/Hashes1.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -69,8 +69,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -82,8 +81,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Hashes1 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Hashes2.java b/spec/output/generator_spec_java/test.x/Hashes2.java index 3d54d807d..1b193bcf1 100644 --- a/spec/output/generator_spec_java/test.x/Hashes2.java +++ b/spec/output/generator_spec_java/test.x/Hashes2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -70,8 +70,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -83,8 +82,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Hashes2 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Hashes3.java b/spec/output/generator_spec_java/test.x/Hashes3.java index f204a03bd..2b7f642ed 100644 --- a/spec/output/generator_spec_java/test.x/Hashes3.java +++ b/spec/output/generator_spec_java/test.x/Hashes3.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -70,8 +70,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -83,8 +82,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Hashes3 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Int1.java b/spec/output/generator_spec_java/test.x/Int1.java index 17fe01b58..ff12e0e0e 100644 --- a/spec/output/generator_spec_java/test.x/Int1.java +++ b/spec/output/generator_spec_java/test.x/Int1.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Int1 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.int1); + return Objects.hash(this.int1); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Int1 other = (Int1) object; - return Objects.equal(this.int1, other.int1); + return Objects.equals(this.int1, other.int1); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Int1 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Int2.java b/spec/output/generator_spec_java/test.x/Int2.java index 67fc0f9e1..630d1f413 100644 --- a/spec/output/generator_spec_java/test.x/Int2.java +++ b/spec/output/generator_spec_java/test.x/Int2.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Int2 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.int2); + return Objects.hash(this.int2); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Int2 other = (Int2) object; - return Objects.equal(this.int2, other.int2); + return Objects.equals(this.int2, other.int2); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Int2 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Int3.java b/spec/output/generator_spec_java/test.x/Int3.java index c80fc74dd..268e149b0 100644 --- a/spec/output/generator_spec_java/test.x/Int3.java +++ b/spec/output/generator_spec_java/test.x/Int3.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Int3 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.int3); + return Objects.hash(this.int3); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Int3 other = (Int3) object; - return Objects.equal(this.int3, other.int3); + return Objects.equals(this.int3, other.int3); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Int3 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Int4.java b/spec/output/generator_spec_java/test.x/Int4.java index f90f395f7..de22eba5c 100644 --- a/spec/output/generator_spec_java/test.x/Int4.java +++ b/spec/output/generator_spec_java/test.x/Int4.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Int4 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.int4); + return Objects.hash(this.int4); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Int4 other = (Int4) object; - return Objects.equal(this.int4, other.int4); + return Objects.equals(this.int4, other.int4); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Int4 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java b/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java index 936144fb0..a6a56b6f2 100644 --- a/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java +++ b/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -63,8 +63,7 @@ public boolean equals(Object object) { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -76,8 +75,7 @@ public byte[] toXdrByteArray() throws IOException { } public static LotsOfMyStructs fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/MyStruct.java b/spec/output/generator_spec_java/test.x/MyStruct.java index 2b07ecbf4..c2011b857 100644 --- a/spec/output/generator_spec_java/test.x/MyStruct.java +++ b/spec/output/generator_spec_java/test.x/MyStruct.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -101,7 +101,7 @@ public static MyStruct decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.field1, this.field2, this.field3, this.field4, this.field5, this.field6, this.field7); + return Objects.hash(this.field1, this.field2, this.field3, this.field4, this.field5, this.field6, this.field7); } @Override public boolean equals(Object object) { @@ -110,13 +110,12 @@ public boolean equals(Object object) { } MyStruct other = (MyStruct) object; - return Objects.equal(this.field1, other.field1) && Objects.equal(this.field2, other.field2) && Objects.equal(this.field3, other.field3) && Objects.equal(this.field4, other.field4) && Objects.equal(this.field5, other.field5) && Objects.equal(this.field6, other.field6) && Objects.equal(this.field7, other.field7); + return Objects.equals(this.field1, other.field1) && Objects.equals(this.field2, other.field2) && Objects.equals(this.field3, other.field3) && Objects.equals(this.field4, other.field4) && Objects.equals(this.field5, other.field5) && Objects.equals(this.field6, other.field6) && Objects.equals(this.field7, other.field7); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -128,8 +127,7 @@ public byte[] toXdrByteArray() throws IOException { } public static MyStruct fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Nester.java b/spec/output/generator_spec_java/test.x/Nester.java index d3d1bd086..5fd612ecb 100644 --- a/spec/output/generator_spec_java/test.x/Nester.java +++ b/spec/output/generator_spec_java/test.x/Nester.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -75,7 +75,7 @@ public static Nester decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.nestedEnum, this.nestedStruct, this.nestedUnion); + return Objects.hash(this.nestedEnum, this.nestedStruct, this.nestedUnion); } @Override public boolean equals(Object object) { @@ -84,13 +84,12 @@ public boolean equals(Object object) { } Nester other = (Nester) object; - return Objects.equal(this.nestedEnum, other.nestedEnum) && Objects.equal(this.nestedStruct, other.nestedStruct) && Objects.equal(this.nestedUnion, other.nestedUnion); + return Objects.equals(this.nestedEnum, other.nestedEnum) && Objects.equals(this.nestedStruct, other.nestedStruct) && Objects.equals(this.nestedUnion, other.nestedUnion); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -102,8 +101,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Nester fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -174,8 +172,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -187,8 +184,7 @@ public byte[] toXdrByteArray() throws IOException { } public static NestedEnum fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -221,7 +217,7 @@ public static NesterNestedStruct decode(XdrDataInputStream stream) throws IOExce } @Override public int hashCode() { - return Objects.hashCode(this.blah); + return Objects.hash(this.blah); } @Override public boolean equals(Object object) { @@ -230,13 +226,12 @@ public boolean equals(Object object) { } NesterNestedStruct other = (NesterNestedStruct) object; - return Objects.equal(this.blah, other.blah); + return Objects.equals(this.blah, other.blah); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -248,8 +243,7 @@ public byte[] toXdrByteArray() throws IOException { } public static NesterNestedStruct fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -343,7 +337,7 @@ public static NesterNestedUnion decode(XdrDataInputStream stream) throws IOExcep } @Override public int hashCode() { - return Objects.hashCode(this.blah2, this.color); + return Objects.hash(this.blah2, this.color); } @Override public boolean equals(Object object) { @@ -352,12 +346,11 @@ public boolean equals(Object object) { } NesterNestedUnion other = (NesterNestedUnion) object; - return Objects.equal(this.blah2, other.blah2) && Objects.equal(this.color, other.color); + return Objects.equals(this.blah2, other.blah2) && Objects.equals(this.color, other.color); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -369,8 +362,7 @@ public byte[] toXdrByteArray() throws IOException { } public static NesterNestedUnion fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/OptHash1.java b/spec/output/generator_spec_java/test.x/OptHash1.java index 18b6bb54e..b561f1c48 100644 --- a/spec/output/generator_spec_java/test.x/OptHash1.java +++ b/spec/output/generator_spec_java/test.x/OptHash1.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -56,7 +56,7 @@ public static OptHash1 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.optHash1); + return Objects.hash(this.optHash1); } @Override @@ -66,12 +66,11 @@ public boolean equals(Object object) { } OptHash1 other = (OptHash1) object; - return Objects.equal(this.optHash1, other.optHash1); + return Objects.equals(this.optHash1, other.optHash1); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -83,8 +82,7 @@ public byte[] toXdrByteArray() throws IOException { } public static OptHash1 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/OptHash2.java b/spec/output/generator_spec_java/test.x/OptHash2.java index 56207e366..a8c88e386 100644 --- a/spec/output/generator_spec_java/test.x/OptHash2.java +++ b/spec/output/generator_spec_java/test.x/OptHash2.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -56,7 +56,7 @@ public static OptHash2 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.optHash2); + return Objects.hash(this.optHash2); } @Override @@ -66,12 +66,11 @@ public boolean equals(Object object) { } OptHash2 other = (OptHash2) object; - return Objects.equal(this.optHash2, other.optHash2); + return Objects.equals(this.optHash2, other.optHash2); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -83,8 +82,7 @@ public byte[] toXdrByteArray() throws IOException { } public static OptHash2 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Str.java b/spec/output/generator_spec_java/test.x/Str.java index ea3343b97..c5d5c971d 100644 --- a/spec/output/generator_spec_java/test.x/Str.java +++ b/spec/output/generator_spec_java/test.x/Str.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Str decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.str); + return Objects.hash(this.str); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Str other = (Str) object; - return Objects.equal(this.str, other.str); + return Objects.equals(this.str, other.str); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Str fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Str2.java b/spec/output/generator_spec_java/test.x/Str2.java index 3d30b06d2..e82da4603 100644 --- a/spec/output/generator_spec_java/test.x/Str2.java +++ b/spec/output/generator_spec_java/test.x/Str2.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Str2 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.str2); + return Objects.hash(this.str2); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Str2 other = (Str2) object; - return Objects.equal(this.str2, other.str2); + return Objects.equals(this.str2, other.str2); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Str2 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Uint512.java b/spec/output/generator_spec_java/test.x/Uint512.java index e2301e572..13eaa7b45 100644 --- a/spec/output/generator_spec_java/test.x/Uint512.java +++ b/spec/output/generator_spec_java/test.x/Uint512.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -65,8 +65,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -78,8 +77,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Uint512 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Uint513.java b/spec/output/generator_spec_java/test.x/Uint513.java index f96d25cea..bdb068cae 100644 --- a/spec/output/generator_spec_java/test.x/Uint513.java +++ b/spec/output/generator_spec_java/test.x/Uint513.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -66,8 +66,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -79,8 +78,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Uint513 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/Uint514.java b/spec/output/generator_spec_java/test.x/Uint514.java index 11e329996..a485d977e 100644 --- a/spec/output/generator_spec_java/test.x/Uint514.java +++ b/spec/output/generator_spec_java/test.x/Uint514.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -66,8 +66,7 @@ public boolean equals(Object object) { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -79,8 +78,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Uint514 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/test.x/XdrString.java b/spec/output/generator_spec_java/test.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/test.x/XdrString.java +++ b/spec/output/generator_spec_java/test.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/test.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/test.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/test.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/test.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/test.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/test.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/test.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/test.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/union.x/Error.java b/spec/output/generator_spec_java/union.x/Error.java index 2d88902e1..59dccb956 100644 --- a/spec/output/generator_spec_java/union.x/Error.java +++ b/spec/output/generator_spec_java/union.x/Error.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Error decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.Error); + return Objects.hash(this.Error); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Error other = (Error) object; - return Objects.equal(this.Error, other.Error); + return Objects.equals(this.Error, other.Error); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Error fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/union.x/IntUnion.java b/spec/output/generator_spec_java/union.x/IntUnion.java index ab0e48dd9..801f91dde 100644 --- a/spec/output/generator_spec_java/union.x/IntUnion.java +++ b/spec/output/generator_spec_java/union.x/IntUnion.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; import java.util.Arrays; // === xdr source ============================================================ @@ -117,7 +117,7 @@ public static IntUnion decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.error, Arrays.hashCode(this.things), this.type); + return Objects.hash(this.error, Arrays.hashCode(this.things), this.type); } @Override public boolean equals(Object object) { @@ -126,12 +126,11 @@ public boolean equals(Object object) { } IntUnion other = (IntUnion) object; - return Objects.equal(this.error, other.error) && Arrays.equals(this.things, other.things) && Objects.equal(this.type, other.type); + return Objects.equals(this.error, other.error) && Arrays.equals(this.things, other.things) && Objects.equals(this.type, other.type); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -143,8 +142,7 @@ public byte[] toXdrByteArray() throws IOException { } public static IntUnion fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/union.x/IntUnion2.java b/spec/output/generator_spec_java/union.x/IntUnion2.java index 5a5558da1..d6cd90ee6 100644 --- a/spec/output/generator_spec_java/union.x/IntUnion2.java +++ b/spec/output/generator_spec_java/union.x/IntUnion2.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static IntUnion2 decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.IntUnion2); + return Objects.hash(this.IntUnion2); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } IntUnion2 other = (IntUnion2) object; - return Objects.equal(this.IntUnion2, other.IntUnion2); + return Objects.equals(this.IntUnion2, other.IntUnion2); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static IntUnion2 fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/union.x/Multi.java b/spec/output/generator_spec_java/union.x/Multi.java index f910ad807..b1234942b 100644 --- a/spec/output/generator_spec_java/union.x/Multi.java +++ b/spec/output/generator_spec_java/union.x/Multi.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; // === xdr source ============================================================ @@ -48,7 +48,7 @@ public static Multi decode(XdrDataInputStream stream) throws IOException { @Override public int hashCode() { - return Objects.hashCode(this.Multi); + return Objects.hash(this.Multi); } @Override @@ -58,12 +58,11 @@ public boolean equals(Object object) { } Multi other = (Multi) object; - return Objects.equal(this.Multi, other.Multi); + return Objects.equals(this.Multi, other.Multi); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +74,7 @@ public byte[] toXdrByteArray() throws IOException { } public static Multi fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/union.x/MyUnion.java b/spec/output/generator_spec_java/union.x/MyUnion.java index 0798460a6..97be8e584 100644 --- a/spec/output/generator_spec_java/union.x/MyUnion.java +++ b/spec/output/generator_spec_java/union.x/MyUnion.java @@ -6,10 +6,10 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import com.google.common.base.Objects; +import java.util.Objects; import java.util.Arrays; // === xdr source ============================================================ @@ -118,7 +118,7 @@ public static MyUnion decode(XdrDataInputStream stream) throws IOException { } @Override public int hashCode() { - return Objects.hashCode(this.error, Arrays.hashCode(this.things), this.type); + return Objects.hash(this.error, Arrays.hashCode(this.things), this.type); } @Override public boolean equals(Object object) { @@ -127,12 +127,11 @@ public boolean equals(Object object) { } MyUnion other = (MyUnion) object; - return Objects.equal(this.error, other.error) && Arrays.equals(this.things, other.things) && Objects.equal(this.type, other.type); + return Objects.equals(this.error, other.error) && Arrays.equals(this.things, other.things) && Objects.equals(this.type, other.type); } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -144,8 +143,7 @@ public byte[] toXdrByteArray() throws IOException { } public static MyUnion fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/union.x/UnionKey.java b/spec/output/generator_spec_java/union.x/UnionKey.java index 2cd199024..ee1b55aad 100644 --- a/spec/output/generator_spec_java/union.x/UnionKey.java +++ b/spec/output/generator_spec_java/union.x/UnionKey.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import com.google.common.io.BaseEncoding; +import java.util.Base64;; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -51,8 +51,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { } @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -64,8 +63,7 @@ public byte[] toXdrByteArray() throws IOException { } public static UnionKey fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } diff --git a/spec/output/generator_spec_java/union.x/XdrString.java b/spec/output/generator_spec_java/union.x/XdrString.java index 8f9b2ab73..7d5b65d73 100644 --- a/spec/output/generator_spec_java/union.x/XdrString.java +++ b/spec/output/generator_spec_java/union.x/XdrString.java @@ -1,12 +1,12 @@ package MyXDR; -import com.google.common.io.BaseEncoding; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InvalidClassException; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.Base64; public class XdrString implements XdrElement { private byte[] bytes; @@ -41,8 +41,7 @@ public byte[] getBytes() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -54,8 +53,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes, maxSize); } diff --git a/spec/output/generator_spec_java/union.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/union.x/XdrUnsignedHyperInteger.java index 6789d46c1..a2fe12840 100644 --- a/spec/output/generator_spec_java/union.x/XdrUnsignedHyperInteger.java +++ b/spec/output/generator_spec_java/union.x/XdrUnsignedHyperInteger.java @@ -1,12 +1,11 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Hyper Integer. @@ -62,8 +61,7 @@ public BigInteger getNumber() { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -75,8 +73,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -88,7 +85,7 @@ public static XdrUnsignedHyperInteger fromXdrByteArray(byte[] xdr) throws IOExce @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -98,7 +95,7 @@ public boolean equals(Object object) { } XdrUnsignedHyperInteger other = (XdrUnsignedHyperInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { diff --git a/spec/output/generator_spec_java/union.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/union.x/XdrUnsignedInteger.java index a8967063c..8ff9c4e9a 100644 --- a/spec/output/generator_spec_java/union.x/XdrUnsignedInteger.java +++ b/spec/output/generator_spec_java/union.x/XdrUnsignedInteger.java @@ -1,11 +1,10 @@ package MyXDR; -import com.google.common.base.Objects; -import com.google.common.io.BaseEncoding; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; +import java.util.Objects; /** * Represents XDR Unsigned Integer. @@ -50,8 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException { @Override public String toXdrBase64() throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - return base64Encoding.encode(toXdrByteArray()); + return Base64.getEncoder().encodeToString(toXdrByteArray()); } @Override @@ -63,8 +61,7 @@ public byte[] toXdrByteArray() throws IOException { } public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException { - BaseEncoding base64Encoding = BaseEncoding.base64(); - byte[] bytes = base64Encoding.decode(xdr); + byte[] bytes = Base64.getDecoder().decode(xdr); return fromXdrByteArray(bytes); } @@ -76,7 +73,7 @@ public static XdrUnsignedInteger fromXdrByteArray(byte[] xdr) throws IOException @Override public int hashCode() { - return Objects.hashCode(this.number); + return Objects.hash(this.number); } @Override @@ -86,7 +83,7 @@ public boolean equals(Object object) { } XdrUnsignedInteger other = (XdrUnsignedInteger) object; - return Objects.equal(this.number, other.number); + return Objects.equals(this.number, other.number); } public String toString() { From 13cc09845db427dadd92262686d4e27002f5850c Mon Sep 17 00:00:00 2001 From: overcat <4catcode@gmail.com> Date: Mon, 11 Sep 2023 14:46:26 +0800 Subject: [PATCH 2/2] refactor(java): Remove the dependency on third-party libraries. --- lib/xdrgen/generators/java.rb | 2 +- .../generator_spec_java/block_comments.x/AccountFlags.java | 2 +- spec/output/generator_spec_java/const.x/TestArray.java | 2 +- spec/output/generator_spec_java/const.x/TestArray2.java | 2 +- spec/output/generator_spec_java/enum.x/Color.java | 2 +- spec/output/generator_spec_java/enum.x/Color2.java | 2 +- spec/output/generator_spec_java/enum.x/MessageType.java | 2 +- spec/output/generator_spec_java/nesting.x/Foo.java | 2 +- spec/output/generator_spec_java/nesting.x/MyUnion.java | 2 +- spec/output/generator_spec_java/nesting.x/UnionKey.java | 2 +- spec/output/generator_spec_java/optional.x/Arr.java | 2 +- spec/output/generator_spec_java/optional.x/HasOptions.java | 2 +- spec/output/generator_spec_java/struct.x/Int64.java | 2 +- spec/output/generator_spec_java/struct.x/MyStruct.java | 2 +- spec/output/generator_spec_java/test.x/Color.java | 2 +- spec/output/generator_spec_java/test.x/HasStuff.java | 2 +- spec/output/generator_spec_java/test.x/Hash.java | 2 +- spec/output/generator_spec_java/test.x/Hashes1.java | 2 +- spec/output/generator_spec_java/test.x/Hashes2.java | 2 +- spec/output/generator_spec_java/test.x/Hashes3.java | 2 +- spec/output/generator_spec_java/test.x/Int1.java | 2 +- spec/output/generator_spec_java/test.x/Int2.java | 2 +- spec/output/generator_spec_java/test.x/Int3.java | 2 +- spec/output/generator_spec_java/test.x/Int4.java | 2 +- spec/output/generator_spec_java/test.x/LotsOfMyStructs.java | 2 +- spec/output/generator_spec_java/test.x/MyStruct.java | 2 +- spec/output/generator_spec_java/test.x/Nester.java | 2 +- spec/output/generator_spec_java/test.x/OptHash1.java | 2 +- spec/output/generator_spec_java/test.x/OptHash2.java | 2 +- spec/output/generator_spec_java/test.x/Str.java | 2 +- spec/output/generator_spec_java/test.x/Str2.java | 2 +- spec/output/generator_spec_java/test.x/Uint512.java | 2 +- spec/output/generator_spec_java/test.x/Uint513.java | 2 +- spec/output/generator_spec_java/test.x/Uint514.java | 2 +- spec/output/generator_spec_java/union.x/Error.java | 2 +- spec/output/generator_spec_java/union.x/IntUnion.java | 2 +- spec/output/generator_spec_java/union.x/IntUnion2.java | 2 +- spec/output/generator_spec_java/union.x/Multi.java | 2 +- spec/output/generator_spec_java/union.x/MyUnion.java | 2 +- spec/output/generator_spec_java/union.x/UnionKey.java | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/xdrgen/generators/java.rb b/lib/xdrgen/generators/java.rb index f0d6369b0..07782dca3 100644 --- a/lib/xdrgen/generators/java.rb +++ b/lib/xdrgen/generators/java.rb @@ -43,7 +43,7 @@ def render_definitions(node, constants_container) end def add_imports_for_definition(defn, imports) - imports.add("java.util.Base64;") + imports.add("java.util.Base64") imports.add("java.io.ByteArrayInputStream") imports.add("java.io.ByteArrayOutputStream") diff --git a/spec/output/generator_spec_java/block_comments.x/AccountFlags.java b/spec/output/generator_spec_java/block_comments.x/AccountFlags.java index 29310df42..b15db047f 100644 --- a/spec/output/generator_spec_java/block_comments.x/AccountFlags.java +++ b/spec/output/generator_spec_java/block_comments.x/AccountFlags.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/spec/output/generator_spec_java/const.x/TestArray.java b/spec/output/generator_spec_java/const.x/TestArray.java index cc2f17b82..9a95ec402 100644 --- a/spec/output/generator_spec_java/const.x/TestArray.java +++ b/spec/output/generator_spec_java/const.x/TestArray.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/const.x/TestArray2.java b/spec/output/generator_spec_java/const.x/TestArray2.java index 953485df0..f65df5de4 100644 --- a/spec/output/generator_spec_java/const.x/TestArray2.java +++ b/spec/output/generator_spec_java/const.x/TestArray2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/enum.x/Color.java b/spec/output/generator_spec_java/enum.x/Color.java index e8ef8b0f3..9c39ac3ca 100644 --- a/spec/output/generator_spec_java/enum.x/Color.java +++ b/spec/output/generator_spec_java/enum.x/Color.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/spec/output/generator_spec_java/enum.x/Color2.java b/spec/output/generator_spec_java/enum.x/Color2.java index f5bacf769..de7ef7aa5 100644 --- a/spec/output/generator_spec_java/enum.x/Color2.java +++ b/spec/output/generator_spec_java/enum.x/Color2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/spec/output/generator_spec_java/enum.x/MessageType.java b/spec/output/generator_spec_java/enum.x/MessageType.java index 866b40aad..ec3e86755 100644 --- a/spec/output/generator_spec_java/enum.x/MessageType.java +++ b/spec/output/generator_spec_java/enum.x/MessageType.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/spec/output/generator_spec_java/nesting.x/Foo.java b/spec/output/generator_spec_java/nesting.x/Foo.java index 59d4d74ee..dbeea33e3 100644 --- a/spec/output/generator_spec_java/nesting.x/Foo.java +++ b/spec/output/generator_spec_java/nesting.x/Foo.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/nesting.x/MyUnion.java b/spec/output/generator_spec_java/nesting.x/MyUnion.java index f0ea8a18f..1dbfcd062 100644 --- a/spec/output/generator_spec_java/nesting.x/MyUnion.java +++ b/spec/output/generator_spec_java/nesting.x/MyUnion.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/nesting.x/UnionKey.java b/spec/output/generator_spec_java/nesting.x/UnionKey.java index b67cb48da..d30343fc7 100644 --- a/spec/output/generator_spec_java/nesting.x/UnionKey.java +++ b/spec/output/generator_spec_java/nesting.x/UnionKey.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/spec/output/generator_spec_java/optional.x/Arr.java b/spec/output/generator_spec_java/optional.x/Arr.java index 47dcea65c..2de6b090e 100644 --- a/spec/output/generator_spec_java/optional.x/Arr.java +++ b/spec/output/generator_spec_java/optional.x/Arr.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/optional.x/HasOptions.java b/spec/output/generator_spec_java/optional.x/HasOptions.java index 61be39ace..113c7105d 100644 --- a/spec/output/generator_spec_java/optional.x/HasOptions.java +++ b/spec/output/generator_spec_java/optional.x/HasOptions.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/struct.x/Int64.java b/spec/output/generator_spec_java/struct.x/Int64.java index 70bb344c8..76c6352f9 100644 --- a/spec/output/generator_spec_java/struct.x/Int64.java +++ b/spec/output/generator_spec_java/struct.x/Int64.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/struct.x/MyStruct.java b/spec/output/generator_spec_java/struct.x/MyStruct.java index d8f81103a..86f83e843 100644 --- a/spec/output/generator_spec_java/struct.x/MyStruct.java +++ b/spec/output/generator_spec_java/struct.x/MyStruct.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Color.java b/spec/output/generator_spec_java/test.x/Color.java index 097d31562..f32c2bbca 100644 --- a/spec/output/generator_spec_java/test.x/Color.java +++ b/spec/output/generator_spec_java/test.x/Color.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/spec/output/generator_spec_java/test.x/HasStuff.java b/spec/output/generator_spec_java/test.x/HasStuff.java index 60a7a6a78..7f7eb95fa 100644 --- a/spec/output/generator_spec_java/test.x/HasStuff.java +++ b/spec/output/generator_spec_java/test.x/HasStuff.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Hash.java b/spec/output/generator_spec_java/test.x/Hash.java index f281d0047..b64dcfd04 100644 --- a/spec/output/generator_spec_java/test.x/Hash.java +++ b/spec/output/generator_spec_java/test.x/Hash.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/test.x/Hashes1.java b/spec/output/generator_spec_java/test.x/Hashes1.java index 95643c932..2c17a6fcb 100644 --- a/spec/output/generator_spec_java/test.x/Hashes1.java +++ b/spec/output/generator_spec_java/test.x/Hashes1.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/test.x/Hashes2.java b/spec/output/generator_spec_java/test.x/Hashes2.java index 1b193bcf1..8516aff64 100644 --- a/spec/output/generator_spec_java/test.x/Hashes2.java +++ b/spec/output/generator_spec_java/test.x/Hashes2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/test.x/Hashes3.java b/spec/output/generator_spec_java/test.x/Hashes3.java index 2b7f642ed..24e0b1f51 100644 --- a/spec/output/generator_spec_java/test.x/Hashes3.java +++ b/spec/output/generator_spec_java/test.x/Hashes3.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/test.x/Int1.java b/spec/output/generator_spec_java/test.x/Int1.java index ff12e0e0e..ae805e985 100644 --- a/spec/output/generator_spec_java/test.x/Int1.java +++ b/spec/output/generator_spec_java/test.x/Int1.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Int2.java b/spec/output/generator_spec_java/test.x/Int2.java index 630d1f413..384221c26 100644 --- a/spec/output/generator_spec_java/test.x/Int2.java +++ b/spec/output/generator_spec_java/test.x/Int2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Int3.java b/spec/output/generator_spec_java/test.x/Int3.java index 268e149b0..0e1e7b46b 100644 --- a/spec/output/generator_spec_java/test.x/Int3.java +++ b/spec/output/generator_spec_java/test.x/Int3.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Int4.java b/spec/output/generator_spec_java/test.x/Int4.java index de22eba5c..6cd8d931f 100644 --- a/spec/output/generator_spec_java/test.x/Int4.java +++ b/spec/output/generator_spec_java/test.x/Int4.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java b/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java index a6a56b6f2..a659ded14 100644 --- a/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java +++ b/spec/output/generator_spec_java/test.x/LotsOfMyStructs.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/test.x/MyStruct.java b/spec/output/generator_spec_java/test.x/MyStruct.java index c2011b857..424da1fc9 100644 --- a/spec/output/generator_spec_java/test.x/MyStruct.java +++ b/spec/output/generator_spec_java/test.x/MyStruct.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Nester.java b/spec/output/generator_spec_java/test.x/Nester.java index 5fd612ecb..810e9e45e 100644 --- a/spec/output/generator_spec_java/test.x/Nester.java +++ b/spec/output/generator_spec_java/test.x/Nester.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/OptHash1.java b/spec/output/generator_spec_java/test.x/OptHash1.java index b561f1c48..200a44682 100644 --- a/spec/output/generator_spec_java/test.x/OptHash1.java +++ b/spec/output/generator_spec_java/test.x/OptHash1.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/OptHash2.java b/spec/output/generator_spec_java/test.x/OptHash2.java index a8c88e386..d52f68317 100644 --- a/spec/output/generator_spec_java/test.x/OptHash2.java +++ b/spec/output/generator_spec_java/test.x/OptHash2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Str.java b/spec/output/generator_spec_java/test.x/Str.java index c5d5c971d..40241ea08 100644 --- a/spec/output/generator_spec_java/test.x/Str.java +++ b/spec/output/generator_spec_java/test.x/Str.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Str2.java b/spec/output/generator_spec_java/test.x/Str2.java index e82da4603..2c70c40d9 100644 --- a/spec/output/generator_spec_java/test.x/Str2.java +++ b/spec/output/generator_spec_java/test.x/Str2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/test.x/Uint512.java b/spec/output/generator_spec_java/test.x/Uint512.java index 13eaa7b45..1cb18f44f 100644 --- a/spec/output/generator_spec_java/test.x/Uint512.java +++ b/spec/output/generator_spec_java/test.x/Uint512.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/test.x/Uint513.java b/spec/output/generator_spec_java/test.x/Uint513.java index bdb068cae..0a196981c 100644 --- a/spec/output/generator_spec_java/test.x/Uint513.java +++ b/spec/output/generator_spec_java/test.x/Uint513.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/test.x/Uint514.java b/spec/output/generator_spec_java/test.x/Uint514.java index a485d977e..542223d05 100644 --- a/spec/output/generator_spec_java/test.x/Uint514.java +++ b/spec/output/generator_spec_java/test.x/Uint514.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Arrays; diff --git a/spec/output/generator_spec_java/union.x/Error.java b/spec/output/generator_spec_java/union.x/Error.java index 59dccb956..3109b0fab 100644 --- a/spec/output/generator_spec_java/union.x/Error.java +++ b/spec/output/generator_spec_java/union.x/Error.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/union.x/IntUnion.java b/spec/output/generator_spec_java/union.x/IntUnion.java index 801f91dde..7d80e11e0 100644 --- a/spec/output/generator_spec_java/union.x/IntUnion.java +++ b/spec/output/generator_spec_java/union.x/IntUnion.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/union.x/IntUnion2.java b/spec/output/generator_spec_java/union.x/IntUnion2.java index d6cd90ee6..a3c657e68 100644 --- a/spec/output/generator_spec_java/union.x/IntUnion2.java +++ b/spec/output/generator_spec_java/union.x/IntUnion2.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/union.x/Multi.java b/spec/output/generator_spec_java/union.x/Multi.java index b1234942b..df9163017 100644 --- a/spec/output/generator_spec_java/union.x/Multi.java +++ b/spec/output/generator_spec_java/union.x/Multi.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/union.x/MyUnion.java b/spec/output/generator_spec_java/union.x/MyUnion.java index 97be8e584..1737794a3 100644 --- a/spec/output/generator_spec_java/union.x/MyUnion.java +++ b/spec/output/generator_spec_java/union.x/MyUnion.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Objects; diff --git a/spec/output/generator_spec_java/union.x/UnionKey.java b/spec/output/generator_spec_java/union.x/UnionKey.java index ee1b55aad..a0acb33d7 100644 --- a/spec/output/generator_spec_java/union.x/UnionKey.java +++ b/spec/output/generator_spec_java/union.x/UnionKey.java @@ -6,7 +6,7 @@ import java.io.IOException; import static MyXDR.Constants.*; -import java.util.Base64;; +import java.util.Base64; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream;