From b4f7d2b192b7200bfcfc1f45cbbf0131c06be0ae Mon Sep 17 00:00:00 2001 From: Nicola Timeus Date: Tue, 31 Oct 2023 09:27:09 +0100 Subject: [PATCH] Minor naming changes Signed-off-by: Nicola Timeus --- .../rest/identity/provider/IdentityRestService.java | 6 +++--- .../rest/identity/provider/test/IdentityEndpointsTest.java | 6 +++--- .../provider/test/IdentityRestServiceDependenciesTest.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kura/org.eclipse.kura.rest.identity.provider/src/main/java/org/eclipse/kura/internal/rest/identity/provider/IdentityRestService.java b/kura/org.eclipse.kura.rest.identity.provider/src/main/java/org/eclipse/kura/internal/rest/identity/provider/IdentityRestService.java index 88bd90df8f1..668fc3db455 100644 --- a/kura/org.eclipse.kura.rest.identity.provider/src/main/java/org/eclipse/kura/internal/rest/identity/provider/IdentityRestService.java +++ b/kura/org.eclipse.kura.rest.identity.provider/src/main/java/org/eclipse/kura/internal/rest/identity/provider/IdentityRestService.java @@ -45,7 +45,7 @@ public class IdentityRestService { private static final Logger logger = LoggerFactory.getLogger(IdentityRestService.class); private static final String DEBUG_MESSAGE = "Processing request for method '{}'"; - private static final String MQTT_APP_ID = "ID-V1"; + private static final String MQTT_APP_ID = "IDN-V1"; private static final String REST_ROLE_NAME = "identity"; private static final String KURA_PERMISSION_REST_ROLE = "kura.permission.rest." + REST_ROLE_NAME; @@ -159,7 +159,7 @@ public Response deleteUser(final UserDTO userName) { } @GET - @Path("/defined-permissions") + @Path("/definedPermissions") @Produces(MediaType.APPLICATION_JSON) public PermissionDTO getDefinedPermissions() { try { @@ -186,7 +186,7 @@ public UserConfigDTO getUserConfig() { } @GET - @Path("/password-requirements") + @Path("/passwordRequirements") @Produces(MediaType.APPLICATION_JSON) public ValidatorOptionsDTO getValidatorOptions() { try { diff --git a/kura/test/org.eclipse.kura.rest.identity.provider.test/src/main/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityEndpointsTest.java b/kura/test/org.eclipse.kura.rest.identity.provider.test/src/main/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityEndpointsTest.java index 32534d0f67f..57683c1077e 100644 --- a/kura/test/org.eclipse.kura.rest.identity.provider.test/src/main/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityEndpointsTest.java +++ b/kura/test/org.eclipse.kura.rest.identity.provider.test/src/main/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityEndpointsTest.java @@ -53,7 +53,7 @@ @RunWith(Parameterized.class) public class IdentityEndpointsTest extends AbstractRequestHandlerTest { - private static final String MQTT_APP_ID = "ID-V1"; + private static final String MQTT_APP_ID = "IDN-V1"; private static final String METHOD_SPEC_GET = "GET"; private static final String METHOD_SPEC_POST = "POST"; @@ -161,7 +161,7 @@ public void shouldReturnUserConfig() throws KuraException { public void shouldReturnDefinedPermissions() throws KuraException { givenIdentityService(); - whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/defined-permissions"); + whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/definedPermissions"); thenRequestSucceeds(); thenResponseBodyEqualsJson("{\"permissions\": [\"perm1\",\"perm2\"]}"); @@ -171,7 +171,7 @@ public void shouldReturnDefinedPermissions() throws KuraException { public void shouldReturnPasswordRequirements() throws KuraException { givenIdentityService(); - whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/password-requirements"); + whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/passwordRequirements"); thenRequestSucceeds(); thenResponseBodyEqualsJson(EXPECTED_GET_PASSWORD_REQUIREMENTS_RESPONSE); diff --git a/kura/test/org.eclipse.kura.rest.identity.provider.test/src/test/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityRestServiceDependenciesTest.java b/kura/test/org.eclipse.kura.rest.identity.provider.test/src/test/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityRestServiceDependenciesTest.java index 2c372d03981..70d30044eea 100644 --- a/kura/test/org.eclipse.kura.rest.identity.provider.test/src/test/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityRestServiceDependenciesTest.java +++ b/kura/test/org.eclipse.kura.rest.identity.provider.test/src/test/java/org/eclipse/kura/internal/rest/identity/provider/test/IdentityRestServiceDependenciesTest.java @@ -37,7 +37,7 @@ public class IdentityRestServiceDependenciesTest { - private static final String MQTT_APP_ID = "ID-V1"; + private static final String MQTT_APP_ID = "IDN-V1"; private static final String REST_ROLE_NAME = "identity"; private static final String KURA_PERMISSION_REST_ROLE = "kura.permission.rest." + REST_ROLE_NAME;