move sql providers into their own modules

CJSCommonPlatform · Mar 13, 2017 · 0e1b45b · 0e1b45b
1 parent fb04af9
commit 0e1b45b
Show file tree

Hide file tree

Showing 28 changed files with 205 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,12 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## Unreleased
 
+### Changed
+- Move sql providers into their own modules
+
 ## [1.5.0] - 2017-03-13
 ### Added
-- add automatic detection of the file content type
+- Add automatic detection of the file content type
 
 ## [1.4.0] - 2017-02-28
 ### Fixed

diff --git a/file-service-it/pom.xml b/file-service-it/pom.xml
@@ -30,7 +30,13 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
-            <artifactId>file-service-persistence</artifactId>
+            <artifactId>file-service-persistence-core</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>file-service-persistence-ansi</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/file-service-persistence/file-service-persistence-ansi/pom.xml b/file-service-persistence/file-service-persistence-ansi/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>file-service-persistence</artifactId>
+        <groupId>uk.gov.justice.services</groupId>
+        <version>1.6.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>file-service-persistence-ansi</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>file-service-persistence-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--Test dependencies-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...e/repository/AnsiMetadataSqlProvider.java → ...e/repository/AnsiMetadataSqlProvider.java b/...e/repository/AnsiMetadataSqlProvider.java → ...e/repository/AnsiMetadataSqlProvider.java
diff --git a/...nce/src/main/resources/META-INF/beans.xml → ...nsi/src/main/resources/META-INF/beans.xml b/...nce/src/main/resources/META-INF/beans.xml → ...nsi/src/main/resources/META-INF/beans.xml
diff --git a/...pository/AnsiMetadataSqlProviderTest.java → ...pository/AnsiMetadataSqlProviderTest.java b/...pository/AnsiMetadataSqlProviderTest.java → ...pository/AnsiMetadataSqlProviderTest.java
@@ -5,6 +5,7 @@
 import static uk.gov.justice.services.fileservice.repository.AnsiMetadataSqlProvider.INSERT_SQL;
 import static uk.gov.justice.services.fileservice.repository.AnsiMetadataSqlProvider.UPDATE_SQL;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

diff --git a/file-service-persistence/file-service-persistence-core/pom.xml b/file-service-persistence/file-service-persistence-core/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>file-service-persistence</artifactId>
+        <groupId>uk.gov.justice.services</groupId>
+        <version>1.6.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>file-service-persistence-core</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>file-service-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.utils</groupId>
+            <artifactId>utilities-core</artifactId>
+            <version>${cpp.utilities.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.utils</groupId>
+            <artifactId>utilities-file</artifactId>
+            <version>${cpp.utilities.version}</version>
+        </dependency>
+
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>test-utils-persistence</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>file-service-liquibase</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path-assert</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...vices/fileservice/client/FileService.java → ...vices/fileservice/client/FileService.java b/...vices/fileservice/client/FileService.java → ...vices/fileservice/client/FileService.java
diff --git a/...ice/repository/ContentJdbcRepository.java → ...ice/repository/ContentJdbcRepository.java b/...ice/repository/ContentJdbcRepository.java → ...ice/repository/ContentJdbcRepository.java
diff --git a/...ervice/repository/DataSourceProvider.java → ...ervice/repository/DataSourceProvider.java b/...ervice/repository/DataSourceProvider.java → ...ervice/repository/DataSourceProvider.java
diff --git a/...s/fileservice/repository/FileContent.java → ...s/fileservice/repository/FileContent.java b/...s/fileservice/repository/FileContent.java → ...s/fileservice/repository/FileContent.java
diff --git a/...ces/fileservice/repository/FileStore.java → ...ces/fileservice/repository/FileStore.java b/...ces/fileservice/repository/FileStore.java → ...ces/fileservice/repository/FileStore.java
@@ -11,7 +11,6 @@
 import uk.gov.justice.services.fileservice.io.InputStreamWrapper;
 
 import java.io.BufferedInputStream;
-import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Optional;

diff --git a/...ce/repository/MetadataJdbcRepository.java → ...ce/repository/MetadataJdbcRepository.java b/...ce/repository/MetadataJdbcRepository.java → ...ce/repository/MetadataJdbcRepository.java
diff --git a/...rvice/repository/MetadataSqlProvider.java → ...rvice/repository/MetadataSqlProvider.java b/...rvice/repository/MetadataSqlProvider.java → ...rvice/repository/MetadataSqlProvider.java
diff --git a/...leservice/repository/MetadataUpdater.java → ...leservice/repository/MetadataUpdater.java b/...leservice/repository/MetadataUpdater.java → ...leservice/repository/MetadataUpdater.java
diff --git a/file-service-persistence/file-service-persistence-core/src/main/resources/META-INF/beans.xml b/file-service-persistence/file-service-persistence-core/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       version="1.1" bean-discovery-mode="all">
+</beans>
diff --git a/...s/fileservice/client/FileServiceTest.java → ...s/fileservice/client/FileServiceTest.java b/...s/fileservice/client/FileServiceTest.java → ...s/fileservice/client/FileServiceTest.java
diff --git a/...repository/ContentJdbcRepositoryTest.java → ...repository/ContentJdbcRepositoryTest.java b/...repository/ContentJdbcRepositoryTest.java → ...repository/ContentJdbcRepositoryTest.java
diff --git a/...ce/repository/DataSourceProviderTest.java → ...ce/repository/DataSourceProviderTest.java b/...ce/repository/DataSourceProviderTest.java → ...ce/repository/DataSourceProviderTest.java
diff --git a/...fileservice/repository/FileStoreTest.java → ...fileservice/repository/FileStoreTest.java b/...fileservice/repository/FileStoreTest.java → ...fileservice/repository/FileStoreTest.java
diff --git a/...epository/MetadataJdbcRepositoryTest.java → ...epository/MetadataJdbcRepositoryTest.java b/...epository/MetadataJdbcRepositoryTest.java → ...epository/MetadataJdbcRepositoryTest.java
diff --git a/...rvice/repository/MetadataUpdaterTest.java → ...rvice/repository/MetadataUpdaterTest.java b/...rvice/repository/MetadataUpdaterTest.java → ...rvice/repository/MetadataUpdaterTest.java
@@ -20,7 +20,6 @@
 import java.time.ZonedDateTime;
 
 import javax.json.JsonObject;
-import javax.ws.rs.BadRequestException;
 import javax.ws.rs.core.MediaType;
 
 import org.junit.Test;

diff --git a/file-service-persistence/file-service-persistence-postgres/pom.xml b/file-service-persistence/file-service-persistence-postgres/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>file-service-persistence</artifactId>
+        <groupId>uk.gov.justice.services</groupId>
+        <version>1.6.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>file-service-persistence-postgres</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>file-service-persistence-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--Test dependencies-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...pository/PostgresMetadataSqlProvider.java → ...pository/PostgresMetadataSqlProvider.java b/...pository/PostgresMetadataSqlProvider.java → ...pository/PostgresMetadataSqlProvider.java
diff --git a/...rvice-persistence/file-service-persistence-postgres/src/main/resources/META-INF/beans.xml b/...rvice-persistence/file-service-persistence-postgres/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       version="1.1" bean-discovery-mode="all">
+</beans>
diff --git a/...tory/PostgresMetadataSqlProviderTest.java → ...tory/PostgresMetadataSqlProviderTest.java b/...tory/PostgresMetadataSqlProviderTest.java → ...tory/PostgresMetadataSqlProviderTest.java
@@ -3,6 +3,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+import org.hamcrest.CoreMatchers;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

diff --git a/file-service-persistence/pom.xml b/file-service-persistence/pom.xml
@@ -10,74 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>file-service-persistence</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>uk.gov.justice.services</groupId>
-            <artifactId>file-service-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.utils</groupId>
-            <artifactId>utilities-core</artifactId>
-            <version>${cpp.utilities.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.utils</groupId>
-            <artifactId>utilities-file</artifactId>
-            <version>${cpp.utilities.version}</version>
-        </dependency>
-
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>uk.gov.justice.services</groupId>
-            <artifactId>test-utils-persistence</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.services</groupId>
-            <artifactId>file-service-liquibase</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <packaging>pom</packaging>
+    <modules>
+        <module>file-service-persistence-core</module>
+        <module>file-service-persistence-postgres</module>
+        <module>file-service-persistence-ansi</module>
+    </modules>
 </project>
diff --git a/file-service-test-utils/pom.xml b/file-service-test-utils/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
-            <artifactId>file-service-persistence</artifactId>
+            <artifactId>file-service-persistence-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -56,6 +56,16 @@
             <artifactId>json-path-assert</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>file-service-persistence-ansi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>file-service-persistence-postgres</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
 </project>