checkstyle

extensions/iam/distributed-identity/identity-did-service/src/main/java/org/eclipse/dataspaceconnector/identity/DistributedIdentityService.java

@@ -32,7 +32,7 @@ public class DistributedIdentityService implements IdentityService {
     private final Monitor monitor;
 
     public DistributedIdentityService(VerifiableCredentialProvider vcProvider, DidResolver didResolver, CredentialsVerifier credentialsVerifier, Monitor monitor) {
-        this.verifiableCredentialProvider = vcProvider;
+        verifiableCredentialProvider = vcProvider;
         this.didResolver = didResolver;
         this.credentialsVerifier = credentialsVerifier;
         this.monitor = monitor;
@@ -66,15 +66,15 @@ public VerificationResult verifyJwtToken(String token, String audience) {
 
             //convert the POJO into a usable PK-wrapper:
             JwkPublicKey publicKeyJwk = publicKey.get().getPublicKeyJwk();
-            PublicKeyWrapper publicKeyWRapper = KeyConverter.toPublicKeyWrapper(publicKeyJwk, publicKey.get().getId());
+            PublicKeyWrapper publicKeyWrapper = KeyConverter.toPublicKeyWrapper(publicKeyJwk, publicKey.get().getId());
 
             monitor.debug("Verifying JWT with public key...");
-            if (!VerifiableCredentialFactory.verify(jwt, publicKeyWRapper)) {
+            if (!VerifiableCredentialFactory.verify(jwt, publicKeyWrapper)) {
                 return new VerificationResult("Token could not be verified!");
             }
             monitor.debug("verification successful! Fetching data from IdentityHub");
             String hubUrl = getHubUrl(did);
-            var credentialsResult = credentialsVerifier.verifyCredentials(hubUrl, publicKeyWRapper);
+            var credentialsResult = credentialsVerifier.verifyCredentials(hubUrl, publicKeyWrapper);
 
             monitor.debug("Building ClaimToken");
             var tokenBuilder = ClaimToken.Builder.newInstance();

extensions/iam/distributed-identity/identity-did-service/src/test/java/org/eclipse/dataspaceconnector/identity/DistributedIdentityServiceTest.java

@@ -48,7 +48,7 @@
 
 /**
  * Test the {@link DistributedIdentityService} with different key algorithms.
- * See {@link WithP_256} and {@link WithSecp256k1} for concrete impls.
+ * See {@link WithP256} and {@link WithSecp256k1} for concrete impls.
  */
 
 abstract class DistributedIdentityServiceTest {
@@ -156,7 +156,7 @@ public static class WithSecp256k1 extends DistributedIdentityServiceTest {
         }
     }
 
-    public static class WithP_256 extends DistributedIdentityServiceTest {
+    public static class WithP256 extends DistributedIdentityServiceTest {
         @Override
         protected @NotNull JWK getKeyPair() {
             return KeyPairFactory.generateKeyPairP256();

extensions/iam/distributed-identity/verifiable-credentials/src/main/java/org/eclipse/dataspaceconnector/verifiablecredential/EcPrivateKeyPemParser.java

@@ -8,8 +8,8 @@
 public class EcPrivateKeyPemParser implements KeyParser<ECKey> {
 
     @Override
-    public boolean canParse(Class<?> aClass) {
-        return aClass.equals(ECKey.class);
+    public boolean canParse(Class<?> keyClass) {
+        return keyClass.equals(ECKey.class);
     }
 
     @Override

extensions/iam/distributed-identity/verifiable-credentials/src/main/java/org/eclipse/dataspaceconnector/verifiablecredential/IonDidPublicKeyResolver.java

@@ -36,7 +36,7 @@ public IonDidPublicKeyResolver(IonClient ionClient) {
         VerificationMethod verificationMethod = didDocument.getVerificationMethod().get(0);
         var jwk = verificationMethod.getPublicKeyJwk();
         try {
-           return KeyConverter.toPublicKeyWrapper(jwk, verificationMethod.getId());
+            return KeyConverter.toPublicKeyWrapper(jwk, verificationMethod.getId());
         } catch (IllegalArgumentException e) {
             throw new PublicKeyResolutionException("Public Key was not a valid EC Key!  Details: " + e.getMessage());
         }

extensions/iam/distributed-identity/verifiable-credentials/src/main/java/org/eclipse/dataspaceconnector/verifiablecredential/KeyConverter.java

@@ -25,7 +25,7 @@ public class KeyConverter {
      * @return an {@link ECKey}
      * @throws IllegalArgumentException if any of the public key's properties are not valid. Check {@link ECKey} for details.
      */
-    public static ECKey toECKey(EllipticCurvePublicKey jwk, String id) {
+    public static ECKey toEcKey(EllipticCurvePublicKey jwk, String id) {
         return new ECKey(Curve.parse(jwk.getCrv()),
                 Base64URL.from(jwk.getX()),
                 Base64URL.from(jwk.getY()),
@@ -53,7 +53,7 @@ public static ECKey toECKey(EllipticCurvePublicKey jwk, String id) {
                 if (!(publicKey instanceof EllipticCurvePublicKey)) {
                     throw new IllegalArgumentException(format("Public key has 'kty' = '%s' but its Java type was %s!", publicKey.getKty(), publicKey.getClass()));
                 }
-                return new EcPublicKeyWrapper(toECKey((EllipticCurvePublicKey) publicKey, id));
+                return new EcPublicKeyWrapper(toEcKey((EllipticCurvePublicKey) publicKey, id));
             default:
                 throw new IllegalArgumentException(format("Only public-key-JWK of type 'EC' can be used at the moment, but '%s' was specified!", publicKey.getKty()));
         }

extensions/iam/distributed-identity/verifiable-credentials/src/test/java/org/eclipse/dataspaceconnector/verifiablecredential/EcPrivateKeyPemParserTest.java

@@ -4,8 +4,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.crypto.interfaces.DHPrivateKey;
 import java.security.interfaces.RSAPrivateKey;
+import javax.crypto.interfaces.DHPrivateKey;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

extensions/iam/distributed-identity/verifiable-credentials/src/test/java/org/eclipse/dataspaceconnector/verifiablecredential/IonDidPublicKeyResolverTest.java

@@ -2,7 +2,11 @@
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.jwk.ECKey;
-import org.eclipse.dataspaceconnector.iam.did.spi.resolution.*;
+import org.eclipse.dataspaceconnector.iam.did.spi.resolution.DidConstants;
+import org.eclipse.dataspaceconnector.iam.did.spi.resolution.DidDocument;
+import org.eclipse.dataspaceconnector.iam.did.spi.resolution.EllipticCurvePublicKey;
+import org.eclipse.dataspaceconnector.iam.did.spi.resolution.Service;
+import org.eclipse.dataspaceconnector.iam.did.spi.resolution.VerificationMethod;
 import org.eclipse.dataspaceconnector.ion.spi.IonClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -11,7 +15,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.niceMock;
+import static org.easymock.EasyMock.replay;
 import static org.eclipse.dataspaceconnector.verifiablecredential.TestHelper.readFile;
 
 class IonDidPublicKeyResolverTest {

extensions/iam/distributed-identity/verifiable-credentials/src/test/java/org/eclipse/dataspaceconnector/verifiablecredential/KeyConverterTest.java

@@ -15,31 +15,31 @@ class KeyConverterTest {
 
     @Test
     void toEcKey_illegalParams() {
-        assertThatThrownBy(() -> KeyConverter.toECKey(null, "some-id")).isInstanceOf(NullPointerException.class);
-        assertThatThrownBy(() -> KeyConverter.toECKey(new EllipticCurvePublicKey(), "some-id")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> KeyConverter.toEcKey(null, "some-id")).isInstanceOf(NullPointerException.class);
+        assertThatThrownBy(() -> KeyConverter.toEcKey(new EllipticCurvePublicKey(), "some-id")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     void toEcKey_invalidCurve() {
-        assertThatThrownBy(() -> KeyConverter.toECKey(new EllipticCurvePublicKey("foobar", "EC", "asdf", "ASdfkl"), "some-id"))
+        assertThatThrownBy(() -> KeyConverter.toEcKey(new EllipticCurvePublicKey("foobar", "EC", "asdf", "ASdfkl"), "some-id"))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining("unsupported curve");
     }
 
     @Test
     void toEcKey_invalidType_shouldCorrectAutomatically() {
-        assertThat(KeyConverter.toECKey(new EllipticCurvePublicKey("secp256k1", "foobar", "wSwuib0Eyfsvdb_RPpQQLlFoHsQE4TSlFdncLePp6Zg", "uxjZNS8HQ9krKn5ZXpjBtSAAj9FQXSDlHlEMR2YA7Hs"), "some-id"))
+        assertThat(KeyConverter.toEcKey(new EllipticCurvePublicKey("secp256k1", "foobar", "wSwuib0Eyfsvdb_RPpQQLlFoHsQE4TSlFdncLePp6Zg", "uxjZNS8HQ9krKn5ZXpjBtSAAj9FQXSDlHlEMR2YA7Hs"), "some-id"))
                 .isNotNull()
                 .hasFieldOrPropertyWithValue("kty", KeyType.EC);
     }
 
     @Test
     void toEcKey_invalidCoordinates() {
-        assertThatThrownBy(() -> KeyConverter.toECKey(new EllipticCurvePublicKey("secp256k1", "EC", "foobar", "uxjZNS8HQ9krKn5ZXpjBtSAAj9FQXSDlHlEMR2YA7Hs"), "some-id"))
+        assertThatThrownBy(() -> KeyConverter.toEcKey(new EllipticCurvePublicKey("secp256k1", "EC", "foobar", "uxjZNS8HQ9krKn5ZXpjBtSAAj9FQXSDlHlEMR2YA7Hs"), "some-id"))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Invalid EC JWK: The 'x' and 'y' public coordinates are not on the secp256k1 curve");
 
-        assertThatThrownBy(() -> KeyConverter.toECKey(new EllipticCurvePublicKey("secp256k1", "EC", "wSwuib0Eyfsvdb_RPpQQLlFoHsQE4TSlFdncLePp6Zg", "foobar"), "some-id"))
+        assertThatThrownBy(() -> KeyConverter.toEcKey(new EllipticCurvePublicKey("secp256k1", "EC", "wSwuib0Eyfsvdb_RPpQQLlFoHsQE4TSlFdncLePp6Zg", "foobar"), "some-id"))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Invalid EC JWK: The 'x' and 'y' public coordinates are not on the secp256k1 curve");
     }

extensions/iam/distributed-identity/verifiable-credentials/src/test/java/org/eclipse/dataspaceconnector/verifiablecredential/PemKeyReaderUtility.java

@@ -18,17 +18,17 @@ public class PemKeyReaderUtility {
     @Test
     @Disabled
     void readPemFile() {
-        var jwk1 = parsePemAsJWK("/home/paul/dev/ion-demo/keys2/consumer-public.pem");
-        var jwk2 = parsePemAsJWK("/home/paul/dev/ion-demo/keys2/verifier-public.pem");
-        var jwk3 = parsePemAsJWK("/home/paul/dev/ion-demo/keys2/provider-public.pem");
+        var jwk1 = parsePemAsJwk("/home/paul/dev/ion-demo/keys2/consumer-public.pem");
+        var jwk2 = parsePemAsJwk("/home/paul/dev/ion-demo/keys2/verifier-public.pem");
+        var jwk3 = parsePemAsJwk("/home/paul/dev/ion-demo/keys2/provider-public.pem");
         System.out.println("Public keys: ");
         System.out.printf("consumer: %s%n", jwk1);
         System.out.printf("verifier: %s%n", jwk2);
         System.out.printf("provider: %s%n", jwk3);
     }
 
 
-    private JWK parsePemAsJWK(String resourceName) {
+    private JWK parsePemAsJwk(String resourceName) {
 
         try {
             var pemContents = Files.readString(Path.of(resourceName));

extensions/iam/distributed-identity/verifiable-credentials/src/test/java/org/eclipse/dataspaceconnector/verifiablecredential/VerifiableCredentialLoaderExtensionTest.java

@@ -8,7 +8,15 @@
 import org.eclipse.dataspaceconnector.verifiablecredential.spi.VerifiableCredentialProvider;
 import org.junit.jupiter.api.Test;
 
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.niceMock;
+import static org.easymock.EasyMock.notNull;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.strictMock;
 
 class VerifiableCredentialLoaderExtensionTest {