adjust updateAccountAttributes returned value format

Author: Xin LI

build.gradle

@@ -101,7 +101,7 @@ sourceSets {
 }
 
 configure(allprojects) {
-    version = '1.4.1'
+    version = '1.4.3'
     if (!project.hasProperty('release')) {
         project.setVersion(project.getVersion() + '-SNAPSHOT')
     }
@@ -132,7 +132,7 @@ configure(allprojects) {
         compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
         compile 'io.jsonwebtoken:jjwt:0.9.1'
         implementation 'org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE'
-        implementation 'com.scality:vaultclient:0.5.1'
+        implementation 'com.scality:vaultclient:0.5.2-SNAPSHOT'
         implementation 'com.amazonaws:aws-java-sdk-s3:1.11.914'
         implementation 'com.amazonaws:aws-java-sdk-sts:1.11.914'
         implementation 'com.amazonaws:aws-java-sdk-iam:1.11.914'

osis-core/src/main/java/com/scality/osis/configuration/DocumentationConfig.java

@@ -30,7 +30,7 @@
 public class DocumentationConfig {
     private static final String DOC_TITLE = "Object Storage Interoperability Services API for Scality platform";
     private static final String DOC_DESCRIPTION = "This is VMware Cloud Director Object Storage Interoperability Services API for Scality platform.";
-    private static final String DOC_VERSION = "1.4.1-SNAPSHOT";
+    private static final String DOC_VERSION = "1.4.3-SNAPSHOT";
     private static final String PROJECT_BASE = "com.scality.osis";
 
     ApiInfo apiInfo() {

osis-core/src/main/java/com/scality/osis/service/impl/ScalityOsisServiceImpl.java

@@ -570,7 +570,7 @@ public OsisTenant updateTenant(String tenantId, OsisTenant osisTenant) {
             logger.debug("[Vault]Update Account Attributes request:{}",
                     new Gson().toJson(updateAccountAttributesRequest));
 
-            CreateAccountResponseDTO accountResponse = vaultAdmin
+            AccountData accountResponse = vaultAdmin
                     .updateAccountAttributes(updateAccountAttributesRequest);
 
             logger.debug("[Vault]Update Account Attributes response:{}", new Gson().toJson(accountResponse));

osis-core/src/test/java/com/scality/osis/service/impl/BaseOsisServiceTest.java

@@ -195,19 +195,14 @@ protected void initCreateTenantMocks() {
     protected void initUpdateTenantMocks() {
         // initialize mock create account response
         when(vaultAdminMock.updateAccountAttributes(any(UpdateAccountAttributesRequestDTO.class)))
-                .thenAnswer((Answer<CreateAccountResponseDTO>) invocation -> {
+                .thenAnswer((Answer<AccountData>) invocation -> {
                     final UpdateAccountAttributesRequestDTO request = invocation.getArgument(0);
                     final AccountData data = new AccountData();
                     data.setEmailAddress(SAMPLE_SCALITY_ACCOUNT_EMAIL);
                     data.setName(request.getAccountName());
                     data.setId(SAMPLE_ID);
                     data.setCustomAttributes(request.getCustomAttributes());
-                    final Account account = new Account();
-                    account.setData(data);
-                    final CreateAccountResponseDTO response = new CreateAccountResponseDTO();
-                    response.setAccount(account);
-
-                    return response;
+                    return data;
                 });
     }
 

osis-core/src/test/java/com/scality/osis/utils/ScalityTestUtils.java

@@ -57,7 +57,7 @@ public final class ScalityTestUtils {
     public static final String TEST_S3_URL = "http://localhost:8000";
     public static final String PLATFORM_NAME = "Scality";
     public static final String PLATFORM_VERSION = "7.10";
-    public static final String API_VERSION = "1.4.1-SNAPSHOT";
+    public static final String API_VERSION = "1.4.3-SNAPSHOT";
     public static final long SAMPLE_DURATION_SECONDS = 120L;
     public static final String ACTIVE_STR = "Active";
     public static final String NA_STR = "N/A";

storage-platform-clients/build.gradle

@@ -22,7 +22,7 @@ dependencies {
     testCompile 'org.javaswift:joss:0.9.13'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.2'
     testCompile 'ch.qos.logback:logback-classic:1.2.1'
-    implementation 'com.scality:vaultclient:0.5.0'
+    implementation 'com.scality:vaultclient:0.5.2-SNAPSHOT'
     implementation 'com.amazonaws:aws-java-sdk-s3:1.11.914'
     implementation 'com.amazonaws:aws-java-sdk-sts:1.11.914'
     implementation 'com.amazonaws:aws-java-sdk-iam:1.11.914'

storage-platform-clients/src/main/java/com/scality/osis/vaultadmin/VaultAdmin.java

@@ -113,7 +113,7 @@ public interface VaultAdmin {
    * @param updateAccountAttributesRequestDTO the update account attributes request dto
    * @return The updated account as a create account response object.
    */
-  CreateAccountResponseDTO updateAccountAttributes(UpdateAccountAttributesRequestDTO updateAccountAttributesRequestDTO);
+  AccountData updateAccountAttributes(UpdateAccountAttributesRequestDTO updateAccountAttributesRequestDTO);
 
   /**
    * Get User by accessKey

storage-platform-clients/src/main/java/com/scality/osis/vaultadmin/impl/VaultAdminImpl.java

@@ -376,7 +376,7 @@ public AccountData getAccount(GetAccountRequestDTO getAccountRequestDTO) {
    * @return The updated account as a create account response object.
    */
   @Override
-  public CreateAccountResponseDTO updateAccountAttributes(UpdateAccountAttributesRequestDTO updateAccountAttributesRequestDTO) {
+  public AccountData updateAccountAttributes(UpdateAccountAttributesRequestDTO updateAccountAttributesRequestDTO) {
     return ExternalServiceFactory.executeVaultService(vaultAccountClient::updateAccountAttributes, updateAccountAttributesRequestDTO);
   }
 

storage-platform-clients/src/test/java/com/scality/osis/vaultadmin/impl/BaseTest.java

@@ -244,29 +244,24 @@ public Response<GenerateAccountAccessKeyResponse> answer(final InvocationOnMock
   private void initUpdateAccountAttributesMocks() {
     //initialize mock update account attributes response
     when(accountServicesClient.updateAccountAttributes(any(UpdateAccountAttributesRequestDTO.class)))
-            .thenAnswer(new Answer<Response<CreateAccountResponseDTO>>() {
+            .thenAnswer(new Answer<Response<AccountData>>() {
               @Override
-              public Response<CreateAccountResponseDTO> answer(final InvocationOnMock invocation) {
+              public Response<AccountData> answer(final InvocationOnMock invocation) {
                 final UpdateAccountAttributesRequestDTO request = invocation.getArgument(0);
 
                 final AccountData data = new AccountData();
                 data.setEmailAddress(DEFAULT_TEST_EMAIL_ADDR);
-                data.setName(request.getName());
+                data.setName(request.getAccountName());
                 data.setId(DEFAULT_TEST_ACCOUNT_ID);
                 data.setCanonicalId(DEFAULT_TEST_CANONICAL_ID);
                 data.setCustomAttributes(request.getCustomAttributes());
-                data.setArn(DEFAULT_TEST_ARN_STR + request.getName() +"/\"");
+                data.setArn(DEFAULT_TEST_ARN_STR + request.getAccountName() +"/\"");
                 data.setCreateDate(new Date());
 
-                final Account account = new Account();
-                account.setData(data);
-                final CreateAccountResponseDTO response = new CreateAccountResponseDTO();
-                response.setAccount(account);
-
                 final HttpResponse httpResponse = new HttpResponse(null, null);
                 httpResponse.setStatusCode(201);
                 httpResponse.setStatusText("Created");
-                return new Response<>(response,httpResponse);
+                return new Response<>(data, httpResponse);
               }
             });
   }

storage-platform-clients/src/test/java/com/scality/osis/vaultadmin/impl/VaultAdminImplTest.java

@@ -531,16 +531,16 @@ public void updateAccountAttributes() {
         customAttributestemp.put("cd_tenant_id==" + UUID.randomUUID(), "");
 
         final UpdateAccountAttributesRequestDTO updateAccountAttributesRequestDTO = UpdateAccountAttributesRequestDTO.builder()
-                .name(name)
+                .accountName(name)
                 .customAttributes(customAttributestemp)
                 .build();
 
-        final CreateAccountResponseDTO response = vaultAdminImpl.updateAccountAttributes(updateAccountAttributesRequestDTO);
-        assertEquals(name, response.getAccount().getData().getName());
-        assertNotNull(response.getAccount().getData().getArn());
-        assertNotNull(response.getAccount().getData().getCreateDate());
-        assertNotNull(response.getAccount().getData().getId());
-        assertNotNull(response.getAccount().getData().getCanonicalId());
-        assertNotNull(response.getAccount().getData().getCustomAttributes());
+        final AccountData response = vaultAdminImpl.updateAccountAttributes(updateAccountAttributesRequestDTO);
+        assertEquals(name, response.getName());
+        assertNotNull(response.getArn());
+        assertNotNull(response.getCreateDate());
+        assertNotNull(response.getId());
+        assertNotNull(response.getCanonicalId());
+        assertNotNull(response.getCustomAttributes());
     }
 }