feat: remove path for accounts v1

* chore: rename file with oidc prefix

Signed-off-by: Nicklas Jannesson <extern.nicklas.jannesson@digg.se>

* feat: remove /accounts/v1 api path

Signed-off-by: Nicklas Jannesson <extern.nicklas.jannesson@digg.se>

---------

Signed-off-by: Nicklas Jannesson <extern.nicklas.jannesson@digg.se>

Author: nickjann-04

src/main/java/se/digg/wallet/gateway/application/controller/AccountController.java

@@ -19,7 +19,7 @@
 import se.digg.wallet.gateway.domain.service.account.AccountService;
 
 @RestController
-@RequestMapping({"/accounts", "/accounts/v1"})
+@RequestMapping("/accounts")
 public class AccountController {
   private final AccountService accountService;
   private final ApiKeyVerifier apiKeyVerifier;

…controller/oidc/AccountControllerV1.java …ntroller/oidc/OidcAccountController.javasrc/main/java/se/digg/wallet/gateway/application/controller/oidc/AccountControllerV1.java renamed to src/main/java/se/digg/wallet/gateway/application/controller/oidc/OidcAccountController.java src/main/java/se/digg/wallet/gateway/application/controller/oidc/AccountControllerV1.java renamed to src/main/java/se/digg/wallet/gateway/application/controller/oidc/OidcAccountController.java

@@ -27,11 +27,11 @@
 @Deprecated(forRemoval = true)
 @RestController
 @RequestMapping("/oidc/accounts/v1")
-public class AccountControllerV1 {
+public class OidcAccountController {
   private final AccountService accountService;
   private final String personalIdentityNumberClaim;
 
-  public AccountControllerV1(AccountService accountService, ApplicationConfig applicationConfig) {
+  public OidcAccountController(AccountService accountService, ApplicationConfig applicationConfig) {
     this.accountService = accountService;
     this.personalIdentityNumberClaim = applicationConfig.oidcClaims().personalIdentityNumber();
   }

src/main/resources/application.yml

@@ -12,7 +12,6 @@ properties:
     - "/public/**"
     - "/wua"
     - "/accounts"
-    - "/accounts/v1"
   walletprovider:
     baseurl: http://
     wua-path: /wallet-unit-attestation

src/test/java/se/digg/wallet/gateway/application/controller/AccountControllerIntegrationTest.java

@@ -13,10 +13,9 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 
-import java.util.List;
 import java.util.UUID;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.FieldSource;
+
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient;
@@ -38,8 +37,6 @@
 @AutoConfigureRestTestClient
 class AccountControllerIntegrationTest {
 
-  public static final List<String> ACCOUNTS_PATH = List.of("accounts", "accounts/v1");
-
   @Autowired
   private RestTestClient restClient;
 
@@ -58,9 +55,8 @@ class AccountControllerIntegrationTest {
   @InjectWireMock(WalletAccountMock.NAME)
   private WireMockServer server;
 
-  @ParameterizedTest
-  @FieldSource("ACCOUNTS_PATH")
-  void testCreateAccount(String path) throws Exception {
+  @Test
+  void testCreateAccount() throws Exception {
     var generatedAccountId = UUID.randomUUID();
     var jwkString = objectMapper.writeValueAsString(JwkDtoTestBuilder.withDefaults().build());
 
@@ -90,7 +86,7 @@ void testCreateAccount(String path) throws Exception {
 
     var requestBody = CreateAccountRequestDtoTestBuilder.withDefaults().build();
     var response = restClient.post()
-        .uri(path)
+        .uri("accounts")
         .header(SecurityConfig.API_KEY_HEADER, applicationConfig.apisecret())
         .body(requestBody)
         .exchange();
@@ -105,16 +101,15 @@ void testCreateAccount(String path) throws Exception {
             """.formatted(generatedAccountId));
   }
 
-  @ParameterizedTest
-  @FieldSource("ACCOUNTS_PATH")
-  void testAccountReturns500IfAccountServiceRespondsWith404(String path) {
+  @Test
+  void testAccountReturns500IfAccountServiceRespondsWith404() {
     server.stubFor(post("/account")
         .willReturn(aResponse()
             .withStatus(404)));
 
     var requestBody = CreateAccountRequestDtoTestBuilder.withDefaults().build();
     var response = restClient.post()
-        .uri(path)
+        .uri("accounts")
         .header(SecurityConfig.API_KEY_HEADER, applicationConfig.apisecret())
         .body(requestBody)
         .exchange();
@@ -123,14 +118,13 @@ void testAccountReturns500IfAccountServiceRespondsWith404(String path) {
         .isEqualTo(500);
   }
 
-  @ParameterizedTest
-  @FieldSource("ACCOUNTS_PATH")
-  void testValidation(String path) {
+  @Test
+  void testValidation() {
     var requestBody = CreateAccountRequestDtoTestBuilder.withDefaults()
         .emailAdress(null)
         .build();
     var response = restClient.post()
-        .uri(path)
+        .uri("accounts")
         .header(SecurityConfig.API_KEY_HEADER, applicationConfig.apisecret())
         .body(requestBody)
         .exchange();

…/controller/AccountControllerV1Test.java …ontroller/OidcAccountControllerTest.javasrc/test/java/se/digg/wallet/gateway/application/controller/AccountControllerV1Test.java renamed to src/test/java/se/digg/wallet/gateway/application/controller/OidcAccountControllerTest.java src/test/java/se/digg/wallet/gateway/application/controller/AccountControllerV1Test.java renamed to src/test/java/se/digg/wallet/gateway/application/controller/OidcAccountControllerTest.java

@@ -25,14 +25,14 @@
 import se.digg.wallet.gateway.application.config.ApplicationConfig;
 import se.digg.wallet.gateway.application.config.ApplicationConfig.OidcClaims;
 import se.digg.wallet.gateway.application.controller.exception.BadRequestException;
-import se.digg.wallet.gateway.application.controller.oidc.AccountControllerV1;
+import se.digg.wallet.gateway.application.controller.oidc.OidcAccountController;
 import se.digg.wallet.gateway.application.model.CreateAccountRequestDtoTestBuilder;
 import se.digg.wallet.gateway.domain.service.account.AccountService;
 
 @ExtendWith(MockitoExtension.class)
-public class AccountControllerV1Test {
+public class OidcAccountControllerTest {
 
-  private AccountControllerV1 controller;
+  private OidcAccountController controller;
 
   private AccountService service;
   private ApplicationConfig config;
@@ -44,7 +44,7 @@ public void beforeEach() {
     when(config.oidcClaims())
         .thenReturn(new OidcClaims("pnr"));
 
-    controller = new AccountControllerV1(service, config);
+    controller = new OidcAccountController(service, config);
   }
 
   @Test

…/AccountControllerV1IntegrationTest.java …idcAccountControllerIntegrationTest.javasrc/test/java/se/digg/wallet/gateway/application/controller/oidc/AccountControllerV1IntegrationTest.java renamed to src/test/java/se/digg/wallet/gateway/application/controller/oidc/OidcAccountControllerIntegrationTest.java src/test/java/se/digg/wallet/gateway/application/controller/oidc/AccountControllerV1IntegrationTest.java renamed to src/test/java/se/digg/wallet/gateway/application/controller/oidc/OidcAccountControllerIntegrationTest.java

@@ -42,7 +42,7 @@
 @Testcontainers
 @ActiveProfiles("test")
 @AutoConfigureRestTestClient
-class AccountControllerV1IntegrationTest {
+class OidcAccountControllerIntegrationTest {
 
   @Container
   @ServiceConnection

src/test/resources/application-test.yml

@@ -17,7 +17,6 @@ properties:
     - "/public/**"
     - "/wua"
     - "/accounts"
-    - "/accounts/v1"
   walletprovider:
     baseurl: http://localhost:${wiremock.provider.port}
     wua-path: /wallet-provider/wallet-unit-attestation