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

Software server capability support and resilient integration daemon
odpi · Dec 13, 2021 · 1a629c1 · 1a629c1
2 parents 680df60 + abb8504
commit 1a629c1
Show file tree

Hide file tree

Showing 206 changed files with 11,255 additions and 1,287 deletions.
diff --git a/...va/org/odpi/openmetadata/accessservices/assetconsumer/elements/ElementOriginCategory.java b/...va/org/odpi/openmetadata/accessservices/assetconsumer/elements/ElementOriginCategory.java
@@ -38,9 +38,9 @@ public enum ElementOriginCategory implements Serializable
 
     private static final long     serialVersionUID = 1L;
 
-    private int    originCode;
-    private String originName;
-    private String originDescription;
+    private final int    originCode;
+    private final String originName;
+    private final String originDescription;
 
 
     /**

diff --git a/...ava/org/odpi/openmetadata/accessservices/assetconsumer/events/AssetConsumerEventType.java b/...ava/org/odpi/openmetadata/accessservices/assetconsumer/events/AssetConsumerEventType.java
@@ -27,9 +27,9 @@ public enum AssetConsumerEventType implements Serializable
 
     private static final long     serialVersionUID = 1L;
 
-    private  int      eventTypeCode;
-    private  String   eventTypeName;
-    private  String   eventTypeDescription;
+    private  final int      eventTypeCode;
+    private  final String   eventTypeName;
+    private  final String   eventTypeDescription;
 
 
     /**

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetconsumer/ffdc/AssetConsumerAuditCode.java b/.../java/org/odpi/openmetadata/accessservices/assetconsumer/ffdc/AssetConsumerAuditCode.java
@@ -69,7 +69,7 @@ public enum AssetConsumerAuditCode implements AuditLogMessageSet
 
     private static final long    serialVersionUID = 1L;
 
-    private AuditLogMessageDefinition messageDefinition;
+    private final AuditLogMessageDefinition messageDefinition;
 
 
     /**

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetconsumer/ffdc/AssetConsumerErrorCode.java b/.../java/org/odpi/openmetadata/accessservices/assetconsumer/ffdc/AssetConsumerErrorCode.java
@@ -88,7 +88,7 @@ public enum AssetConsumerErrorCode implements ExceptionMessageSet
 
     private static final long    serialVersionUID = 1L;
 
-    private ExceptionMessageDefinition messageDefinition;
+    private final ExceptionMessageDefinition messageDefinition;
 
 
     /**

diff --git a/.../main/java/org/odpi/openmetadata/accessservices/assetconsumer/properties/CommentType.java b/.../main/java/org/odpi/openmetadata/accessservices/assetconsumer/properties/CommentType.java
@@ -32,11 +32,11 @@ public enum CommentType implements Serializable
     public static final String ENUM_TYPE_GUID  = "06d5032e-192a-4f77-ade1-a4b97926e867";
     public static final String ENUM_TYPE_NAME  = "CommentType";
 
-    private int    openTypeOrdinal;
+    private final int    openTypeOrdinal;
 
-    private int    ordinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final String name;
+    private final String description;
 
 
     /**

diff --git a/...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/properties/OwnerType.java b/...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/properties/OwnerType.java
@@ -35,9 +35,9 @@ public enum OwnerType implements Serializable
 
     private int    openTypeOrdinal;
 
-    private int    ordinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/...c/main/java/org/odpi/openmetadata/accessservices/assetconsumer/properties/StarRating.java b/...c/main/java/org/odpi/openmetadata/accessservices/assetconsumer/properties/StarRating.java
@@ -30,11 +30,11 @@ public enum StarRating implements Serializable
     public static final String ENUM_TYPE_GUID  = "77fea3ef-6ec1-4223-8408-38567e9d3c93";
     public static final String ENUM_TYPE_NAME  = "StarRating";
 
-    private int    openTypeOrdinal;
+    private final int    openTypeOrdinal;
 
-    private int    ordinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetmanager/events/AssetManagerEventType.java b/.../java/org/odpi/openmetadata/accessservices/assetmanager/events/AssetManagerEventType.java
@@ -35,9 +35,9 @@ public enum AssetManagerEventType implements Serializable
 
     private static final long     serialVersionUID = 1L;
 
-    private  int      eventTypeCode;
-    private  String   eventTypeName;
-    private  String   eventTypeDescription;
+    private  final int      eventTypeCode;
+    private  final String   eventTypeName;
+    private  final String   eventTypeDescription;
 
 
     /**

diff --git a/...in/java/org/odpi/openmetadata/accessservices/assetmanager/ffdc/AssetManagerAuditCode.java b/...in/java/org/odpi/openmetadata/accessservices/assetmanager/ffdc/AssetManagerAuditCode.java
@@ -111,7 +111,7 @@ public enum AssetManagerAuditCode implements AuditLogMessageSet
 
     private static final long    serialVersionUID = 1L;
 
-    private AuditLogMessageDefinition messageDefinition;
+    private final AuditLogMessageDefinition messageDefinition;
 
 
     /**

diff --git a/...in/java/org/odpi/openmetadata/accessservices/assetmanager/ffdc/AssetManagerErrorCode.java b/...in/java/org/odpi/openmetadata/accessservices/assetmanager/ffdc/AssetManagerErrorCode.java
@@ -72,7 +72,7 @@ public enum AssetManagerErrorCode implements ExceptionMessageSet
 
     private static final long    serialVersionUID = 1L;
 
-    private ExceptionMessageDefinition messageDefinition;
+    private final ExceptionMessageDefinition messageDefinition;
 
 
     /**

diff --git a/...odpi/openmetadata/accessservices/assetmanager/metadataelements/ElementOriginCategory.java b/...odpi/openmetadata/accessservices/assetmanager/metadataelements/ElementOriginCategory.java
@@ -38,9 +38,9 @@ public enum ElementOriginCategory implements Serializable
 
     private static final long     serialVersionUID = 1L;
 
-    private int    originCode;
-    private String originName;
-    private String originDescription;
+    private final int    originCode;
+    private final String originName;
+    private final String originDescription;
 
 
     /**

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetmanager/properties/DataItemSortOrder.java b/.../java/org/odpi/openmetadata/accessservices/assetmanager/properties/DataItemSortOrder.java
@@ -33,10 +33,10 @@ public enum DataItemSortOrder implements Serializable
     public static final String ENUM_TYPE_NAME  = "DataItemSortOrder";
 
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/...rg/odpi/openmetadata/accessservices/assetmanager/properties/GlossaryTermActivityType.java b/...rg/odpi/openmetadata/accessservices/assetmanager/properties/GlossaryTermActivityType.java
@@ -29,11 +29,11 @@ public enum GlossaryTermActivityType implements Serializable
     public static final String ENUM_TYPE_GUID  = "af7e403d-9865-4ebb-8c1a-1fd57b4f4bca";
     public static final String ENUM_TYPE_NAME  = "ActivityType";
 
-    private int    openTypeOrdinal;
+    private final int    openTypeOrdinal;
 
-    private int    ordinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/...i/openmetadata/accessservices/assetmanager/properties/GlossaryTermRelationshipStatus.java b/...i/openmetadata/accessservices/assetmanager/properties/GlossaryTermRelationshipStatus.java
@@ -28,11 +28,11 @@ public enum GlossaryTermRelationshipStatus implements Serializable
     public static final String ENUM_TYPE_GUID  = "42282652-7d60-435e-ad3e-7cfe5291bcc7";
     public static final String ENUM_TYPE_NAME  = "TermRelationshipStatus";
 
-    private int    openTypeOrdinal;
+    private final int    openTypeOrdinal;
 
-    private int    ordinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/...java/org/odpi/openmetadata/accessservices/assetmanager/properties/GlossaryTermStatus.java b/...java/org/odpi/openmetadata/accessservices/assetmanager/properties/GlossaryTermStatus.java
@@ -36,10 +36,10 @@ public enum GlossaryTermStatus implements Serializable
     ACTIVE    (4,15, "Active",   "The term is approved and in use.");
 
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/.../org/odpi/openmetadata/accessservices/assetmanager/properties/GovernanceActionStatus.java b/.../org/odpi/openmetadata/accessservices/assetmanager/properties/GovernanceActionStatus.java
@@ -35,9 +35,9 @@ public enum GovernanceActionStatus implements Serializable
     private static final String ENUM_TYPE_GUID  = "a6e698b0-a4f7-4a39-8c80-db0bb0f972e";
     private static final String ENUM_TYPE_NAME  = "GovernanceActionStatus";
 
-    private String statusName;
-    private String statusDescription;
-    private int    statusCode;
+    private final String statusName;
+    private final String statusDescription;
+    private final int    statusCode;
 
     private int openTypeOrdinal;
 

diff --git a/.../odpi/openmetadata/accessservices/assetmanager/properties/GovernanceDefinitionStatus.java b/.../odpi/openmetadata/accessservices/assetmanager/properties/GovernanceDefinitionStatus.java
@@ -36,9 +36,9 @@ public enum GovernanceDefinitionStatus implements Serializable
 
     private static final long serialVersionUID = 1L;
 
-    private int            ordinal;
-    private String         name;
-    private String         description;
+    private final int            ordinal;
+    private final String         name;
+    private final String         description;
 
 
     /**

diff --git a/...rc/main/java/org/odpi/openmetadata/accessservices/assetmanager/properties/KeyPattern.java b/...rc/main/java/org/odpi/openmetadata/accessservices/assetmanager/properties/KeyPattern.java
@@ -34,10 +34,10 @@ public enum KeyPattern implements Serializable
     public static final String ENUM_TYPE_NAME  = "KeyPattern";
 
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/.../src/main/java/org/odpi/openmetadata/accessservices/assetmanager/properties/PortType.java b/.../src/main/java/org/odpi/openmetadata/accessservices/assetmanager/properties/PortType.java
@@ -37,10 +37,10 @@ public enum PortType implements Serializable
     public static final String ENUM_TYPE_GUID  = "b57Fbce7-42ac-71D1-D6a6-9f62Cb7C6dc3";
     public static final String ENUM_TYPE_NAME  = "PortType";
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
 
     /**

diff --git a/.../org/odpi/openmetadata/accessservices/assetmanager/properties/ProcessContainmentType.java b/.../org/odpi/openmetadata/accessservices/assetmanager/properties/ProcessContainmentType.java
@@ -35,10 +35,10 @@ public enum ProcessContainmentType implements Serializable
     public static final String ENUM_TYPE_GUID  = "1bb4b908-7983-4802-a2b5-91b095552ee9";
     public static final String ENUM_TYPE_NAME  = "ProcessContainmentType";
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
 
     /**

diff --git a/...main/java/org/odpi/openmetadata/accessservices/assetmanager/properties/ProcessStatus.java b/...main/java/org/odpi/openmetadata/accessservices/assetmanager/properties/ProcessStatus.java
@@ -35,10 +35,10 @@ public enum ProcessStatus implements Serializable
     ACTIVE    (4,15, "Active",   "The process is approved and in use.");
 
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/...java/org/odpi/openmetadata/accessservices/assetmanager/properties/ServerAssetUseType.java b/...java/org/odpi/openmetadata/accessservices/assetmanager/properties/ServerAssetUseType.java
@@ -37,10 +37,10 @@ public enum ServerAssetUseType implements Serializable
     public static final String ENUM_TYPE_GUID  = "09439481-9489-467c-9ae5-178a6e0b6b5a";
     public static final String ENUM_TYPE_NAME  = "ServerAssetUseType";
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
 
     /**

diff --git a/...rg/odpi/openmetadata/accessservices/assetmanager/properties/SynchronizationDirection.java b/...rg/odpi/openmetadata/accessservices/assetmanager/properties/SynchronizationDirection.java
@@ -38,10 +38,10 @@ public enum SynchronizationDirection implements Serializable
     ;
 
 
-    private int    ordinal;
-    private int    openTypeOrdinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final int    openTypeOrdinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/...va/org/odpi/openmetadata/accessservices/assetmanager/server/AssetManagerRESTServices.java b/...va/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,

diff --git a/...main/java/org/odpi/openmetadata/accessservices/assetowner/events/AssetOwnerEventType.java b/...main/java/org/odpi/openmetadata/accessservices/assetowner/events/AssetOwnerEventType.java
@@ -27,9 +27,9 @@ public enum AssetOwnerEventType implements Serializable
 
     private static final long     serialVersionUID = 1L;
 
-    private  int      eventTypeCode;
-    private  String   eventTypeName;
-    private  String   eventTypeDescription;
+    private  final int      eventTypeCode;
+    private  final String   eventTypeName;
+    private  final String   eventTypeDescription;
 
 
     /**

diff --git a/...c/main/java/org/odpi/openmetadata/accessservices/assetowner/ffdc/AssetOwnerAuditCode.java b/...c/main/java/org/odpi/openmetadata/accessservices/assetowner/ffdc/AssetOwnerAuditCode.java
@@ -56,7 +56,7 @@ public enum AssetOwnerAuditCode implements AuditLogMessageSet
 
     private static final long    serialVersionUID = 1L;
 
-    private AuditLogMessageDefinition messageDefinition;
+    private final AuditLogMessageDefinition messageDefinition;
 
 
     /**

diff --git a/...c/main/java/org/odpi/openmetadata/accessservices/assetowner/ffdc/AssetOwnerErrorCode.java b/...c/main/java/org/odpi/openmetadata/accessservices/assetowner/ffdc/AssetOwnerErrorCode.java
@@ -192,7 +192,7 @@ public enum AssetOwnerErrorCode implements ExceptionMessageSet
 
     private static final long    serialVersionUID = 1L;
 
-    private ExceptionMessageDefinition messageDefinition;
+    private final ExceptionMessageDefinition messageDefinition;
 
 
     /**

diff --git a/...g/odpi/openmetadata/accessservices/assetowner/metadataelements/ElementOriginCategory.java b/...g/odpi/openmetadata/accessservices/assetowner/metadataelements/ElementOriginCategory.java
@@ -38,9 +38,9 @@ public enum ElementOriginCategory implements Serializable
 
     private static final long     serialVersionUID = 1L;
 
-    private int    originCode;
-    private String originName;
-    private String originDescription;
+    private final int    originCode;
+    private final String originName;
+    private final String originDescription;
 
 
     /**

diff --git a/...in/java/org/odpi/openmetadata/accessservices/assetowner/properties/DataItemSortOrder.java b/...in/java/org/odpi/openmetadata/accessservices/assetowner/properties/DataItemSortOrder.java
@@ -32,11 +32,11 @@ public enum DataItemSortOrder implements Serializable
     public static final String ENUM_TYPE_GUID  = "aaa4df8f-1aca-4de8-9abd-1ef2aadba300";
     public static final String ENUM_TYPE_NAME  = "DataItemSortOrder";
 
-    private int    openTypeOrdinal;
+    private final int    openTypeOrdinal;
 
-    private int    ordinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
 

diff --git a/...i/src/main/java/org/odpi/openmetadata/accessservices/assetowner/properties/OwnerType.java b/...i/src/main/java/org/odpi/openmetadata/accessservices/assetowner/properties/OwnerType.java
@@ -35,9 +35,9 @@ public enum OwnerType implements Serializable
 
     private int    openTypeOrdinal;
 
-    private int    ordinal;
-    private String name;
-    private String description;
+    private final int    ordinal;
+    private final String name;
+    private final String description;
 
     private static final long     serialVersionUID = 1L;
-Original file line number
+Diff line change
@@ Expand Up @@
         private static final long    serialVersionUID = 1L;
-        private AuditLogMessageDefinition messageDefinition;
+        private final AuditLogMessageDefinition messageDefinition;
         /**
@@ Expand Down @@