diff --git a/open-metadata-implementation/access-services/data-manager/data-manager-spring/src/main/java/org/odpi/openmetadata/accessservices/datamanager/server/spring/DisplayApplicationResource.java b/open-metadata-implementation/access-services/data-manager/data-manager-spring/src/main/java/org/odpi/openmetadata/accessservices/datamanager/server/spring/DisplayApplicationResource.java index 57a7bf538e8..e5fee8c2ada 100644 --- a/open-metadata-implementation/access-services/data-manager/data-manager-spring/src/main/java/org/odpi/openmetadata/accessservices/datamanager/server/spring/DisplayApplicationResource.java +++ b/open-metadata-implementation/access-services/data-manager/data-manager-spring/src/main/java/org/odpi/openmetadata/accessservices/datamanager/server/spring/DisplayApplicationResource.java @@ -836,7 +836,7 @@ public QueryResponse getQueryByGUID(@PathVariable String serverName, * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @PostMapping(path = "/elements/{parentGUID}/data-containers") + @PostMapping(path = "/schemas/elements/{parentGUID}/data-containers") public GUIDResponse createDataContainer(@PathVariable String serverName, @PathVariable String userId, @@ -863,7 +863,7 @@ public GUIDResponse createDataContainer(@PathVariable String s * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @PostMapping(path = "/elements/{parentGUID}/data-containers/from-template/{templateGUID}") + @PostMapping(path = "/schemas/elements/{parentGUID}/data-containers/from-template/{templateGUID}") public GUIDResponse createDataContainerFromTemplate(@PathVariable String serverName, @PathVariable String userId, @@ -890,7 +890,7 @@ public GUIDResponse createDataContainerFromTemplate(@PathVariable String * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @PostMapping(path = "/data-containers/{dataContainerGUID}") + @PostMapping(path = "/schemas/data-containers/{dataContainerGUID}") public VoidResponse updateDataContainer(@PathVariable String serverName, @PathVariable String userId, @@ -916,7 +916,7 @@ public VoidResponse updateDataContainer(@PathVariable String s * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @PostMapping(path = "/data-containers/{dataContainerGUID}/delete") + @PostMapping(path = "/schemas/data-containers/{dataContainerGUID}/delete") public VoidResponse removeDataContainer(@PathVariable String serverName, @PathVariable String userId, @@ -943,7 +943,7 @@ public VoidResponse removeDataContainer(@PathVariable String * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @PostMapping(path = "/data-containers/by-search-string") + @PostMapping(path = "/schemas/data-containers/by-search-string") public DataContainersResponse findDataContainers(@PathVariable String serverName, @PathVariable String userId, @@ -969,7 +969,7 @@ public DataContainersResponse findDataContainers(@PathVariable String * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @GetMapping(path = "/data-containers/by-parent-element/{parentGUID}") + @GetMapping(path = "/schemas/data-containers/by-parent-element/{parentGUID}") public DataContainersResponse getDataContainersForParent(@PathVariable String serverName, @PathVariable String userId, @@ -996,7 +996,7 @@ public DataContainersResponse getDataContainersForParent(@PathVariable String se * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @PostMapping(path = "/data-containers/by-name") + @PostMapping(path = "/schemas/data-containers/by-name") public DataContainersResponse getDataContainersByName(@PathVariable String serverName, @PathVariable String userId, @@ -1020,7 +1020,7 @@ public DataContainersResponse getDataContainersByName(@PathVariable String * UserNotAuthorizedException the user is not authorized to issue this request or * PropertyServerException there is a problem reported in the open metadata server(s) */ - @GetMapping(path = "/data-containers/{dataContainerGUID}") + @GetMapping(path = "/schemas/data-containers/{dataContainerGUID}") public DataContainerResponse getDataContainerByGUID(@PathVariable String serverName, @PathVariable String userId, diff --git a/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/server/mappers/relationships/IsARelationshipMapper.java b/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/server/mappers/relationships/IsARelationshipMapper.java index f894ab2ddb6..e47e9059727 100644 --- a/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/server/mappers/relationships/IsARelationshipMapper.java +++ b/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/server/mappers/relationships/IsARelationshipMapper.java @@ -44,9 +44,7 @@ protected void mapRelationshipToInstanceProperties(IsA iSARelationship, Instance SubjectAreaUtils.setStringPropertyInInstanceProperties(instanceProperties, iSARelationship.getSource(), OpenMetadataAPIMapper.SOURCE_PROPERTY_NAME); } if (iSARelationship.getStatus() != null) { - EnumPropertyValue enumPropertyValue = new EnumPropertyValue(); - enumPropertyValue.setOrdinal(iSARelationship.getStatus().getOrdinal()); - instanceProperties.setProperty(OpenMetadataAPIMapper.STATUS_PROPERTY_NAME, enumPropertyValue); + SubjectAreaUtils.setStatusPropertyInInstanceProperties(instanceProperties, iSARelationship.getStatus(), OpenMetadataAPIMapper.STATUS_PROPERTY_NAME); } } diff --git a/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/utilities/SubjectAreaUtils.java b/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/utilities/SubjectAreaUtils.java index 09d9ce79f70..57953c5ddcb 100644 --- a/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/utilities/SubjectAreaUtils.java +++ b/open-metadata-implementation/access-services/subject-area/subject-area-server/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/utilities/SubjectAreaUtils.java @@ -6,6 +6,7 @@ import org.odpi.openmetadata.accessservices.subjectarea.ffdc.SubjectAreaErrorCode; import org.odpi.openmetadata.accessservices.subjectarea.ffdc.exceptions.InvalidParameterException; import org.odpi.openmetadata.accessservices.subjectarea.properties.enums.Status; +import org.odpi.openmetadata.accessservices.subjectarea.properties.enums.TermRelationshipStatus; import org.odpi.openmetadata.accessservices.subjectarea.properties.objects.category.Category; import org.odpi.openmetadata.accessservices.subjectarea.properties.objects.common.SystemAttributes; import org.odpi.openmetadata.accessservices.subjectarea.properties.objects.glossary.Glossary; @@ -18,6 +19,7 @@ import org.odpi.openmetadata.accessservices.subjectarea.properties.relationships.CategoryAnchor; import org.odpi.openmetadata.accessservices.subjectarea.properties.relationships.TermAnchor; import org.odpi.openmetadata.accessservices.subjectarea.responses.SubjectAreaOMASAPIResponse; +import org.odpi.openmetadata.commonservices.generichandlers.OpenMetadataAPIMapper; import org.odpi.openmetadata.frameworks.auditlog.messagesets.ExceptionMessageDefinition; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.*; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.PrimitiveDefCategory; @@ -305,4 +307,18 @@ public SubjectAreaOMASAPIResponse getIconSummarySet(String userId, response.addAllResults(icons); return response; } + + /** + * Set status values into instance properties. + * + * @param instanceProperties supplied instanceproperties + * @param status Status value + * @param propertyName property name + */ + public static void setStatusPropertyInInstanceProperties(InstanceProperties instanceProperties, TermRelationshipStatus status, String propertyName) { + EnumPropertyValue enumPropertyValue = new EnumPropertyValue(); + enumPropertyValue.setOrdinal(status.getOrdinal()); + enumPropertyValue.setSymbolicName(status.getName()); + instanceProperties.setProperty(propertyName, enumPropertyValue); + } } \ No newline at end of file diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-consumer-fvt/src/test/resources/logback-test.xml b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-consumer-fvt/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..a4fe6291821 --- /dev/null +++ b/open-metadata-test/open-metadata-fvt/access-services-fvt/asset-consumer-fvt/src/test/resources/logback-test.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + +