Merge pull request #33 from G8XSU/multi-lang

Refactor/Prepare for Multi-language support.
lightningdevkit · Oct 17, 2024 · 15c68d6 · 15c68d6
2 parents 5f917b0 + 425342b
commit 15c68d6
Show file tree

Hide file tree

Showing 31 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/build-and-deploy.yml → .github/workflows/build-and-deploy-java.yml b/.github/workflows/build-and-deploy.yml → .github/workflows/build-and-deploy-java.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Create database table
         run: |
-          psql -h localhost -U postgres -d postgres -f ./app/src/main/java/org/vss/impl/postgres/sql/v0_create_vss_db.sql
+          psql -h localhost -U postgres -d postgres -f ./java/app/src/main/java/org/vss/impl/postgres/sql/v0_create_vss_db.sql
         env:
           PGPASSWORD: YOU_MUST_CHANGE_THIS_PASSWORD
 
@@ -56,6 +56,7 @@ jobs:
           java -version
           gradle --version
 
+          cd java
           gradle wrapper --gradle-version 8.1.1
           ./gradlew --version
           ./gradlew build

diff --git a/java/.env b/java/.env
@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=vss-server-java
diff --git a/Dockerfile → java/Dockerfile b/Dockerfile → java/Dockerfile
diff --git a/app/build.gradle → java/app/build.gradle b/app/build.gradle → java/app/build.gradle
@@ -21,6 +21,14 @@ repositories {
   mavenCentral()
 }
 
