From 619b532be09d6f5b047a5204ebae04863f90e9e2 Mon Sep 17 00:00:00 2001 From: gabriele Date: Tue, 17 Dec 2024 14:49:11 +0100 Subject: [PATCH] v1.0.11 fix to registry policyProxy service --- odm-cli/pom.xml | 12 ++++++------ platform-core/commons/pom.xml | 4 ++-- platform-core/pom.xml | 4 ++-- pom.xml | 2 +- product-plane-services/blueprint-api/pom.xml | 6 +++--- product-plane-services/blueprint-server/pom.xml | 6 +++--- product-plane-services/devops-api/pom.xml | 8 ++++---- product-plane-services/devops-server/pom.xml | 16 ++++++++-------- product-plane-services/notification-api/pom.xml | 6 +++--- .../notification-server/pom.xml | 10 +++++----- product-plane-services/params-api/pom.xml | 6 +++--- product-plane-services/params-server/pom.xml | 6 +++--- product-plane-services/policy-api/pom.xml | 10 +++++----- product-plane-services/policy-server/pom.xml | 12 ++++++------ product-plane-services/pom.xml | 4 ++-- product-plane-services/registry-api/pom.xml | 6 +++--- product-plane-services/registry-server/pom.xml | 12 ++++++------ .../proxies/RegistryPolicyServiceProxy.java | 2 ++ .../pp/registry/server/DataProductVersionIT.java | 2 ++ utility-plane-services/executor-api/pom.xml | 6 +++--- utility-plane-services/observer-api/pom.xml | 8 ++++---- utility-plane-services/pom.xml | 4 ++-- utility-plane-services/validator-api/pom.xml | 8 ++++---- 23 files changed, 82 insertions(+), 78 deletions(-) diff --git a/odm-cli/pom.xml b/odm-cli/pom.xml index 0b605e11..a49e29f2 100644 --- a/odm-cli/pom.xml +++ b/odm-cli/pom.xml @@ -7,7 +7,7 @@ org.opendatamesh odm-platform - 1.0.10 + 1.0.11 ../ @@ -15,7 +15,7 @@ odm-platform-cli Open Data Mesh Platform's CLI ODM Platform CLI - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform 11 @@ -72,25 +72,25 @@ org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-blueprint-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-registry-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-policy-api - 1.0.10 + 1.0.11 compile diff --git a/platform-core/commons/pom.xml b/platform-core/commons/pom.xml index 240fd506..54f24e28 100644 --- a/platform-core/commons/pom.xml +++ b/platform-core/commons/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-core - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-core-commons ODM Platform Commons Open Data Mesh Platform's Commons - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform diff --git a/platform-core/pom.xml b/platform-core/pom.xml index 7c242fb9..8987879d 100644 --- a/platform-core/pom.xml +++ b/platform-core/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform - 1.0.10 + 1.0.11 org.opendatamesh @@ -33,7 +33,7 @@ License. ODM Platform CORE MODULES Open Data Mesh Core Modules - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform-pp-services pom diff --git a/pom.xml b/pom.xml index d9eafd49..f37fcc68 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ License. ODM Platform Open Data Mesh Platform - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform-pp-services pom diff --git a/product-plane-services/blueprint-api/pom.xml b/product-plane-services/blueprint-api/pom.xml index b456cd51..dea36c90 100644 --- a/product-plane-services/blueprint-api/pom.xml +++ b/product-plane-services/blueprint-api/pom.xml @@ -7,7 +7,7 @@ org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -15,7 +15,7 @@ odm-platform-pp-blueprint-api ODM Platform Blueprint API Open Data Mesh Platform's Blueprint service API - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -91,7 +91,7 @@ org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/blueprint-server/pom.xml b/product-plane-services/blueprint-server/pom.xml index 80d666a7..15a22023 100644 --- a/product-plane-services/blueprint-server/pom.xml +++ b/product-plane-services/blueprint-server/pom.xml @@ -7,7 +7,7 @@ org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -15,7 +15,7 @@ odm-platform-pp-blueprint-server ODM Platform Blueprint Server Open Data Mesh Platform's Blueprint service server - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -242,7 +242,7 @@ org.opendatamesh odm-platform-pp-blueprint-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/devops-api/pom.xml b/product-plane-services/devops-api/pom.xml index d7387aff..73537f9b 100644 --- a/product-plane-services/devops-api/pom.xml +++ b/product-plane-services/devops-api/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-devops-api ODM Platform DevOps API Open Data Mesh Platform's DevOps service API - 1.0.10 + 1.0.11 @@ -167,13 +167,13 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-up-executor-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/devops-server/pom.xml b/product-plane-services/devops-server/pom.xml index 19e4afdd..c814ace4 100644 --- a/product-plane-services/devops-server/pom.xml +++ b/product-plane-services/devops-server/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-devops-server ODM Platform DevOps Server Open Data Mesh Platform's DevOps service server - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -241,37 +241,37 @@ License. org.opendatamesh odm-platform-pp-registry-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-devops-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-up-executor-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-up-observer-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-policy-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-notification-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/notification-api/pom.xml b/product-plane-services/notification-api/pom.xml index d41826c3..f2ff5ca7 100644 --- a/product-plane-services/notification-api/pom.xml +++ b/product-plane-services/notification-api/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-notification-api ODM Platform Notification API Open Data Mesh Platform's Notification Service API - 1.0.10 + 1.0.11 @@ -87,7 +87,7 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/notification-server/pom.xml b/product-plane-services/notification-server/pom.xml index 07973e1b..1ec31010 100644 --- a/product-plane-services/notification-server/pom.xml +++ b/product-plane-services/notification-server/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-notification-server ODM Platform Notification Server Open Data Mesh Platform's Notification service server - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -226,17 +226,17 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 org.opendatamesh odm-platform-pp-notification-api - 1.0.10 + 1.0.11 org.opendatamesh odm-platform-up-observer-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/params-api/pom.xml b/product-plane-services/params-api/pom.xml index 832f4b32..c35cf79a 100644 --- a/product-plane-services/params-api/pom.xml +++ b/product-plane-services/params-api/pom.xml @@ -24,14 +24,14 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ odm-platform-pp-params-api ODM Platform Params API Open Data Mesh Platform's Params Service API - 1.0.10 + 1.0.11 @@ -83,7 +83,7 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/params-server/pom.xml b/product-plane-services/params-server/pom.xml index 7796a694..ea43c624 100644 --- a/product-plane-services/params-server/pom.xml +++ b/product-plane-services/params-server/pom.xml @@ -7,7 +7,7 @@ org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -15,7 +15,7 @@ odm-platform-pp-params-server ODM Platform Params Server Open Data Mesh Platform's Params service server - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -148,7 +148,7 @@ org.opendatamesh odm-platform-pp-params-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/policy-api/pom.xml b/product-plane-services/policy-api/pom.xml index d86c11f1..5cbb7c6d 100644 --- a/product-plane-services/policy-api/pom.xml +++ b/product-plane-services/policy-api/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-policy-api ODM Platform Policy API Open Data Mesh Platform's Policy Service API - 1.0.10 + 1.0.11 @@ -103,19 +103,19 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-devops-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-up-executor-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/policy-server/pom.xml b/product-plane-services/policy-server/pom.xml index 7491fe97..7039fcf7 100644 --- a/product-plane-services/policy-server/pom.xml +++ b/product-plane-services/policy-server/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-policy-server ODM Platform Policy Server Open Data Mesh Platform's Policy service server - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -248,24 +248,24 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-policy-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-registry-api - 1.0.10 + 1.0.11 org.opendatamesh odm-platform-up-validator-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/pom.xml b/product-plane-services/pom.xml index 0b401486..f0d0e4a5 100644 --- a/product-plane-services/pom.xml +++ b/product-plane-services/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform - 1.0.10 + 1.0.11 org.opendatamesh @@ -33,7 +33,7 @@ License. ODM Platform PRODUCT PLANE SERVICES Open Data Mesh Platform Utility Plane Services - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform pom diff --git a/product-plane-services/registry-api/pom.xml b/product-plane-services/registry-api/pom.xml index d7fc4f62..2405cddb 100644 --- a/product-plane-services/registry-api/pom.xml +++ b/product-plane-services/registry-api/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-registry-api ODM Platform Registry API Open Data Mesh Platform's registry service API - 1.0.10 + 1.0.11 @@ -169,7 +169,7 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/registry-server/pom.xml b/product-plane-services/registry-server/pom.xml index 6d739b42..ea31525f 100644 --- a/product-plane-services/registry-server/pom.xml +++ b/product-plane-services/registry-server/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform-pp-services - 1.0.10 + 1.0.11 ../ @@ -33,7 +33,7 @@ License. odm-platform-pp-registry-server ODM Platform Registry Server Open Data Mesh Platform's registry service server - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -274,25 +274,25 @@ License. org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-registry-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-policy-api - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-notification-api - 1.0.10 + 1.0.11 compile diff --git a/product-plane-services/registry-server/src/main/java/org/opendatamesh/platform/pp/registry/server/services/proxies/RegistryPolicyServiceProxy.java b/product-plane-services/registry-server/src/main/java/org/opendatamesh/platform/pp/registry/server/services/proxies/RegistryPolicyServiceProxy.java index 392ef9cc..c12d9eb8 100644 --- a/product-plane-services/registry-server/src/main/java/org/opendatamesh/platform/pp/registry/server/services/proxies/RegistryPolicyServiceProxy.java +++ b/product-plane-services/registry-server/src/main/java/org/opendatamesh/platform/pp/registry/server/services/proxies/RegistryPolicyServiceProxy.java @@ -106,6 +106,7 @@ private void checkPoliciesValidationResults(ValidationResponseResource validatio String allFailedPoliciesIds = ""; String failedBlockingPolicies = validationResults.getPolicyResults() .stream() + .filter(policyResult -> Boolean.FALSE.equals(policyResult.getResult())) .filter(policyResult -> Boolean.TRUE.equals(policyResult.getPolicy().getBlockingFlag())) .map(this::getPolicyIdentifier) .reduce("", (first, second) -> StringUtils.hasText(first) ? first + ", " + second : second); @@ -114,6 +115,7 @@ private void checkPoliciesValidationResults(ValidationResponseResource validatio } String failedNonBlockingPolicies = validationResults.getPolicyResults() .stream() + .filter(policyResult -> Boolean.FALSE.equals(policyResult.getResult())) .filter(policyResult -> Boolean.FALSE.equals(policyResult.getPolicy().getBlockingFlag())) .map(this::getPolicyIdentifier) .reduce("", (first, second) -> StringUtils.hasText(first) ? first + ", " + second : second); diff --git a/product-plane-services/registry-server/src/test/java/org/opendatamesh/platform/pp/registry/server/DataProductVersionIT.java b/product-plane-services/registry-server/src/test/java/org/opendatamesh/platform/pp/registry/server/DataProductVersionIT.java index f6a51b45..18753199 100644 --- a/product-plane-services/registry-server/src/test/java/org/opendatamesh/platform/pp/registry/server/DataProductVersionIT.java +++ b/product-plane-services/registry-server/src/test/java/org/opendatamesh/platform/pp/registry/server/DataProductVersionIT.java @@ -118,6 +118,7 @@ public void testCreateDPVersionWithFailingBlockingPolicy() throws NoSuchFieldExc policyResult1PolicyResource.setId(1L); policyResult1PolicyResource.setRootId(1L); policyResult1.setPolicy(policyResult1PolicyResource); + policyResult1.setResult(Boolean.FALSE); PolicyEvaluationResultResource policyResult2 = new PolicyEvaluationResultResource(); policyResult2.setPolicyId(2L); @@ -126,6 +127,7 @@ public void testCreateDPVersionWithFailingBlockingPolicy() throws NoSuchFieldExc policyResult2PolicyResource.setId(3L); policyResult2PolicyResource.setRootId(1L); policyResult2.setPolicy(policyResult2PolicyResource); + policyResult2.setResult(Boolean.FALSE); ValidationResponseResource validationResponseResource = new ValidationResponseResource(); validationResponseResource.setPolicyResults(Lists.newArrayList(policyResult1, policyResult2)); diff --git a/utility-plane-services/executor-api/pom.xml b/utility-plane-services/executor-api/pom.xml index 3b4a2630..b9ee9de9 100644 --- a/utility-plane-services/executor-api/pom.xml +++ b/utility-plane-services/executor-api/pom.xml @@ -7,7 +7,7 @@ org.opendatamesh odm-platform-up-services - 1.0.10 + 1.0.11 ../ @@ -15,7 +15,7 @@ odm-platform-up-executor-api ODM Platform Executor Service API Open Data Mesh Platform Executor Service API - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -148,7 +148,7 @@ org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile diff --git a/utility-plane-services/observer-api/pom.xml b/utility-plane-services/observer-api/pom.xml index 4bd624c5..6c2be035 100644 --- a/utility-plane-services/observer-api/pom.xml +++ b/utility-plane-services/observer-api/pom.xml @@ -7,7 +7,7 @@ org.opendatamesh odm-platform-up-services - 1.0.10 + 1.0.11 ../ @@ -15,7 +15,7 @@ odm-platform-up-observer-api ODM Platform Observer Service API Open Data Mesh Platform Observer Service API - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform @@ -148,13 +148,13 @@ org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-notification-api - 1.0.10 + 1.0.11 compile diff --git a/utility-plane-services/pom.xml b/utility-plane-services/pom.xml index 0c30f04a..e732239a 100644 --- a/utility-plane-services/pom.xml +++ b/utility-plane-services/pom.xml @@ -25,7 +25,7 @@ License. org.opendatamesh odm-platform - 1.0.10 + 1.0.11 org.opendatamesh @@ -38,7 +38,7 @@ License. jackson-core - 1.0.10 + 1.0.11 https://github.com/opendatamesh-initiative/odm-platform-pp-services pom diff --git a/utility-plane-services/validator-api/pom.xml b/utility-plane-services/validator-api/pom.xml index f0b4e224..075b1ab1 100644 --- a/utility-plane-services/validator-api/pom.xml +++ b/utility-plane-services/validator-api/pom.xml @@ -7,7 +7,7 @@ org.opendatamesh odm-platform-up-services - 1.0.10 + 1.0.11 ../ @@ -16,7 +16,7 @@ ODM Platform Validator Service API Open Data Mesh Platform Validator Service API https://github.com/opendatamesh-initiative/odm-platform - 1.0.10 + 1.0.11 11 @@ -76,13 +76,13 @@ org.opendatamesh odm-platform-core-commons - 1.0.10 + 1.0.11 compile org.opendatamesh odm-platform-pp-policy-api - 1.0.10 + 1.0.11 compile