chore: fix lombok compiling error and error for list cast to string (#…

…2592) Co-authored-by: imbajin <jin@apache.org>
apache · Sep 28, 2024 · 4274b72 · 4274b72
1 parent a657ce5
commit 4274b72
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 79 deletions.
diff --git a/hugegraph-commons/hugegraph-common/pom.xml b/hugegraph-commons/hugegraph-common/pom.xml
@@ -38,7 +38,6 @@
 
     <properties>
         <!-- Use parent params -->
-        <lombok.version>1.18.8</lombok.version>
         <okhttp.version>4.10.0</okhttp.version>
     </properties>
 
@@ -220,12 +219,9 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <optional>true</optional>
         </dependency>
     </dependencies>
 

diff --git a/hugegraph-commons/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-commons/hugegraph-dist/scripts/dependency/known-dependencies.txt
@@ -1,7 +1,4 @@
-animal-sniffer-annotations-1.18.jar
-annotations-4.1.1.4.jar
 annotations-13.0.jar
-bolt-1.6.2.jar
 checker-qual-3.5.0.jar
 commons-beanutils-1.9.4.jar
 commons-codec-1.13.jar
@@ -13,25 +10,14 @@ commons-lang-2.6.jar
 commons-lang3-3.12.0.jar
 commons-logging-1.1.1.jar
 commons-text-1.9.jar
-disruptor-3.3.7.jar
 error_prone_annotations-2.3.4.jar
 failureaccess-1.0.1.jar
-grpc-api-1.28.1.jar
-grpc-context-1.28.1.jar
-grpc-core-1.28.1.jar
-grpc-netty-shaded-1.28.0.jar
-grpc-protobuf-1.28.0.jar
-grpc-protobuf-lite-1.28.0.jar
-grpc-stub-1.28.0.jar
-gson-2.8.6.jar
 guava-30.0-jre.jar
 hamcrest-core-1.3.jar
-hessian-3.3.7.jar
 j2objc-annotations-1.3.jar
 jackson-annotations-2.14.0-rc1.jar
 jackson-core-2.14.0-rc1.jar
 jackson-databind-2.14.0-rc1.jar
-jackson-dataformat-yaml-2.9.3.jar
 jackson-jaxrs-base-2.14.0-rc1.jar
 jackson-jaxrs-json-provider-2.14.0-rc1.jar
 jackson-module-jaxb-annotations-2.14.0-rc1.jar
@@ -44,34 +30,16 @@ jaxb-impl-3.0.2.jar
 joda-time-2.10.8.jar
 jsr305-3.0.1.jar
 junit-4.13.1.jar
-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-log4j-api-2.18.0.jar
-log4j-core-2.18.0.jar
-log4j-slf4j-impl-2.18.0.jar
-lookout-api-1.4.1.jar
-netty-all-4.1.42.Final.jar
-opentracing-api-0.22.0.jar
-opentracing-mock-0.22.0.jar
-opentracing-noop-0.22.0.jar
-opentracing-util-0.22.0.jar
-perfmark-api-0.19.0.jar
-proto-google-common-protos-1.17.0.jar
-protobuf-java-3.11.0.jar
-slf4j-api-1.7.25.jar
-snakeyaml-1.18.jar
-sofa-common-tools-1.0.12.jar
-sofa-rpc-all-5.7.6.jar
-swagger-annotations-1.5.18.jar
-swagger-core-1.5.18.jar
-swagger-models-1.5.18.jar
-tracer-core-3.0.8.jar
-validation-api-1.1.0.Final.jar
 kotlin-stdlib-1.6.20.jar
 kotlin-stdlib-common-1.5.31.jar
 kotlin-stdlib-jdk7-1.6.10.jar
 kotlin-stdlib-jdk8-1.6.10.jar
+listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+log4j-api-2.18.0.jar
+log4j-core-2.18.0.jar
+log4j-slf4j-impl-2.18.0.jar
 logging-interceptor-4.10.0.jar
 lombok-1.18.8.jar
 okhttp-4.10.0.jar
 okio-jvm-3.0.0.jar
-
+slf4j-api-1.7.25.jar
diff --git a/hugegraph-commons/pom.xml b/hugegraph-commons/pom.xml
@@ -124,6 +124,8 @@
         <module>hugegraph-rpc</module>
     </modules>
 
+    <dependencyManagement />
+
     <build>
         <plugins>
             <plugin>

diff --git a/hugegraph-pd/hg-pd-client/pom.xml b/hugegraph-pd/hg-pd-client/pom.xml
@@ -34,7 +34,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

diff --git a/hugegraph-pd/hg-pd-common/pom.xml b/hugegraph-pd/hg-pd-common/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/hugegraph-pd/hg-pd-core/pom.xml b/hugegraph-pd/hg-pd-core/pom.xml
@@ -72,7 +72,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/hugegraph-pd/hg-pd-service/pom.xml b/hugegraph-pd/hg-pd-service/pom.xml
@@ -114,7 +114,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util -->
         <dependency>

diff --git a/hugegraph-pd/hg-pd-test/pom.xml b/hugegraph-pd/hg-pd-test/pom.xml
@@ -75,7 +75,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java
@@ -401,17 +401,17 @@ private void loadGraph(String name, String graphConfPath) {
     }
 
     private void transferRoleWorkerConfig(HugeConfig config) {
-        config.addProperty(RoleElectionOptions.NODE_EXTERNAL_URL.name(),
+        config.setProperty(RoleElectionOptions.NODE_EXTERNAL_URL.name(),
                            this.conf.get(ServerOptions.REST_SERVER_URL));
-        config.addProperty(RoleElectionOptions.BASE_TIMEOUT_MILLISECOND.name(),
+        config.setProperty(RoleElectionOptions.BASE_TIMEOUT_MILLISECOND.name(),
                            this.conf.get(RoleElectionOptions.BASE_TIMEOUT_MILLISECOND));
-        config.addProperty(RoleElectionOptions.EXCEEDS_FAIL_COUNT.name(),
+        config.setProperty(RoleElectionOptions.EXCEEDS_FAIL_COUNT.name(),
                            this.conf.get(RoleElectionOptions.EXCEEDS_FAIL_COUNT));
-        config.addProperty(RoleElectionOptions.RANDOM_TIMEOUT_MILLISECOND.name(),
+        config.setProperty(RoleElectionOptions.RANDOM_TIMEOUT_MILLISECOND.name(),
                            this.conf.get(RoleElectionOptions.RANDOM_TIMEOUT_MILLISECOND));
-        config.addProperty(RoleElectionOptions.HEARTBEAT_INTERVAL_SECOND.name(),
+        config.setProperty(RoleElectionOptions.HEARTBEAT_INTERVAL_SECOND.name(),
                            this.conf.get(RoleElectionOptions.HEARTBEAT_INTERVAL_SECOND));
-        config.addProperty(RoleElectionOptions.MASTER_DEAD_TIMES.name(),
+        config.setProperty(RoleElectionOptions.MASTER_DEAD_TIMES.name(),
                            this.conf.get(RoleElectionOptions.MASTER_DEAD_TIMES));
     }
 

diff --git a/hugegraph-store/hg-store-cli/pom.xml b/hugegraph-store/hg-store-cli/pom.xml
@@ -56,6 +56,10 @@
             <artifactId>hg-pd-client</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/hugegraph-store/hg-store-client/pom.xml b/hugegraph-store/hg-store-client/pom.xml
@@ -32,7 +32,6 @@
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
-        <lombok.version>1.18.20</lombok.version>
     </properties>
 
     <dependencies>
@@ -60,7 +59,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

diff --git a/hugegraph-store/hg-store-core/pom.xml b/hugegraph-store/hg-store-core/pom.xml
@@ -34,7 +34,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -55,7 +54,6 @@
                     <groupId>org.rocksdb</groupId>
                     <artifactId>rocksdbjni</artifactId>
                 </exclusion>
-
             </exclusions>
         </dependency>
 

diff --git a/hugegraph-store/hg-store-node/pom.xml b/hugegraph-store/hg-store-node/pom.xml
@@ -83,7 +83,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/hugegraph-store/hg-store-rocksdb/pom.xml b/hugegraph-store/hg-store-rocksdb/pom.xml
@@ -62,8 +62,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

diff --git a/hugegraph-store/hg-store-test/pom.xml b/hugegraph-store/hg-store-test/pom.xml
@@ -31,7 +31,6 @@
 
     <properties>
         <!--maven.test.skip>true</maven.test.skip-->
-        <lombok.version>1.18.20</lombok.version>
     </properties>
 
     <profiles>
@@ -80,7 +79,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

diff --git a/install-dist/scripts/dependency/known-dependencies.txt b/install-dist/scripts/dependency/known-dependencies.txt
@@ -1,3 +1,7 @@
+HdrHistogram-2.1.12.jar
+HdrHistogram-2.1.9.jar
+LatencyUtils-2.0.3.jar
+ST4-4.0.8.jar
 accessors-smart-1.2.jar
 airline-0.8.jar
 android-json-0.0.20131108.vaadin1.jar
@@ -140,8 +144,6 @@ hamcrest-2.2.jar
 hamcrest-core-1.3.jar
 hanlp-portable-1.8.3.jar
 hbase-shaded-endpoint-2.0.6.jar
-HdrHistogram-2.1.12.jar
-HdrHistogram-2.1.9.jar
 hessian-3.3.6.jar
 hessian-3.3.7.jar
 hg-pd-client-1.5.0.jar
@@ -212,12 +214,12 @@ javassist-3.21.0-GA.jar
 javassist-3.24.0-GA.jar
 javassist-3.28.0-GA.jar
 javatuples-1.2.jar
+javax-websocket-client-impl-9.4.46.v20220331.jar
+javax-websocket-server-impl-9.4.46.v20220331.jar
 javax.activation-api-1.2.0.jar
 javax.annotation-api-1.3.2.jar
 javax.inject-1.jar
 javax.json-1.0.jar
-javax-websocket-client-impl-9.4.46.v20220331.jar
-javax-websocket-server-impl-9.4.46.v20220331.jar
 jaxb-api-2.3.1.jar
 jaxb-core-3.0.2.jar
 jaxb-impl-3.0.2.jar
@@ -260,8 +262,8 @@ jetty-util-9.4.46.v20220331.jar
 jetty-util-ajax-9.4.46.v20220331.jar
 jetty-webapp-9.4.46.v20220331.jar
 jetty-xml-9.4.46.v20220331.jar
-jffi-1.2.16.jar
 jffi-1.2.16-native.jar
+jffi-1.2.16.jar
 jflex-1.8.2.jar
 jieba-analysis-1.0.2.jar
 jjwt-api-0.11.5.jar
@@ -278,10 +280,10 @@ jraft-core-1.3.11.jar
 jraft-core-1.3.13.jar
 jraft-core-1.3.9.jar
 json-20210307.jar
-jsonassert-1.5.0.jar
 json-path-2.5.0.jar
 json-simple-1.1.jar
 json-smart-2.3.jar
+jsonassert-1.5.0.jar
 jsr305-3.0.1.jar
 jsr305-3.0.2.jar
 jul-to-slf4j-1.7.36.jar
@@ -312,7 +314,6 @@ kotlin-stdlib-1.6.20.jar
 kotlin-stdlib-common-1.5.31.jar
 kotlin-stdlib-jdk7-1.6.10.jar
 kotlin-stdlib-jdk8-1.6.10.jar
-LatencyUtils-2.0.3.jar
 listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 log4j-api-2.15.0.jar
 log4j-api-2.17.0.jar
@@ -330,9 +331,6 @@ log4j-slf4j-impl-2.17.0.jar
 log4j-slf4j-impl-2.17.1.jar
 log4j-slf4j-impl-2.18.0.jar
 logging-interceptor-4.10.0.jar
-lombok-1.18.20.jar
-lombok-1.18.24.jar
-lombok-1.18.8.jar
 lookout-api-1.4.1.jar
 lucene-analyzers-common-8.11.2.jar
 lucene-analyzers-smartcn-8.11.2.jar
@@ -363,10 +361,10 @@ netty-buffer-4.1.52.Final.jar
 netty-buffer-4.1.72.Final.jar
 netty-codec-4.1.52.Final.jar
 netty-codec-4.1.72.Final.jar
-netty-codec-http2-4.1.52.Final.jar
-netty-codec-http2-4.1.72.Final.jar
 netty-codec-http-4.1.52.Final.jar
 netty-codec-http-4.1.72.Final.jar
+netty-codec-http2-4.1.52.Final.jar
+netty-codec-http2-4.1.72.Final.jar
 netty-codec-socks-4.1.52.Final.jar
 netty-codec-socks-4.1.72.Final.jar
 netty-common-4.1.52.Final.jar
@@ -414,20 +412,20 @@ powermock-module-junit4-2.0.0-RC.3.jar
 powermock-module-junit4-common-2.0.0-RC.3.jar
 powermock-module-junit4-rule-2.0.0-RC.3.jar
 powermock-reflect-2.0.0-RC.3.jar
+proto-google-common-protos-1.17.0.jar
+proto-google-common-protos-2.0.1.jar
 protobuf-java-3.11.0.jar
 protobuf-java-3.17.2.jar
 protobuf-java-3.21.7.jar
 protobuf-java-3.5.1.jar
 protobuf-java-util-3.17.2.jar
-proto-google-common-protos-1.17.0.jar
-proto-google-common-protos-2.0.1.jar
 protostuff-api-1.6.0.jar
 protostuff-collectionschema-1.6.0.jar
 protostuff-core-1.6.0.jar
 protostuff-runtime-1.6.0.jar
 psjava-0.1.19.jar
-reporter-config3-3.0.3.jar
 reporter-config-base-3.0.3.jar
+reporter-config3-3.0.3.jar
 rewriting-9.0-9.0.20190305.jar
 rocksdbjni-6.29.5.jar
 rocksdbjni-7.2.2.jar
@@ -444,9 +442,9 @@ sjk-cli-0.22.jar
 sjk-core-0.14.jar
 sjk-core-0.22.jar
 sjk-hflame-0.22.jar
+sjk-jfr-standalone-0.7.jar
 sjk-jfr5-0.5.jar
 sjk-jfr6-0.7.jar
-sjk-jfr-standalone-0.7.jar
 sjk-json-0.14.jar
 sjk-json-0.22.jar
 sjk-nps-0.9.jar
@@ -489,7 +487,6 @@ spring-expression-5.3.20.jar
 spring-jcl-5.3.20.jar
 spring-web-5.3.20.jar
 spring-webmvc-5.3.20.jar
-ST4-4.0.8.jar
 stream-2.5.2.jar
 swagger-annotations-1.5.18.jar
 swagger-annotations-jakarta-2.2.18.jar