fix: remove raw type usage of EthLog.LogResult and add generics for type safety

Author: Dev10-sys

core/src/main/java/org/web3j/protocol/core/filters/BlockFilter.java

@@ -35,8 +35,8 @@ protected EthFilter sendRequest() throws IOException {
     }
 
     @Override
-    protected void process(List<EthLog.LogResult> logResults) {
-        for (EthLog.LogResult logResult : logResults) {
+    protected void process(List<EthLog.LogResult<?>> logResults) {
+        for (EthLog.LogResult<?> logResult : logResults) {
             if (logResult instanceof EthLog.Hash) {
                 String blockHash = ((EthLog.Hash) logResult).get();
                 callback.onEvent(blockHash);

core/src/main/java/org/web3j/protocol/core/filters/BlocksFilter.java

@@ -37,10 +37,10 @@ protected EthFilter sendRequest() throws IOException {
     }
 
     @Override
-    protected void process(List<LogResult> logResults) {
+    protected void process(List<LogResult<?>> logResults) {
         List<String> blockHashes = new ArrayList<>(logResults.size());
 
-        for (EthLog.LogResult logResult : logResults) {
+        for (EthLog.LogResult<?> logResult : logResults) {
             if (!(logResult instanceof EthLog.Hash)) {
                 throw new FilterException(
                         "Unexpected result type: " + logResult.get() + ", required Hash");

core/src/main/java/org/web3j/protocol/core/filters/Filter.java

@@ -157,7 +157,7 @@ private void pollFilter(EthFilter ethFilter) {
 
     protected abstract EthFilter sendRequest() throws IOException;
 
-    protected abstract void process(List<EthLog.LogResult> logResults);
+    protected abstract void process(List<EthLog.LogResult<?>> logResults);
 
     private void reinstallFilter() {
         log.warn(

core/src/main/java/org/web3j/protocol/core/filters/LogFilter.java

@@ -42,8 +42,8 @@ protected EthFilter sendRequest() throws IOException {
     }
 
     @Override
-    protected void process(List<EthLog.LogResult> logResults) {
-        for (EthLog.LogResult logResult : logResults) {
+    protected void process(List<EthLog.LogResult<?>> logResults) {
+        for (EthLog.LogResult<?> logResult : logResults) {
             if (logResult instanceof EthLog.LogObject) {
                 Log log = ((EthLog.LogObject) logResult).get();
                 callback.onEvent(log);

core/src/main/java/org/web3j/protocol/core/filters/LogsFilter.java

@@ -44,10 +44,10 @@ protected EthFilter sendRequest() throws IOException {
     }
 
     @Override
-    protected void process(List<LogResult> logResults) {
+    protected void process(List<LogResult<?>> logResults) {
         List<Log> logs = new ArrayList<>(logResults.size());
 
-        for (EthLog.LogResult logResult : logResults) {
+        for (EthLog.LogResult<?> logResult : logResults) {
             if (!(logResult instanceof EthLog.LogObject)) {
                 throw new FilterException(
                         "Unexpected result type: " + logResult.get() + " required LogObject");

core/src/main/java/org/web3j/protocol/core/filters/PendingTransactionFilter.java

@@ -35,8 +35,8 @@ protected EthFilter sendRequest() throws IOException {
     }
 
     @Override
-    protected void process(List<EthLog.LogResult> logResults) {
-        for (EthLog.LogResult logResult : logResults) {
+    protected void process(List<EthLog.LogResult<?>> logResults) {
+        for (EthLog.LogResult<?> logResult : logResults) {
             if (logResult instanceof EthLog.Hash) {
                 String transactionHash = ((EthLog.Hash) logResult).get();
                 callback.onEvent(transactionHash);

core/src/main/java/org/web3j/protocol/core/filters/PendingTransactionsFilter.java

@@ -36,10 +36,10 @@ protected EthFilter sendRequest() throws IOException {
     }
 
     @Override
-    protected void process(List<EthLog.LogResult> logResults) {
+    protected void process(List<EthLog.LogResult<?>> logResults) {
         List<String> logs = new ArrayList<>(logResults.size());
 
-        for (EthLog.LogResult logResult : logResults) {
+        for (EthLog.LogResult<?> logResult : logResults) {
             if (!(logResult instanceof EthLog.Hash)) {
                 throw new FilterException(
                         "Unexpected result type: " + logResult.get() + ", required Hash");

core/src/main/java/org/web3j/protocol/core/methods/response/EthLog.java

@@ -39,15 +39,15 @@
  * <p>See <a href="https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getfilterchanges">docs</a> for
  * further details.
  */
-public class EthLog extends Response<List<EthLog.LogResult>> {
+public class EthLog extends Response<List<EthLog.LogResult<?>>> {
 
     @Override
     @JsonDeserialize(using = LogResultDeserialiser.class)
-    public void setResult(List<LogResult> result) {
+    public void setResult(List<LogResult<?>> result) {
         super.setResult(result);
     }
 
-    public List<LogResult> getLogs() {
+    public List<LogResult<?>> getLogs() {
         return getResult();
     }
 
@@ -127,16 +127,16 @@ public int hashCode() {
         }
     }
 
-    public static class LogResultDeserialiser extends JsonDeserializer<List<LogResult>> {
+    public static class LogResultDeserialiser extends JsonDeserializer<List<LogResult<?>>> {
 
         private ObjectReader objectReader = ObjectMapperFactory.getObjectReader();
 
         @Override
-        public List<LogResult> deserialize(
+        public List<LogResult<?>> deserialize(
                 JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException {
 
-            List<LogResult> logResults = new ArrayList<>();
+            List<LogResult<?>> logResults = new ArrayList<>();
             JsonToken nextToken = jsonParser.nextToken();
 
             if (nextToken == JsonToken.START_OBJECT) {

core/src/test/java/org/web3j/protocol/core/filters/FilterTester.java

@@ -111,12 +111,13 @@ <T> void runTest(EthLog ethLog, Flowable<T> flowable) throws Exception {
         assertTrue(subscription.isDisposed());
     }
 
-    List createExpected(EthLog ethLog) {
-        List<EthLog.LogResult> logResults = ethLog.getLogs();
+    @SuppressWarnings("unchecked")
+    <T> List<T> createExpected(EthLog ethLog) {
+        List<EthLog.LogResult<?>> logResults = ethLog.getLogs();
         if (logResults.isEmpty()) {
             fail("Results cannot be empty");
         }
 
-        return ethLog.getLogs().stream().map(EthLog.LogResult::get).toList();
+        return (List<T>) ethLog.getLogs().stream().map(EthLog.LogResult::get).toList();
     }
 }

integration-tests/src/test/java/org/web3j/protocol/core/CoreIT.java

@@ -441,7 +441,7 @@ public void testFiltersByFilterId() throws Exception {
 
         // eth_getFilterLogs
         EthLog ethFilterLogs = web3j.ethGetFilterLogs(filterId).send();
-        List<EthLog.LogResult> filterLogs = ethFilterLogs.getLogs();
+        List<EthLog.LogResult<?>> filterLogs = ethFilterLogs.getLogs();
         assertFalse(filterLogs.isEmpty());
 
         // eth_getFilterChanges - nothing will have changed in this interval
@@ -480,7 +480,7 @@ public void testEthGetLogs() throws Exception {
         ethFilter.addSingleTopic(config.encodedEvent());
 
         EthLog ethLog = web3j.ethGetLogs(ethFilter).send();
-        List<EthLog.LogResult> logs = ethLog.getLogs();
+        List<EthLog.LogResult<?>> logs = ethLog.getLogs();
         assertFalse(logs.isEmpty());
     }