Rename UserCredential to UserCredentials

eclipse · Feb 6, 2023 · ec96c7b · ec96c7b
1 parent 64c226f
commit ec96c7b
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 49 deletions.
diff --git a/...ources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserCredential.java b/...ources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserCredential.java
@@ -18,7 +18,7 @@
 import org.eclipse.kapua.service.KapuaService;
 import org.eclipse.kapua.service.authentication.credential.Credential;
 import org.eclipse.kapua.service.authentication.user.PasswordChangeRequest;
-import org.eclipse.kapua.service.authentication.user.UserCredentialService;
+import org.eclipse.kapua.service.authentication.user.UserCredentialsService;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -30,7 +30,7 @@
 @Path("{scopeId}/user/credentials")
 public class UserCredential {
     private final KapuaLocator locator = KapuaLocator.getInstance();
-    private final UserCredentialService userCredentialService = locator.getService(UserCredentialService.class);
+    private final UserCredentialsService userCredentialsService = locator.getService(UserCredentialsService.class);
 
 
     /**
@@ -46,6 +46,6 @@ public class UserCredential {
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Credential newPassword(@PathParam("scopeId") ScopeId scopeId, PasswordChangeRequest passwordChangeRequest) throws KapuaException {
-        return userCredentialService.changePasswordRequest(passwordChangeRequest);
+        return userCredentialsService.changePasswordRequest(passwordChangeRequest);
     }
 }
diff --git a/rest-api/resources/src/main/resources/openapi/userCredentials/user-credentials-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/userCredentials/user-credentials-scopeId.yaml
@@ -14,7 +14,7 @@ paths:
       tags:
         - User Credentials
       summary: Change the user password
-      operationId: provisionRequestExecutionCount
+      operationId: passwordChangeRequest
       parameters:
         - $ref: '../openapi.yaml#/components/parameters/scopeId'
       requestBody:

diff --git a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/JaxbContextResolver.java b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/JaxbContextResolver.java
@@ -100,7 +100,7 @@
 import org.eclipse.kapua.service.authentication.token.AccessToken;
 import org.eclipse.kapua.service.authentication.token.LoginInfo;
 import org.eclipse.kapua.service.authentication.user.PasswordChangeRequest;
-import org.eclipse.kapua.service.authentication.user.UserCredentialXmlRegistry;
+import org.eclipse.kapua.service.authentication.user.UserCredentialsXmlRegistry;
 import org.eclipse.kapua.service.authorization.access.AccessInfo;
 import org.eclipse.kapua.service.authorization.access.AccessInfoCreator;
 import org.eclipse.kapua.service.authorization.access.AccessInfoListResult;
@@ -685,7 +685,7 @@ public JaxbContextResolver() {
 
                     // User Credentials
                     PasswordChangeRequest.class,
-                    UserCredentialXmlRegistry.class,
+                    UserCredentialsXmlRegistry.class,
 
                     // KapuaEvent
                     ServiceEvent.class,

diff --git a/...pi/src/main/java/org/eclipse/kapua/service/authentication/user/PasswordChangeRequest.java b/...pi/src/main/java/org/eclipse/kapua/service/authentication/user/PasswordChangeRequest.java
@@ -20,7 +20,7 @@
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.PROPERTY)
-@XmlType(factoryClass = UserCredentialXmlRegistry.class, factoryMethod = "newPasswordChangeRequest")
+@XmlType(factoryClass = UserCredentialsXmlRegistry.class, factoryMethod = "newPasswordChangeRequest")
 public interface PasswordChangeRequest {
     @XmlElement(name = "currentPassword")
     String getCurrentPassword();

diff --git a/...ntication/user/UserCredentialFactory.java → ...tication/user/UserCredentialsFactory.java b/...ntication/user/UserCredentialFactory.java → ...tication/user/UserCredentialsFactory.java
@@ -14,6 +14,6 @@
 
 import org.eclipse.kapua.model.KapuaObjectFactory;
 
-public interface UserCredentialFactory extends KapuaObjectFactory {
+public interface UserCredentialsFactory extends KapuaObjectFactory {
     PasswordChangeRequest newPasswordChangeRequest();
 }
diff --git a/...ntication/user/UserCredentialService.java → ...tication/user/UserCredentialsService.java b/...ntication/user/UserCredentialService.java → ...tication/user/UserCredentialsService.java
@@ -21,7 +21,7 @@
  *
  * @since 2.0.0
  */
-public interface UserCredentialService extends KapuaService {
+public interface UserCredentialsService extends KapuaService {
 
     Credential changePasswordRequest(PasswordChangeRequest passwordChangeRequest) throws KapuaException;
 }
diff --git a/...ation/user/UserCredentialXmlRegistry.java → ...tion/user/UserCredentialsXmlRegistry.java b/...ation/user/UserCredentialXmlRegistry.java → ...tion/user/UserCredentialsXmlRegistry.java
@@ -17,10 +17,10 @@
 import javax.xml.bind.annotation.XmlRegistry;
 
 @XmlRegistry
-public class UserCredentialXmlRegistry {
+public class UserCredentialsXmlRegistry {
 
     private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();
-    private static final UserCredentialFactory USER_CREDENTIAL_FACTORY = LOCATOR.getFactory(UserCredentialFactory.class);
+    private static final UserCredentialsFactory USER_CREDENTIAL_FACTORY = LOCATOR.getFactory(UserCredentialsFactory.class);
 
 
     /**

diff --git a/...c/main/java/org/eclipse/kapua/service/authentication/user/shiro/UserCredentialModule.java b/...c/main/java/org/eclipse/kapua/service/authentication/user/shiro/UserCredentialModule.java
diff --git a/...user/shiro/UserCredentialFactoryImpl.java → ...ser/shiro/UserCredentialsFactoryImpl.java b/...user/shiro/UserCredentialFactoryImpl.java → ...ser/shiro/UserCredentialsFactoryImpl.java
@@ -13,12 +13,12 @@
 package org.eclipse.kapua.service.authentication.user.shiro;
 
 import org.eclipse.kapua.service.authentication.user.PasswordChangeRequest;
-import org.eclipse.kapua.service.authentication.user.UserCredentialFactory;
+import org.eclipse.kapua.service.authentication.user.UserCredentialsFactory;
 
 import javax.inject.Singleton;
 
 @Singleton
-public class UserCredentialFactoryImpl implements UserCredentialFactory {
+public class UserCredentialsFactoryImpl implements UserCredentialsFactory {
     @Override
     public PasswordChangeRequest newPasswordChangeRequest() {
         return new PasswordChangeRequestImpl();

diff --git a/...user/shiro/UserCredentialServiceImpl.java → ...ser/shiro/UserCredentialsServiceImpl.java b/...user/shiro/UserCredentialServiceImpl.java → ...ser/shiro/UserCredentialsServiceImpl.java
@@ -31,24 +31,24 @@
 import org.eclipse.kapua.service.authentication.shiro.utils.AuthenticationUtils;
 import org.eclipse.kapua.service.authentication.shiro.utils.CryptAlgorithm;
 import org.eclipse.kapua.service.authentication.user.PasswordChangeRequest;
-import org.eclipse.kapua.service.authentication.user.UserCredentialService;
+import org.eclipse.kapua.service.authentication.user.UserCredentialsService;
 import org.eclipse.kapua.service.user.User;
 import org.eclipse.kapua.service.user.UserService;
 
 import javax.inject.Singleton;
 
 /**
- * {@link UserCredentialService} implementation.
+ * {@link UserCredentialsService} implementation.
  *
  * @since 2.0.0
  */
 @Singleton
-public class UserCredentialServiceImpl implements UserCredentialService {
+public class UserCredentialsServiceImpl implements UserCredentialsService {
     private static final int SYSTEM_MAXIMUM_PASSWORD_LENGTH = 255;
     @Override
     public Credential changePasswordRequest(PasswordChangeRequest passwordChangeRequest) throws KapuaException {
         ArgumentValidator.notNull(passwordChangeRequest.getNewPassword(), "passwordChangeRequest.newPassword");
-        ArgumentValidator.notNull(passwordChangeRequest.getCurrentPassword(), "passwordChangeRequest.oldPassword");
+        ArgumentValidator.notNull(passwordChangeRequest.getCurrentPassword(), "passwordChangeRequest.currentPassword");
 
         return KapuaSecurityUtils.doPrivileged(() -> {
             KapuaLocator locator = KapuaLocator.getInstance();
@@ -64,7 +64,7 @@ public Credential changePasswordRequest(PasswordChangeRequest passwordChangeRequ
             try {
                 authenticationService.verifyCredentials(usernamePasswordCredentials);
             } catch (KapuaAuthenticationException e) {
-                throw new KapuaIllegalArgumentException("passwordChangeRequest.oldPassword", passwordChangeRequest.getCurrentPassword());
+                throw new KapuaIllegalArgumentException("passwordChangeRequest.currentPassword", passwordChangeRequest.getCurrentPassword());
             }
 
             CredentialService credentialService = locator.getService(CredentialService.class);