From d2b628d90454893fdfe36223846c09a8be18bfb4 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Tue, 23 Aug 2016 19:16:38 +0100 Subject: [PATCH] Move stuff to bridge package --- .../bridge/db/sqlite/SqliteDBStore.java | 18 ++++++++--------- .../GetLatestVersionForProjectSQLQuery.java | 2 +- .../query/GetPathForURLInProjectSQLQuery.java | 2 +- .../query/GetProjectNamesSQLQuery.java | 2 +- .../create/CreateIndexURLIndexStore.java | 2 +- .../create/CreateProjectsTableSQLUpdate.java | 2 +- .../create/CreateURLIndexStoreSQLUpdate.java | 2 +- .../DeleteFilesForProjectSQLUpdate.java | 2 +- .../update/insert/AddURLIndexSQLUpdate.java | 2 +- .../update/insert/SetProjectSQLUpdate.java | 2 +- .../data/model/db/PersistentStore.java | 20 ------------------- .../DeleteFilesForProjectSQLUpdateTest.java | 2 +- 12 files changed, 19 insertions(+), 39 deletions(-) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/query/GetLatestVersionForProjectSQLQuery.java (95%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/query/GetPathForURLInProjectSQLQuery.java (95%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/query/GetProjectNamesSQLQuery.java (94%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/update/create/CreateIndexURLIndexStore.java (90%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/update/create/CreateProjectsTableSQLUpdate.java (92%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/update/create/CreateURLIndexStoreSQLUpdate.java (93%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/update/delete/DeleteFilesForProjectSQLUpdate.java (95%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/update/insert/AddURLIndexSQLUpdate.java (94%) rename services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/update/insert/SetProjectSQLUpdate.java (93%) delete mode 100644 services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/PersistentStore.java rename services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/{data/model/db/sql => bridge/db/sqlite}/update/delete/DeleteFilesForProjectSQLUpdateTest.java (86%) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/SqliteDBStore.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/SqliteDBStore.java index ea92393eb7..576881cd16 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/SqliteDBStore.java +++ b/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.*; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetLatestVersionForProjectSQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetLatestVersionForProjectSQLQuery.java similarity index 95% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetLatestVersionForProjectSQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetLatestVersionForProjectSQLQuery.java index 5bac1e1032..42802af1ae 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetLatestVersionForProjectSQLQuery.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetPathForURLInProjectSQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetPathForURLInProjectSQLQuery.java similarity index 95% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetPathForURLInProjectSQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetPathForURLInProjectSQLQuery.java index f243ccb11f..b88ae81f4d 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetPathForURLInProjectSQLQuery.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetProjectNamesSQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetProjectNamesSQLQuery.java similarity index 94% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetProjectNamesSQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/query/GetProjectNamesSQLQuery.java index e0dce1a413..97fbb1ace4 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/query/GetProjectNamesSQLQuery.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateIndexURLIndexStore.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateIndexURLIndexStore.java similarity index 90% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateIndexURLIndexStore.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateIndexURLIndexStore.java index 50a0c8ca64..516a5c297f 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateIndexURLIndexStore.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateProjectsTableSQLUpdate.java similarity index 92% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateProjectsTableSQLUpdate.java index d315048390..649c863059 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateURLIndexStoreSQLUpdate.java similarity index 93% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/create/CreateURLIndexStoreSQLUpdate.java index 327a145535..d98c5b5ec0 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/delete/DeleteFilesForProjectSQLUpdate.java similarity index 95% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/delete/DeleteFilesForProjectSQLUpdate.java index de3c83c575..24683dca33 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdate.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/AddURLIndexSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/insert/AddURLIndexSQLUpdate.java similarity index 94% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/AddURLIndexSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/insert/AddURLIndexSQLUpdate.java index cc12fe971c..7112ea1bd6 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/AddURLIndexSQLUpdate.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/SetProjectSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/insert/SetProjectSQLUpdate.java similarity index 93% rename from services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/SetProjectSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/insert/SetProjectSQLUpdate.java index 5df6396f21..f75ee9a973 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/insert/SetProjectSQLUpdate.java +++ b/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; diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/PersistentStore.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/PersistentStore.java deleted file mode 100644 index 59cf8103c2..0000000000 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/model/db/PersistentStore.java +++ /dev/null @@ -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 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); -} diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdateTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/delete/DeleteFilesForProjectSQLUpdateTest.java similarity index 86% rename from services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdateTest.java rename to services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/bridge/db/sqlite/update/delete/DeleteFilesForProjectSQLUpdateTest.java index 8904e60877..973dd2ca11 100644 --- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/data/model/db/sql/update/delete/DeleteFilesForProjectSQLUpdateTest.java +++ b/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.*;