pr remarks

eclipse-tractusx · Aug 3, 2023 · 6d8a223 · 6d8a223
1 parent b8af255
commit 6d8a223
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/...g/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerEvaluationExtension.java b/...g/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerEvaluationExtension.java
@@ -35,12 +35,12 @@
  *     <li>{@link org.eclipse.edc.connector.contract.spi.validation.ContractValidationService#NEGOTIATION_SCOPE}</li>
  *     <li>{@link org.eclipse.edc.connector.contract.spi.validation.ContractValidationService#TRANSFER_SCOPE}</li>
  * </ul>
- * The rule to which the function is bound is {@link BusinessPartnerEvaluationExtension#BUSINESS_PARTNER_CONSTRAINT_KEY}. That means, that policies that are bound to these scopes look
+ * The rule to which the function is bound is {@link BusinessPartnerGroupFunction#BUSINESS_PARTNER_CONSTRAINT_KEY}. That means, that policies that are bound to these scopes look
  * like this:
  * <pre>
  * {
  *     "constraint": {
- *         "leftOperand": "BusinessPartnerGroup",
+ *         "leftOperand": "https://w3id.org/tractusx/v0.0.1/ns/BusinessPartnerGroup",
  *         "operator": "isAnyOf",
  *         "rightOperand": ["gold_customer","platin_partner"]
  *     }
@@ -52,7 +52,6 @@
 @Extension(value = "Registers a function to evaluate whether a BPN number is covered by a certain policy or not", categories = {"policy", "contract"})
 public class BusinessPartnerEvaluationExtension implements ServiceExtension {
 
-    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = "BusinessPartnerGroup";
     private static final String USE = "USE";
     @Inject
     private RuleBindingRegistry ruleBindingRegistry;
@@ -72,8 +71,8 @@ public void initialize(ServiceExtensionContext context) {
 
     private void bindToScope(BusinessPartnerGroupFunction function, String scope) {
         ruleBindingRegistry.bind(USE, scope);
-        ruleBindingRegistry.bind(BUSINESS_PARTNER_CONSTRAINT_KEY, scope);
+        ruleBindingRegistry.bind(BusinessPartnerGroupFunction.BUSINESS_PARTNER_CONSTRAINT_KEY, scope);
 
-        policyEngine.registerFunction(scope, Permission.class, BUSINESS_PARTNER_CONSTRAINT_KEY, function);
+        policyEngine.registerFunction(scope, Permission.class, BusinessPartnerGroupFunction.BUSINESS_PARTNER_CONSTRAINT_KEY, function);
     }
 }
diff --git a/...lipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerGroupFunction.java b/...lipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerGroupFunction.java
@@ -35,6 +35,7 @@
 import static org.eclipse.edc.policy.model.Operator.IS_ANY_OF;
 import static org.eclipse.edc.policy.model.Operator.IS_NONE_OF;
 import static org.eclipse.edc.policy.model.Operator.NEQ;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
 
 /**
  * This function evaluates, that a particular {@link ParticipantAgent} is a member of a particular group.
@@ -46,7 +47,7 @@
  * <pre>
  * {
  *     "constraint": {
- *         "leftOperand": "BusinessPartnerGroup",
+ *         "leftOperand": "https://w3id.org/tractusx/v0.0.1/ns/BusinessPartnerGroup",
  *         "operator": "isAnyOf",
  *         "rightOperand": ["gold_customer","platin_partner"]
  *     }
@@ -70,6 +71,7 @@
  */
 public class BusinessPartnerGroupFunction implements AtomicConstraintFunction<Permission> {
     public static final String REFERRING_CONNECTOR_CLAIM = "referringConnector";
+    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = TX_NAMESPACE + "BusinessPartnerGroup";
     private static final List<Operator> ALLOWED_OPERATORS = List.of(EQ, NEQ, IN, IS_ALL_OF, IS_ANY_OF, IS_NONE_OF);
     private static final Map<Operator, Function<BpnGroupHolder, Boolean>> OPERATOR_EVALUATOR_MAP = new HashMap<>();
     private final BusinessPartnerGroupStore store;

diff --git a/...e/tractusx/edc/validation/businesspartner/functions/BusinessPartnerGroupFunctionTest.java b/...e/tractusx/edc/validation/businesspartner/functions/BusinessPartnerGroupFunctionTest.java
@@ -48,7 +48,7 @@
 import static org.eclipse.edc.policy.model.Operator.LEQ;
 import static org.eclipse.edc.policy.model.Operator.LT;
 import static org.eclipse.edc.policy.model.Operator.NEQ;
-import static org.eclipse.tractusx.edc.validation.businesspartner.BusinessPartnerEvaluationExtension.BUSINESS_PARTNER_CONSTRAINT_KEY;
+import static org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerGroupFunction.BUSINESS_PARTNER_CONSTRAINT_KEY;
 import static org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerGroupFunction.REFERRING_CONNECTOR_CLAIM;
 import static org.mockito.ArgumentMatchers.endsWith;
 import static org.mockito.ArgumentMatchers.eq;

diff --git a/...pse/tractusx/edc/validation/businesspartner/store/sql/BusinessPartnerGroupStatements.java b/...pse/tractusx/edc/validation/businesspartner/store/sql/BusinessPartnerGroupStatements.java
@@ -14,6 +14,9 @@
 
 package org.eclipse.tractusx.edc.validation.businesspartner.store.sql;
 
+/**
+ * Statement templates and SQL table+column names required for the {@link SqlBusinessPartnerGroupStore}
+ */
 public interface BusinessPartnerGroupStatements {
 
     default String getBpnColumn() {

diff --git a/...tusx/edc/validation/businesspartner/store/sql/PostgresBusinessPartnerGroupStatements.java b/...tusx/edc/validation/businesspartner/store/sql/PostgresBusinessPartnerGroupStatements.java
@@ -19,6 +19,9 @@
 
 import static java.lang.String.format;
 
+/**
+ * Postgres-specific statement templates for the {@link SqlBusinessPartnerGroupStore}
+ */
 public class PostgresBusinessPartnerGroupStatements implements BusinessPartnerGroupStatements {
     @Override
     public String findByBpnTemplate() {
@@ -44,7 +47,7 @@ public String countQuery() {
     public String updateTemplate() {
         return format("UPDATE %s SET %s=?%s WHERE %s=?", getTable(), getGroupsColumn(), getFormatJsonOperator(), getBpnColumn());
     }
-    
+
     @NotNull
     private String getFormatJsonOperator() {
         return PostgresDialect.getJsonCastOperator();