Merge pull request #103 from diggsweden/fix/delete-wua-endpoint-v2

Fix/delete wua endpoint v2

Author: shir-digg

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

@@ -21,7 +21,7 @@
 import se.digg.wallet.gateway.domain.service.wua.WuaService;
 
 @RestController
-@RequestMapping("/wua/v3")
+@RequestMapping({"/wua", "/wua/v3"})
 @Validated
 public class WuaController {
   private final Logger logger = LoggerFactory.getLogger(WuaController.class);

src/main/java/se/digg/wallet/gateway/application/controller/old/WuaControllerV1.java

@@ -6,10 +6,8 @@
 
 import org.springframework.stereotype.Component;
 import se.digg.wallet.gateway.application.config.WalletRuntimeException;
-import se.digg.wallet.gateway.application.model.wua.CreateWuaDto;
 import se.digg.wallet.gateway.infrastructure.account.model.WalletAccountAccountDto;
 import se.digg.wallet.gateway.infrastructure.walletprovider.model.WalletProviderCreateWuaDto;
-import se.digg.wallet.gateway.infrastructure.walletprovider.model.WalletProviderCreateWuaDtoV1;
 import tools.jackson.core.JacksonException;
 import tools.jackson.databind.ObjectMapper;
 
@@ -32,15 +30,4 @@ public WalletProviderCreateWuaDto toWalletProviderCreateWuaDto(WalletAccountAcco
     }
     return new WalletProviderCreateWuaDto(jwkString, nonce);
   }
-
-  @Deprecated(since = "0.3.1", forRemoval = true)
-  public WalletProviderCreateWuaDtoV1 toWalletProviderCreateWuaDto(CreateWuaDto createWuaDto) {
-    String jwkString;
-    try {
-      jwkString = objectMapper.writeValueAsString(createWuaDto.jwk());
-    } catch (JacksonException e) {
-      throw new WalletRuntimeException(e);
-    }
-    return new WalletProviderCreateWuaDtoV1(createWuaDto.walletId().toString(), jwkString);
-  }
 }

src/main/java/se/digg/wallet/gateway/application/controller/old/WuaControllerV2.java

@@ -8,7 +8,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import se.digg.wallet.gateway.application.model.wua.CreateWuaDto;
 import se.digg.wallet.gateway.application.model.wua.WuaDto;
 import se.digg.wallet.gateway.infrastructure.account.client.WalletAccountClient;
 import se.digg.wallet.gateway.infrastructure.walletprovider.client.WalletProviderClient;
@@ -41,16 +40,4 @@ public WuaDto createWua(String accountId, String nonce) {
     }
     return new WuaDto(result);
   }
-
-  @Deprecated(since = "0.3.1", forRemoval = true)
-  public WuaDto createWua(CreateWuaDto createWuaDto) {
-
-    var mapped = wuaMapper.toWalletProviderCreateWuaDto(createWuaDto);
-    var result = walletProviderClient.createWua(mapped);
-    if (logger.isDebugEnabled()) {
-      logger.debug("Mapped request {} to new wua dto {}",
-          createWuaDto.walletId(), result.substring(0, 10));
-    }
-    return new WuaDto(result);
-  }
 }

src/main/java/se/digg/wallet/gateway/application/model/wua/CreateWuaDto.java

@@ -9,22 +9,19 @@
 import org.springframework.web.client.RestClient;
 import se.digg.wallet.gateway.application.config.ApplicationConfig;
 import se.digg.wallet.gateway.infrastructure.walletprovider.model.WalletProviderCreateWuaDto;
-import se.digg.wallet.gateway.infrastructure.walletprovider.model.WalletProviderCreateWuaDtoV1;
 
 @Component
 public class WalletProviderClient {
 
   private final RestClient restClient;
   private final String walletProviderUrl;
   private final String wuaPath;
-  private final String wuaUrlV1;
   private final String wuaUrlV2;
 
   public WalletProviderClient(RestClient restClient, ApplicationConfig applicationConfig) {
     this.restClient = restClient.mutate().build();
     this.walletProviderUrl = applicationConfig.walletprovider().baseurl();
     this.wuaPath = applicationConfig.walletprovider().wuaPath();
-    this.wuaUrlV1 = walletProviderUrl + wuaPath;
     this.wuaUrlV2 = walletProviderUrl + wuaPath + "/v2";
   }
 
@@ -37,15 +34,4 @@ public String createWua(WalletProviderCreateWuaDto createWuaDto) {
         .retrieve()
         .body(String.class);
   }
-
-  @Deprecated(since = "0.3.1", forRemoval = true)
-  public String createWua(WalletProviderCreateWuaDtoV1 createWuaDto) {
-    return restClient
-        .post()
-        .uri(wuaUrlV1)
-        .body(createWuaDto)
-        .contentType(MediaType.APPLICATION_JSON)
-        .retrieve()
-        .body(String.class);
-  }
 }