Merge pull request #8394 from mandy-chessell/oak2024

Split up CoreContentPack
odpi · Sep 22, 2024 · 462635b · 462635b
2 parents 85da3dc + 16da44d
commit 462635b
Show file tree

Hide file tree

Showing 154 changed files with 5,484 additions and 9,080 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/application.properties b/application.properties
@@ -12,8 +12,8 @@ server.port=9443
 
 ###############################################
 ### Set up the configuration document store the OMAG Server Platform
-### The values below will set up the clear text config document store
-### (the default is the encrypted config document store).
+### The values below will set up the clear text config document store (default)
+### Change the class name to change the implementation of the configuration document store
 ################################################
 platform.configstore.provider=org.odpi.openmetadata.adapters.adminservices.configurationstore.file.FileBasedServerConfigStoreProvider
 platform.configstore.endpoint=data/servers/{0}/config/{0}.config

diff --git a/container.application.properties b/container.application.properties
@@ -12,8 +12,8 @@ server.port=9443
 
 ###############################################
 ### Set up the configuration document store the OMAG Server Platform
-### The values below will set up the clear text config document store
-### (the default is the encrypted config document store).
+### The values below will set up the clear text config document store (default)
+### Change the class name to change the implementation of the configuration document store
 ################################################
 platform.configstore.provider=org.odpi.openmetadata.adapters.adminservices.configurationstore.file.FileBasedServerConfigStoreProvider
 platform.configstore.endpoint=data/servers/{0}/config/{0}.config

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/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
@@ -37,7 +37,6 @@ dependencies {
     implementation project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-audit-integration-connector')
-    implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors')
@@ -211,7 +210,6 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:csv-lineage-import-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-audit-integration-connector').jar }
-                from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors').jar }

diff --git a/...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/client/AssetConsumer.java b/...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/client/AssetConsumer.java
@@ -8,6 +8,7 @@
 import org.odpi.openmetadata.accessservices.assetconsumer.api.AssetConsumerLoggingInterface;
 import org.odpi.openmetadata.accessservices.assetconsumer.api.AssetConsumerTaggingInterface;
 import org.odpi.openmetadata.accessservices.assetconsumer.client.rest.AssetConsumerRESTClient;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.commonservices.ffdc.rest.*;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.AssetElement;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.MeaningElement;
@@ -53,7 +54,7 @@ public class AssetConsumer extends ConnectedAssetClientBase implements AssetCons
 {
     private final AssetConsumerRESTClient restClient;               /* Initialized in constructor */
 
-    private static final String  serviceURLName = "asset-consumer";
+    private static final String  serviceURLName = AccessServiceDescription.ASSET_CONSUMER_OMAS.getAccessServiceURLMarker();
 
     /**
      * Create a new client with no authentication embedded in the HTTP request.
@@ -529,28 +530,6 @@ public List<String> getAssetsByToken(String userId,
     }
 
 
-    /**
-     * Returns a comprehensive collection of properties about the requested asset.
-     *
-     * @param userId         userId of user making request.
-     * @param assetGUID      unique identifier for asset.
-     *
-     * @return a comprehensive collection of properties about the asset.
-     *
-     * @throws InvalidParameterException one of the parameters is null or invalid.
-     * @throws PropertyServerException there is a problem retrieving the asset properties from the property servers.
-     * @throws UserNotAuthorizedException the requesting user is not authorized to issue this request.
-     */
-    @Override
-    public AssetUniverse getAssetProperties(String userId,
-                                            String assetGUID) throws InvalidParameterException,
-                                                                     PropertyServerException,
-                                                                     UserNotAuthorizedException
-    {
-        return super.getAssetProperties(serviceURLName, userId, assetGUID);
-    }
-
-
     /*
      * ===============================================
      * AssetConsumerFeedbackInterface

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
@@ -6,6 +6,7 @@
 import org.odpi.openmetadata.accessservices.assetowner.api.*;
 import org.odpi.openmetadata.accessservices.assetowner.client.rest.AssetOwnerRESTClient;
 import org.odpi.openmetadata.accessservices.assetowner.rest.TemplateRequestBody;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.commonservices.ffdc.rest.*;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.RelationshipElement;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.*;
@@ -34,6 +35,7 @@
 import org.odpi.openmetadata.frameworks.openmetadata.properties.governance.GovernanceClassificationProperties;
 import org.odpi.openmetadata.frameworks.openmetadata.properties.schema.DataFieldQueryProperties;
 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.surveyaction.properties.SurveyReport;
@@ -58,8 +60,8 @@ public class AssetOwner extends AssetOwnerBaseClient implements AssetKnowledgeIn
                                                                 AssetReviewInterface,
                                                                 AssetDecommissioningInterface
 {
-    private static final String  serviceURLName = "asset-owner";
-    private static final String  defaultAssetType = "Asset";
+    private static final String  serviceURLName = AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceURLMarker();
+    private static final String  defaultAssetType = OpenMetadataType.ASSET.typeName;
 
 
     /**
@@ -158,28 +160,6 @@ public AssetOwner(String               serverName,
     }
 
 
-    /**
-     * Returns a comprehensive collection of properties about the requested asset.
-     *
-     * @param userId         userId of user making request.
-     * @param assetGUID      unique identifier for asset.
-     *
-     * @return a comprehensive collection of properties about the asset.
-     *
-     * @throws InvalidParameterException one of the parameters is null or invalid.
-     * @throws PropertyServerException there is a problem retrieving the asset properties from the property servers).
-     * @throws UserNotAuthorizedException the requesting user is not authorized to issue this request.
-     */
-    @Override
-    public AssetUniverse getAssetProperties(String userId,
-                                            String assetGUID) throws InvalidParameterException,
-                                                                     PropertyServerException,
-                                                                     UserNotAuthorizedException
-    {
-        return super.getAssetProperties(serviceURLName, userId, assetGUID);
-    }
-
-
     /**
      * Return the asset subtype names.
      *

diff --git a/...n/java/org/odpi/openmetadata/accessservices/assetowner/client/SurveyAssetStoreClient.java b/...n/java/org/odpi/openmetadata/accessservices/assetowner/client/SurveyAssetStoreClient.java
@@ -77,9 +77,7 @@ public Connector getConnectorByConnection(Connection connection) throws InvalidP
     @Override
     public AssetUniverse getAssetProperties() throws InvalidParameterException, PropertyServerException, UserNotAuthorizedException
     {
-        return connectedAssetClient.getAssetProperties(AccessServiceDescription.ASSET_OWNER_OMAS.getAccessServiceFullName(),
-                                                       userId,
-                                                       assetGUID);
+        return connectedAssetClient.getAssetProperties(userId, assetGUID);
     }
 
 

diff --git a/...openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java b/...openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java
@@ -4,6 +4,7 @@
 package org.odpi.openmetadata.adapters.connectors.postgres.catalog;
 
 import org.odpi.openmetadata.adapters.connectors.postgres.controls.PostgresConfigurationProperty;
+import org.odpi.openmetadata.adapters.connectors.postgres.controls.PostgresDeployedImplementationType;
 import org.odpi.openmetadata.adapters.connectors.postgres.ffdc.PostgresAuditCode;
 import org.odpi.openmetadata.adapters.connectors.resource.jdbc.JDBCResourceConnector;
 import org.odpi.openmetadata.adapters.connectors.resource.jdbc.JDBCResourceConnectorProvider;
@@ -20,7 +21,6 @@
 import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
 import org.odpi.openmetadata.frameworks.governanceaction.properties.OpenMetadataElement;
 import org.odpi.openmetadata.frameworks.governanceaction.properties.RelatedMetadataElement;
-import org.odpi.openmetadata.frameworks.openmetadata.refdata.DeployedImplementationType;
 import org.odpi.openmetadata.frameworks.governanceaction.search.ElementProperties;
 import org.odpi.openmetadata.frameworks.governanceaction.search.PropertyHelper;
 import org.odpi.openmetadata.frameworks.integration.connectors.CatalogTargetIntegrator;
@@ -130,7 +130,7 @@ public void integrateCatalogTarget(RequestedCatalogTarget requestedCatalogTarget
     {
         final String methodName = "integrateCatalogTarget";
 
-        if (DeployedImplementationType.POSTGRESQL_SERVER.getAssociatedTypeName().equals(requestedCatalogTarget.getCatalogTargetElement().getType().getTypeName()))
+        if (PostgresDeployedImplementationType.POSTGRESQL_SERVER.getAssociatedTypeName().equals(requestedCatalogTarget.getCatalogTargetElement().getType().getTypeName()))
         {
             String databaseServerGUID = requestedCatalogTarget.getCatalogTargetElement().getGUID();
             String databaseManagerGUID = this.getDatabaseManagerGUID(databaseServerGUID, requestedCatalogTarget.getCatalogTargetElement().getUniqueName());
@@ -163,7 +163,7 @@ public void integrateCatalogTarget(RequestedCatalogTarget requestedCatalogTarget
         {
             super.throwWrongTypeOfAsset(requestedCatalogTarget.getCatalogTargetElement().getGUID(),
                                         requestedCatalogTarget.getCatalogTargetElement().getType().getTypeName(),
-                                        DeployedImplementationType.POSTGRESQL_SERVER.getAssociatedTypeName(),
+                                        PostgresDeployedImplementationType.POSTGRESQL_SERVER.getAssociatedTypeName(),
                                         connectorName,
                                         methodName);
         }
@@ -429,9 +429,9 @@ private   void catalogDatabase(String              databaseName,
 
                     elementProperties = propertyHelper.addStringProperty(elementProperties,
                                                                          OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.name,
-                                                                         DeployedImplementationType.POSTGRESQL_DATABASE.getDeployedImplementationType());
+                                                                         PostgresDeployedImplementationType.POSTGRESQL_DATABASE.getDeployedImplementationType());
 
-                    String databaseGUID = openMetadataAccess.createMetadataElementInStore(DeployedImplementationType.POSTGRESQL_DATABASE.getAssociatedTypeName(),
+                    String databaseGUID = openMetadataAccess.createMetadataElementInStore(PostgresDeployedImplementationType.POSTGRESQL_DATABASE.getAssociatedTypeName(),
                                                                                           ElementStatus.ACTIVE,
                                                                                           null,
                                                                                           databaseServerGUID,

diff --git a/.../openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationProvider.java b/.../openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationProvider.java
@@ -4,13 +4,15 @@
 package org.odpi.openmetadata.adapters.connectors.postgres.catalog;
 
 import org.odpi.openmetadata.adapters.connectors.postgres.controls.PostgresConfigurationProperty;
+import org.odpi.openmetadata.adapters.connectors.postgres.controls.PostgresDeployedImplementationType;
 import org.odpi.openmetadata.adapters.connectors.postgres.controls.PostgresTarget;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent;
 import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus;
 import org.odpi.openmetadata.frameworks.connectors.controls.SupportedTechnologyType;
 import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType;
 import org.odpi.openmetadata.frameworks.openmetadata.refdata.DeployedImplementationType;
 import org.odpi.openmetadata.frameworks.integration.connectors.IntegrationConnectorProvider;
+import org.odpi.openmetadata.frameworks.openmetadata.refdata.DeployedImplementationTypeDefinition;
 
 /**
  * PostgresServerIntegrationProvider is the OCF connector provider for the PostgreSQL database server integration connector.
@@ -85,7 +87,7 @@ public PostgresServerIntegrationProvider()
 
         super.setConnectorComponentDescription(componentDescription);
 
-        super.supportedTechnologyTypes = SupportedTechnologyType.getSupportedTechnologyTypes(new DeployedImplementationType[]{DeployedImplementationType.POSTGRESQL_SERVER});
+        super.supportedTechnologyTypes = SupportedTechnologyType.getSupportedTechnologyTypes(new DeployedImplementationTypeDefinition[]{PostgresDeployedImplementationType.POSTGRESQL_SERVER});
         super.catalogTargets = PostgresTarget.getPostgresServerCatalogTargetTypes();
         super.supportedConfigurationProperties = PostgresConfigurationProperty.getPostgresServerConfigurationPropertyTypes();
     }