cleanup

eclipse-tractusx · Aug 3, 2023 · 4fbc215 · 4fbc215
1 parent ba838df
commit 4fbc215
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 29 deletions.
diff --git a/edc-extensions/business-partner-store-sql/docs/schema.sql b/edc-extensions/business-partner-store-sql/docs/schema.sql
@@ -12,7 +12,7 @@
 --
 
 
-CREATE TABLE public.edc_business_partner_group
+CREATE TABLE edc_business_partner_group
 (
     bpn    VARCHAR                 NOT NULL
         CONSTRAINT edc_business_partner_group_pk

diff --git a/...lipse/tractusx/edc/validation/businesspartner/store/sql/SqlBusinessPartnerGroupStore.java b/...lipse/tractusx/edc/validation/businesspartner/store/sql/SqlBusinessPartnerGroupStore.java
@@ -49,7 +49,7 @@ public StoreResult<List<String>> resolveForBpn(String businessPartnerNumber) {
                 var sql = statements.findByBpnTemplate();
                 var list = queryExecutor.single(connection, true, this::mapJson, sql, businessPartnerNumber);
                 return list == null ?
-                        StoreResult.notFound("BPN " + businessPartnerNumber + " was not found") :
+                        StoreResult.notFound(NOT_FOUND_TEMPLATE.formatted(businessPartnerNumber)) :
                         StoreResult.success(list);
             } catch (SQLException e) {
                 throw new EdcPersistenceException(e);
@@ -63,7 +63,7 @@ public StoreResult<Void> save(String businessPartnerNumber, List<String> groups)
         return transactionContext.execute(() -> {
             try (var connection = getConnection()) {
                 if (exists(businessPartnerNumber, connection)) {
-                    return StoreResult.alreadyExists("BPN " + businessPartnerNumber + " already exists in database");
+                    return StoreResult.alreadyExists(ALREADY_EXISTS_TEMPLATE.formatted(businessPartnerNumber));
                 }
                 var sql = statements.insertTemplate();
                 queryExecutor.execute(connection, sql, businessPartnerNumber, toJson(groups));
@@ -81,7 +81,7 @@ public StoreResult<Void> delete(String businessPartnerNumber) {
         return transactionContext.execute(() -> {
             try (var connection = getConnection()) {
                 if (!exists(businessPartnerNumber, connection)) {
-                    return StoreResult.notFound("BPN " + businessPartnerNumber + " was not found");
+                    return StoreResult.notFound(NOT_FOUND_TEMPLATE.formatted(businessPartnerNumber));
                 }
                 var sql = statements.deleteTemplate();
                 queryExecutor.execute(connection, sql, businessPartnerNumber);
@@ -98,7 +98,7 @@ public StoreResult<Void> update(String businessPartnerNumber, List<String> group
         return transactionContext.execute(() -> {
             try (var connection = getConnection()) {
                 if (!exists(businessPartnerNumber, connection)) {
-                    return StoreResult.notFound("BPN " + businessPartnerNumber + " was not found");
+                    return StoreResult.notFound(NOT_FOUND_TEMPLATE.formatted(businessPartnerNumber));
                 }
                 var sql = statements.updateTemplate();
                 queryExecutor.execute(connection, sql, toJson(groups), businessPartnerNumber);

diff --git a/...e/tractusx/edc/validation/businesspartner/defaults/InMemoryBusinessPartnerGroupStore.java b/...e/tractusx/edc/validation/businesspartner/defaults/InMemoryBusinessPartnerGroupStore.java
@@ -28,15 +28,15 @@ public class InMemoryBusinessPartnerGroupStore implements BusinessPartnerGroupSt
     public StoreResult<List<String>> resolveForBpn(String businessPartnerNumber) {
         var entry = cache.get(businessPartnerNumber);
         return entry == null ?
-                StoreResult.notFound("BPN " + businessPartnerNumber + " was not found in database") :
+                StoreResult.notFound(NOT_FOUND_TEMPLATE.formatted(businessPartnerNumber)) :
                 StoreResult.success(entry);
     }
 
     @Override
     public StoreResult<Void> save(String businessPartnerNumber, List<String> groups) {
         //to maintain behavioural consistency with the SQL store
         if (cache.containsKey(businessPartnerNumber)) {
-            return StoreResult.alreadyExists("BPN " + businessPartnerNumber + " already exists in database");
+            return StoreResult.alreadyExists(ALREADY_EXISTS_TEMPLATE.formatted(businessPartnerNumber));
         }
         cache.put(businessPartnerNumber, groups);
         return StoreResult.success();
@@ -46,7 +46,7 @@ public StoreResult<Void> save(String businessPartnerNumber, List<String> groups)
     public StoreResult<Void> delete(String businessPartnerNumber) {
 
         return cache.remove(businessPartnerNumber) == null ?
-                StoreResult.notFound("BPN " + businessPartnerNumber + " was not found in database") :
+                StoreResult.notFound(NOT_FOUND_TEMPLATE.formatted(businessPartnerNumber)) :
                 StoreResult.success();
     }
 
@@ -56,6 +56,6 @@ public StoreResult<Void> update(String businessPartnerNumber, List<String> group
             cache.put(businessPartnerNumber, groups);
             return StoreResult.success();
         }
-        return StoreResult.notFound("BPN " + businessPartnerNumber + " was not found in database");
+        return StoreResult.notFound(NOT_FOUND_TEMPLATE.formatted(businessPartnerNumber));
     }
 }
diff --git a/...in/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroup.java b/...in/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroup.java
diff --git a/...va/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroupStore.java b/...va/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroupStore.java
@@ -19,6 +19,9 @@
 import java.util.List;
 
 public interface BusinessPartnerGroupStore {
+    String NOT_FOUND_TEMPLATE = "BPN %s was not found";
+    String ALREADY_EXISTS_TEMPLATE = "BPN %s already exists in database";
+
     StoreResult<List<String>> resolveForBpn(String businessPartnerNumber);
 
     StoreResult<Void> save(String businessPartnerNumber, List<String> groups);