Merge pull request #8485 from mandy-chessell/oak2024

Change marker for placeholder variables
odpi · Nov 11, 2024 · 7df6196 · 7df6196
2 parents 41b1461 + e38af1e
commit 7df6196
Show file tree

Hide file tree

Showing 29 changed files with 78 additions and 75 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/application.properties b/application.properties
@@ -44,8 +44,8 @@ platform.security.secrets.collection=userDirectory
 #            "topicURLRoot": "egeria.omag",\
 #            "configurationProperties":\
 #             {\
-#                "producer": {"bootstrap.servers": "{{kafkaEndpoint}}"},\
-#                "consumer": {"bootstrap.servers": "{{kafkaEndpoint}}"}\
+#                "producer": {"bootstrap.servers": "~{kafkaEndpoint}~"},\
+#                "consumer": {"bootstrap.servers": "~{kafkaEndpoint}~"}\
 #             }\
 #        }\
 #  }

diff --git a/container.application.properties b/container.application.properties
@@ -44,8 +44,8 @@ platform.security.secrets.collection=userDirectory
 #            "topicURLRoot": "egeria.omag",\
 #            "configurationProperties":\
 #             {\
-#                "producer": {"bootstrap.servers": "{{kafkaEndpoint}}"},\
-#                "consumer": {"bootstrap.servers": "{{kafkaEndpoint}}"}\
+#                "producer": {"bootstrap.servers": "~{kafkaEndpoint}~"},\
+#                "consumer": {"bootstrap.servers": "~{kafkaEndpoint}~"}\
 #             }\
 #        }\
 #  }

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/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-conformance-suite/Egeria-open-metadata-conformance-suite.http b/open-metadata-conformance-suite/Egeria-open-metadata-conformance-suite.http
@@ -38,11 +38,11 @@ Content-Type: application/json
 {
 "producer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 },
 "consumer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 }
 }
 

diff --git a/...lection-store-connectors/postgres-repository-connector/configure-postgres-repository.http b/...lection-store-connectors/postgres-repository-connector/configure-postgres-repository.http
@@ -42,10 +42,10 @@ POST {{baseURL}}/open-metadata/admin-services/users/{{adminUserId}}/servers/post
 Content-Type: application/json
 
 {
-    "databaseURL": "{{postgreSQLDatabaseURL}}?currentSchema=repository_postgres_metadata_store",
+    "databaseURL": "~{postgreSQLDatabaseURL}~?currentSchema=repository_postgres_metadata_store",
     "databaseSchema": "repository_postgres_metadata_store",
-    "secretsStore": "{{secretsStore}}",
-    "secretsCollectionName": "{{postgreSQLServerCollectionName}}"
+    "secretsStore": "~{secretsStore}~",
+    "secretsCollectionName": "~{postgreSQLServerCollectionName}~"
 }
 
 ###
@@ -59,19 +59,19 @@ Content-Type: text/plain
 
 
 ###
-# Set up the common properties needed to call your event bus.  The value of {{kafkaEndpoint}} is resolved in the
+# Set up the common properties needed to call your event bus.  The value of ~{kafkaEndpoint}~ is resolved in the
 # application.properties file using the `platform.placeholder.variables` property.
 POST {{baseURL}}/open-metadata/admin-services/users/{{adminUserId}}/servers/postgres-metadata-store/event-bus
 Content-Type: application/json
 
 {
 "producer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 },
 "consumer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 }
 }
 

diff --git a/...ata-collection-store-connectors/postgres-repository-connector/postgres-cts-configure.http b/...ata-collection-store-connectors/postgres-repository-connector/postgres-cts-configure.http
@@ -34,11 +34,11 @@ Content-Type: application/json
 {
 "producer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 },
 "consumer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 }
 }
 
