Fix Sonar Code Smells (#25)

* decode ec certificates * fix ec signature computation * junit for signing * sonar * Fix coverage exclusions * Remove Sonar Coverage exclusion properties * Refactoring * fix Sonar Code Smells * Checkstyle Co-authored-by: Artur T <[email protected]>
eu-digital-green-certificates · May 3, 2021 · 7bd9c76 · 7bd9c76
1 parent 5186b74
commit 7bd9c76
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/issuance/restapi/controller/CertController.java b/src/main/java/eu/europa/ec/dgc/issuance/restapi/controller/CertController.java
@@ -145,7 +145,7 @@ public ResponseEntity<EgcDecodeResult> decodeEgCert(
 
         try {
             oneKey = new OneKey(map);
-            message = (Sign1Message) Sign1Message.DecodeFromBytes(cose);
+            message = (Sign1Message) COSE.Message.DecodeFromBytes(cose);
         } catch (CoseException e) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
         }
@@ -218,7 +218,7 @@ private CBORObject getEcCurve(ECPublicKey publicKey) {
     }
 
     private CBORObject stripLeadingZero(BigInteger input) {
-        val bytes = input.toByteArray();
+        final byte[] bytes = input.toByteArray();
         byte[] stripped;
 
         if (bytes.length % 8 != 0 && bytes[0] == 0x00) {

diff --git a/src/main/java/eu/europa/ec/dgc/issuance/service/impl/SigningServiceImpl.java b/src/main/java/eu/europa/ec/dgc/issuance/service/impl/SigningServiceImpl.java
@@ -1,7 +1,6 @@
 package eu.europa.ec.dgc.issuance.service.impl;
 
 import eu.europa.ec.dgc.issuance.service.SigningService;
-import java.io.IOException;
 import java.math.BigInteger;
 import java.security.PrivateKey;
 import java.security.interfaces.RSAPrivateCrtKey;
@@ -29,7 +28,7 @@ public byte[] signHash(byte[] hashBytes, PrivateKey privateKey) {
             } else {
                 signature = signEc(hashBytes, privateKey);
             }
-        } catch (CryptoException | IOException e) {
+        } catch (CryptoException e) {
             throw new IllegalArgumentException("error during signing ", e);
         }
         return signature;
@@ -50,7 +49,7 @@ private byte[] signRsapss(byte[] hashBytes, PrivateKey privateKey) throws Crypto
         return pssSigner.generateSignature();
     }
 
-    private byte[] signEc(byte[] hash, PrivateKey privateKey) throws IOException {
+    private byte[] signEc(byte[] hash, PrivateKey privateKey) {
         java.security.interfaces.ECPrivateKey privKey = (java.security.interfaces.ECPrivateKey) privateKey;
         ECParameterSpec s = EC5Util.convertSpec(privKey.getParams());
         ECPrivateKeyParameters keyparam = new ECPrivateKeyParameters(

diff --git a/src/main/java/eu/europa/ec/dgc/issuance/utils/CborDumpService.java b/src/main/java/eu/europa/ec/dgc/issuance/utils/CborDumpService.java
@@ -28,12 +28,14 @@
 @Service
 public class CborDumpService {
 
+    /**
+     * Method to write a CBOR Array into a {@link Writer} (e.g. {@link java.io.StringWriter}).
+     *
+     * @param cb     cbor Byte Array to write
+     * @param writer destination
+     */
     public void dumpCbor(byte[] cb, Writer writer) throws IOException {
         CBORObject cborObject = CBORObject.DecodeFromBytes(cb);
-        dumpCbor(cborObject, writer, 0);
-    }
-
-    private void dumpCbor(CBORObject cborObject, Writer writer, int ident) throws IOException {
         writer
             .append("")
             .append(String.valueOf(cborObject));