fix: fixing codesmells (#177)

* fix: fixing codesmells

* fix: spotless

* fix: reverting

Author: Kammerlo

api/src/main/java/org/cardanofoundation/rosetta/common/util/ParseConstructionUtil.java

@@ -532,24 +532,23 @@ public static List<Relay> parsePoolRelays(PoolRegistration poolRegistration) {
       MultiHostName multiHostRelay = getMultiHostRelay(relay);
       SingleHostName singleHostName = getSingleHostName(relay);
       SingleHostAddr singleHostAddr = getSingleHostAddr(relay);
-      if (multiHostRelay != null || singleHostName != null) {
-        addRelayToPoolReLayOfTypeMultiHostOrSingleHostName(poolRelays, multiHostRelay,
-            singleHostName);
-        continue;
-      }
-      if (singleHostAddr != null) {
-        addRelayToPoolReLayOfTypeSingleHostAddr(poolRelays, singleHostAddr);
-      }
+
+      addRelayToPoolRelayOfTypeMultiHost(poolRelays, multiHostRelay);
+      addRelayToPoolReLayOfTypeSingleHostName(poolRelays, singleHostName);
+      addRelayToPoolReLayOfTypeSingleHostAddr(poolRelays, singleHostAddr);
+
     }
     return poolRelays;
   }
 
   public static void addRelayToPoolReLayOfTypeSingleHostAddr(List<Relay> poolRelays,
       SingleHostAddr singleHostAddr) {
-    Relay relay1 = new Relay(RelayType.SINGLE_HOST_ADDR.getValue(),
-        singleHostAddr.getIpv4().getHostAddress(), singleHostAddr.getIpv6().getHostAddress(),
-        null, String.valueOf(singleHostAddr.getPort()));
-    poolRelays.add(relay1);
+    if(!ObjectUtils.isEmpty(singleHostAddr)) {
+      Relay relay1 = new Relay(RelayType.SINGLE_HOST_ADDR.getValue(),
+          singleHostAddr.getIpv4().getHostAddress(), singleHostAddr.getIpv6().getHostAddress(),
+          null, String.valueOf(singleHostAddr.getPort()));
+      poolRelays.add(relay1);
+    }
   }
 
   public static MultiHostName getMultiHostRelay(
@@ -579,16 +578,19 @@ public static SingleHostAddr getSingleHostAddr(
     return null;
   }
 
-  public static void addRelayToPoolReLayOfTypeMultiHostOrSingleHostName(List<Relay> poolRelays,
-      MultiHostName multiHostRelay,
-      SingleHostName singleHostName) {
+  public static void addRelayToPoolRelayOfTypeMultiHost(List<Relay> poolRelays, MultiHostName multiHostRelay) {
     if (!ObjectUtils.isEmpty(multiHostRelay)) {
       poolRelays.add(
           Relay.builder()
               .type(RelayType.MULTI_HOST_NAME.getValue())
               .dnsName(multiHostRelay.getDnsName())
               .build());
     }
+  }
+
+  public static void addRelayToPoolReLayOfTypeSingleHostName(List<Relay> poolRelays,
+      SingleHostName singleHostName) {
+
     if (!ObjectUtils.isEmpty(singleHostName)) {
       poolRelays.add(
           Relay.builder()

api/src/test/java/org/cardanofoundation/rosetta/api/block/mapper/BlockToBlockResponseTest.java

@@ -6,7 +6,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 
@@ -91,12 +90,12 @@ void toDto_test_Ok() {
 
     List<String> sts = IntStream.range(0, 8)
         .mapToObj(p -> SUCCESS_OPERATION_STATUS.getStatus())
-        .collect(Collectors.toList());
+        .toList();
     assertThat((into.getBlock().getTransactions()))
         .extracting(t -> t.getOperations()
             .stream()
             .map(Operation::getStatus)
-            .collect(Collectors.toList()))
+            .toList())
         .containsAnyOf(sts);
 
     List<OperationIdentifier> opIds = LongStream.range(0, 8)
@@ -109,14 +108,14 @@ void toDto_test_Ok() {
         .extracting(t -> t.getOperations()
             .stream()
             .map(Operation::getOperationIdentifier)
-            .collect(Collectors.toList()))
+            .toList())
         .containsAnyOf(opIds);
 
     assertThat((into.getBlock().getTransactions()))
         .extracting(t -> t.getOperations()
             .stream()
             .map(Operation::getRelatedOperations)
-            .collect(Collectors.toList()))
+            .toList())
         .extracting(p -> p == null ? Collections.emptyList() : p)
         .allSatisfy(
             BlockToBlockResponseTest::assertAllElementsIsNull);
@@ -130,7 +129,7 @@ void toDto_test_Ok() {
         .extracting(t -> t.getOperations()
             .stream()
             .map(Operation::getType)
-            .collect(Collectors.toList()))
+            .toList())
         .containsAnyOf(types);
 
     List<AccountIdentifier> accIds = List.of(
@@ -142,14 +141,14 @@ void toDto_test_Ok() {
         .extracting(t -> t.getOperations()
             .stream()
             .map(Operation::getAccount)
-            .collect(Collectors.toList()))
+            .toList())
         .containsAnyOf(accIds);
 
     assertThat((into.getBlock().getTransactions()))
         .extracting(t -> t.getOperations()
             .stream()
             .map(Operation::getCoinChange)
-            .collect(Collectors.toList()))
+            .toList())
         .allSatisfy(BlockToBlockResponseTest::assertAllElementsIsNull);
 
     Currency ada = Currency
@@ -165,7 +164,7 @@ void toDto_test_Ok() {
             .filter(
                 g -> g.getType().equals("stakeKeyRegistration"))
             .map(Operation::getMetadata)
-            .collect(Collectors.toList()))
+            .toList())
         .allSatisfy(d -> {
           assertAllPropertiesIsNull(d, "depositAmount");
           assertProperty(d, "depositAmount",
@@ -184,7 +183,7 @@ void toDto_test_Ok() {
             .filter(
                 g -> g.getType().equals("poolRegistration"))
             .map(Operation::getMetadata)
-            .collect(Collectors.toList()))
+            .toList())
         .allSatisfy(d -> {
 
           assertAllPropertiesIsNull(d, "depositAmount", "poolRegistrationParams");
@@ -206,7 +205,7 @@ void toDto_test_Ok() {
             .filter(
                 g -> g.getType().equals("poolRetirement"))
             .map(Operation::getMetadata)
-            .collect(Collectors.toList()))
+            .toList())
         .allSatisfy(d -> {
           assertAllPropertiesIsNull(d, "epoch");
           assertProperty(List.of(d.getFirst()), "epoch", aiEpoch.incrementAndGet());
@@ -220,7 +219,7 @@ void toDto_test_Ok() {
             .filter(
                 g -> g.getType().equals("stakeDelegation"))
             .map(Operation::getMetadata)
-            .collect(Collectors.toList()))
+            .toList())
         .allSatisfy(d ->
         {
           assertAllPropertiesIsNull(d, "poolKeyHash");
@@ -313,7 +312,7 @@ private List<Delegation> newDelegations(int... instances) {
             .poolId("poolDlg" + ver)
             .address("delegationAcc" + ver)
             .build())
-        .collect(Collectors.toList());
+        .toList();
   }
 
   private List<PoolRegistration> newPoolRegistrations(int... instances) {
@@ -330,7 +329,7 @@ private List<PoolRegistration> newPoolRegistrations(int... instances) {
             .relays(List.of(Relay.builder().ipv4("ipv4" + ver).ipv6("ipv6" + ver)
                 .dnsName("dnsName" + ver).port(1 + ver).type("type" + ver).build()))
             .build())
-        .collect(Collectors.toList());
+        .toList();
   }
 
   @NotNull
@@ -349,7 +348,7 @@ private List<PoolRetirement> newPoolRetirements(int... instances) {
             .poolId("poolRet" + ver)
             .epoch(1 + ver)
             .build())
-        .collect(Collectors.toList());
+        .toList();
   }
 
   private List<StakeRegistration> newStakeRegistrations(int... instances) {
@@ -361,7 +360,7 @@ private List<StakeRegistration> newStakeRegistrations(int... instances) {
             .type(CertificateType.STAKE_REGISTRATION)
             .address("address" + ver)
             .build())
-        .collect(Collectors.toList());
+        .toList();
 
 
   }

api/src/test/java/org/cardanofoundation/rosetta/api/block/mapper/WithdrawalEntityToWithdrawalTest.java

@@ -12,13 +12,13 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-public class WithdrawalEntityToWithdrawalTest extends BaseMapperSetup {
+class WithdrawalEntityToWithdrawalTest extends BaseMapperSetup {
 
   @Autowired
   private WithdrawalEntityToWithdrawal my;
 
   @Test
-  public void fromEntity() {
+  void fromEntity() {
     WithdrawalEntity from = newWithdrawalEntity();
     Withdrawal into = my.fromEntity(from);
 

api/src/test/java/org/cardanofoundation/rosetta/common/mapper/ProtocolParamsToRosettaProtocolParamsTest.java

@@ -13,7 +13,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ProtocolParamsToRosettaProtocolParamsTest extends BaseMapperSetup {
+class ProtocolParamsToRosettaProtocolParamsTest extends BaseMapperSetup {
 
   @Autowired
   private ProtocolParamsToRosettaProtocolParameters mapper;