Merge pull request #6855 from mandy-chessell/egeria-code

FVT testcases for locations and profiles

content-packs/CocoBusinessSystemsArchive.json

@@ -1 +1 @@
-{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"ac202586-4042-407b-ae51-8096dfda223e","archiveName":"Coco Pharmaceuticals Business Systems","archiveDescription":"The data flows from Coco Pharmaceuticals business systems to the data lake.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1661202365551,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]}}
+{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"ac202586-4042-407b-ae51-8096dfda223e","archiveName":"Coco Pharmaceuticals Business Systems","archiveDescription":"The data flows from Coco Pharmaceuticals business systems to the data lake.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1661805846259,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]}}

content-packs/CocoClinicalTrialsTemplatesArchive.json

@@ -1 +1 @@
-{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"74a786b2-d6d7-401d-b8c1-7d798f752c55","archiveName":"Coco Pharmaceuticals Clinical Trials Templates","archiveDescription":"Templates for new assets relating to a clinical trial.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1661202363657,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]}}
+{"class":"OpenMetadataArchive","archiveProperties":{"class":"OpenMetadataArchiveProperties","archiveGUID":"74a786b2-d6d7-401d-b8c1-7d798f752c55","archiveName":"Coco Pharmaceuticals Clinical Trials Templates","archiveDescription":"Templates for new assets relating to a clinical trial.","archiveType":"CONTENT_PACK","originatorName":"Egeria Project","originatorLicense":"Apache 2.0","creationDate":1661805845696,"dependsOnArchives":["bce3b0a0-662a-4f87-b8dc-844078a11a6e"]}}

open-metadata-implementation/access-services/community-profile/community-profile-api/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/properties/ActorProfileProperties.java

@@ -16,6 +16,15 @@
 @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown=true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME,
+              include = JsonTypeInfo.As.PROPERTY,
+              property = "class")
+@JsonSubTypes(
+        {
+                @JsonSubTypes.Type(value = TeamProfileProperties.class, name = "TeamProfileProperties"),
+                @JsonSubTypes.Type(value = PersonalProfileProperties.class, name = "PersonalProfileProperties")
+        })
+
 public class ActorProfileProperties extends ReferenceableProperties
 {
     private static final long    serialVersionUID = 1L;

open-metadata-implementation/access-services/community-profile/community-profile-api/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/properties/ReferenceableProperties.java

@@ -35,7 +35,9 @@
                 @JsonSubTypes.Type(value = NoteLogEntryProperties.class, name = "NoteLogEntryProperties"),
                 @JsonSubTypes.Type(value = NoteLogHeaderProperties.class, name = "NoteLogHeaderProperties"),
                 @JsonSubTypes.Type(value = ProjectProperties.class, name = "ProjectProperties"),
+                @JsonSubTypes.Type(value = LocationProperties.class, name = "LocationProperties"),
                 @JsonSubTypes.Type(value = ResourceProperties.class, name = "ResourceProperties"),
+                @JsonSubTypes.Type(value = ToDoProperties.class, name = "ToDoProperties"),
                 @JsonSubTypes.Type(value = UserIdentityProperties.class, name = "UserIdentityProperties"),
                 @JsonSubTypes.Type(value = ValidValueProperties.class, name = "ValidValueProperties"),
         })

open-metadata-implementation/access-services/community-profile/community-profile-api/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/properties/RelationshipProperties.java

@@ -34,8 +34,12 @@
                 @JsonSubTypes.Type(value = StakeholderProperties.class, name = "StakeholderProperties"),
                 @JsonSubTypes.Type(value = ProfileLocationProperties.class, name = "ProfileLocationProperties"),
                 @JsonSubTypes.Type(value = AssetLocationProperties.class, name = "AssetLocationProperties"),
+                @JsonSubTypes.Type(value = CommunityMembershipProperties.class, name = "CommunityMembershipProperties"),
                 @JsonSubTypes.Type(value = AdjacentLocationProperties.class, name = "AdjacentLocationProperties"),
                 @JsonSubTypes.Type(value = NestedLocationProperties.class, name = "NestedLocationProperties"),
+                @JsonSubTypes.Type(value = ReferenceValueAssignmentProperties.class, name = "ReferenceValueAssignmentProperties"),
+                @JsonSubTypes.Type(value = ValidValueAssignmentProperties.class, name = "ValidValueAssignmentProperties"),
+                @JsonSubTypes.Type(value = ValidValueMembershipProperties.class, name = "ValidValueMembershipProperties"),
         })
 public class RelationshipProperties implements Serializable
 {

open-metadata-implementation/access-services/community-profile/community-profile-api/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/properties/ToDoProperties.java

@@ -2,11 +2,21 @@
 /* Copyright Contributors to the ODPi Egeria project. */
 package org.odpi.openmetadata.accessservices.communityprofile.properties;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.util.*;
 
+import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
+import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY;
+
 /**
- * To Do describes an action - it may be assigned to a person role (see PersonRoleAction).
+ * The "To Do" describes an action - it may be assigned to a person role (see PersonRoleAction).
  */
+@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class ToDoProperties extends ReferenceableProperties
 {
     private static final long    serialVersionUID = 1L;

open-metadata-implementation/access-services/community-profile/community-profile-client/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/client/CommunityProfileBaseClient.java

@@ -379,7 +379,7 @@ void setReferenceableClassification(String                   userId,
         requestBody.setProperties(properties);
 
         restClient.callVoidPostRESTCall(methodName,
-                                        serverPlatformURLRoot + urlTemplate,
+                                        urlTemplate,
                                         requestBody,
                                         serverName,
                                         userId,
@@ -422,7 +422,7 @@ void removeReferenceableClassification(String userId,
         requestBody.setExternalSourceName(externalSourceName);
 
         restClient.callVoidPostRESTCall(methodName,
-                                        serverPlatformURLRoot + urlTemplate,
+                                        urlTemplate,
                                         requestBody,
                                         serverName,
                                         userId,
@@ -770,14 +770,14 @@ public List<RelatedElement> getDescriptiveElements(String userId,
      * @throws PropertyServerException    there is a problem reported in the open metadata server(s)
      */
     @Override
-    public void setupStakeholder(String userId,
-                                 String externalSourceGUID,
-                                 String externalSourceName,
-                                 String elementGUID,
+    public void setupStakeholder(String                userId,
+                                 String                externalSourceGUID,
+                                 String                externalSourceName,
+                                 String                elementGUID,
                                  StakeholderProperties properties,
-                                 String stakeholderGUID) throws InvalidParameterException,
-                                                                UserNotAuthorizedException,
-                                                                PropertyServerException
+                                 String                stakeholderGUID) throws InvalidParameterException,
+                                                                               UserNotAuthorizedException,
+                                                                               PropertyServerException
     {
         final String methodName                   = "setupStakeholder";
         final String elementGUIDParameterName     = "elementGUID";