bugfix/remove-in-flow/tests-database-type Remove DatabaseType in flow and request in /databases endpoint

cascades-client/src/main/java/pl/gov/coi/cascades/client/CascadesImpl.java

@@ -70,10 +70,6 @@ public RemoteDatabaseSpec getSpec() {
     private RemoteDatabaseRequest createRequest() {
         Driver driver = configuration.getDriver();
         return new RemoteDatabaseRequest(
-            checkNotNull(
-                checkNotNull(driver, "20170330:093926").getType(),
-                "20170330:093953"
-            ).getName(),
             driver.getTemplateId().orNull(),
             configuration.getInstanceName().orNull()
         );

cascades-contract/src/main/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequest.java

@@ -1,7 +1,6 @@
 package pl.gov.coi.cascades.contract.service;
 
 import com.google.common.base.Optional;
-import lombok.Getter;
 import pl.gov.coi.cascades.contract.domain.Template;
 
 import javax.annotation.Nullable;
@@ -14,8 +13,6 @@ public class RemoteDatabaseRequest implements Serializable {
 
     private static final long serialVersionUID = 42L;
 
-    @Getter
-    private final String type;
     @Nullable
     private final Template template;
     @Nullable
@@ -24,14 +21,11 @@ public class RemoteDatabaseRequest implements Serializable {
     /**
      * Required argument constructor.
      *
-     * @param type         Given type of database (a name or FQCN).
      * @param template   Given id of template (Optional).
      * @param instanceName Given name of instance (Optional).
      */
-    public RemoteDatabaseRequest(String type,
-                                 @Nullable Template template,
+    public RemoteDatabaseRequest(@Nullable Template template,
                                  @Nullable String instanceName) {
-        this.type = type;
         this.template = template;
         this.instanceName = instanceName;
     }

cascades-contract/src/test/java/pl/gov/coi/cascades/contract/configuration/DriverTest.java

@@ -10,7 +10,6 @@
 import org.mockito.junit.MockitoRule;
 import pl.gov.coi.cascades.contract.domain.DatabaseType;
 import pl.gov.coi.cascades.contract.domain.Template;
-import pl.gov.coi.cascades.contract.domain.Template;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -38,7 +37,7 @@ public class DriverTest {
     @Before
     public void setUp() {
         driver = new Driver(
-                databaseType,
+            databaseType,
             template
         );
     }
@@ -47,7 +46,7 @@ public void setUp() {
     public void testDefaultConstructor() throws Exception {
         // when
         Driver actual = new Driver(
-                databaseType,
+            databaseType,
             template
         );
 

cascades-contract/src/test/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequestTest.java

@@ -22,7 +22,6 @@ public class RemoteDatabaseRequestTest {
 
     private RemoteDatabaseRequest remoteDatabaseRequest;
     private String instanceName;
-    private String typeClassName;
 
     @Mock
     private Template template;
@@ -36,9 +35,7 @@ public class RemoteDatabaseRequestTest {
     @Before
     public void setUp() {
         instanceName = "PESEL";
-        typeClassName = "typeClassName";
-        remoteDatabaseRequest = new RemoteDatabaseRequest(
-            typeClassName,
+             remoteDatabaseRequest = new RemoteDatabaseRequest(
             template,
             instanceName
         );
@@ -48,7 +45,6 @@ public void setUp() {
     public void testDefaultConstructor() throws Exception {
         // when
         RemoteDatabaseRequest actual = new RemoteDatabaseRequest(
-            typeClassName,
             template,
             instanceName
         );

cascades-server/app/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/FunctionalIT.java

@@ -135,16 +135,13 @@ private Description buildDescription(MockHttpServletResponse response)
     }
 
     private String requestWithNoTemplateId() throws JSONException {
-        DatabaseTypeStub stub = new DatabaseTypeStub();
         return new JSONObject()
-            .put("type", stub.getName())
+            .put("instanceName", "dfasd")
             .toString();
     }
 
     private String requestWithTemplateId(String templateId) throws JSONException {
-        DatabaseTypeStub stub = new DatabaseTypeStub();
         return new JSONObject()
-            .put("type", stub.getName())
             .put("templateId", templateId)
             .toString();
     }

cascades-server/domain/contract/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Request.java

@@ -15,8 +15,6 @@
 @Builder
 public class Request {
 
-    @Getter
-    private final String type;
     @Getter
     private final User user;
     @Nullable
@@ -27,16 +25,13 @@ public class Request {
     /**
      * Default argument constructor.
      *
-     * @param type Name of type class.
      * @param user          User of the database.
      * @param template    Given id of template (Optional).
      * @param instanceName  Given name of database instance (Optional).
      */
-    public Request(String type,
-                   User user,
+    public Request(User user,
                    @Nullable Template template,
                    @Nullable String instanceName) {
-        this.type = EidPreconditions.checkNotNull(type, "20170228:153927");
         this.user = EidPreconditions.checkNotNull(user, "20170228:153954");
         this.template = template;
         this.instanceName = instanceName;

cascades-server/domain/contract/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/RequestTest.java

@@ -21,7 +21,6 @@
  */
 public class RequestTest {
 
-    private final static String typeClassName = "Type";
     private final static String instanceName = "PESEL";
     private final static String ID = "453v4c4c";
     private final static String NAME = "dg5nj69s";
@@ -52,7 +51,6 @@ public void setUp() {
             VERSION
         );
         request = new Request(
-            typeClassName,
             user,
             template,
             instanceName
@@ -63,7 +61,6 @@ public void setUp() {
     public void testDefaultConstructor() throws Exception {
         // when
         Request actual = new Request(
-            typeClassName,
             user,
             template,
             instanceName
@@ -97,7 +94,6 @@ public void testBuilder() {
         Request requestBuilder = Request.builder()
             .instanceName(instanceName)
             .user(user)
-            .type(typeClassName)
             .template(template)
             .build();
 
@@ -113,14 +109,4 @@ public void testGetUser() throws Exception {
         // then
         assertThat(actual).isNotNull();
     }
-
-    @Test
-    public void testGetType() {
-        // when
-        String actual = request.getType();
-
-        // then
-        assertThat(actual).isNotNull();
-    }
-
 }

cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImpl.java

@@ -8,7 +8,6 @@
 import pl.gov.coi.cascades.server.domain.DatabaseInstance.DatabaseInstanceBuilder;
 import pl.gov.coi.cascades.server.domain.DatabaseStatus;
 import pl.gov.coi.cascades.server.domain.DatabaseTypeClassNameService;
-import pl.gov.coi.cascades.server.domain.DatabaseTypeDTO;
 import pl.gov.coi.cascades.server.domain.User;
 
 import java.sql.Date;
@@ -36,15 +35,12 @@ public void execute(Request request, Response response) {
         Optional<User> user = request.getUser() != null
             ? launchNewDatabaseGatewayFacade.findUser(request.getUser().getUsername())
             : Optional.empty();
-        DatabaseTypeDTO databaseTypeDTO = databaseTypeClassNameService
-            .getDatabaseType(request.getType());
 
         Validator.ValidatorBuilder validatorBuilder = Validator.builder()
             .databaseLimitGateway(launchNewDatabaseGatewayFacade.getDatabaseLimitGateway())
             .templateIdGateway(launchNewDatabaseGatewayFacade.getTemplateIdGateway())
             .request(request)
-            .response(response)
-            .databaseTypeDTO(databaseTypeDTO);
+            .response(response);
 
         user.ifPresent(validatorBuilder::user);
 
@@ -65,7 +61,6 @@ private void succeedResponse(Request request,
         DatabaseInstanceBuilder candidateBuilder = DatabaseInstance.builder()
             .databaseId(newId)
             .databaseName(databaseName)
-            .databaseType(validator.getDatabaseType())
             .created(Date.from(Instant.now()))
             .credentials(credentials)
             .reuseTimes(0)
@@ -87,7 +82,7 @@ private void succeedResponse(Request request,
     }
 
     private static String generateDatabaseName(Request request,
-                                        DatabaseNameGeneratorService databaseNameGeneratorService) {
+                                               DatabaseNameGeneratorService databaseNameGeneratorService) {
         Optional<String> instanceName = request.getInstanceName();
         return instanceName.isPresent()
             ? databaseNameGeneratorService.generate(instanceName.get())

cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Validator.java

@@ -43,7 +43,6 @@ public boolean validate() {
         validateTemplateId();
         validateUser();
         validateLimitOfDatabases();
-        validateDatabaseType();
         return response.isSuccessful();
     }
 

cascades-server/domain/logic/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImplTest.java

@@ -6,13 +6,14 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
-import pl.gov.coi.cascades.contract.domain.*;
+import pl.gov.coi.cascades.contract.domain.DatabaseId;
+import pl.gov.coi.cascades.contract.domain.NetworkBind;
 import pl.gov.coi.cascades.contract.domain.Template;
+import pl.gov.coi.cascades.contract.domain.UsernameAndPasswordCredentials;
 import pl.gov.coi.cascades.contract.service.Violation;
 import pl.gov.coi.cascades.server.domain.DatabaseInstance;
 import pl.gov.coi.cascades.server.domain.DatabaseLimitGateway;
 import pl.gov.coi.cascades.server.domain.DatabaseTypeClassNameService;
-import pl.gov.coi.cascades.server.domain.DatabaseTypeDTO;
 import pl.gov.coi.cascades.server.domain.TemplateIdGateway;
 import pl.gov.coi.cascades.server.domain.User;
 import pl.gov.coi.cascades.server.persistance.stub.DatabaseIdGatewayStub;
@@ -36,9 +37,6 @@
  */
 public class UseCaseImplTest {
 
-    @Mock
-    private DatabaseTypeDTO databaseTypeDTO;
-
     @Mock
     private LaunchNewDatabaseGatewayFacade launchNewDatabaseGatewayFacade;
 
@@ -72,9 +70,6 @@ public class UseCaseImplTest {
     @Mock
     private DatabaseLimitGateway databaseLimitGateway;
 
-    @Mock
-    private DatabaseType databaseType;
-
     @Mock
     private UsernameAndPasswordCredentials usernameAndPasswordCredentials;
 
@@ -100,7 +95,6 @@ public void testExecuteWhenUserIsNotPresent() throws Exception {
             databaseIdGeneratorService
         );
         when(launchNewDatabaseGatewayFacade.findUser(anyString())).thenReturn(Optional.of(user));
-        when(databaseTypeClassNameService.getDatabaseType(anyString())).thenReturn(databaseTypeDTO);
         when(launchNewDatabaseGatewayFacade.getTemplateIdGateway()).thenReturn(templateIdGateway);
         when(templateIdGateway.find(anyString())).thenReturn(Optional.of(id));
         when(request.getTemplateId()).thenReturn(Optional.of(templateId));
@@ -140,10 +134,6 @@ public void testExecuteWhenErrorsOccurred() throws Exception {
         when(templateIdGateway.find(anyString())).thenReturn(Optional.of(id));
         when(launchNewDatabaseGatewayFacade.getDatabaseLimitGateway()).thenReturn(databaseLimitGateway);
         when(databaseLimitGateway.isGlobalLimitExceeded()).thenReturn(true);
-        DatabaseTypeDTOExtension databaseTypeDTOStub = new DatabaseTypeDTOExtension(type);
-        when(databaseTypeClassNameService.getDatabaseType(anyString())).thenReturn(databaseTypeDTOStub);
-        when(databaseTypeDTO.onFail(any())).thenReturn(databaseTypeDTOStub);
-        when(databaseTypeDTO.onSuccess(any())).thenReturn(databaseTypeDTOStub);
 
         // when
         useCase.execute(
@@ -181,17 +171,12 @@ public void testExecuteWithoutErrors() throws Exception {
             databaseTypeClassNameService,
             databaseIdGeneratorService
         );
-        DatabaseTypeDTOExtension databaseTypeDTOStub = new DatabaseTypeDTOExtension(type);
         when(launchNewDatabaseGatewayFacade.findUser(anyString())).thenReturn(Optional.of(jrambo));
-        when(databaseTypeClassNameService.getDatabaseType(anyString())).thenReturn(databaseTypeDTOStub);
         when(launchNewDatabaseGatewayFacade.getTemplateIdGateway()).thenReturn(templateIdGateway);
         when(templateIdGateway.find(anyString())).thenReturn(Optional.of(id));
         when(request.getTemplateId()).thenReturn(Optional.of(templateId));
         when(request.getUser()).thenReturn(jrambo);
-        when(request.getType()).thenReturn(type);
         when(launchNewDatabaseGatewayFacade.getDatabaseLimitGateway()).thenReturn(databaseLimitGateway);
-        when(databaseTypeDTO.onFail(any())).thenReturn(databaseTypeDTOStub);
-        when(databaseTypeDTO.onSuccess(any())).thenReturn(databaseTypeDTOStub);
         when(request.getInstanceName()).thenReturn(Optional.of(instanceName));
         when(databaseNameGeneratorService.generate(anyString())).thenReturn(instanceName);
         when(credentialsGeneratorService.generate()).thenReturn(usernameAndPasswordCredentials);
@@ -230,17 +215,12 @@ public void testExecuteWithInstanceNameNotPresent() throws Exception {
             databaseTypeClassNameService,
             databaseIdGeneratorService
         );
-        DatabaseTypeDTOExtension databaseTypeDTOStub = new DatabaseTypeDTOExtension(type);
         when(launchNewDatabaseGatewayFacade.findUser(anyString())).thenReturn(Optional.of(jrambo));
-        when(databaseTypeClassNameService.getDatabaseType(anyString())).thenReturn(databaseTypeDTOStub);
         when(launchNewDatabaseGatewayFacade.getTemplateIdGateway()).thenReturn(templateIdGateway);
         when(templateIdGateway.find(anyString())).thenReturn(Optional.of(id));
         when(request.getTemplateId()).thenReturn(Optional.of(templateId));
         when(request.getUser()).thenReturn(jrambo);
-        when(request.getType()).thenReturn(type);
         when(launchNewDatabaseGatewayFacade.getDatabaseLimitGateway()).thenReturn(databaseLimitGateway);
-        when(databaseTypeDTO.onFail(any())).thenReturn(databaseTypeDTOStub);
-        when(databaseTypeDTO.onSuccess(any())).thenReturn(databaseTypeDTOStub);
         when(request.getInstanceName()).thenReturn(Optional.empty());
         when(databaseNameGeneratorService.generate(anyString())).thenReturn(instanceName);
         when(credentialsGeneratorService.generate()).thenReturn(usernameAndPasswordCredentials);
@@ -279,23 +259,6 @@ public void testBuilder() throws Exception {
         assertThat(useCase).isNotNull();
     }
 
-    private static final class DatabaseTypeDTOExtension extends DatabaseTypeDTO {
-        private DatabaseTypeDTOExtension(String type) {
-            super(new DatabaseType() {
-
-                @Override
-                public String getName() {
-                    return type;
-                }
-
-                @Override
-                public ConnectionStringProducer getConnectionStringProducer() {
-                    return null;
-                }
-            });
-        }
-    }
-
     private static final class ResponseImpl implements Response {
 
         private final Collection<Violation> violations = new HashSet<>();