odpi#5399 merge with master

Signed-off-by: David Radley <david_radley@uk.ibm.com>
davidradl · Jul 13, 2021 · cd9895f · cd9895f
2 parents dd3721b + d5ce31a
commit cd9895f
Show file tree

Hide file tree

Showing 345 changed files with 31,887 additions and 2,861 deletions.
diff --git a/open-metadata-distribution/open-metadata-assemblies/build.gradle b/open-metadata-distribution/open-metadata-assemblies/build.gradle
@@ -69,12 +69,16 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:subject-area:subject-area-client')
     implementation project(':open-metadata-implementation:engine-services:asset-analysis:asset-analysis-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')
     implementation project(':open-metadata-implementation:integration-services:catalog-integrator:catalog-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:files-integrator:files-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:database-integrator:database-integrator-client')
+    implementation project(':open-metadata-implementation:integration-services:display-integrator:display-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:lineage-integrator:lineage-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:organization-integrator:organization-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:security-integrator:security-integrator-client')
+    implementation project(':open-metadata-implementation:integration-services:topic-integrator:topic-integrator-client')
     implementation project(':open-metadata-implementation:governance-servers:engine-host-services:engine-host-services-client')
     implementation project(':open-metadata-implementation:governance-servers:integration-daemon-services:integration-daemon-services-client')
     implementation project(':open-metadata-implementation:governance-servers:open-lineage-services:open-lineage-services-client')

diff --git a/open-metadata-distribution/open-metadata-assemblies/pom.xml b/open-metadata-distribution/open-metadata-assemblies/pom.xml
@@ -250,6 +250,14 @@
             <groupId>org.odpi.egeria</groupId>
             <artifactId>governance-action-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>analytics-integrator-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>api-integrator-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>catalog-integrator-client</artifactId>
@@ -258,6 +266,10 @@
             <groupId>org.odpi.egeria</groupId>
             <artifactId>database-integrator-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>display-integrator-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>files-integrator-client</artifactId>
@@ -274,6 +286,10 @@
             <groupId>org.odpi.egeria</groupId>
             <artifactId>security-integrator-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>topic-integrator-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>engine-host-services-client</artifactId>

diff --git a/open-metadata-distribution/open-metadata-packages/open-metadata-client-package/pom.xml b/open-metadata-distribution/open-metadata-packages/open-metadata-client-package/pom.xml
@@ -123,6 +123,14 @@
             <groupId>org.odpi.egeria</groupId>
             <artifactId>subject-area-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>analytics-integrator-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>api-integrator-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>catalog-integrator-client</artifactId>
@@ -131,6 +139,10 @@
             <groupId>org.odpi.egeria</groupId>
             <artifactId>database-integrator-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>display-integrator-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>files-integrator-client</artifactId>
@@ -147,6 +159,10 @@
             <groupId>org.odpi.egeria</groupId>
             <artifactId>security-integrator-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>topic-integrator-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>integration-daemon-services-client</artifactId>

diff --git a/...g/odpi/openmetadata/accessservices/analyticsmodeling/ffdc/AnalyticsModelingErrorCode.java b/...g/odpi/openmetadata/accessservices/analyticsmodeling/ffdc/AnalyticsModelingErrorCode.java
@@ -184,6 +184,11 @@ public enum AnalyticsModelingErrorCode implements ExceptionMessageSet {
 			"User {0} is not authorized to perform operation: {1}",
 			"The system is unable to process the request.",
 			"Review the user permissions to resolve the issue and repeat request."),
