Merge pull request #8656 from mandy-chessell/oak2025

Add Classification Explorer OMVS
odpi · Mar 4, 2025 · 4248ea6 · 4248ea6
2 parents 36eb61b + 16e0be4
commit 4248ea6
Show file tree

Hide file tree

Showing 142 changed files with 13,481 additions and 14,604 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/build.gradle b/build.gradle
@@ -131,7 +131,7 @@ subprojects {
                                 developer {
                                     id = 'mandy-chessell'
                                     name = 'Mandy Chessell'
-                                    email = 'mandy.e.chessell@gmail.com'
+                                    email = 'mandy.chessell@pdr-associates.com'
                                     timezone = 'Europe/London'
                                     roles = ['Project Leader']
                                     organization = 'Pragmatic Data Research Ltd'
@@ -143,6 +143,13 @@ subprojects {
                                     roles = ['maintainer']
                                     organization = 'IBM Corporation'
                                 }
+                                developer {
+                                    id = 'dwolfson'
+                                    name = 'Dan Wolfson'
+                                    email = 'dan.wolfson@pdr-associates.com'
+                                    roles = ['maintainer']
+                                    organization = 'Pragmatic Data Research Ltd'
+                                }
                             }
                             scm {
                                 connection = 'scm:git:git://github.com/odpi/egeria.git'

diff --git a/content-packs/APIsContentPack.omarchive b/content-packs/APIsContentPack.omarchive
diff --git a/content-packs/ApacheAtlasContentPack.omarchive b/content-packs/ApacheAtlasContentPack.omarchive
diff --git a/content-packs/ApacheKafkaContentPack.omarchive b/content-packs/ApacheKafkaContentPack.omarchive
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/content-packs/ObservabilityContentPack.omarchive b/content-packs/ObservabilityContentPack.omarchive
diff --git a/content-packs/OpenMetadataTypes.omarchive b/content-packs/OpenMetadataTypes.omarchive
diff --git a/content-packs/PostgresContentPack.omarchive b/content-packs/PostgresContentPack.omarchive
diff --git a/content-packs/UnityCatalogContentPack.omarchive b/content-packs/UnityCatalogContentPack.omarchive
diff --git a/open-metadata-distribution/omag-server-platform/build.gradle b/open-metadata-distribution/omag-server-platform/build.gradle
@@ -399,6 +399,8 @@ distributions {
                         { include 'Egeria*.http' }
                 from { "$rootProject.projectDir/open-metadata-implementation/view-services/project-manager" }
                         { include 'Egeria*.http' }
+                from { "$rootProject.projectDir/open-metadata-implementation/view-server-generic-services/classification-explorer" }
+                        { include 'Egeria*.http' }
                 from { "$rootProject.projectDir/open-metadata-implementation/view-services/classification-manager" }
                         { include 'Egeria*.http' }
                 from { "$rootProject.projectDir/open-metadata-implementation/view-server-generic-services/feedback-manager" }

diff --git a/...odpi/openmetadata/accessservices/assetmanager/client/exchange/GlossaryExchangeClient.java b/...odpi/openmetadata/accessservices/assetmanager/client/exchange/GlossaryExchangeClient.java
@@ -1328,7 +1328,7 @@ public void clearCategoryParent(String  userId,
         final String glossaryParentGUIDParameterName = "glossaryParentCategoryGUID";
         final String glossaryChildGUIDParameterName  = "glossaryChildCategoryGUID";
 
-        final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/glossaries/categories/{2}/subcategory/{3}/remove";
+        final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/glossaries/categories/{2}/subcategories/{3}/remove";
 
         super.clearRelationship(userId,
                                 assetManagerGUID,
@@ -3327,7 +3327,7 @@ public GlossaryTermElement undoGlossaryTermUpdate(String  userId,
         invalidParameterHandler.validateUserId(userId, methodName);
         invalidParameterHandler.validateGUID(glossaryTermGUID, glossaryGUIDParameterName, methodName);
 
-        final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/glossaries/terms/{2}/undo&forLineage={3}&forDuplicateProcessing={4}";
+        final String urlTemplate = serverPlatformURLRoot + urlTemplatePrefix + "/glossaries/terms/{2}/undo?forLineage={3}&forDuplicateProcessing={4}";
 
         GlossaryTermElementResponse response = restClient.callMyGlossaryTermPostRESTCall(methodName,
                                                                                          urlTemplate,

diff --git a/...i/openmetadata/accessservices/assetmanager/client/exchange/StewardshipExchangeClient.java b/...i/openmetadata/accessservices/assetmanager/client/exchange/StewardshipExchangeClient.java
@@ -2394,9 +2394,7 @@ public List<MetadataElementSummary> getElementsByClassification(String
     {
         final String methodName                 = "getElementsByClassification";
         final String classificationNameProperty = "classificationName";
-        final String findPropertiesProperty     = "findProperties";
 
-        invalidParameterHandler.validateObject(findProperties, findPropertiesProperty, methodName);
         invalidParameterHandler.validateUserId(userId, methodName);
         invalidParameterHandler.validateName(classificationName, classificationNameProperty, methodName);
 

diff --git a/...rg/odpi/openmetadata/accessservices/assetmanager/server/GlossaryExchangeRESTServices.java b/...rg/odpi/openmetadata/accessservices/assetmanager/server/GlossaryExchangeRESTServices.java
@@ -4251,7 +4251,7 @@ public GlossaryTermElementResponse undoGlossaryTermUpdate(String            serv
                                                                    glossaryTermGUID,
                                                                    forLineage,
                                                                    forDuplicateProcessing,
-                                                                  null,
+                                                                   new Date(),
                                                                    methodName));
             }
         }

diff --git a/...odpi/openmetadata/accessservices/assetmanager/server/StewardshipExchangeRESTServices.java b/...odpi/openmetadata/accessservices/assetmanager/server/StewardshipExchangeRESTServices.java
@@ -250,7 +250,7 @@ public ElementStubsResponse getDataFieldClassifiedElements(String
                                                                boolean                     forDuplicateProcessing,
                                                                FindByPropertiesRequestBody requestBody)
     {
-        final String methodName = "getConfidenceClassifiedElements";
+        final String methodName = "getDataFieldClassifiedElements";
 
         RESTCallToken token = restCallLogger.logRESTCall(serverName, userId, methodName);
 
@@ -264,7 +264,7 @@ public ElementStubsResponse getDataFieldClassifiedElements(String
 
             if (requestBody != null)
             {
-                if (requestBody.getProperties() instanceof LevelIdentifierProperties properties)
+                if (requestBody.getProperties() instanceof LevelIdentifierQueryProperties properties)
                 {
                     response.setElements(handler.getGovernanceActionClassifiedElements(userId,
                                                                                        OpenMetadataType.CONFIDENCE_CLASSIFICATION.typeName,
@@ -292,7 +292,7 @@ else if (requestBody.getProperties() == null)
                 }
                 else
                 {
-                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierProperties.class.getName(), methodName);
+                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierQueryProperties.class.getName(), methodName);
                 }
             }
             else
@@ -566,7 +566,7 @@ public ElementStubsResponse getConfidenceClassifiedElements(String
 
             if (requestBody != null)
             {
-                if (requestBody.getProperties() instanceof LevelIdentifierProperties properties)
+                if (requestBody.getProperties() instanceof LevelIdentifierQueryProperties properties)
                 {
                     response.setElements(handler.getGovernanceActionClassifiedElements(userId,
                                                                                        OpenMetadataType.CONFIDENCE_CLASSIFICATION.typeName,
@@ -594,7 +594,7 @@ else if (requestBody.getProperties() == null)
                 }
                 else
                 {
-                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierProperties.class.getName(), methodName);
+                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierQueryProperties.class.getName(), methodName);
                 }
             }
             else
@@ -867,7 +867,7 @@ public ElementStubsResponse getCriticalityClassifiedElements(String
 
             if (requestBody != null)
             {
-                if (requestBody.getProperties() instanceof LevelIdentifierProperties properties)
+                if (requestBody.getProperties() instanceof LevelIdentifierQueryProperties properties)
                 {
                     response.setElements(handler.getGovernanceActionClassifiedElements(userId,
                                                                                        OpenMetadataType.CRITICALITY_CLASSIFICATION.typeName,
@@ -895,7 +895,7 @@ else if (requestBody.getProperties() == null)
                 }
                 else
                 {
-                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierProperties.class.getName(), methodName);
+                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierQueryProperties.class.getName(), methodName);
                 }
             }
             else
@@ -1170,7 +1170,7 @@ public ElementStubsResponse getConfidentialityClassifiedElements(String
 
             if (requestBody != null)
             {
-                if (requestBody.getProperties() instanceof LevelIdentifierProperties properties)
+                if (requestBody.getProperties() instanceof LevelIdentifierQueryProperties properties)
                 {
                     response.setElements(handler.getGovernanceActionClassifiedElements(userId,
                                                                                        OpenMetadataType.CONFIDENTIALITY_CLASSIFICATION.typeName,
@@ -1198,7 +1198,7 @@ else if (requestBody.getProperties() == null)
                 }
                 else
                 {
-                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierProperties.class.getName(), methodName);
+                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierQueryProperties.class.getName(), methodName);
                 }
             }
             else
@@ -1468,7 +1468,7 @@ public ElementStubsResponse getRetentionClassifiedElements(String
 
             if (requestBody != null)
             {
-                if (requestBody.getProperties() instanceof LevelIdentifierProperties properties)
+                if (requestBody.getProperties() instanceof LevelIdentifierQueryProperties properties)
                 {
                     response.setElements(handler.getRetentionClassifiedElements(userId,
                                                                                 properties.getReturnSpecificLevel(),
@@ -1494,7 +1494,7 @@ else if (requestBody.getProperties() == null)
                 }
                 else
                 {
-                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierProperties.class.getName(), methodName);
+                    restExceptionHandler.handleInvalidPropertiesObject(LevelIdentifierQueryProperties.class.getName(), methodName);
                 }
             }
             else

diff --git a/...c/main/java/org/odpi/openmetadata/accessservices/assetowner/api/AssetReviewInterface.java b/...c/main/java/org/odpi/openmetadata/accessservices/assetowner/api/AssetReviewInterface.java
@@ -17,7 +17,7 @@
 import org.odpi.openmetadata.frameworks.connectors.properties.AssetUniverse;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.ElementStub;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.Annotation;
-import org.odpi.openmetadata.frameworks.surveyaction.properties.AnnotationStatus;
+import org.odpi.openmetadata.frameworks.openmetadata.enums.AnnotationStatus;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.SurveyReport;
 
 import java.util.Date;

diff --git a/...ient/src/main/java/org/odpi/openmetadata/accessservices/assetowner/client/AssetOwner.java b/...ient/src/main/java/org/odpi/openmetadata/accessservices/assetowner/client/AssetOwner.java
@@ -19,7 +19,6 @@
 import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
 import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException;
 import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
-import org.odpi.openmetadata.frameworks.connectors.properties.AssetUniverse;
 import org.odpi.openmetadata.frameworks.connectors.properties.beans.Connection;
 import org.odpi.openmetadata.frameworks.openmetadata.properties.governance.RetentionClassificationProperties;
 import org.odpi.openmetadata.frameworks.openmetadata.properties.schema.SchemaAttributeProperties;
@@ -37,7 +36,7 @@
 import org.odpi.openmetadata.frameworks.openmetadata.properties.schema.DataFieldValuesProperties;
 import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.Annotation;
-import org.odpi.openmetadata.frameworks.surveyaction.properties.AnnotationStatus;
+import org.odpi.openmetadata.frameworks.openmetadata.enums.AnnotationStatus;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.SurveyReport;
 
 import java.util.Date;

diff --git a/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java b/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java
@@ -29,7 +29,7 @@
 import org.odpi.openmetadata.frameworks.openmetadata.properties.assets.AssetProperties;
 import org.odpi.openmetadata.frameworks.openmetadata.properties.assets.DataContentForDataSetProperties;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.Annotation;
-import org.odpi.openmetadata.frameworks.surveyaction.properties.AnnotationStatus;
+import org.odpi.openmetadata.frameworks.openmetadata.enums.AnnotationStatus;
 import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty;
 import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.SurveyReport;

diff --git a/...ager-connectors/unity-catalog-connectors/UnityCatalog-demo-onboarding-clinical-trial.http b/...ager-connectors/unity-catalog-connectors/UnityCatalog-demo-onboarding-clinical-trial.http
@@ -262,7 +262,7 @@ Content-Type: application/json
 ###
 # @name Get GUID for Project
 
-POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/classification-manager/elements/by-exact-property-value?startFrom=0&pageSize=10
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/classification-explorer/elements/by-exact-property-value?startFrom=0&pageSize=10
 Authorization: Bearer {{token}}
 Content-Type: application/json
 
@@ -414,7 +414,7 @@ Content-Type: application/json
 #
 # https://egeria-project.org/types/
 
-POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/classification-manager/elements/by-exact-property-value?startFrom=0&pageSize=10
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/classification-explorer/elements/by-exact-property-value?startFrom=0&pageSize=10
 Authorization: Bearer {{token}}
 Content-Type: application/json
 

diff --git a/...va/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyService.java b/...va/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyService.java
@@ -27,7 +27,7 @@
 import org.odpi.openmetadata.frameworks.surveyaction.SurveyOpenMetadataStore;
 import org.odpi.openmetadata.frameworks.surveyaction.controls.AnalysisStep;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.Annotation;
-import org.odpi.openmetadata.frameworks.surveyaction.properties.AnnotationStatus;
+import org.odpi.openmetadata.frameworks.openmetadata.enums.AnnotationStatus;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.ResourceProfileAnnotation;
 import org.odpi.openmetadata.frameworks.surveyaction.properties.SchemaAnalysisAnnotation;
 

diff --git a/...rg/odpi/openmetadata/adminservices/configuration/registration/ViewServiceDescription.java b/...rg/odpi/openmetadata/adminservices/configuration/registration/ViewServiceDescription.java
@@ -236,7 +236,7 @@ public enum ViewServiceDescription
                             "Classification Manager OMVS",
                             "classification-manager",
                             "Maintain classifications and relationships used to organize open metadata elements.",
-                            "https://egeria-project.org/services/omvs/valid-metadata/overview/",
+                            "https://egeria-project.org/services/omvs/classification-manager/overview/",
                             AccessServiceDescription.ASSET_MANAGER_OMAS.getAccessServiceFullName()),
 
     /**
@@ -376,6 +376,17 @@ public enum ViewServiceDescription
                           "https://egeria-project.org/services/omvs/solution-architect/overview/",
                           AccessServiceDescription.DIGITAL_ARCHITECTURE_OMAS.getAccessServiceFullName()),
 
+    /**
+     * Retrieve elements based on type or the classifications/relationships attached to these metadata elements.
+     */
+    CLASSIFICATION_EXPLORER (830,
+                            ComponentDevelopmentStatus.STABLE,
+                            "Classification Explorer",
+                            "Classification Explorer OMVS",
+                            "classification-explorer",
+                            "Retrieve elements based on type or the classifications/relationships attached to these metadata elements",
+                            "https://egeria-project.org/services/omvs/classification-explorer/overview/",
+                            AccessServiceDescription.ASSET_CONSUMER_OMAS.getAccessServiceFullName()),
     ;
 
 

diff --git a/...main/java/org/odpi/openmetadata/commonservices/ffdc/rest/AnnotationStatusRequestBody.java b/...main/java/org/odpi/openmetadata/commonservices/ffdc/rest/AnnotationStatusRequestBody.java
@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import org.odpi.openmetadata.frameworks.surveyaction.properties.AnnotationStatus;
+import org.odpi.openmetadata.frameworks.openmetadata.enums.AnnotationStatus;
 
 import java.util.Objects;