Merge pull request #8083 from mandy-chessell/oak2024

Remove discovery engine and add todo support
odpi · Mar 10, 2024 · b0b2109 · b0b2109
2 parents 04abfee + 5adddbe
commit b0b2109
Show file tree

Hide file tree

Showing 235 changed files with 4,915 additions and 30,882 deletions.
diff --git a/content-packs/OpenConnectorsArchive.json b/content-packs/OpenConnectorsArchive.json
diff --git a/content-packs/OpenConnectorsArchive.omarchive b/content-packs/OpenConnectorsArchive.omarchive
diff --git a/open-metadata-distribution/omag-server-platform/build.gradle b/open-metadata-distribution/omag-server-platform/build.gradle
@@ -64,7 +64,6 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:dev-ops:dev-ops-client')
     implementation project(':open-metadata-implementation:access-services:digital-architecture:digital-architecture-client')
     implementation project(':open-metadata-implementation:access-services:digital-service:digital-service-client')
-    implementation project(':open-metadata-implementation:access-services:discovery-engine:discovery-engine-client')
     implementation project(':open-metadata-implementation:access-services:governance-engine:governance-engine-client')
     implementation project(':open-metadata-implementation:access-services:governance-server:governance-server-client')
     implementation project(':open-metadata-implementation:access-services:governance-program:governance-program-client')
@@ -74,7 +73,7 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:software-developer:software-developer-client')
     implementation project(':open-metadata-implementation:access-services:subject-area:subject-area-client')
     implementation project(':open-metadata-implementation:engine-services:repository-governance:repository-governance-client')
-    implementation project(':open-metadata-implementation:engine-services:asset-analysis:asset-analysis-client')
+    implementation project(':open-metadata-implementation:engine-services:survey-action:survey-action-client')
     implementation project(':open-metadata-implementation:engine-services:governance-action:governance-action-client')
     implementation project(':open-metadata-implementation:integration-services:analytics-integrator:analytics-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:api-integrator:api-integrator-client')

diff --git a/open-metadata-distribution/open-metadata-assemblies/build.gradle b/open-metadata-distribution/open-metadata-assemblies/build.gradle
@@ -74,7 +74,6 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:dev-ops:dev-ops-client')
     implementation project(':open-metadata-implementation:access-services:digital-architecture:digital-architecture-client')
     implementation project(':open-metadata-implementation:access-services:digital-service:digital-service-client')
-    implementation project(':open-metadata-implementation:access-services:discovery-engine:discovery-engine-client')
     implementation project(':open-metadata-implementation:access-services:governance-engine:governance-engine-client')
     implementation project(':open-metadata-implementation:access-services:governance-server:governance-server-client')
     implementation project(':open-metadata-implementation:access-services:governance-program:governance-program-client')
@@ -84,7 +83,7 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:software-developer:software-developer-client')
     implementation project(':open-metadata-implementation:access-services:subject-area:subject-area-client')
     implementation project(':open-metadata-implementation:engine-services:repository-governance:repository-governance-client')
-    implementation project(':open-metadata-implementation:engine-services:asset-analysis:asset-analysis-client')
+    implementation project(':open-metadata-implementation:engine-services:survey-action:survey-action-client')
     implementation project(':open-metadata-implementation:engine-services:governance-action:governance-action-client')
     implementation project(':open-metadata-implementation:integration-services:analytics-integrator:analytics-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:api-integrator:api-integrator-client')

diff --git a/open-metadata-implementation/access-services/README.md b/open-metadata-implementation/access-services/README.md
@@ -99,11 +99,6 @@ definition and management of a digital service through concept to deployment.
 
   The Digital Service OMAS provides services for a managing the lifecycle of a Digital Service and any associated products.
 
-* **[discovery-engine](discovery-engine)** - manage metadata for metadata discovery services.
-
-  The Discovery Engine OMAS provides an API for a discovery engine to access and store
-metadata about a digital resource, its schema and the data it stores.
-
 * **[governance-engine](governance-engine)** - manage metadata for an operational governance engine.
 
   The Governance Engine OMAS provides APIs and events that retrieve and

diff --git a/open-metadata-implementation/access-services/asset-owner/asset-owner-api/build.gradle b/open-metadata-implementation/access-services/asset-owner/asset-owner-api/build.gradle
@@ -9,9 +9,9 @@ dependencies {
     implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
     implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
     implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
+    implementation project(':open-metadata-implementation:frameworks:survey-action-framework')
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation 'com.fasterxml.jackson.core:jackson-databind'
-    implementation project(':open-metadata-implementation:frameworks:open-discovery-framework')
     testImplementation project(':open-metadata-test:open-metadata-ut')
     testImplementation 'org.testng:testng'
 }

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
@@ -16,9 +16,9 @@
 import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
 import org.odpi.openmetadata.frameworks.connectors.properties.AssetUniverse;
 import org.odpi.openmetadata.frameworks.connectors.properties.beans.ElementStub;
-import org.odpi.openmetadata.frameworks.discovery.properties.Annotation;
-import org.odpi.openmetadata.frameworks.discovery.properties.AnnotationStatus;
-import org.odpi.openmetadata.frameworks.discovery.properties.DiscoveryAnalysisReport;
+import org.odpi.openmetadata.frameworks.surveyaction.properties.Annotation;
+import org.odpi.openmetadata.frameworks.surveyaction.properties.AnnotationStatus;
+import org.odpi.openmetadata.frameworks.surveyaction.properties.SurveyReport;
 
 import java.util.Date;
 import java.util.List;
