From 2392231ee0d328ea585d5c8610b5270b0470f0fd Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Thu, 3 Aug 2023 07:39:35 +0200 Subject: [PATCH] cleanup --- .../sql/SqlBusinessPartnerGroupStore.java | 8 ++++---- .../InMemoryBusinessPartnerGroupStore.java | 8 ++++---- .../spi/BusinessPartnerGroup.java | 20 ------------------- .../spi/BusinessPartnerGroupStore.java | 3 +++ 4 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroup.java diff --git a/edc-extensions/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/sql/SqlBusinessPartnerGroupStore.java b/edc-extensions/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/sql/SqlBusinessPartnerGroupStore.java index 04b29171d..0a9a5e235 100644 --- a/edc-extensions/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/sql/SqlBusinessPartnerGroupStore.java +++ b/edc-extensions/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/sql/SqlBusinessPartnerGroupStore.java @@ -49,7 +49,7 @@ public StoreResult> 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 save(String businessPartnerNumber, List 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 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 update(String businessPartnerNumber, List 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/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/defaults/InMemoryBusinessPartnerGroupStore.java b/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/defaults/InMemoryBusinessPartnerGroupStore.java index d6fb4e754..556bff402 100644 --- a/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/defaults/InMemoryBusinessPartnerGroupStore.java +++ b/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/defaults/InMemoryBusinessPartnerGroupStore.java @@ -28,7 +28,7 @@ public class InMemoryBusinessPartnerGroupStore implements BusinessPartnerGroupSt public StoreResult> 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); } @@ -36,7 +36,7 @@ public StoreResult> resolveForBpn(String businessPartnerNumber) { public StoreResult save(String businessPartnerNumber, List 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 save(String businessPartnerNumber, List groups) public StoreResult 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 update(String businessPartnerNumber, List 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/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroup.java b/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroup.java deleted file mode 100644 index 9177b8495..000000000 --- a/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroup.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation - * - */ - -package org.eclipse.tractusx.edc.validation.businesspartner.spi; - -import java.util.List; - -public record BusinessPartnerGroup(String groupId, String groupName, List bpns) { -} diff --git a/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroupStore.java b/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroupStore.java index de9338b7f..c95dee513 100644 --- a/edc-extensions/business-partner-validation2/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/spi/BusinessPartnerGroupStore.java +++ b/edc-extensions/business-partner-validation2/src/main/java/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> resolveForBpn(String businessPartnerNumber); StoreResult save(String businessPartnerNumber, List groups);