Merge b2ab83b into 8c75ba1

coi-gov-pl · Jul 18, 2018 · f82b74b · f82b74b
2 parents 8c75ba1 + b2ab83b
commit f82b74b
Show file tree

Hide file tree

Showing 107 changed files with 3,344 additions and 558 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,8 +5,8 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
+maven-wrapper.jar
 *.ear
 
 # Config file

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
@@ -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/domain/Template.java b/cascades-contract/src/main/java/pl/gov/coi/cascades/contract/domain/Template.java
@@ -15,7 +15,10 @@ public class Template implements Serializable {
     private static final long serialVersionUID = 42L;
 
     @Getter
-    private final String id;
+    private final Long id;
+
+    @Getter
+    private final String generatedId;
 
     @Getter
     private final String name;

diff --git a/...es-contract/src/main/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequest.java b/...es-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
@@ -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/domain/TemplateTest.java b/cascades-contract/src/test/java/pl/gov/coi/cascades/contract/domain/TemplateTest.java
@@ -11,7 +11,8 @@
  */
 public class TemplateTest {
 
-    private String id;
+    private Long id;
+    private String generatedId;
     private String name;
     private String serverId;
     private String version;
@@ -20,10 +21,11 @@ public class TemplateTest {
 
     @Before
     public void setUp() {
-        id = "oracle_template";
+        id = 123L;
         name = "hbet6f73";
         serverId = "1234";
         version = "0.0.1";
+        generatedId = "gw13dqD";
         status = TemplateIdStatus.CREATED;
         isDefault = true;
     }
@@ -33,6 +35,7 @@ public void testToString() {
         // given
         Template templateBuilder = Template.builder()
             .id(id)
+            .generatedId(generatedId)
             .name(name)
             .isDefault(isDefault)
             .serverId(serverId)
@@ -50,7 +53,8 @@ public void testToString() {
             serverId,
             status.toString(),
             version,
-            id,
+            id.toString(),
+            generatedId,
             name
         );
     }
@@ -86,6 +90,7 @@ public void testDefaultConstructor() throws Exception {
         // when
         Template actual = new Template(
             id,
+            generatedId,
             name,
             TemplateIdStatus.CREATED,
             true,
@@ -96,6 +101,7 @@ public void testDefaultConstructor() throws Exception {
         // then
         assertThat(actual).isNotNull();
         assertThat(actual.getId()).isEqualTo(id);
+        assertThat(actual.getGeneratedId()).isEqualTo(generatedId);
         assertThat(actual.getStatus()).isEqualTo(TemplateIdStatus.CREATED);
         assertThat(actual.getServerId()).isEqualTo(serverId);
         assertThat(actual.getName()).isEqualTo(name);

diff --git a/...ontract/src/test/java/pl/gov/coi/cascades/contract/service/RemoteDatabaseRequestTest.java b/...ontract/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-junit4/src/test/java/pl/gov/coi/cascades/junit4/CascadesRuleTest.java b/cascades-junit4/src/test/java/pl/gov/coi/cascades/junit4/CascadesRuleTest.java
@@ -15,14 +15,16 @@
 @Ignore
 public class CascadesRuleTest {
 
-    private String id;
+    private long id;
+    private String generatedId;
     private String serverId;
     private String version;
     private String name;
 
     @Before
     public void setUp() {
-        id = "gw45223";
+        id = 123L;
+        generatedId = "gw45223";
         serverId = "898693";
         version = "0.0.1";
         name = "oracle_template";
@@ -69,6 +71,7 @@ public void testBefore() {
         CascadesRule rule = CascadesRule.builder()
             .driver(new Driver(DATABASE_TYPE_STUB, new Template(
                 id,
+                generatedId,
                 name,
                 TemplateIdStatus.CREATED,
                 false,