+	FAILED_UPDATE_UNKNOWN_ARTIFACT(
+			"OMAS-ANALYTICS-MODELING-031", 
+			"User {0} failed to update artifact {1}. The artifact is unknown.",
+			"The system is unable to process the request.",
+			"Confirm the artifact exists."),
     UNEXPECTED_EXCEPTION(400, "OMAG-ANALYTICS-MODELING-499",
             "An unexpected {0} exception was caught by {1}; error message was {2}",
             "The system is unable to process the request and has returned an exception to the caller.",

diff --git a/...enmetadata/accessservices/analyticsmodeling/synchronization/AnalyticsArtifactHandler.java b/...enmetadata/accessservices/analyticsmodeling/synchronization/AnalyticsArtifactHandler.java
@@ -1065,6 +1065,13 @@ private boolean updateAssetAttributes(AnalyticsAsset asset, boolean bModuleAsset
 		AnalyticsAsset assetRepo = assetHandler.getBeanByQualifiedName(
 				ctx.getUserId(), assetTypeGuid, assetTypeName, asset.getQualifiedName(), Constants.QUALIFIED_NAME, methodName);
 
+		if (assetRepo == null) {
+		    throw new AnalyticsModelingCheckedException(
+		    		AnalyticsModelingErrorCode.FAILED_UPDATE_UNKNOWN_ARTIFACT.getMessageDefinition(ctx.getUserId(), asset.getUid()),
+					this.getClass().getSimpleName(),
+					methodName);
+		}
+
 		asset.setGuid(assetRepo.getGuid());	// asset is new definition of the assetRepo
 
 		// update relationships for referenced assets

diff --git a/...in/java/org/odpi/openmetadata/accessservices/assetconsumer/converters/AssetConverter.java b/...in/java/org/odpi/openmetadata/accessservices/assetconsumer/converters/AssetConverter.java
@@ -11,6 +11,7 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
 
@@ -46,6 +47,7 @@ public AssetConverter(OMRSRepositoryHelper repositoryHelper,
      * @throws PropertyServerException there is a problem instantiating the bean
      */
     @Override
+    @SuppressWarnings(value="deprecation")
     public B getNewBean(Class<B>     beanClass,
                         EntityDetail entity,
                         String       methodName) throws PropertyServerException
@@ -55,7 +57,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof AssetElement)
             {
@@ -125,7 +127,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetconsumer/converters/CommentConverter.java b/.../java/org/odpi/openmetadata/accessservices/assetconsumer/converters/CommentConverter.java
@@ -11,6 +11,7 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
 
@@ -56,7 +57,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof CommentElement)
             {
@@ -105,7 +106,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/...a/org/odpi/openmetadata/accessservices/assetconsumer/converters/InformalTagConverter.java b/...a/org/odpi/openmetadata/accessservices/assetconsumer/converters/InformalTagConverter.java
@@ -11,6 +11,8 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
+
 
 /**
  * InformalTagConverter provides common methods for transferring relevant properties from an Open Metadata Repository Services (OMRS)
@@ -55,7 +57,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof InformalTagElement)
             {
@@ -95,7 +97,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/...ain/java/org/odpi/openmetadata/accessservices/assetconsumer/converters/LikeConverter.java b/...ain/java/org/odpi/openmetadata/accessservices/assetconsumer/converters/LikeConverter.java
@@ -9,6 +9,8 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
+
 
 /**
  * LikeConverter provides common methods for transferring relevant properties from an Open Metadata Repository Services (OMRS)
@@ -53,7 +55,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof LikeElement)
             {
@@ -85,7 +87,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetconsumer/converters/MeaningConverter.java b/.../java/org/odpi/openmetadata/accessservices/assetconsumer/converters/MeaningConverter.java
@@ -13,6 +13,7 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
 
@@ -57,7 +58,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof MeaningElement)
             {
@@ -97,7 +98,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/...n/java/org/odpi/openmetadata/accessservices/assetconsumer/converters/RatingConverter.java b/...n/java/org/odpi/openmetadata/accessservices/assetconsumer/converters/RatingConverter.java
@@ -11,6 +11,7 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
 
@@ -56,7 +57,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof RatingElement)
             {
@@ -95,7 +96,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/...ain/java/org/odpi/openmetadata/accessservices/assetmanager/converters/AssetConverter.java b/...ain/java/org/odpi/openmetadata/accessservices/assetmanager/converters/AssetConverter.java
@@ -11,6 +11,7 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 
@@ -55,7 +56,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof DataAssetElement)
             {
@@ -93,7 +94,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/...a/org/odpi/openmetadata/accessservices/assetmanager/converters/AssetManagerConverter.java b/...a/org/odpi/openmetadata/accessservices/assetmanager/converters/AssetManagerConverter.java
@@ -11,6 +11,8 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
+
 /**
  * AssetManagerConverter transfers the relevant properties from an Open Metadata Repository Services (OMRS)
  * EntityDetail object into a SoftwareServerCapabilityElement bean.
@@ -52,7 +54,7 @@ public B getNewBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof SoftwareServerCapabilityElement)
             {
@@ -93,7 +95,7 @@ public B getNewBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ControlFlowConverter.java b/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ControlFlowConverter.java
@@ -11,6 +11,8 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
+
 
 /**
  * ControlFlowConverter provides common methods for transferring relevant properties from an Open Metadata Repository Services (OMRS)
@@ -53,7 +55,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof ControlFlowElement)
             {
@@ -95,7 +97,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetmanager/converters/DataFlowConverter.java b/.../java/org/odpi/openmetadata/accessservices/assetmanager/converters/DataFlowConverter.java
@@ -11,6 +11,8 @@
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefCategory;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper;
 
+import java.lang.reflect.InvocationTargetException;
+
 
 /**
  * DataFlowConverter provides common methods for transferring relevant properties from an Open Metadata Repository Services (OMRS)
@@ -53,7 +55,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
             /*
              * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
              */
-            B returnBean = beanClass.newInstance();
+            B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
             if (returnBean instanceof DataFlowElement)
             {
@@ -95,7 +97,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
 
             return returnBean;
         }
-        catch (IllegalAccessException | InstantiationException | ClassCastException error)
+        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
         {
             super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }