Move stuff to bridge package

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/SqliteDBStore.java

@@ -2,15 +2,15 @@ package uk.ac.ic.wlgitbridge.bridge.db.sqlite;
 
 import uk.ac.ic.wlgitbridge.bridge.db.DBInitException;
 import uk.ac.ic.wlgitbridge.bridge.db.DBStore;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.query.GetLatestVersionForProjectSQLQuery;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.query.GetPathForURLInProjectSQLQuery;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.query.GetProjectNamesSQLQuery;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.update.create.CreateIndexURLIndexStore;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.update.create.CreateProjectsTableSQLUpdate;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.update.create.CreateURLIndexStoreSQLUpdate;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.update.delete.DeleteFilesForProjectSQLUpdate;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.update.insert.AddURLIndexSQLUpdate;
-import uk.ac.ic.wlgitbridge.data.model.db.sql.update.insert.SetProjectSQLUpdate;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.query.GetLatestVersionForProjectSQLQuery;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.query.GetPathForURLInProjectSQLQuery;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.query.GetProjectNamesSQLQuery;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.create.CreateIndexURLIndexStore;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.create.CreateProjectsTableSQLUpdate;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.create.CreateURLIndexStoreSQLUpdate;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.delete.DeleteFilesForProjectSQLUpdate;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.insert.AddURLIndexSQLUpdate;
+import uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.insert.SetProjectSQLUpdate;
 
 import java.io.File;
 import java.sql.*;

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetLatestVersionForProjectSQLQuery.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetLatestVersionForProjectSQLQuery.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.query;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.query;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLQuery;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetPathForURLInProjectSQLQuery.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetPathForURLInProjectSQLQuery.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.query;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.query;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLQuery;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetProjectNamesSQLQuery.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetProjectNamesSQLQuery.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.query;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.query;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLQuery;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateIndexURLIndexStore.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateIndexURLIndexStore.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.update.create;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.create;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLUpdate;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateProjectsTableSQLUpdate.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.update.create;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.create;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLUpdate;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateURLIndexStoreSQLUpdate.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.update.create;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.create;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLUpdate;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdate.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/delete/DeleteFilesForProjectSQLUpdate.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.update.delete;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.delete;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLUpdate;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/AddURLIndexSQLUpdate.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/insert/AddURLIndexSQLUpdate.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.update.insert;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.insert;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLUpdate;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/SetProjectSQLUpdate.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/insert/SetProjectSQLUpdate.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.update.insert;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.insert;
 
 import uk.ac.ic.wlgitbridge.bridge.db.sqlite.SQLUpdate;
 

services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/PersistentStore.java

@@ -1,20 +0,0 @@
-package uk.ac.ic.wlgitbridge.data.model.db;
-
-import java.util.List;
-
-/**
- * Created by m on 20/11/15.
- */
-public interface PersistentStore {
-    List<String> getProjectNames();
-
-    void setLatestVersionForProject(String project, int versionID);
-
-    int getLatestVersionForProject(String project);
-
-    void addURLIndexForProject(String projectName, String url, String path);
-
-    void deleteFilesForProject(String project, String... files);
-
-    String getPathForURLInProject(String projectName, String url);
-}

services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdateTest.java → services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/delete/DeleteFilesForProjectSQLUpdateTest.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.data.model.db.sql.update.delete;
+package uk.ac.ic.wlgitbridge.bridge.db.sqlite.update.delete;
 
 import org.junit.Test;
 import static org.junit.Assert.*;