Merge pull request #8451 from mandy-chessell/oak2024

Remove serverId from template qualifiedName
odpi · Oct 17, 2024 · 9a7b914 · 9a7b914
2 parents 1fb37ee + 47fa93a
commit 9a7b914
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 56 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
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/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/content-packs/ObservabilityContentPack.omarchive b/content-packs/ObservabilityContentPack.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/...pters/connectors/egeriainfrastructure/control/EgeriaSoftwareServerTemplateDefinition.java b/...pters/connectors/egeriainfrastructure/control/EgeriaSoftwareServerTemplateDefinition.java
@@ -35,7 +35,6 @@ public enum EgeriaSoftwareServerTemplateDefinition implements TemplateDefinition
                                   DeployedImplementationType.USER_AUTHENTICATION_MANAGER,
                                   "User Token Manager",
                                   OMAGServerPlatformPlaceholderProperty.PLATFORM_NAME.getPlaceholder(),
-                                  null,
                                   OMAGServerPlatformPlaceholderProperty.PLATFORM_DESCRIPTION.getPlaceholder(),
                                   OMAGServerPlatformPlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                   new OMAGServerPlatformProvider().getConnectorType().getGUID(),
@@ -53,7 +52,6 @@ public enum EgeriaSoftwareServerTemplateDefinition implements TemplateDefinition
                          DeployedImplementationType.REST_API_MANAGER,
                          "Governance Engine Status APIs",
                          PlaceholderProperty.SERVER_NAME.getPlaceholder(),
-                         PlaceholderProperty.SERVER_ID.getPlaceholder(),
                          PlaceholderProperty.DESCRIPTION.getPlaceholder(),
                          PlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                          new EngineHostProvider().getConnectorType().getGUID(),
@@ -70,7 +68,6 @@ public enum EgeriaSoftwareServerTemplateDefinition implements TemplateDefinition
                                 DeployedImplementationType.REST_API_MANAGER,
                                 "Governance Engine Status APIs",
                                 PlaceholderProperty.SERVER_NAME.getPlaceholder(),
-                                PlaceholderProperty.SERVER_ID.getPlaceholder(),
                                 PlaceholderProperty.DESCRIPTION.getPlaceholder(),
                                 PlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                 new IntegrationDaemonProvider().getConnectorType().getGUID(),
@@ -87,7 +84,6 @@ public enum EgeriaSoftwareServerTemplateDefinition implements TemplateDefinition
                                     DeployedImplementationType.REST_API_MANAGER,
                                     "Open Metadata Repository Access APIs",
                                     PlaceholderProperty.SERVER_NAME.getPlaceholder(),
-                                    PlaceholderProperty.SERVER_ID.getPlaceholder(),
                                     PlaceholderProperty.DESCRIPTION.getPlaceholder(),
                                     PlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                     new MetadataAccessServerProvider().getConnectorType().getGUID(),
@@ -104,7 +100,6 @@ public enum EgeriaSoftwareServerTemplateDefinition implements TemplateDefinition
                          DeployedImplementationType.REST_API_MANAGER,
                          "Open Metadata and Governance End User APIs",
                          PlaceholderProperty.SERVER_NAME.getPlaceholder(),
-                         PlaceholderProperty.SERVER_ID.getPlaceholder(),
                          PlaceholderProperty.DESCRIPTION.getPlaceholder(),
                          PlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                          new ViewServerProvider().getConnectorType().getGUID(),
@@ -185,7 +180,6 @@ public static List<PlaceholderPropertyType> getViewServerPlaceholderPropertyType
     private final DeployedImplementationTypeDefinition softwareCapabilityType;
     private final String                               softwareCapabilityName;
     private final String                               serverName;
-    private final String                               serverId;
     private final String                               description;
     private final String                               userId;
     private final String                               connectorTypeGUID;
@@ -206,7 +200,6 @@ public static List<PlaceholderPropertyType> getViewServerPlaceholderPropertyType
      * @param softwareCapabilityType           type of the associated capability
      * @param softwareCapabilityName           name for the associated capability
      * @param serverName                       name for the server
-     * @param serverId                         id for the server
      * @param description                      description for the server
      * @param userId                           userId for the connection
      * @param connectorTypeGUID                connector type to link to the connection
@@ -223,7 +216,6 @@ public static List<PlaceholderPropertyType> getViewServerPlaceholderPropertyType
                                            DeployedImplementationTypeDefinition softwareCapabilityType,
                                            String                               softwareCapabilityName,
                                            String                               serverName,
-                                           String                               serverId,
                                            String                               description,
                                            String                               userId,
                                            String                               connectorTypeGUID,
@@ -240,7 +232,6 @@ public static List<PlaceholderPropertyType> getViewServerPlaceholderPropertyType
         this.softwareCapabilityType        = softwareCapabilityType;
         this.softwareCapabilityName        = softwareCapabilityName;
         this.serverName                    = serverName;
-        this.serverId                      = serverId;
         this.description                   = description;
         this.userId                        = userId;
         this.connectorTypeGUID             = connectorTypeGUID;
@@ -273,14 +264,7 @@ public String getTemplateGUID()
      */
     public String getQualifiedName()
     {
-        if (serverId == null)
-        {
-            return deployedImplementationType.getDeployedImplementationType() + ":" + serverName;
-        }
-        else
-        {
-            return deployedImplementationType.getDeployedImplementationType() + ":" + serverName + "[" + serverId + "]";
-        }
+        return deployedImplementationType.getDeployedImplementationType() + ":" + serverName;
     }
 
 
@@ -363,17 +347,6 @@ public String getServerName()
     }
 
 
-    /**
-     * Return the id of the server.
-     *
-     * @return string
-     */
-    public String getServerId()
-    {
-        return serverId;
-    }
-
-
     /**
      * Return the server description.
      *

diff --git a/.../openmetadata/frameworks/governanceaction/converters/MetadataElementSummaryConverter.java b/.../openmetadata/frameworks/governanceaction/converters/MetadataElementSummaryConverter.java
@@ -51,31 +51,34 @@ public B getNewBean(Class<B>            beanClass,
                         OpenMetadataElement openMetadataElement,
                         String              methodName) throws PropertyServerException
     {
-        try
+        if (openMetadataElement != null)
         {
-            /*
-             * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
-             */
-            B returnBean = beanClass.getDeclaredConstructor().newInstance();
-
-            if (returnBean instanceof MetadataElementSummary elementSummary)
+            try
             {
-                ElementHeader          elementHeader  = new ElementHeader(openMetadataElement);
-
-                elementHeader.setGUID(openMetadataElement.getElementGUID());
-                elementHeader.setClassifications(this.getElementClassifications(openMetadataElement.getClassifications()));
+                /*
+                 * This is initial confirmation that the generic converter has been initialized with an appropriate bean class.
+                 */
+                B returnBean = beanClass.getDeclaredConstructor().newInstance();
 
-                elementSummary.setElementHeader(elementHeader);
-                if (openMetadataElement.getElementProperties() != null)
+                if (returnBean instanceof MetadataElementSummary elementSummary)
                 {
-                    elementSummary.setProperties(openMetadataElement.getElementProperties().getPropertiesAsStrings());
+                    ElementHeader          elementHeader  = new ElementHeader(openMetadataElement);
+
+                    elementHeader.setGUID(openMetadataElement.getElementGUID());
+                    elementHeader.setClassifications(this.getElementClassifications(openMetadataElement.getClassifications()));
+
+                    elementSummary.setElementHeader(elementHeader);
+                    if (openMetadataElement.getElementProperties() != null)
+                    {
+                        elementSummary.setProperties(openMetadataElement.getElementProperties().getPropertiesAsStrings());
+                    }
                 }
+                return returnBean;
+            }
+            catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
+            {
+                super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
             }
-            return returnBean;
-        }
-        catch (IllegalAccessException | InstantiationException | ClassCastException | NoSuchMethodException | InvocationTargetException error)
-        {
-            super.handleInvalidBeanClass(beanClass.getName(), error, methodName);
         }
 
         return null;

diff --git a/open-metadata-implementation/view-services/data-discovery/README.md b/open-metadata-implementation/view-services/data-discovery/README.md
@@ -5,7 +5,7 @@
 
 # Data Discovery OMVS 
 
-The Data Designer OMVS enables the caller to define and search for new data resources.
+The Data Discovery OMVS enables the caller to define and search for new data resources.
 
 Link to documentation: [https://egeria-project.org/services/omvs/data-discovery/overview/](https://egeria-project.org/services/omvs/data-discovery/overview/)