diff --git a/cascades-client/src/main/java/pl/gov/coi/cascades/client/CascadesImpl.java b/cascades-client/src/main/java/pl/gov/coi/cascades/client/CascadesImpl.java index 106963c..2dbd6d5 100644 --- a/cascades-client/src/main/java/pl/gov/coi/cascades/client/CascadesImpl.java +++ b/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() ); diff --git a/cascades-contract/src/main/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequest.java b/cascades-contract/src/main/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequest.java index 2d518ff..196721f 100644 --- a/cascades-contract/src/main/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequest.java +++ b/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; } diff --git a/cascades-contract/src/test/java/pl/gov/coi/cascades/contract/configuration/DriverTest.java b/cascades-contract/src/test/java/pl/gov/coi/cascades/contract/configuration/DriverTest.java index 4e4e182..61a10c6 100644 --- a/cascades-contract/src/test/java/pl/gov/coi/cascades/contract/configuration/DriverTest.java +++ b/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 ); diff --git a/cascades-contract/src/test/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequestTest.java b/cascades-contract/src/test/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequestTest.java index 44cb3bf..c5fd111 100644 --- a/cascades-contract/src/test/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequestTest.java +++ b/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 ); diff --git a/cascades-server/app/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/FunctionalIT.java b/cascades-server/app/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/FunctionalIT.java index 9b08b9a..5ceb693 100644 --- a/cascades-server/app/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/FunctionalIT.java +++ b/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(); } diff --git a/cascades-server/domain/contract/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Request.java b/cascades-server/domain/contract/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Request.java index 75ad605..d1047a8 100644 --- a/cascades-server/domain/contract/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Request.java +++ b/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; diff --git a/cascades-server/domain/contract/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/RequestTest.java b/cascades-server/domain/contract/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/RequestTest.java index b12583d..fa062db 100644 --- a/cascades-server/domain/contract/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/RequestTest.java +++ b/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(); - } - } diff --git a/cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImpl.java b/cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImpl.java index baf720e..eeb3508 100644 --- a/cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImpl.java +++ b/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 = 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 instanceName = request.getInstanceName(); return instanceName.isPresent() ? databaseNameGeneratorService.generate(instanceName.get()) diff --git a/cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Validator.java b/cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Validator.java index ec5c169..ec6652a 100644 --- a/cascades-server/domain/logic/src/main/java/pl/gov/coi/cascades/server/domain/launchdatabase/Validator.java +++ b/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(); } diff --git a/cascades-server/domain/logic/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImplTest.java b/cascades-server/domain/logic/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImplTest.java index 4fceaed..f8a7c62 100644 --- a/cascades-server/domain/logic/src/test/java/pl/gov/coi/cascades/server/domain/launchdatabase/UseCaseImplTest.java +++ b/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 violations = new HashSet<>(); diff --git a/cascades-server/persistence-hibernate/src/main/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapper.java b/cascades-server/persistence-hibernate/src/main/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapper.java index 2ce9601..8232b2d 100644 --- a/cascades-server/persistence-hibernate/src/main/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapper.java +++ b/cascades-server/persistence-hibernate/src/main/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapper.java @@ -1,15 +1,11 @@ package pl.gov.coi.cascades.server.persistance.hibernate.mapper; import com.google.common.annotations.VisibleForTesting; -import lombok.Setter; import pl.gov.coi.cascades.contract.domain.DatabaseId; -import pl.gov.coi.cascades.contract.domain.DatabaseType; 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.DatabaseIdMapper; import pl.gov.coi.cascades.server.domain.DatabaseTypeClassNameService; -import pl.gov.coi.cascades.server.domain.DatabaseTypeDTO; import pl.gov.coi.cascades.server.domain.Mapper; import pl.gov.coi.cascades.server.domain.launchdatabase.UsernameAndPasswordCredentialsImpl; import pl.gov.coi.cascades.server.persistance.hibernate.entity.Credentials; @@ -18,7 +14,6 @@ import pl.gov.coi.cascades.server.persistance.hibernate.entity.NetworkBind; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.inject.Inject; import java.util.Arrays; @@ -71,7 +66,6 @@ public DatabaseInstance toHibernateEntity(@Nonnull pl.gov.coi.cascades.server.do checkNotNull(databaseInstance.getCreated(), "20170414:111035"); checkNotNull(databaseInstance.getDatabaseId(), "20170414:111216"); checkNotNull(databaseInstance.getTemplate(), "20170414:111233"); - checkNotNull(databaseInstance.getDatabaseType(), "20170414:111248"); Credentials credentials = new Credentials(); credentials.setPassword(Arrays.toString(databaseInstance.getCredentials().getPassword())); @@ -89,7 +83,6 @@ public DatabaseInstance toHibernateEntity(@Nonnull pl.gov.coi.cascades.server.do DatabaseInstance instance = new DatabaseInstance(); instance.setId(databaseIdMapper.toHibernateEntity(databaseInstance.getDatabaseId())); instance.setTemplate(templateIdMapper.toHibernateEntity(databaseInstance.getTemplate())); - instance.setType(databaseInstance.getDatabaseType().getName()); instance.setInstanceName(databaseInstance.getInstanceName()); instance.setReuseTimes(databaseInstance.getReuseTimes()); instance.setDatabaseName(databaseInstance.getDatabaseName()); @@ -117,8 +110,6 @@ public pl.gov.coi.cascades.server.domain.DatabaseInstance fromHibernateEntity(@N DatabaseId databaseId = databaseIdMapper.fromHibernateEntity(databaseInstance.getId()); Template template = templateIdMapper.fromHibernateEntity(databaseInstance.getTemplate()); - DatabaseTypeDTO databaseTypeDTO = databaseTypeClassNameService.getDatabaseType(databaseInstance.getType()); - DatabaseType databaseType = new DtoFetcher(databaseTypeDTO).getDatabaseType(); UsernameAndPasswordCredentials credentials = new UsernameAndPasswordCredentialsImpl( databaseInstance.getCredentials().getUsername(), databaseInstance.getCredentials().getPassword().toCharArray() @@ -132,18 +123,17 @@ public pl.gov.coi.cascades.server.domain.DatabaseInstance fromHibernateEntity(@N ? pl.gov.coi.cascades.server.domain.DatabaseStatus.DELETED : pl.gov.coi.cascades.server.domain.DatabaseStatus.LAUNCHED; - return new pl.gov.coi.cascades.server.domain.DatabaseInstance( - databaseId, - template, - databaseType, - databaseInstance.getInstanceName(), - databaseInstance.getReuseTimes(), - databaseInstance.getDatabaseName(), - credentials, - networkBind, - databaseStatus, - databaseInstance.getCreated() - ); + return pl.gov.coi.cascades.server.domain.DatabaseInstance.builder() + .databaseId(databaseId) + .template(template) + .instanceName(databaseInstance.getInstanceName()) + .reuseTimes(databaseInstance.getReuseTimes()) + .databaseName(databaseInstance.getDatabaseName()) + .credentials(credentials) + .networkBind(networkBind) + .status(databaseStatus) + .created(databaseInstance.getCreated()) + .build(); } private static final class NetworkBindImpl implements pl.gov.coi.cascades.contract.domain.NetworkBind { @@ -167,23 +157,4 @@ public int getPort() { return port; } } - - private static final class DtoFetcher { - @Setter - private Violation violation; - @Setter - private DatabaseType databaseType; - - private DtoFetcher(DatabaseTypeDTO dto) { - dto.onFail(this::setViolation) - .onSuccess(this::setDatabaseType) - .resolve(); - } - - @Nullable - DatabaseType getDatabaseType() { - return databaseType; - } - } - } diff --git a/cascades-server/persistence-hibernate/src/test/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapperTest.java b/cascades-server/persistence-hibernate/src/test/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapperTest.java index 1da4930..fa13c2c 100644 --- a/cascades-server/persistence-hibernate/src/test/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapperTest.java +++ b/cascades-server/persistence-hibernate/src/test/java/pl/gov/coi/cascades/server/persistance/hibernate/mapper/DatabaseInstanceMapperTest.java @@ -6,11 +6,8 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import pl.gov.coi.cascades.contract.domain.ConnectionStringProducer; -import pl.gov.coi.cascades.contract.domain.DatabaseType; 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.persistance.hibernate.entity.Credentials; import pl.gov.coi.cascades.server.persistance.hibernate.entity.DatabaseInstance; import pl.gov.coi.cascades.server.persistance.hibernate.entity.NetworkBind; @@ -23,10 +20,6 @@ import java.util.Date; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.when; /** * @author Agnieszka Celuch @@ -54,9 +47,6 @@ public class DatabaseInstanceMapperTest { @Mock private DatabaseTypeClassNameService databaseTypeClassNameService; - @Mock - private DatabaseTypeDTO databaseTypeDTO; - @Rule public MockitoRule mockitoRule = MockitoJUnit.rule(); @@ -94,7 +84,6 @@ public void testToHibernateEntity() throws Exception { assertThat(actual.getTemplate() .getVersion()) .isEqualTo(DatabaseIdGatewayStub.INSTANCE1.getTemplate().getVersion()); - assertThat(actual.getType()).isEqualTo(DatabaseIdGatewayStub.INSTANCE1.getDatabaseType().getName()); assertThat(actual.getInstanceName()).isEqualTo(DatabaseIdGatewayStub.INSTANCE1.getInstanceName()); assertThat(actual.getReuseTimes()).isEqualTo(DatabaseIdGatewayStub.INSTANCE1.getReuseTimes()); assertThat(actual.getDatabaseName()).isEqualTo(DatabaseIdGatewayStub.INSTANCE1.getDatabaseName()); @@ -117,10 +106,6 @@ public void testToHibernateEntity() throws Exception { @Test public void testFromHibernateEntity() throws Exception { // given - when(databaseTypeClassNameService.getDatabaseType(anyString())).thenReturn(databaseTypeDTO); - when(databaseTypeDTO.onFail(any())).thenReturn(databaseTypeDTO); - when(databaseTypeDTO.onSuccess(any())).thenReturn(databaseTypeDTO); - doNothing().when(databaseTypeDTO).resolve(); DatabaseInstanceMapper databaseInstanceMapper = new DatabaseInstanceMapper( databaseTypeClassNameService ); @@ -162,7 +147,6 @@ public void testFromHibernateEntity() throws Exception { assertThat(actual.getTemplate().getServerId()).isEqualTo(template.getServerId()); assertThat(actual.getTemplate().getStatus().name()).isEqualTo(template.getStatus().name()); assertThat(actual.getTemplate().getVersion()).isEqualTo(template.getVersion()); - assertThat(actual.getDatabaseType()).isEqualTo(null); assertThat(actual.getInstanceName()).isEqualTo(INSTANCE_NAME); assertThat(actual.getReuseTimes()).isEqualTo(1); assertThat(actual.getDatabaseName()).isEqualTo(DATABASE_NAME); @@ -207,8 +191,6 @@ public void testDatabaseIdMapping() { DatabaseInstanceMapper databaseInstanceMapper = new DatabaseInstanceMapper( databaseTypeClassNameService ); - when(databaseTypeClassNameService.getDatabaseType(anyString())) - .thenReturn(new DatabaseTypeDTOStub(DATABASE_TYPE)); // when pl.gov.coi.cascades.server.domain.DatabaseInstance model = @@ -220,22 +202,4 @@ public void testDatabaseIdMapping() { assertThat(mapped.getId()).isEqualTo(ID); assertThat(model.getDatabaseId().getId()).isEqualTo("-rr04ayic"); } - - private static final class DatabaseTypeDTOStub extends DatabaseTypeDTO { - private DatabaseTypeDTOStub(String type) { - super(new DatabaseType() { - - @Override - public String getName() { - return type; - } - - @Override - public ConnectionStringProducer getConnectionStringProducer() { - return null; - } - }); - } - } - } diff --git a/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseController.java b/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseController.java index e1a2fa1..6cbc552 100644 --- a/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseController.java +++ b/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseController.java @@ -51,7 +51,6 @@ public ResponseEntity> launchDatabasePost( User user = userSession.getSignedInUser(); Request.RequestBuilder requestBuilder = Request.builder() - .type(request.getType()) .user(user); optionalMapper.toJava8(request.getTemplate()) diff --git a/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTO.java b/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTO.java index 5ef0acc..7157078 100644 --- a/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTO.java +++ b/cascades-server/presentation/src/main/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTO.java @@ -15,10 +15,9 @@ final class RemoteDatabaseRequestDTO extends RemoteDatabaseRequest { /** * {@inheritDoc} */ - public RemoteDatabaseRequestDTO(@JsonProperty("type") String type, - @JsonProperty("templateId") @Nullable String templateId, + public RemoteDatabaseRequestDTO(@JsonProperty("templateId") @Nullable String templateId, @JsonProperty("instanceName") @Nullable String instanceName) { - super(type, createTemplateId(templateId), instanceName); + super(createTemplateId(templateId), instanceName); } @Nullable diff --git a/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseControllerTest.java b/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseControllerTest.java index a52efda..789c492 100644 --- a/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseControllerTest.java +++ b/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/LaunchDatabaseControllerTest.java @@ -35,7 +35,6 @@ public class LaunchDatabaseControllerTest { @Test public void testLaunchDatabasePost() throws Exception { // given - String type = "oracle"; String templateId = "oracle_template"; String instanceName = "ora84u8439"; String username = "jrambo"; @@ -49,7 +48,6 @@ public void testLaunchDatabasePost() throws Exception { DefaultOptionalMapper optionalMapper = new DefaultOptionalMapper(); when(userSession.getSignedInUser()).thenReturn(user); RemoteDatabaseRequestDTO request = new RemoteDatabaseRequestDTO( - type, templateId, instanceName ); @@ -71,5 +69,4 @@ public void testLaunchDatabasePost() throws Exception { assertThat(actual.getBody()).isNotNull(); assertThat(actual.getBody().getViolations()).hasSize(0); } - } diff --git a/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/PresenterTest.java b/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/PresenterTest.java index 0dc98dd..252c0bb 100644 --- a/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/PresenterTest.java +++ b/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/PresenterTest.java @@ -8,7 +8,6 @@ import org.mockito.junit.MockitoRule; import org.springframework.http.HttpStatus; import pl.gov.coi.cascades.contract.domain.DatabaseId; -import pl.gov.coi.cascades.contract.domain.DatabaseType; import pl.gov.coi.cascades.contract.domain.NetworkBind; import pl.gov.coi.cascades.contract.domain.UsernameAndPasswordCredentials; import pl.gov.coi.cascades.contract.service.Violation; @@ -26,9 +25,6 @@ public class PresenterTest { @Mock private DatabaseId databaseId; - @Mock - private DatabaseType databaseType; - @Mock private NetworkBind networkBind; diff --git a/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTOTest.java b/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTOTest.java index 6c8cbb4..c99c692 100644 --- a/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTOTest.java +++ b/cascades-server/presentation/src/test/java/pl/gov/coi/cascades/server/presentation/launchdatabase/RemoteDatabaseRequestDTOTest.java @@ -13,12 +13,10 @@ public class RemoteDatabaseRequestDTOTest { @Test public void testParameterConstructorWhenTemplateIdIsNotPresent() { // given - String type = ""; String instanceName = "oracler49903"; // when RemoteDatabaseRequestDTO actual = new RemoteDatabaseRequestDTO( - type, null, instanceName ); @@ -31,13 +29,11 @@ public void testParameterConstructorWhenTemplateIdIsNotPresent() { @Test public void testParameterConstructorWhenTemplateIdIsPresent() { // given - String type = ""; String instanceName = "oracler49903"; String templateName = "oracle_template"; // when RemoteDatabaseRequestDTO actual = new RemoteDatabaseRequestDTO( - type, templateName, instanceName );