@@ -195,23 +195,23 @@ Connector getConnectorToAsset(String  userId,
 
 
     /**
-     * Return the discovery analysis reports about the asset.
+     * Return the survey reports about the asset.
      *
      * @param userId calling user
      * @param assetGUID unique identifier of the asset
      * @param startingFrom position in the list (used when there are so many reports that paging is needed
      * @param maximumResults maximum number of elements to return an this call
-     * @return list of discovery analysis reports
+     * @return list of survey reports
      * @throws InvalidParameterException one of the parameters is null or invalid.
      * @throws UserNotAuthorizedException user not authorized to issue this request.
      * @throws PropertyServerException there was a problem that occurred within the property server.
      */
-    List<DiscoveryAnalysisReport>   getDiscoveryAnalysisReports(String  userId,
-                                                                String  assetGUID,
-                                                                int     startingFrom,
-                                                                int     maximumResults) throws InvalidParameterException,
-                                                                                               UserNotAuthorizedException,
-                                                                                               PropertyServerException;
+    List<SurveyReport>   getSurveyReports(String  userId,
+                                          String  assetGUID,
+                                          int     startingFrom,
+                                          int     maximumResults) throws InvalidParameterException,
+                                                                         UserNotAuthorizedException,
+                                                                         PropertyServerException;
 
 
     /**
@@ -246,7 +246,7 @@ Map<String, String> getTypesOfAnnotationWithDescriptions(String userId) throws I
      * Return the annotations linked directly to the report.
      *
      * @param userId identifier of calling user
-     * @param discoveryReportGUID identifier of the discovery request.
+     * @param surveyReportGUID identifier of the survey report.
      * @param annotationStatus status of the desired annotations - null means all statuses.
      * @param startingFrom initial position in the stored list.
      * @param maximumResults maximum number of definitions to return on this call.
@@ -257,11 +257,11 @@ Map<String, String> getTypesOfAnnotationWithDescriptions(String userId) throws I
      * @throws UserNotAuthorizedException user not authorized to issue this request.
      * @throws PropertyServerException there was a problem that occurred within the property server.
      */
-    List<Annotation> getDiscoveryReportAnnotations(String           userId,
-                                                   String           discoveryReportGUID,
-                                                   AnnotationStatus annotationStatus,
-                                                   int              startingFrom,
-                                                   int              maximumResults) throws InvalidParameterException,
+    List<Annotation> getSurveyReportAnnotations(String           userId,
+                                                String           surveyReportGUID,
+                                                AnnotationStatus annotationStatus,
+                                                int              startingFrom,
+                                                int              maximumResults) throws InvalidParameterException,
                                                                                            UserNotAuthorizedException,
                                                                                            PropertyServerException;
 

diff --git a/...dpi/openmetadata/accessservices/assetowner/properties/GovernanceDefinitionProperties.java b/...dpi/openmetadata/accessservices/assetowner/properties/GovernanceDefinitionProperties.java
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,7 +47,7 @@
                 @JsonSubTypes.Type(value = LicenseTypeProperties.class, name = "LicenseTypeProperties"),
                 @JsonSubTypes.Type(value = CertificationTypeProperties.class, name = "CertificationTypeProperties"),
         })
-public class GovernanceDefinitionProperties implements Serializable
+public class GovernanceDefinitionProperties
 {
     private String                           documentIdentifier   = null;
     private Map<String, String>              additionalProperties = null;

diff --git a/...ain/java/org/odpi/openmetadata/accessservices/assetowner/rest/AnnotationListResponse.java b/...ain/java/org/odpi/openmetadata/accessservices/assetowner/rest/AnnotationListResponse.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.discovery.properties.Annotation;
+import org.odpi.openmetadata.frameworks.surveyaction.properties.Annotation;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,8 +25,6 @@
 @JsonIgnoreProperties(ignoreUnknown=true)
 public class AnnotationListResponse extends AssetOwnerOMASAPIResponse
 {
-    private static final long    serialVersionUID = 1L;
-
     private List<Annotation> annotations = null;
 
     /**

diff --git a/...rc/main/java/org/odpi/openmetadata/accessservices/assetowner/rest/AnnotationResponse.java b/...rc/main/java/org/odpi/openmetadata/accessservices/assetowner/rest/AnnotationResponse.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.discovery.properties.Annotation;
+import org.odpi.openmetadata.frameworks.surveyaction.properties.Annotation;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -24,8 +24,6 @@
 @JsonIgnoreProperties(ignoreUnknown=true)
 public class AnnotationResponse extends AssetOwnerOMASAPIResponse
 {
-    private static final long    serialVersionUID = 1L;
-
     private Annotation annotation = null;
 
     /**

diff --git a/...odpi/openmetadata/accessservices/assetowner/rest/DiscoveryAnalysisReportListResponse.java b/...odpi/openmetadata/accessservices/assetowner/rest/DiscoveryAnalysisReportListResponse.java
diff --git a/...a/org/odpi/openmetadata/accessservices/assetowner/rest/EmbeddedConnectionRequestBody.java b/...a/org/odpi/openmetadata/accessservices/assetowner/rest/EmbeddedConnectionRequestBody.java
@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -21,7 +20,7 @@
 @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown=true)
-public class EmbeddedConnectionRequestBody implements Serializable
+public class EmbeddedConnectionRequestBody
 {
     protected int                 position           = 0;
     protected String              displayName        = null;

diff --git a/...src/main/java/org/odpi/openmetadata/accessservices/assetowner/rest/StatusRequestBody.java b/...src/main/java/org/odpi/openmetadata/accessservices/assetowner/rest/StatusRequestBody.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.discovery.properties.AnnotationStatus;
+import org.odpi.openmetadata.frameworks.surveyaction.properties.AnnotationStatus;
 
 import java.util.Objects;