Merge pull request #8244 from mandy-chessell/oak2024

Emergency Fix - Regress commons-codec to 1.16.0
odpi · Jun 19, 2024 · 6cf8c12 · 6cf8c12
2 parents 59639f6 + 7e55d64
commit 6cf8c12
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 31 deletions.
diff --git a/CoreContentPackGUIDMap.json b/CoreContentPackGUIDMap.json
diff --git a/bom/build.gradle b/bom/build.gradle
@@ -29,7 +29,8 @@ ext {
     classgraphVersion = '4.8.172'
     classmateVersion = '1.5.1'
     collections4Version = '4.4'
-    commonscodecVersion = '1.17.0'
+    // Version 1.17.0 breaks XTDB because of a change in lucene's library names
+    commonscodecVersion = '1.16.0'
     commonsconfiguration2Version = '2.10.1'
     commonsconfigurationVersion = '1.10'
     commonsioVersion = '2.16.1'
@@ -72,7 +73,7 @@ ext {
     kafkaVersion = '3.7.0'
     lang3Version = '3.14.0'
     logbackVersion = '1.5.6'
-    lettuceVersion = '6.3.1.RELEASE'
+    lettuceVersion = '6.3.2.RELEASE'
     // TODO: Version 9 now available
     luceneVersion = '8.11.2'
     openlineageVersion = '1.16.0'

diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/...g/odpi/openmetadata/adapters/connectors/apacheatlas/control/AtlasPlaceholderProperty.java b/...g/odpi/openmetadata/adapters/connectors/apacheatlas/control/AtlasPlaceholderProperty.java
@@ -18,12 +18,12 @@ public enum AtlasPlaceholderProperty
     /**
      * The host IP address or domain name.
      */
-    HOST_IDENTIFIER ("hostIdentifier", "The host IP address or domain name of the Apache Atlas server.", "string", "coconet.com"),
+    HOST_URL ("hostURL", "The host IP address or domain name of the server with the HTTP protocol prefix.", "string", "https://coconet.com"),
 
     /**
      * The number of the port to use to connect to a service.
      */
-    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the Apache Atlas server.", "string", "1234"),
+    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the server.", "string", "1234"),
 
     /**
      * The userId to store in the userId attribute of the connection.

diff --git a/...g/odpi/openmetadata/adapters/connectors/apachekafka/control/KafkaPlaceholderProperty.java b/...g/odpi/openmetadata/adapters/connectors/apachekafka/control/KafkaPlaceholderProperty.java
@@ -18,12 +18,12 @@ public enum KafkaPlaceholderProperty
     /**
      * The host IP address or domain name.
      */
-    HOST_IDENTIFIER ("hostIdentifier", "The host IP address or domain name of the Apache Kafka server.", "string", "coconet.com"),
+    HOST_IDENTIFIER ("hostIdentifier", "The host IP address or domain name.", "string", "https://coconet.com"),
 
     /**
      * The number of the port to use to connect to a service.
      */
-    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the Apache Kafka server.", "string", "1234"),
+    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the server.", "string", "1234"),
 
     /**
      * The name of the server being catalogued.

diff --git a/...adata/adapters/connectors/egeriainfrastructure/control/OMAGServerPlaceholderProperty.java b/...adata/adapters/connectors/egeriainfrastructure/control/OMAGServerPlaceholderProperty.java
@@ -18,12 +18,12 @@ public enum OMAGServerPlaceholderProperty
     /**
      * The host IP address or domain name.
      */
-    HOST_IDENTIFIER ("hostIdentifier", "The host IP address or domain name of the OMAG Server.", "string", "coconet.com"),
+    HOST_URL ("hostURL", "The host IP address or domain name of the server with the HTTP protocol prefix.", "string", "https://coconet.com"),
 
     /**
      * The number of the port to use to connect to a service.
      */
-    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the OMAG Server.", "string", "9443"),
+    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the server.", "string", "9443"),
 
 
     /**

diff --git a/...apters/connectors/egeriainfrastructure/control/OMAGServerPlatformPlaceholderProperty.java b/...apters/connectors/egeriainfrastructure/control/OMAGServerPlatformPlaceholderProperty.java
@@ -18,12 +18,12 @@ public enum OMAGServerPlatformPlaceholderProperty
     /**
      * The host IP address or domain name.
      */
-    HOST_IDENTIFIER ("hostIdentifier", "The host IP address or domain name of the OMAG Server Platform.", "string", "coconet.com"),
+    HOST_URL ("platformHostURL", "The host IP address or domain name of the platform with the HTTP protocol prefix.", "string", "https://coconet.com"),
 
     /**
      * The number of the port to use to connect to a service.
      */
-    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the OMAG Server Platform.", "string", "9443"),
+    PORT_NUMBER ("platformPortNumber", "The number of the port to use to connect to the platform.", "string", "9443"),
 
     /**
      * The userId to store in the userId attribute of the connection.

diff --git a/.../odpi/openmetadata/adapters/connectors/postgres/controls/PostgresPlaceholderProperty.java b/.../odpi/openmetadata/adapters/connectors/postgres/controls/PostgresPlaceholderProperty.java
@@ -18,12 +18,12 @@ public enum PostgresPlaceholderProperty
     /**
      * The host IP address or domain name.
      */
-    HOST_IDENTIFIER ("hostIdentifier", "The host IP address or domain name of the database server.", "string", "coconet.com"),
+    HOST_IDENTIFIER ("hostIdentifier", "The host IP address or domain name.", "string", "coconet.com"),
 
     /**
      * The number of the port to use to connect to a service.
      */
-    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the database server.", "string", "1234"),
+    PORT_NUMBER ("portNumber", "The number of the port to use to connect to the server.", "string", "1234"),
 
     /**
      * The name of the database being catalogued.

diff --git a/...adata-implementation/view-services/automated-curation/Egeria-automated-curation-omvs.http b/...adata-implementation/view-services/automated-curation/Egeria-automated-curation-omvs.http
@@ -87,7 +87,7 @@ Authorization: Bearer {{token}}
 Content-Type: application/json
 
 {
-  "filter" : "PostgreSQL Server"
+  "filter" : "PostgreSQL Relational Database"
 }
 
 ###
@@ -101,6 +101,69 @@ Content-Type: application/json
   "filter" : "FileFolder"
 }
 
+
+###
+# @name getTechnologyTypeDetail (OMAG Server Platform)
+# Retrieve the requested deployed implementation type metadata element. There are no wildcards allowed in the name.
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/automated-curation/technology-types/by-name
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "filter" : "OMAG Server Platform"
+}
+
+
+###
+# @name getTechnologyTypeDetail (Metadata Access Server)
+# Retrieve the requested deployed implementation type metadata element. There are no wildcards allowed in the name.
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/automated-curation/technology-types/by-name
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "filter" : "Metadata Access Server"
+}
+
+
+
+###
+# @name getTechnologyTypeDetail (Engine Host)
+# Retrieve the requested deployed implementation type metadata element. There are no wildcards allowed in the name.
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/automated-curation/technology-types/by-name
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "filter" : "Engine Host"
+}
+
+
+
+
+###
+# @name getTechnologyTypeDetail (Integration Daemon)
+# Retrieve the requested deployed implementation type metadata element. There are no wildcards allowed in the name.
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/automated-curation/technology-types/by-name
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "filter" : "Integration Daemon"
+}
+
+
+###
+# @name getTechnologyTypeDetail (View server)
+# Retrieve the requested deployed implementation type metadata element. There are no wildcards allowed in the name.
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/automated-curation/technology-types/by-name
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "filter" : "View Server"
+}
+
 ###
 # =====================================================================================================================
 # Catalog templates make it easy to create new complex object such as assets.
@@ -217,14 +280,35 @@ Content-Type: application/json
   "placeholderPropertyValues" : {
     "hostIdentifier" : "egeria.pdr-associates.com",
     "portNumber" : "5432",
-    "serverName" : "DemoPostgreSQL1",
+    "serverName" : "DemoPostgreSQL2",
     "databaseName" : "my_database",
     "databaseUserId" : "surveyor",
     "databasePassword" : "secret"
   }
 }
 
 
+
+###
+# @name createElementFromTemplate (OMAG Server Platform)
+# Create a new element from a template.
+# Further Information: https://egeria-project.org/features/templated-cataloguing/overview/
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/automated-curation/catalog-templates/new-element
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "templateGUID" : "9b06c4dc-ddc8-47ae-b56b-28775d3a96f0",
+  "isOwnAnchor" : true,
+  "placeholderPropertyValues" : {
+    "platformUserId" : "garygeeke",
+    "platformHostURL" : "https://localhost",
+    "platformPortNumber" : "9446",
+    "platformName" : "Nanny Platform"
+  }
+}
+
+
 ###
 # =====================================================================================================================
 # A catalog target links an element (typically an asset) to an integration connector for processing.

diff --git a/...ava/org/odpi/openmetadata/archiveutilities/openconnectors/OpenConnectorArchiveWriter.java b/...ava/org/odpi/openmetadata/archiveutilities/openconnectors/OpenConnectorArchiveWriter.java
@@ -1605,9 +1605,8 @@ private void addAtlasServerCatalogTemplate()
                                                  AtlasPlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                                  AtlasPlaceholderProperty.CONNECTION_PASSWORD.getPlaceholder(),
                                                  provider.getConnectorType().getGUID(),
-                                                 "http://" +
-                                                         AtlasPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
-                                                         AtlasPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
+                                                 AtlasPlaceholderProperty.HOST_URL.getPlaceholder() + ":" +
+                                                               AtlasPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
                                                  null,
                                                  null,
                                                  placeholderPropertyTypes);
@@ -1721,8 +1720,7 @@ private void addOMAGServerPlatformCatalogTemplate()
                                                  OMAGServerPlatformPlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                                  null,
                                                  provider.getConnectorType().getGUID(),
-                                                 "http://" +
-                                                         OMAGServerPlatformPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
+                                                 OMAGServerPlatformPlaceholderProperty.HOST_URL.getPlaceholder() + ":" +
                                                          OMAGServerPlatformPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
                                                  null,
                                                  null,
@@ -1751,8 +1749,7 @@ private void addEngineHostCatalogTemplate()
                                                  OMAGServerPlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                                  null,
                                                  provider.getConnectorType().getGUID(),
-                                                 "http://" +
-                                                         OMAGServerPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
+                                                 OMAGServerPlaceholderProperty.HOST_URL.getPlaceholder() + ":" +
                                                          OMAGServerPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
                                                  configurationProperties,
                                                  null,
@@ -1782,8 +1779,7 @@ private void addIntegrationDaemonCatalogTemplate()
                                                  OMAGServerPlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                                  null,
                                                  provider.getConnectorType().getGUID(),
-                                                 "http://" +
-                                                         OMAGServerPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
+                                                 OMAGServerPlaceholderProperty.HOST_URL.getPlaceholder() + ":" +
                                                          OMAGServerPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
                                                  configurationProperties,
                                                  null,
@@ -1813,8 +1809,7 @@ private void addMetadataAccessServerCatalogTemplate()
                                                  OMAGServerPlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                                  null,
                                                  provider.getConnectorType().getGUID(),
-                                                 "http://" +
-                                                         OMAGServerPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
+                                                 OMAGServerPlaceholderProperty.HOST_URL.getPlaceholder() + ":" +
                                                          OMAGServerPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
                                                  configurationProperties,
                                                  null,
@@ -1844,8 +1839,7 @@ private void addViewServerCatalogTemplate()
                                                  OMAGServerPlaceholderProperty.CONNECTION_USER_ID.getPlaceholder(),
                                                  null,
                                                  provider.getConnectorType().getGUID(),
-                                                 "http://" +
-                                                         OMAGServerPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
+                                                 OMAGServerPlaceholderProperty.HOST_URL.getPlaceholder() + ":" +
                                                          OMAGServerPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
                                                  configurationProperties,
                                                  null,
@@ -1871,8 +1865,7 @@ private void addKafkaServerCatalogTemplate()
                                                  null,
                                                  null,
                                                  provider.getConnectorType().getGUID(),
-                                                 "http://" +
-                                                         KafkaPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
+                                                 KafkaPlaceholderProperty.HOST_IDENTIFIER.getPlaceholder() + ":" +
                                                          KafkaPlaceholderProperty.PORT_NUMBER.getPlaceholder(),
                                                  null,
                                                  null,