Merge pull request #2131 from hyperledger-web3j/fix_organization_name

Fix organization
hyperledger-web3j · Dec 17, 2024 · 3169ca8 · 3169ca8
2 parents 6785725 + 8fff251
commit 3169ca8
Show file tree

Hide file tree

Showing 25 changed files with 147 additions and 166 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### BREAKING CHANGES
 
-*
+* Change organization name [#2131](https://github.com/hyperledger-web3j/web3j/pull/2131)
 
 # [4.12.2](https://github.com/hyperledger/web3j/releases/tag/v4.12.2) (2024-09-18)
 

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Web3j is a lightweight, highly modular, reactive, type safe Java and
 Android library for working with Smart Contracts and integrating with
 clients (nodes) on the Ethereum network:
 
-![image](https://github.com/hyperledger/web3j-docs/blob/main/docs/img/web3j_network.png)
+![image](https://github.com/hyperledger-web3j/web3j-docs/blob/main/docs/img/web3j_network.png)
 
 This allows you to work with the [Ethereum](https://www.ethereum.org/)
 blockchain, without the additional overhead of having to write your own

diff --git a/build.gradle b/build.gradle
@@ -50,7 +50,7 @@ description 'Web3j base project.'
     'spotless'
 ].each { buildScript ->
     download {
-        src "https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/$buildScript/build.gradle"
+        src "https://raw.githubusercontent.com/hyperledger-web3j/web3j-build-tools/main/gradle/$buildScript/build.gradle"
         dest "$rootDir/gradle/$buildScript/build.gradle"
         overwrite false
         quiet true

diff --git a/codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java b/codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java
@@ -120,7 +120,7 @@ public class SolidityFunctionWrapper extends Generator {
                     + "or the "
                     + SolidityFunctionWrapperGenerator.class.getName()
                     + " in the \n"
-                    + "<a href=\"https://github.com/hyperledger/web3j/tree/main/codegen\">"
+                    + "<a href=\"https://github.com/hyperledger-web3j/web3j/tree/main/codegen\">"
                     + "codegen module</a> to update.\n";
 
     private final boolean useNativeJavaTypes;
@@ -422,8 +422,7 @@ private FieldSpec createEventDefinition(
             String name,
             List<NamedTypeName> parameters,
             Map<String, Integer> eventsCount,
-            AbiDefinition event
-    ) {
+            AbiDefinition event) {
 
         CodeBlock initializer = buildVariableLengthEventInitializer(name, parameters);
 
@@ -460,8 +459,7 @@ List<MethodSpec> buildFunctionDefinitions(
                 methodSpecs.addAll(buildFunctions(functionDefinition, useUpperCase));
             } else if (functionDefinition.getType().equals(TYPE_EVENT)) {
                 methodSpecs.addAll(
-                        buildEventFunctions(functionDefinition, classBuilder, eventsCount)
-                );
+                        buildEventFunctions(functionDefinition, classBuilder, eventsCount));
             }
         }
         return methodSpecs;
@@ -1955,8 +1953,7 @@ private static String getEventFromLogFunctionName(String functionName) {
     List<MethodSpec> buildEventFunctions(
             AbiDefinition functionDefinition,
             TypeSpec.Builder classBuilder,
-            Map<String, Integer> eventsCount
-    )
+            Map<String, Integer> eventsCount)
             throws ClassNotFoundException {
         List<AbiDefinition.NamedType> inputs = functionDefinition.getInputs();
 
@@ -1985,9 +1982,8 @@ List<MethodSpec> buildEventFunctions(
 
         String functionName = functionDefinition.getName();
 
-        classBuilder.addField(createEventDefinition(
-                functionName, parameters, eventsCount, functionDefinition
-        ));
+        classBuilder.addField(
+                createEventDefinition(functionName, parameters, eventsCount, functionDefinition));
 
         functionName = functionDefinition.getName();
 

diff --git a/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java b/codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java
diff --git a/codegen/src/test/resources/solidity/abifuncs/build/java/AbiFuncs.java b/codegen/src/test/resources/solidity/abifuncs/build/java/AbiFuncs.java
@@ -19,7 +19,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/...src/test/resources/solidity/arrayofstructandstruct/build/java/ArrayOfStructAndStruct.java b/...src/test/resources/solidity/arrayofstructandstruct/build/java/ArrayOfStructAndStruct.java
@@ -23,7 +23,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/...ources/solidity/arrayofstructclassgeneration/build/java/ArrayOfStructClassGeneration.java b/...ources/solidity/arrayofstructclassgeneration/build/java/ArrayOfStructClassGeneration.java
@@ -23,7 +23,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/codegen/src/test/resources/solidity/arraysinstruct/build/java/ArraysInStruct.java b/codegen/src/test/resources/solidity/arraysinstruct/build/java/ArraysInStruct.java
@@ -33,7 +33,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/codegen/src/test/resources/solidity/eventparameters/build/java/EventParameters.java b/codegen/src/test/resources/solidity/eventparameters/build/java/EventParameters.java
@@ -31,7 +31,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/codegen/src/test/resources/solidity/metacoin/build/java/MetaCoin.java b/codegen/src/test/resources/solidity/metacoin/build/java/MetaCoin.java
@@ -31,7 +31,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/codegen/src/test/resources/solidity/onlyinarraystruct/build/java/OnlyInArrayStruct.java b/codegen/src/test/resources/solidity/onlyinarraystruct/build/java/OnlyInArrayStruct.java
@@ -24,7 +24,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/codegen/src/test/resources/solidity/sameinnerstructname/build/java/SameInnerStructName.java b/codegen/src/test/resources/solidity/sameinnerstructname/build/java/SameInnerStructName.java
@@ -23,7 +23,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/...ources/solidity/staticarrayofstructsinstruct/build/java/StaticArrayOfStructsInStruct.java b/...ources/solidity/staticarrayofstructsinstruct/build/java/StaticArrayOfStructsInStruct.java
@@ -27,7 +27,7 @@
  * <p><strong>Do not modify!</strong>
  * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
  * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the 
- * <a href="https://github.com/hyperledger/web3j/tree/main/codegen">codegen module</a> to update.
+ * <a href="https://github.com/hyperledger-web3j/web3j/tree/main/codegen">codegen module</a> to update.
  *
  * <p>Generated with web3j version none.
  */

diff --git a/core/src/main/java/org/web3j/protocol/admin/methods/response/TxPoolContent.java b/core/src/main/java/org/web3j/protocol/admin/methods/response/TxPoolContent.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.web3j.protocol.core.Response;
 import org.web3j.protocol.core.methods.response.Transaction;
@@ -49,17 +48,11 @@ public Map<String, Map<BigInteger, Transaction>> getQueued() {
         }
 
         public List<Transaction> getPendingTransactions() {
-            return pending.values().stream()
-                    .map(Map::values)
-                    .flatMap(Collection::stream)
-                    .toList();
+            return pending.values().stream().map(Map::values).flatMap(Collection::stream).toList();
         }
 
         public List<Transaction> getQueuedTransactions() {
-            return queued.values().stream()
-                    .map(Map::values)
-                    .flatMap(Collection::stream)
-                    .toList();
+            return queued.values().stream().map(Map::values).flatMap(Collection::stream).toList();
         }
 
         private static <K, V> Map<K, V> immutableCopy(Map<K, V> map, Function<V, V> valueMapper) {

diff --git a/core/src/main/java/org/web3j/protocol/core/methods/response/EthFeeHistory.java b/core/src/main/java/org/web3j/protocol/core/methods/response/EthFeeHistory.java
@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
@@ -76,9 +75,7 @@ public List<List<BigInteger>> getReward() {
             return reward.stream()
                     .map(
                             rewardPercentile ->
-                                    rewardPercentile.stream()
-                                            .map(Numeric::decodeQuantity)
-                                            .toList())
+                                    rewardPercentile.stream().map(Numeric::decodeQuantity).toList())
                     .toList();
         }
 

diff --git a/core/src/main/java/org/web3j/protocol/deserializer/KeepAsJsonDeserialzier.java b/core/src/main/java/org/web3j/protocol/deserializer/KeepAsJsonDeserialzier.java
@@ -15,16 +15,14 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 
 public class KeepAsJsonDeserialzier extends JsonDeserializer<String> {
 
     @Override
-    public String deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException {
+    public String deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
 
         TreeNode tree = jp.getCodec().readTree(jp);
         return tree.toString();

diff --git a/core/src/main/java/org/web3j/protocol/websocket/WebSocketService.java b/core/src/main/java/org/web3j/protocol/websocket/WebSocketService.java
@@ -374,8 +374,7 @@ private void sendReplyToListener(WebSocketRequest request, Object reply) {
         request.getOnReply().complete(reply);
     }
 
-    private void sendExceptionToListener(
-            String replyStr, WebSocketRequest request, Exception e) {
+    private void sendExceptionToListener(String replyStr, WebSocketRequest request, Exception e) {
         request.getOnReply()
                 .completeExceptionally(
                         new IOException(

diff --git a/core/src/main/java/org/web3j/tx/response/EmptyTransactionReceipt.java b/core/src/main/java/org/web3j/tx/response/EmptyTransactionReceipt.java
@@ -28,7 +28,7 @@ public EmptyTransactionReceipt(String transactionHash) {
         super();
         this.setTransactionHash(transactionHash);
     }
-    
+
     private UnsupportedOperationException unsupportedOperation() {
         return new UnsupportedOperationException(
                 "Empty transaction receipt, only transaction hash is available");

diff --git a/core/src/test/java/org/web3j/protocol/BatchTester.java b/core/src/test/java/org/web3j/protocol/BatchTester.java
@@ -104,12 +104,12 @@ public okhttp3.Response intercept(Chain chain) throws IOException {
             }
 
             return new okhttp3.Response.Builder()
-                            .request(chain.request())
-                            .protocol(Protocol.HTTP_2)
-                            .code(200)
-                            .body(ResponseBody.create(jsonResponse, JSON_MEDIA_TYPE))
-                            .message("")
-                            .build();
+                    .request(chain.request())
+                    .protocol(Protocol.HTTP_2)
+                    .code(200)
+                    .body(ResponseBody.create(jsonResponse, JSON_MEDIA_TYPE))
+                    .message("")
+                    .build();
         }
 
         public void setJsonResponse(String jsonResponse) {

diff --git a/core/src/test/java/org/web3j/protocol/RequestTester.java b/core/src/test/java/org/web3j/protocol/RequestTester.java
@@ -71,16 +71,16 @@ public okhttp3.Response intercept(Chain chain) throws IOException {
             Request request = chain.request();
             this.requestBody = request.body();
             return new okhttp3.Response.Builder()
-                            .request(chain.request())
-                            .protocol(Protocol.HTTP_2)
-                            .code(200)
-                            .body(
-                                    ResponseBody.create(
-                                            "{\"jsonrpc\":\"2.0\",\"method\":\"\","
-                                                    + "\"params\":[],\"id\":1}",
-                                            JSON_MEDIA_TYPE))
-                            .message("")
-                            .build();
+                    .request(chain.request())
+                    .protocol(Protocol.HTTP_2)
+                    .code(200)
+                    .body(
+                            ResponseBody.create(
+                                    "{\"jsonrpc\":\"2.0\",\"method\":\"\","
+                                            + "\"params\":[],\"id\":1}",
+                                    JSON_MEDIA_TYPE))
+                    .message("")
+                    .build();
         }
 
         public RequestBody getRequestBody() {

diff --git a/core/src/test/java/org/web3j/protocol/ResponseTester.java b/core/src/test/java/org/web3j/protocol/ResponseTester.java
@@ -75,12 +75,12 @@ public okhttp3.Response intercept(Chain chain) throws IOException {
             }
 
             return new okhttp3.Response.Builder()
-                            .body(ResponseBody.create(jsonResponse, JSON_MEDIA_TYPE))
-                            .request(chain.request())
-                            .protocol(Protocol.HTTP_2)
-                            .code(200)
-                            .message("")
-                            .build();
+                    .body(ResponseBody.create(jsonResponse, JSON_MEDIA_TYPE))
+                    .request(chain.request())
+                    .protocol(Protocol.HTTP_2)
+                    .code(200)
+                    .message("")
+                    .build();
         }
     }
 }
diff --git a/core/src/test/java/org/web3j/protocol/core/BatchTest.java b/core/src/test/java/org/web3j/protocol/core/BatchTest.java
@@ -86,8 +86,8 @@ void testBatchResponse() throws Exception {
         assertTrue(response.getResponses().get(1) instanceof Web3Sha3);
         Web3Sha3 web3Sha3 = (Web3Sha3) response.getResponses().get(1);
         assertEquals(
-			"0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad",
-			web3Sha3.getResult());
+                "0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad",
+                web3Sha3.getResult());
 
         assertTrue(response.getResponses().get(2) instanceof NetVersion);
         NetVersion netVersion = (NetVersion) response.getResponses().get(2);

diff --git a/core/src/test/java/org/web3j/protocol/core/filters/FilterTester.java b/core/src/test/java/org/web3j/protocol/core/filters/FilterTester.java
@@ -20,7 +20,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.reactivex.Flowable;

diff --git a/core/src/test/java/org/web3j/tx/FastRawTransactionManagerTest.java b/core/src/test/java/org/web3j/tx/FastRawTransactionManagerTest.java
@@ -12,7 +12,6 @@
  */
 package org.web3j.tx;
 
-import java.io.IOException;
 import java.math.BigInteger;
 
 import org.junit.jupiter.api.BeforeEach;
-Original file line number
+Diff line change
@@ Expand Up @@
     ### BREAKING CHANGES
-    *
+    * Change organization name [#2131](https://github.com/hyperledger-web3j/web3j/pull/2131)
     # [4.12.2](https://github.com/hyperledger/web3j/releases/tag/v4.12.2) (2024-09-18)
@@ Expand Down @@