fix: format code by google code format plugin.

FISCO-BCOS · Mar 29, 2024 · 0bd9632 · 0bd9632
1 parent 2798ca2
commit 0bd9632
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 40 deletions.
diff --git a/src/main/java/org/fisco/solc/compiler/CompilationResult.java b/src/main/java/org/fisco/solc/compiler/CompilationResult.java
@@ -50,7 +50,7 @@ public static CompilationResult parse(String rawJson) throws IOException {
                 abiObject.addProperty("bin", contractJsonObject.get("bin").getAsString());
                 abiObject.addProperty("metadata", contractJsonObject.get("metadata").getAsString());
 
-                if ( contractJsonObject.get("userdoc") != null) {
+                if (contractJsonObject.get("userdoc") != null) {
                     abiObject.addProperty("userdoc", contractJsonObject.get("userdoc").toString());
                 }
 
@@ -116,7 +116,17 @@ public static class ContractMetadata {
 
         @Override
         public String toString() {
-            return "ContractMetadata [abi=" + abi + ", bin=" + bin + ", metadata=" + metadata + ", userdoc=" + userdoc + ", devdoc=" + devdoc + "]";
+            return "ContractMetadata [abi="
+                    + abi
+                    + ", bin="
+                    + bin
+                    + ", metadata="
+                    + metadata
+                    + ", userdoc="
+                    + userdoc
+                    + ", devdoc="
+                    + devdoc
+                    + "]";
         }
     }
 }
diff --git a/src/main/java/org/fisco/solc/compiler/Solc.java b/src/main/java/org/fisco/solc/compiler/Solc.java
@@ -46,7 +46,11 @@ private void initDefaultBundled(boolean sm, Version version) throws IOException
         File tmpDir =
                 new File(
                         System.getProperty("user.home"),
-                        ".fisco/solc" + "/" + version.toString() + "/" + (sm ? "sm3" : "keccak256"));
+                        ".fisco/solc"
+                                + "/"
+                                + version.toString()
+                                + "/"
+                                + (sm ? "sm3" : "keccak256"));
 
         if (logger.isTraceEnabled()) {
             logger.trace(" sm: {}, tmpDir: {}", sm, tmpDir.getAbsolutePath());
@@ -84,7 +88,13 @@ private void initDefaultBundled(boolean sm, Version version) throws IOException
     private String getSolcDir(boolean sm, Version version) {
 
         String osName = getOS();
-        String resourceDir = "/native/" + (sm ? "sm/" : "ecdsa/") +  getOS() + File.separator + version.toString() + File.separator;
+        String resourceDir =
+                "/native/"
+                        + (sm ? "sm/" : "ecdsa/")
+                        + getOS()
+                        + File.separator
+                        + version.toString()
+                        + File.separator;
         if (osName.equals("linux") || osName.equals("mac")) {
             // Add support for arm
             String archName = getArch();

diff --git a/src/main/java/org/fisco/solc/compiler/SolidityCompiler.java b/src/main/java/org/fisco/solc/compiler/SolidityCompiler.java
@@ -15,7 +15,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +47,8 @@ private void initSolc(boolean sm, Version version) {
      * @return
      * @throws IOException
      */
-    public static Result compile(File source, boolean sm, boolean combinedJson, Version version, Option... options)
+    public static Result compile(
+            File source, boolean sm, boolean combinedJson, Version version, Option... options)
             throws IOException {
         return getInstance().compileSrc(source, sm, false, combinedJson, version, options);
     }
@@ -61,7 +61,8 @@ public static Result compile(File source, boolean sm, boolean combinedJson, Vers
      * @return
      * @throws IOException
      */
-    public static Result compile(byte[] source, boolean sm, boolean combinedJson, Version version, Option... options)
+    public static Result compile(
+            byte[] source, boolean sm, boolean combinedJson, Version version, Option... options)
             throws IOException {
         return getInstance().compileSrc(source, sm, false, combinedJson, version, options);
     }
@@ -185,7 +186,6 @@ private enum OutputOption implements Option {
         USERDOC("userdoc"),
         DEVDOC("devdoc");
 
-
         private String name;
 
         OutputOption(String name) {
@@ -314,7 +314,12 @@ public void run() {
     }
 
     private Result compileSrc(
-            File source, boolean sm, boolean optimize, boolean combinedJson, Version version, Option... options)
+            File source,
+            boolean sm,
+            boolean optimize,
+            boolean combinedJson,
+            Version version,
+            Option... options)
             throws IOException {
 
         if (logger.isDebugEnabled()) {
@@ -400,7 +405,12 @@ private static <T> List<T> getElementsOf(Class<T> clazz, Option... options) {
     }
 
     private Result compileSrc(
-            byte[] source, boolean sm, boolean optimize, boolean combinedJson, Version version,  Option... options)
+            byte[] source,
+            boolean sm,
+            boolean optimize,
+            boolean combinedJson,
+            Version version,
+            Option... options)
             throws IOException {
         Solc tmpSolc = getInstance().getSolc(sm, version);
         List<String> commandParts = prepareCommandOptions(tmpSolc, optimize, combinedJson, options);

diff --git a/src/main/java/org/fisco/solc/compiler/Version.java b/src/main/java/org/fisco/solc/compiler/Version.java
@@ -7,6 +7,7 @@ public enum Version {
     V0_8_11("0.8.11");
 
     private String version;
+
     Version(String version) {
         this.version = version;
     }
@@ -15,4 +16,4 @@ public enum Version {
     public String toString() {
         return this.version;
     }
-}
+}
diff --git a/src/test/java/org/fisco/solc/compiler/test/SolidityCompilerV0425_0610Test.java b/src/test/java/org/fisco/solc/compiler/test/SolidityCompilerV0425_0610Test.java
@@ -1,23 +1,22 @@
 package org.fisco.solc.compiler.test;
 
-import org.fisco.solc.compiler.CompilationResult;
-import org.fisco.solc.compiler.SolidityCompiler;
-import org.fisco.solc.compiler.SolidityCompiler.Result;
-import org.fisco.solc.compiler.Version;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
-
 import static org.fisco.solc.compiler.SolidityCompiler.Options.ABI;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.BIN;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.DEVDOC;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.METADATA;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.USERDOC;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import org.fisco.solc.compiler.CompilationResult;
+import org.fisco.solc.compiler.SolidityCompiler;
+import org.fisco.solc.compiler.SolidityCompiler.Result;
+import org.fisco.solc.compiler.Version;
+import org.junit.Test;
+
 public class SolidityCompilerV0425_0610Test {
     @SuppressWarnings("static-access")
     @Test
@@ -55,7 +54,8 @@ private void compileAsset(boolean sm, Version version) {
                             .getSystemResource("solidity/Asset.sol");
             File file = new File(url.getFile());
             Result result =
-//                    SolidityCompiler.compile(file, false, true, ABI, BIN, INTERFACE, METADATA);
+                    //                    SolidityCompiler.compile(file, false, true, ABI, BIN,
+                    // INTERFACE, METADATA);
                     SolidityCompiler.compile(file, sm, true, version, ABI, BIN, METADATA);
             assertTrue(
                     "compile solidity failed, solidity error: " + result.getErrors(),
@@ -83,8 +83,10 @@ private void compileTable(boolean sm, Version version) {
             File file = new File(url.getFile());
             byte[] bytes = Files.readAllBytes(file.toPath());
             Result result =
-//                    SolidityCompiler.compile(file, false, true, ABI, BIN, INTERFACE, METADATA);
-                    SolidityCompiler.compile(bytes, sm, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
+                    //                    SolidityCompiler.compile(file, false, true, ABI, BIN,
+                    // INTERFACE, METADATA);
+                    SolidityCompiler.compile(
+                            bytes, sm, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
             assertTrue(
                     "compile solidity failed, solidity error: " + result.getErrors(),
                     !result.isFailed());
@@ -110,7 +112,8 @@ public void docTest(Version version) {
                             .getSystemResource("solidity/Points.sol");
             File file = new File(url.getFile());
             Result result =
-                    SolidityCompiler.compile(file, true, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
+                    SolidityCompiler.compile(
+                            file, true, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
             assertTrue(
                     "compile solidity failed, solidity error: " + result.getErrors(),
                     !result.isFailed());

diff --git a/src/test/java/org/fisco/solc/compiler/test/SolidityCompilerV0610_0811Test.java b/src/test/java/org/fisco/solc/compiler/test/SolidityCompilerV0610_0811Test.java
@@ -1,23 +1,22 @@
 package org.fisco.solc.compiler.test;
 
-import org.fisco.solc.compiler.CompilationResult;
-import org.fisco.solc.compiler.SolidityCompiler;
-import org.fisco.solc.compiler.SolidityCompiler.Result;
-import org.fisco.solc.compiler.Version;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
-
 import static org.fisco.solc.compiler.SolidityCompiler.Options.ABI;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.BIN;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.DEVDOC;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.METADATA;
 import static org.fisco.solc.compiler.SolidityCompiler.Options.USERDOC;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import org.fisco.solc.compiler.CompilationResult;
+import org.fisco.solc.compiler.SolidityCompiler;
+import org.fisco.solc.compiler.SolidityCompiler.Result;
+import org.fisco.solc.compiler.Version;
+import org.junit.Test;
+
 public class SolidityCompilerV0610_0811Test {
     @SuppressWarnings("static-access")
     @Test
@@ -88,7 +87,8 @@ public void docTest(Version version) {
                             .getSystemResource("solidity/IERC721.sol");
             File file = new File(url.getFile());
             Result result =
-                    SolidityCompiler.compile(file, true, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
+                    SolidityCompiler.compile(
+                            file, true, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
             assertTrue(
                     "compile solidity failed, solidity error: " + result.getErrors(),
                     !result.isFailed());
@@ -120,7 +120,8 @@ public void weCossProxyContractTest(Version version) {
                             .getSystemResource("solidity/WeCrossProxy.sol");
             File file = new File(url.getFile());
             Result result =
-                    SolidityCompiler.compile(file, true, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
+                    SolidityCompiler.compile(
+                            file, true, true, version, ABI, BIN, METADATA, USERDOC, DEVDOC);
             assertTrue(
                     "compile solidity failed, solidity error: " + result.getErrors(),
                     !result.isFailed());

diff --git a/src/test/java/org/fisco/solc/compiler/test/SolidityCompilerVersionTest.java b/src/test/java/org/fisco/solc/compiler/test/SolidityCompilerVersionTest.java
@@ -7,7 +7,6 @@
 
 public class SolidityCompilerVersionTest {
     @SuppressWarnings("static-access")
-
     @Test
     public void smSolcVersionTest() throws Exception {
         String versionOutput = SolidityCompiler.runGetVersionOutput(true, Version.V0_8_11);