@@ -102,10 +102,10 @@ POST {{baseURL}}/open-metadata/admin-services/users/{{adminUserId}}/servers/{{tu
 Content-Type: application/json
 
 {
-    "databaseURL": "{{postgreSQLDatabaseURL}}?currentSchema=repository_postgres_metadata_store",
+    "databaseURL": "~{postgreSQLDatabaseURL}~?currentSchema=repository_postgres_metadata_store",
     "databaseSchema": "repository_postgres_metadata_store",
-    "secretsStore": "{{secretsStore}}",
-    "secretsCollectionName": "{{postgreSQLServerCollectionName}}"
+    "secretsStore": "~{secretsStore}~",
+    "secretsCollectionName": "~{postgreSQLServerCollectionName}~"
 }
 
 ###
@@ -118,19 +118,19 @@ Content-Type: text/plain
 
 
 ###
-# Set up the common properties needed to call your event bus.  The value of {{kafkaEndpoint}} is resolved in the
+# Set up the common properties needed to call your event bus.  The value of ~{kafkaEndpoint}~ is resolved in the
 # application.properties file using the `platform.placeholder.variables` property.
 POST {{baseURL}}/open-metadata/admin-services/users/{{adminUserId}}/servers/{{tutServer}}/event-bus
 Content-Type: application/json
 
 {
 "producer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 },
 "consumer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 }
 }
 

diff --git a/...a/adapters/repositoryservices/postgres/repositoryconnector/PostgresOMRSMetadataStore.java b/...a/adapters/repositoryservices/postgres/repositoryconnector/PostgresOMRSMetadataStore.java
@@ -136,7 +136,6 @@ private Date getAsOfTime(Date suppliedAsOfTime)
      * Return the entity identified by the guid.
      *
      * @param guid - unique identifier for the entity
-     * @param asOfTime value from caller
      * @return entity object
      * @throws RepositoryErrorException problem forming entity proxy
      */

diff --git a/...positoryservices/postgres/repositoryconnector/controls/PostgresConfigurationProperty.java b/...positoryservices/postgres/repositoryconnector/controls/PostgresConfigurationProperty.java
@@ -17,10 +17,10 @@
  */
 public enum PostgresConfigurationProperty
 {
-    DATABASE_URL("databaseURL", "Connection string for the database where the schema is located.", DataType.STRING.getName(), "{{postgreSQLDatabaseURL}}"),
+    DATABASE_URL("databaseURL", "Connection string for the database where the schema is located.", DataType.STRING.getName(), "~{postgreSQLDatabaseURL}~"),
     DATABASE_SCHEMA ("databaseSchema", "The name of the database schema used to store the repository contents.", DataType.STRING.getName(), "repository_{{serverName}}"),
-    SECRETS_STORE ("secretsStore", "The file name of the secrets store containing the log on credentials to access the database schema.", DataType.STRING.getName(), "{{secretsStore}}"),
-    SECRETS_COLLECTION_NAME ("secretsCollectionName", "The name of the secrets collection.", DataType.STRING.getName(), "{{secretsStore}}"),
+    SECRETS_STORE ("secretsStore", "The file name of the secrets store containing the log on credentials to access the database schema.", DataType.STRING.getName(), "~{secretsStore}~"),
+    SECRETS_COLLECTION_NAME ("secretsCollectionName", "The name of the secrets collection.", DataType.STRING.getName(), "~{secretsStore}~"),
     DEFAULT_AS_OF_TIME ("defaultAsOfTime", "Optional value that changes the default value for 'asOfTime'. The 'asOfTime' parameter is used on queries to control which point in time to take the open metadata from.  The standard default is 'null' which means use the current time. If the 'defaultAsOfTime' option is specified then, by default, queries will use the supplied asOfTime value.  This can be overridden on individual requests.  Creates, updates, deletes continue to be appended to the database.  The mode recent data can be retrieved by setting the asOfTime to the current time on queries.", DataType.DATE.getName(), null),
     REPOSITORY_MODE ("repositoryMode", "Optional value that controls which functions are active in the repository. If it is set to 'readOnly' the repository is switched into read-only mode.  Any other value (or if it is not specified) results in a read-write repository.", DataType.DATE.getName(), "yyyy/MM/dd HH:mm:ss"),
     ;

diff --git a/...data/adapters/repositoryservices/postgres/repositoryconnector/database/DatabaseStore.java b/...data/adapters/repositoryservices/postgres/repositoryconnector/database/DatabaseStore.java
@@ -282,7 +282,7 @@ public EntityMapper getEntityFromStore(String guid,
                                                                                         RepositoryColumn.INSTANCE_GUID.getColumnName() + " = '" + guid + "'" + getAsOfTimeClause(asOfTime),
                                                                                         RepositoryTable.ENTITY.getColumnNameTypeMap());
 
-            return this.getCompleteEntityFromStore(guid, entityRow);
+            return this.getCompleteEntityFromStore(guid, entityRow, asOfTime);
         }
         catch (PropertyServerException sqlException)
         {
@@ -484,11 +484,13 @@ public List<RelationshipMapper> retrieveRelationshipsByProperties(QueryBuilder q
      *
      * @param guid unique identifier of the entity
      * @param entityRow appropriate row from table
+     * @param asOfTime database time
      * @return entity mapper
      * @throws RepositoryErrorException problem communicating with the database, or mapping the values returned
      */
     public EntityMapper getCompleteEntityFromStore(String                     guid,
-                                                   Map<String, JDBCDataValue> entityRow) throws RepositoryErrorException
+                                                   Map<String, JDBCDataValue> entityRow,
+                                                   Date                       asOfTime) throws RepositoryErrorException
     {
         final String methodName = "getCompleteEntityFromStore";
 
@@ -506,8 +508,7 @@ public EntityMapper getCompleteEntityFromStore(String                     guid,
                                                                                                               whereClause,
                                                                                                               RepositoryTable.ENTITY_ATTRIBUTE_VALUE.getColumnNameTypeMap());
 
-                    Map<String, List<ClassificationMapper>> classificationMappersForEntityGUIDs = getClassificationMappersForEntityGUIDs(whereClause);
-
+                    Map<String, List<ClassificationMapper>> classificationMappersForEntityGUIDs = getClassificationMappersForEntityGUIDs(RepositoryColumn.INSTANCE_GUID.getColumnName() + " = '" + guid + "'" + getAsOfTimeClause(asOfTime));
 
                     return new EntityMapper(entityRow,
                                             entityProperties,
@@ -1060,7 +1061,9 @@ public List<EntityMapper> getEntityHistoryFromStore(String  guid,
             {
                 for (Map<String, JDBCDataValue> entityRow : entityRows)
                 {
-                    entityMappers.add(this.getCompleteEntityFromStore(guid, entityRow));
+                    Date versionEndTime = baseMapper.getDatePropertyFromColumn(RepositoryColumn.VERSION_END_TIME.getColumnName(), entityRow, false);
+
+                    entityMappers.add(this.getCompleteEntityFromStore(guid, entityRow, versionEndTime));
                 }
             }
         }

diff --git a/open-metadata-implementation/admin-services/Egeria-admin-services-server-configuration.http b/open-metadata-implementation/admin-services/Egeria-admin-services-server-configuration.http
@@ -302,10 +302,10 @@ POST {{baseURL}}/open-metadata/admin-services/users/{{adminUserId}}/servers/{{se
 Content-Type: application/json
 
 {
-    "databaseURL": "{{postgreSQLDatabaseURL}}",
+    "databaseURL": "~{postgreSQLDatabaseURL}~",
     "databaseSchema": "repository_{{server}}",
-    "secretsStore": "{{secretsStore}}",
-    "secretsCollectionName": "{{postgreSQLServerCollectionName}}"
+    "secretsStore": "~{secretsStore}~",
+    "secretsCollectionName": "~{postgreSQLServerCollectionName}~"
 }
 
 ###

diff --git a/...n/java/org/odpi/openmetadata/adminservices/configuration/properties/OMAGServerConfig.java b/...n/java/org/odpi/openmetadata/adminservices/configuration/properties/OMAGServerConfig.java
@@ -68,7 +68,7 @@ public class OMAGServerConfig extends AdminServicesConfigHeader
      */
     public  static final String  defaultLocalServerType                   = null;
     private static final String  defaultLocalOrganizationName             = null;
-    private static final String  defaultLocalServerURL                    = "{{egeriaEndpoint}}";
+    private static final String  defaultLocalServerURL                    = "~{egeriaEndpoint}~";
     private static final String  defaultLocalServerUserId                 = "OMAGServer";
     public  static final int     defaultMaxPageSize                       = 1000;
 

diff --git a/...rc/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerAdminStoreServices.java b/...rc/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerAdminStoreServices.java
@@ -787,7 +787,7 @@ public OMAGServerConfig getServerConfigForStartUp(String  userId,
 
                 for (String variableName : currentPlaceholderValues.keySet())
                 {
-                    String regExMatchString = Pattern.quote("{{"+ variableName + "}}");
+                    String regExMatchString = Pattern.quote("~{"+ variableName + "}~");
                     String[] configBits = omagServerConfigString.split(regExMatchString);
 
                     if (configBits.length > 1)

diff --git a/...k/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataType.java b/...k/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataType.java
@@ -170,8 +170,8 @@ public enum OpenMetadataType
     SEARCH_KEYWORD("0134c9ae-0fe6-4224-bb3b-e18b78a90b1e",
                    "SearchKeyword",
                    OpenMetadataWikiPages.MODEL_0012_SEARCH_KEYWORDS,
-                   "A shareable keyword to help locating relevant assets.",
-                   "26707bea-f65c-43bc-9576-5991d9bafc24"),
+                   "26707bea-f65c-43bc-9576-5991d9bafc24",
+                   "A shareable keyword to help locating relevant assets."),
 
     /**
      * Provides a link to a keyword that helps to identify specific elements in a search.
@@ -1091,8 +1091,8 @@ public enum OpenMetadataType
     PROJECT("0799569f-0c16-4a1f-86d9-e2e89568f7fd",
             "Project",
             OpenMetadataWikiPages.MODEL_0130_PROJECTS,
-            "An organized activity, typically to achieve a well defined goal.",
-            "1d8eed39-17e2-400c-adac-4d0c8f3063ad"),
+            "1d8eed39-17e2-400c-adac-4d0c8f3063ad",
+            "An organized activity, typically to achieve a well-defined goal."),
 
     /**
      * An person with overall responsibility for one or more project.

diff --git a/...vices-apis/src/main/java/org/odpi/openmetadata/repositoryservices/ffdc/OMRSErrorCode.java b/...vices-apis/src/main/java/org/odpi/openmetadata/repositoryservices/ffdc/OMRSErrorCode.java
@@ -411,11 +411,11 @@ public enum OMRSErrorCode implements ExceptionMessageSet
             "Correct the caller's code and attempt the request again."),
 
     /**
-     * OMRS-REPOSITORY-400-048 - A {0} request has been made to repository {1} to remove a non-existent classification {2} from entity {3}
+     * OMRS-REPOSITORY-400-048 - A {0} request has been made to repository {1} to access a non-existent classification {2} from entity {3}
      */
     ENTITY_NOT_CLASSIFIED(400, "OMRS-REPOSITORY-400-048",
-            "A {0} request has been made to repository {1} to remove a non-existent classification {2} from entity {3}",
-            "The system is unable to perform the request as the instance has invalid values.",
+            "A {0} request has been made to repository {1} to access a non-existent classification {2} from entity {3}",
+            "The system is unable to perform the request as the instance has a missing classification.",
             "Correct the caller's code and reattempt the request."),
 
     /**

diff --git a/...ositoryservices/localrepository/repositorycontentmanager/OMRSRepositoryContentHelper.java b/...ositoryservices/localrepository/repositorycontentmanager/OMRSRepositoryContentHelper.java
@@ -3,6 +3,7 @@
 package org.odpi.openmetadata.repositoryservices.localrepository.repositorycontentmanager;
 
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;
+import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.MatchCriteria;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.SequencingOrder;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.*;
@@ -1503,11 +1504,11 @@ public void checkEntityNotClassifiedEntity(String        sourceName,
      */
     @Override
     public Classification checkEntityNotClassifiedEntity(String             sourceName,
-                                                  EntitySummary      entity,
-                                                  String             classificationName,
-                                                  InstanceProperties classificationProperties,
-                                                  AuditLog           auditLog,
-                                                  String             methodName) throws ClassificationErrorException
+                                                         EntitySummary      entity,
+                                                         String             classificationName,
+                                                         InstanceProperties classificationProperties,
+                                                         AuditLog           auditLog,
+                                                         String             methodName) throws ClassificationErrorException
     {
         final String thisMethodName = "checkEntityNotClassifiedEntity";
 

diff --git a/open-metadata-resources/open-metadata-deployment/sample-configs/BuildSampleConfigs.http b/open-metadata-resources/open-metadata-deployment/sample-configs/BuildSampleConfigs.http
@@ -61,10 +61,10 @@ POST {{baseURL}}/open-metadata/admin-services/users/{{adminUserId}}/servers/acti
 Content-Type: application/json
 
 {
-    "databaseURL": "{{postgreSQLDatabaseURL}}?currentSchema=repository_active_metadata_store",
+    "databaseURL": "~{postgreSQLDatabaseURL}~?currentSchema=repository_active_metadata_store",
     "databaseSchema": "repository_active_metadata_store",
-    "secretsStore": "{{secretsStore}}",
-    "secretsCollectionName": "{{postgreSQLServerCollectionName}}"
+    "secretsStore": "~{secretsStore}~",
+    "secretsCollectionName": "~{postgreSQLServerCollectionName}~"
 }
 
 ###
@@ -82,19 +82,19 @@ Content-Type: text/plain
 
 
 ###
-# Set up the common properties needed to call your event bus.  The value of {{kafkaEndpoint}} is resolved in the
+# Set up the common properties needed to call your event bus.  The value of ~{kafkaEndpoint}~ is resolved in the
 # application.properties file using the `platform.placeholder.variables` property.
 POST {{baseURL}}/open-metadata/admin-services/users/{{adminUserId}}/servers/active-metadata-store/event-bus
 Content-Type: application/json
 
 {
 "producer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 },
 "consumer":
 {
-"bootstrap.servers":"{{kafkaEndpoint}}"
+"bootstrap.servers":"~{kafkaEndpoint}~"
 }
 }
 
@@ -140,7 +140,7 @@ Content-Type: application/json
 {
   "class": "ViewServiceRequestBody",
   "omagserverName": "active-metadata-store",
-  "omagserverPlatformRootURL": "{{egeriaEndpoint}}"
+  "omagserverPlatformRootURL": "~{egeriaEndpoint}~"
 }
 
 ###
@@ -252,7 +252,7 @@ Content-Type: application/json
       "engineUserId": "generalnpa"
     }
   ],
-  "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+  "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
   "omagserverName": "active-metadata-store"
 }
 
@@ -280,43 +280,43 @@ Content-Type: application/json
 [
     {
         "class": "IntegrationGroupConfig",
-        "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+        "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
         "omagserverName" : "active-metadata-store",
         "integrationGroupQualifiedName" : "Egeria:IntegrationGroup:Default"
     },
     {
         "class": "IntegrationGroupConfig",
-        "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+        "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
         "omagserverName" : "active-metadata-store",
         "integrationGroupQualifiedName" : "Egeria:IntegrationGroup:ApacheAtlas"
     },
     {
         "class": "IntegrationGroupConfig",
-        "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+        "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
         "omagserverName" : "active-metadata-store",
         "integrationGroupQualifiedName" : "Egeria:IntegrationGroup:ApacheKafka"
     },
     {
         "class": "IntegrationGroupConfig",
-        "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+        "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
         "omagserverName" : "active-metadata-store",
         "integrationGroupQualifiedName" : "Egeria:IntegrationGroup:OpenAPIs"
     },
     {
         "class": "IntegrationGroupConfig",
-        "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+        "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
         "omagserverName" : "active-metadata-store",
         "integrationGroupQualifiedName" : "Egeria:IntegrationGroup:OpenMetadataObservability"
     },
     {
         "class": "IntegrationGroupConfig",
-        "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+        "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
         "omagserverName" : "active-metadata-store",
         "integrationGroupQualifiedName" : "Egeria:IntegrationGroup:PostgreSQL"
     },
     {
         "class": "IntegrationGroupConfig",
-        "omagserverPlatformRootURL": "{{egeriaEndpoint}}",
+        "omagserverPlatformRootURL": "~{egeriaEndpoint}~",
         "omagserverName" : "active-metadata-store",
         "integrationGroupQualifiedName" : "Egeria:IntegrationGroup:UnityCatalog"
     }

diff --git a/...adata-deployment/sample-configs/active-metadata-store/config/active-metadata-store.config b/...adata-deployment/sample-configs/active-metadata-store/config/active-metadata-store.config