Simplify code using error-prone's suggestions

Author: kostis

src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/DtlsOutputMapper.java

@@ -138,8 +138,7 @@ private String toAbstractOutputString(List<String> abstractMessageStrings) {
     }
 
     private String toOutputString(ProtocolMessage message) {
-        if (message instanceof CertificateMessage) {
-            CertificateMessage cert = (CertificateMessage) message;
+        if (message instanceof CertificateMessage cert) {
             if (cert.getCertificatesListLength().getValue() > 0) {
                 String certTypeString = getCertSignatureTypeString(cert);
                 return certTypeString + "_" + message.toCompactString();
@@ -162,16 +161,12 @@ private String getCertSignatureTypeString(CertificateMessage message) {
             X509Certificate x509Cert = message.getX509CertificateListFromEntries().get(0);
             certType = x509Cert.getX509SignatureAlgorithm().getSignatureAlgorithm();
         }
-        switch (certType) {
-            case RSA_PKCS1:
-            case RSA_PSS_RSAE:
-            case RSA_SSA_PSS:
-                return "RSA";
-            case ECDSA:
-                return "ECDSA";
-            default:
+        return switch (certType) {
+            case RSA_PKCS1, RSA_PSS_RSAE, RSA_SSA_PSS -> "RSA";
+            case ECDSA -> "ECDSA";
+            default ->
                 throw new NotImplementedException("Signature algorithm mapping not implemented for: " + certType.name());
-        }
+        };
     }
 
 }

src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientHelloRenegotiationInput.java

@@ -38,20 +38,20 @@ public ClientHelloRenegotiationInput() {
 
     @Override
     public boolean isEnabled(ExecutionContext context) {
-        switch (enabled) {
-            case OWN_EPOCH_CHANGE :
+        return switch (enabled) {
+            case OWN_EPOCH_CHANGE ->
                 // send epoch is 1 or more
-                return getTlsContext(context).getWriteEpoch() > 0;
-            case SERVER_EPOCH_CHANGE :
+                getTlsContext(context).getWriteEpoch() > 0;
+            case SERVER_EPOCH_CHANGE ->
                 // receive epoch is 1 or more
-                return getTlsContext(context).getReadEpoch() > 0;
-            case ONCE :
-                return getTlsExecutionContext(context)
+                getTlsContext(context).getReadEpoch() > 0;
+            case ONCE ->
+                getTlsExecutionContext(context)
                         .getTlsStepContextStream()
                         .noneMatch(s -> this.equals(s.getInput()) && s.getIndex() != getTlsExecutionContext(context).getStepCount() - 1);
-            default :
-                return true;
-        }
+            default ->
+                true;
+        };
     }
 
     @Override

src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientKeyExchangeInput.java

@@ -33,38 +33,21 @@ public ClientKeyExchangeInput(KeyExchangeAlgorithm algorithm) {
     @Override
     public TlsProtocolMessage generateProtocolMessage(ExecutionContext context) {
         getTlsContext(context).setPreMasterSecret(null);
-        ProtocolMessage message = null;
         if (algorithm == null) {
             throw new RuntimeException("Algorithm not set");
         }
-        switch (algorithm) {
-            case RSA :
-                message = new RSAClientKeyExchangeMessage();
-                break;
-            case PSK :
-                message = new PskClientKeyExchangeMessage();
-                break;
-            case DH :
-                message = new DHClientKeyExchangeMessage();
-                break;
-            case ECDH :
-                message = new ECDHClientKeyExchangeMessage();
-                break;
-            case PSK_RSA :
-                message = new PskRsaClientKeyExchangeMessage();
-                break;
-            case GOST :
-                message = new GOSTClientKeyExchangeMessage();
-                break;
-            case SRP :
-                message = new SrpClientKeyExchangeMessage();
-                break;
-            default :
+        ProtocolMessage message = switch (algorithm) {
+            case RSA -> new RSAClientKeyExchangeMessage();
+            case PSK -> new PskClientKeyExchangeMessage();
+            case DH -> new DHClientKeyExchangeMessage();
+            case ECDH -> new ECDHClientKeyExchangeMessage();
+            case PSK_RSA -> new PskRsaClientKeyExchangeMessage();
+            case GOST -> new GOSTClientKeyExchangeMessage();
+            case SRP -> new SrpClientKeyExchangeMessage();
+            default ->
                 throw new RuntimeException("Algorithm " + algorithm
                         + " not supported");
-
-        }
-
+        };
         return new TlsProtocolMessage(message);
     }
 

src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ServerKeyExchangeInput.java

@@ -30,21 +30,14 @@ public TlsProtocolMessage generateProtocolMessage(ExecutionContext context) {
         if (algorithm == null) {
             throw new RuntimeException("Algorithm not set");
         }
-        ProtocolMessage ske = null;
-        switch (algorithm) {
-            case DH :
-                ske = new DHEServerKeyExchangeMessage();
-                break;
-            case ECDH :
-                ske = new ECDHEServerKeyExchangeMessage();
-                break;
-            case PSK:
-                ske = new PskServerKeyExchangeMessage();
-                break;
-            default :
+        ProtocolMessage ske = switch (algorithm) {
+            case DH -> new DHEServerKeyExchangeMessage();
+            case ECDH -> new ECDHEServerKeyExchangeMessage();
+            case PSK -> new PskServerKeyExchangeMessage();
+            default ->
                 throw new RuntimeException("Algorithm " + algorithm
                         + " not supported");
-        }
+        };
         return new TlsProtocolMessage(ske);
     }
 

src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/TlsInputType.java

@@ -6,22 +6,17 @@ public enum TlsInputType {
     CCS, HANDSHAKE, ALERT, APPLICATION, UNKNOWN, HEARTBEAT, EMPTY;
 
     public static TlsInputType fromTlsMessageType(ProtocolMessageType type) {
-        switch (type) {
-            case ALERT :
-                return TlsInputType.ALERT;
-            case APPLICATION_DATA :
-                return TlsInputType.APPLICATION;
-            case CHANGE_CIPHER_SPEC :
-                return TlsInputType.CCS;
-            case HANDSHAKE :
-                return TlsInputType.HANDSHAKE;
-            case HEARTBEAT :
-                return TlsInputType.HEARTBEAT;
-            case UNKNOWN :
-                return TlsInputType.UNKNOWN;
-            default :
+        return switch (type) {
+            case ALERT -> TlsInputType.ALERT;
+            case APPLICATION_DATA -> TlsInputType.APPLICATION;
+            case CHANGE_CIPHER_SPEC -> TlsInputType.CCS;
+            case HANDSHAKE -> TlsInputType.HANDSHAKE;
+            case HEARTBEAT -> TlsInputType.HEARTBEAT;
+            case UNKNOWN -> TlsInputType.UNKNOWN;
+            default -> {
                 throw new RuntimeException("Type not supported: " + type);
-        }
+            }
+        };
     }
 
 }