+sourceSets {
+  main {
+    proto {
+      srcDir '../../proto'
+    }
+  }
+}
+
 idea {
   module {
     generatedSourceDirs.add(file("build/generated/proto/main"))

diff --git a/app/src/main/java/org/vss/KVStore.java → java/app/src/main/java/org/vss/KVStore.java b/app/src/main/java/org/vss/KVStore.java → java/app/src/main/java/org/vss/KVStore.java
diff --git a/...src/main/java/org/vss/VSSApplication.java → ...src/main/java/org/vss/VSSApplication.java b/...src/main/java/org/vss/VSSApplication.java → ...src/main/java/org/vss/VSSApplication.java
diff --git a/...main/java/org/vss/api/AbstractVssApi.java → ...main/java/org/vss/api/AbstractVssApi.java b/...main/java/org/vss/api/AbstractVssApi.java → ...main/java/org/vss/api/AbstractVssApi.java
diff --git a/...ain/java/org/vss/api/DeleteObjectApi.java → ...ain/java/org/vss/api/DeleteObjectApi.java b/...ain/java/org/vss/api/DeleteObjectApi.java → ...ain/java/org/vss/api/DeleteObjectApi.java
diff --git a/...c/main/java/org/vss/api/GetObjectApi.java → ...c/main/java/org/vss/api/GetObjectApi.java b/...c/main/java/org/vss/api/GetObjectApi.java → ...c/main/java/org/vss/api/GetObjectApi.java
diff --git a/.../java/org/vss/api/ListKeyVersionsApi.java → .../java/org/vss/api/ListKeyVersionsApi.java b/.../java/org/vss/api/ListKeyVersionsApi.java → .../java/org/vss/api/ListKeyVersionsApi.java
diff --git a/.../main/java/org/vss/api/PutObjectsApi.java → .../main/java/org/vss/api/PutObjectsApi.java b/.../main/java/org/vss/api/PutObjectsApi.java → .../main/java/org/vss/api/PutObjectsApi.java
diff --git a/...main/java/org/vss/api/VssApiEndpoint.java → ...main/java/org/vss/api/VssApiEndpoint.java b/...main/java/org/vss/api/VssApiEndpoint.java → ...main/java/org/vss/api/VssApiEndpoint.java
diff --git a/.../main/java/org/vss/auth/AuthResponse.java → .../main/java/org/vss/auth/AuthResponse.java b/.../main/java/org/vss/auth/AuthResponse.java → .../main/java/org/vss/auth/AuthResponse.java
diff --git a/...rc/main/java/org/vss/auth/Authorizer.java → ...rc/main/java/org/vss/auth/Authorizer.java b/...rc/main/java/org/vss/auth/Authorizer.java → ...rc/main/java/org/vss/auth/Authorizer.java
diff --git a/...ain/java/org/vss/auth/NoopAuthorizer.java → ...ain/java/org/vss/auth/NoopAuthorizer.java b/...ain/java/org/vss/auth/NoopAuthorizer.java → ...ain/java/org/vss/auth/NoopAuthorizer.java
diff --git a/...java/org/vss/exception/AuthException.java → ...java/org/vss/exception/AuthException.java b/...java/org/vss/exception/AuthException.java → ...java/org/vss/exception/AuthException.java
diff --git a/.../org/vss/exception/ConflictException.java → .../org/vss/exception/ConflictException.java b/.../org/vss/exception/ConflictException.java → .../org/vss/exception/ConflictException.java
diff --git a/...org/vss/exception/NoSuchKeyException.java → ...org/vss/exception/NoSuchKeyException.java b/...org/vss/exception/NoSuchKeyException.java → ...org/vss/exception/NoSuchKeyException.java
diff --git a/...c/main/java/org/vss/guice/BaseModule.java → ...c/main/java/org/vss/guice/BaseModule.java b/...c/main/java/org/vss/guice/BaseModule.java → ...c/main/java/org/vss/guice/BaseModule.java
diff --git a/...ss/impl/postgres/PostgresBackendImpl.java → ...ss/impl/postgres/PostgresBackendImpl.java b/...ss/impl/postgres/PostgresBackendImpl.java → ...ss/impl/postgres/PostgresBackendImpl.java
diff --git a/...ss/impl/postgres/sql/v0_create_vss_db.sql → ...ss/impl/postgres/sql/v0_create_vss_db.sql b/...ss/impl/postgres/sql/v0_create_vss_db.sql → ...ss/impl/postgres/sql/v0_create_vss_db.sql
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...g/vss/AbstractKVStoreIntegrationTest.java → ...g/vss/AbstractKVStoreIntegrationTest.java b/...g/vss/AbstractKVStoreIntegrationTest.java → ...g/vss/AbstractKVStoreIntegrationTest.java
diff --git a/...java/org/vss/api/DeleteObjectApiTest.java → ...java/org/vss/api/DeleteObjectApiTest.java b/...java/org/vss/api/DeleteObjectApiTest.java → ...java/org/vss/api/DeleteObjectApiTest.java
diff --git a/...st/java/org/vss/api/GetObjectApiTest.java → ...st/java/org/vss/api/GetObjectApiTest.java b/...st/java/org/vss/api/GetObjectApiTest.java → ...st/java/org/vss/api/GetObjectApiTest.java
diff --git a/...a/org/vss/api/ListKeyVersionsApiTest.java → ...a/org/vss/api/ListKeyVersionsApiTest.java b/...a/org/vss/api/ListKeyVersionsApiTest.java → ...a/org/vss/api/ListKeyVersionsApiTest.java
diff --git a/...t/java/org/vss/api/PutObjectsApiTest.java → ...t/java/org/vss/api/PutObjectsApiTest.java b/...t/java/org/vss/api/PutObjectsApiTest.java → ...t/java/org/vss/api/PutObjectsApiTest.java
diff --git a/...s/PostgresBackendImplIntegrationTest.java → ...s/PostgresBackendImplIntegrationTest.java b/...s/PostgresBackendImplIntegrationTest.java → ...s/PostgresBackendImplIntegrationTest.java
diff --git a/docker-compose.yml → java/docker-compose.yml b/docker-compose.yml → java/docker-compose.yml
diff --git a/settings.gradle → java/settings.gradle b/settings.gradle → java/settings.gradle
diff --git a/app/src/main/proto/vss.proto → proto/vss.proto b/app/src/main/proto/vss.proto → proto/vss.proto