Software server capability support and resilient integration daemon

open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/server/AssetManagerRESTServices.java

@@ -138,7 +138,6 @@ public GUIDResponse createExternalAssetManager(String                 serverName
                 response.setGUID(handler.createSoftwareServerCapability(userId,
                                                                         null,
                                                                         null,
-                                                                        OpenMetadataAPIMapper.CATALOG_TYPE_GUID,
                                                                         OpenMetadataAPIMapper.CATALOG_TYPE_NAME,
                                                                         OpenMetadataAPIMapper.ASSET_MANAGER_TYPE_NAME,
                                                                         assetManagerProperties.getQualifiedName(),
@@ -149,6 +148,7 @@ public GUIDResponse createExternalAssetManager(String                 serverName
                                                                         assetManagerProperties.getPatchLevel(),
                                                                         assetManagerProperties.getSource(),
                                                                         assetManagerProperties.getAdditionalProperties(),
+                                                                        null,
                                                                         assetManagerProperties.getVendorProperties(),
                                                                         null,
                                                                         null,

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

@@ -23,11 +23,20 @@ public class PersonalProfileProperties extends ActorProfileProperties
 {
     private static final long    serialVersionUID = 1L;
 
-    private String  fullName = null;
-    private String  jobTitle = null;
+    private String title             = null;
+    private String initials          = null;
+    private String givenNames        = null;
+    private String surname           = null;
+    private String fullName          = null;
+    private String jobTitle          = null;
+    private String employeeNumber    = null;
+    private String employeeType      = null;
+    private String preferredLanguage = null;
+
     private boolean isPublic = false;
 
 
+
     /**
      * Default Constructor
      */
@@ -50,6 +59,13 @@ public PersonalProfileProperties(PersonalProfileProperties template)
         {
             this.fullName = template.getFullName();
             this.jobTitle = template.getJobTitle();
+            this.title = template.getTitle();
+            this.initials = template.getInitials();
+            this.givenNames = template.getGivenNames();
+            this.surname = template.getSurname();
+            this.employeeNumber = template.getEmployeeNumber();
+            this.employeeType = template.getEmployeeType();
+            this.preferredLanguage = template.getPreferredLanguage();
             this.isPublic = template.getIsPublic();
         }
     }
@@ -100,7 +116,161 @@ public void setJobTitle(String jobTitle)
 
 
     /**
-     * Return if the contents of this profile be shared with colleagues.
+     * Return the courtesy title for the person.
+     *
+     * @return string
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+
+    /**
+     * Set up the courtesy title for the person.
+     *
+     * @param title string
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+
+    /**
+     * Return first letter of each of the person's given names.
+     *
+     * @return string
+     */
+    public String getInitials()
+    {
+        return initials;
+    }
+
+
+    /**
+     * Set up first letter of each of the person's given names.
+     *
+     * @param initials string
+     */
+    public void setInitials(String initials)
+    {
+        this.initials = initials;
+    }
+
+
+    /**
+     * Return the name strings that are the part of a person's name that is not their surname.
+     *
+     * @return space separated list of names
+     */
+    public String getGivenNames()
+    {
+        return givenNames;
+    }
+
+
+    /**
+     * Set up the name strings that are the part of a person's name that is not their surname.
+     *
+     * @param givenNames space separated list of names
+     */
+    public void setGivenNames(String givenNames)
+    {
+        this.givenNames = givenNames;
+    }
+
+
+    /**
+     * Return the family name of the person.
+     *
+     * @return string
+     */
+    public String getSurname()
+    {
+        return surname;
+    }
+
+
+    /**
+     * Set up the family name of the person.
+     *
+     * @param surname string
+     */
+    public void setSurname(String surname)
+    {
+        this.surname = surname;
+    }
+
+
+    /**
+     * Return the unique identifier of the person used by their employer.
+     *
+     * @return string
+     */
+    public String getEmployeeNumber()
+    {
+        return employeeNumber;
+    }
+
+
+    /**
+     * Set up the unique identifier of the person used by their employer.
+     *
+     * @param employeeNumber string
+     */
+    public void setEmployeeNumber(String employeeNumber)
+    {
+        this.employeeNumber = employeeNumber;
+    }
+
+
+    /**
+     * Return code used by employer typically to describe the type of employment contract.
+     *
+     * @return string
+     */
+    public String getEmployeeType()
+    {
+        return employeeType;
+    }
+
+
+    /**
+     * Set up code used by employer typically to describe the type of employment contract.
+     *
+     * @param employeeType string
+     */
+    public void setEmployeeType(String employeeType)
+    {
+        this.employeeType = employeeType;
+    }
+
+
+    /**
+     * Return spoken or written language preferred by the person.
+     *
+     * @return string
+     */
+    public String getPreferredLanguage()
+    {
+        return preferredLanguage;
+    }
+
+
+    /**
+     * Set up spoken or written language preferred by the person.
+     *
+     * @param preferredLanguage string
+     */
+    public void setPreferredLanguage(String preferredLanguage)
+    {
+        this.preferredLanguage = preferredLanguage;
+    }
+
+
+    /**
+     * Return if the contents of this profile is to be shared with colleagues.
      *
      * @return flag
      */
@@ -111,7 +281,7 @@ public boolean getIsPublic()
 
 
     /**
-     * Set up if the contents of this profile be shared with colleagues.
+     * Set up if the contents of this profile is to be shared with colleagues.
      *
      * @param isPublic flag
      */
@@ -132,6 +302,13 @@ public String toString()
         return "PersonalProfileProperties{" +
                        "fullName='" + fullName + '\'' +
                        ", jobTitle='" + jobTitle + '\'' +
+                       ", title='" + title + '\'' +
+                       ", initials='" + initials + '\'' +
+                       ", givenNames='" + givenNames + '\'' +
+                       ", surname='" + surname + '\'' +
+                       ", employeeNumber='" + employeeNumber + '\'' +
+                       ", employeeType='" + employeeType + '\'' +
+                       ", preferredLanguage='" + preferredLanguage + '\'' +
                        ", isPublic=" + isPublic +
                        ", knownName='" + getKnownName() + '\'' +
                        ", description='" + getDescription() + '\'' +
@@ -163,13 +340,21 @@ public boolean equals(Object objectToCompare)
         {
             return false;
         }
-        if (!super.equals(objectToCompare))
+        if (! super.equals(objectToCompare))
         {
             return false;
         }
         PersonalProfileProperties that = (PersonalProfileProperties) objectToCompare;
-        return Objects.equals(fullName, that.fullName) &&
-                       Objects.equals(jobTitle, that.jobTitle);
+        return isPublic == that.isPublic &&
+                       Objects.equals(fullName, that.fullName) &&
+                       Objects.equals(jobTitle, that.jobTitle) &&
+                       Objects.equals(title, that.title) &&
+                       Objects.equals(initials, that.initials) &&
+                       Objects.equals(givenNames, that.givenNames) &&
+                       Objects.equals(surname, that.surname) &&
+                       Objects.equals(employeeNumber, that.employeeNumber) &&
+                       Objects.equals(employeeType, that.employeeType) &&
+                       Objects.equals(preferredLanguage, that.preferredLanguage);
     }
 
 
@@ -181,6 +366,7 @@ public boolean equals(Object objectToCompare)
     @Override
     public int hashCode()
     {
-        return Objects.hash(super.hashCode(), fullName, jobTitle);
+        return Objects.hash(super.hashCode(), fullName, jobTitle, title, initials, givenNames, surname, employeeNumber, employeeType,
+                            preferredLanguage, isPublic);
     }
 }

open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/converters/PersonalProfileConverter.java

@@ -88,8 +88,15 @@ public B getNewComplexBean(Class<B>           beanClass,
                     profileProperties.setQualifiedName(this.removeQualifiedName(instanceProperties));
                     profileProperties.setKnownName(this.removeName(instanceProperties));
                     profileProperties.setDescription(this.removeDescription(instanceProperties));
+                    profileProperties.setTitle(this.removeTitle(instanceProperties));
+                    profileProperties.setInitials(this.removeInitials(instanceProperties));
+                    profileProperties.setGivenNames(this.removeGivenNames(instanceProperties));
+                    profileProperties.setSurname(this.removeSurname(instanceProperties));
                     profileProperties.setFullName(this.removeFullName(instanceProperties));
+                    profileProperties.setPreferredLanguage(this.removePreferredLanguage(instanceProperties));
                     profileProperties.setJobTitle(this.removeJobTitle(instanceProperties));
+                    profileProperties.setEmployeeNumber(this.removeEmployeeNumber(instanceProperties));
+                    profileProperties.setEmployeeType(this.removeEmployeeType(instanceProperties));
                     profileProperties.setIsPublic(this.removeIsPublic(instanceProperties));
                     profileProperties.setAdditionalProperties(this.removeAdditionalProperties(instanceProperties));
                     profileProperties.setEffectiveFrom(instanceProperties.getEffectiveFromTime());

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

@@ -122,7 +122,6 @@ public GUIDResponse createMetadataSource(String                   serverName,
                                                                         null,
                                                                         null,
                                                                         null,
-                                                                        null,
                                                                         requestBody.getQualifiedName(),
                                                                         requestBody.getDisplayName(),
                                                                         requestBody.getDescription(),
@@ -131,6 +130,7 @@ public GUIDResponse createMetadataSource(String                   serverName,
                                                                         requestBody.getPatchLevel(),
                                                                         requestBody.getSource(),
                                                                         requestBody.getAdditionalProperties(),
+                                                                        null,
                                                                         requestBody.getVendorProperties(),
                                                                         null,
                                                                         null,

open-metadata-implementation/access-services/data-manager/data-manager-api/src/main/java/org/odpi/openmetadata/accessservices/datamanager/api/EventBrokerInterface.java

@@ -368,7 +368,7 @@ List<EventTypeElement> findEventTypes(String userId,
 
 
     /**
-     * Return the list of event types associated with an EvenSet.  This is a collection of EventType definitions.
+     * Return the list of event types associated with an EventSet.  This is a collection of EventType definitions.
      * These event types can be used as a template for adding the event types to a topic.
      *
      * @param userId calling user

open-metadata-implementation/access-services/data-manager/data-manager-api/src/main/java/org/odpi/openmetadata/accessservices/datamanager/metadataelements/APIOperationElement.java

@@ -26,7 +26,6 @@ public class APIOperationElement implements MetadataElement, Serializable
 
     private APIOperationProperties properties    = null;
     private ElementHeader          elementHeader = null;
-    private int                    payloadCount  = 0;
 
     /**
      * Default constructor
@@ -48,8 +47,6 @@ public APIOperationElement(APIOperationElement template)
         {
             elementHeader = template.getElementHeader();
             properties = template.getProperties();
-
-            payloadCount = template.getPayloadCount();
         }
     }
 
@@ -100,26 +97,6 @@ public void setProperties(APIOperationProperties properties)
     }
 
 
-
-    /**
-     * Return the count of the payloads (header, request, response) defined for this operation.
-     *
-     * @return int
-     */
-    public int getPayloadCount() { return payloadCount; }
-
-
-    /**
-     * Set up the count of payloads (header, request, response) defined for this operation
-     *
-     * @param payloadCount int
-     */
-    public void setPayloadCount(int payloadCount)
-    {
-        this.payloadCount = payloadCount;
-    }
-
-
     /**
      * JSON-style toString
      *
@@ -131,7 +108,6 @@ public String toString()
         return "APIOperationElement{" +
                        "properties=" + properties +
                        ", elementHeader=" + elementHeader +
-                       ", payloadCount=" + payloadCount +
                        '}';
     }
 
@@ -154,8 +130,7 @@ public boolean equals(Object objectToCompare)
             return false;
         }
         APIOperationElement that = (APIOperationElement) objectToCompare;
-        return payloadCount == that.payloadCount &&
-                       Objects.equals(properties, that.properties) &&
+        return Objects.equals(properties, that.properties) &&
                        Objects.equals(elementHeader, that.elementHeader);
     }
 
@@ -168,6 +143,6 @@ public boolean equals(Object objectToCompare)
     @Override
     public int hashCode()
     {
-        return Objects.hash(super.hashCode(), elementHeader, properties, payloadCount);
+        return Objects.hash(super.hashCode(), elementHeader, properties);
     }
 }