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

Rename split packages (#7246)
odpi · Jan 4, 2023 · b819161 · b819161
2 parents f0c8945 + 7fde2c9
commit b819161
Show file tree

Hide file tree

Showing 132 changed files with 384 additions and 402 deletions.
diff --git a/...mance-suite-client/src/main/java/org/odpi/openmetadata/conformance/client/RESTClient.java b/...mance-suite-client/src/main/java/org/odpi/openmetadata/conformance/client/RESTClient.java
@@ -6,7 +6,7 @@
 import org.odpi.openmetadata.adapters.connectors.restclients.RESTClientConnector;
 import org.odpi.openmetadata.adapters.connectors.restclients.ffdc.exceptions.RESTConfigurationException;
 import org.odpi.openmetadata.adapters.connectors.restclients.ffdc.exceptions.RESTServerException;
-import org.odpi.openmetadata.adapters.connectors.restclients.RESTClientFactory;
+import org.odpi.openmetadata.adapters.connectors.restclients.factory.RESTClientFactory;
 import org.odpi.openmetadata.conformance.ffdc.ConformanceSuiteErrorCode;
 import org.odpi.openmetadata.conformance.rest.*;
 

diff --git a/.../org/odpi/openmetadata/accessservices/analyticsmodeling/admin/AnalyticsModelingAdmin.java b/.../org/odpi/openmetadata/accessservices/analyticsmodeling/admin/AnalyticsModelingAdmin.java
@@ -10,7 +10,7 @@
 import org.odpi.openmetadata.accessservices.analyticsmodeling.ffdc.AnalyticsModelingErrorCode;
 import org.odpi.openmetadata.accessservices.analyticsmodeling.server.AnalyticsModelingServicesInstance;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.OMAGAdminErrorCode;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;

diff --git a/...enmetadata/accessservices/analyticsmodeling/server/AnalyticsModelingOMASRegistration.java b/...enmetadata/accessservices/analyticsmodeling/server/AnalyticsModelingOMASRegistration.java
@@ -3,9 +3,9 @@
 package org.odpi.openmetadata.accessservices.analyticsmodeling.server;
 
 import org.odpi.openmetadata.accessservices.analyticsmodeling.admin.AnalyticsModelingAdmin;
-import org.odpi.openmetadata.adminservices.configuration.OMAGAccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistrationEntry;
+import org.odpi.openmetadata.adminservices.registration.OMAGAccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.ServiceOperationalStatus;
 
 /**
@@ -23,8 +23,8 @@ class AnalyticsModelingOMASRegistration {
 	 */
 	static void registerAccessService() {
 		AccessServiceDescription myDescription = AccessServiceDescription.ANALYTICS_MODELING_OMAS;
-		AccessServiceRegistration myRegistration = new AccessServiceRegistration(myDescription,
-				ServiceOperationalStatus.ENABLED, AnalyticsModelingAdmin.class.getName());
+		AccessServiceRegistrationEntry myRegistration = new AccessServiceRegistrationEntry(myDescription,
+                                                                                           ServiceOperationalStatus.ENABLED, AnalyticsModelingAdmin.class.getName());
 
 		OMAGAccessServiceRegistration.registerAccessService(myRegistration);
 	}

diff --git a/.../main/java/org/odpi/openmetadata/accessservices/assetcatalog/admin/AssetCatalogAdmin.java b/.../main/java/org/odpi/openmetadata/accessservices/assetcatalog/admin/AssetCatalogAdmin.java
@@ -5,7 +5,7 @@
 import org.odpi.openmetadata.accessservices.assetcatalog.auditlog.AssetCatalogAuditCode;
 import org.odpi.openmetadata.accessservices.assetcatalog.listeners.AssetCatalogOMRSTopicListener;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;

diff --git a/...ava/org/odpi/openmetadata/accessservices/assetcatalog/admin/AssetCatalogRegistration.java b/...ava/org/odpi/openmetadata/accessservices/assetcatalog/admin/AssetCatalogRegistration.java
@@ -4,9 +4,9 @@
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.odpi.openmetadata.adminservices.configuration.OMAGAccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistrationEntry;
+import org.odpi.openmetadata.adminservices.registration.OMAGAccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.ServiceOperationalStatus;
 
 /**
@@ -24,9 +24,9 @@ class AssetCatalogRegistration {
     static void registerAccessService() {
         AccessServiceDescription myDescription = AccessServiceDescription.ASSET_CATALOG_OMAS;
 
-        AccessServiceRegistration myRegistration = new AccessServiceRegistration(myDescription,
-                                                                                 ServiceOperationalStatus.ENABLED,
-                                                                                 AssetCatalogAdmin.class.getName());
+        AccessServiceRegistrationEntry myRegistration = new AccessServiceRegistrationEntry(myDescription,
+                                                                                           ServiceOperationalStatus.ENABLED,
+                                                                                           AssetCatalogAdmin.class.getName());
         OMAGAccessServiceRegistration.registerAccessService(myRegistration);
     }
 }
diff --git a/...ain/java/org/odpi/openmetadata/accessservices/assetconsumer/admin/AssetConsumerAdmin.java b/...ain/java/org/odpi/openmetadata/accessservices/assetconsumer/admin/AssetConsumerAdmin.java
@@ -9,7 +9,7 @@
 import org.odpi.openmetadata.accessservices.assetconsumer.outtopic.AssetConsumerOutTopicPublisher;
 import org.odpi.openmetadata.accessservices.assetconsumer.server.AssetConsumerServicesInstance;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;

diff --git a/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRegistration.java b/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRegistration.java
@@ -4,10 +4,10 @@
 
 
 import org.odpi.openmetadata.accessservices.assetconsumer.admin.AssetConsumerAdmin;
-import org.odpi.openmetadata.adminservices.configuration.OMAGAccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.registration.OMAGAccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.configuration.registration.ServiceOperationalStatus;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistrationEntry;
 
 /**
  * AssetConsumerRegistration registers the access service with the OMAG Server administration services.
@@ -24,9 +24,9 @@ public static void registerAccessService()
     {
         AccessServiceDescription myDescription = AccessServiceDescription.ASSET_CONSUMER_OMAS;
 
-        AccessServiceRegistration myRegistration = new AccessServiceRegistration(myDescription,
-                                                                                 ServiceOperationalStatus.ENABLED,
-                                                                                 AssetConsumerAdmin.class.getName());
+        AccessServiceRegistrationEntry myRegistration = new AccessServiceRegistrationEntry(myDescription,
+                                                                                           ServiceOperationalStatus.ENABLED,
+                                                                                           AssetConsumerAdmin.class.getName());
         OMAGAccessServiceRegistration.registerAccessService(myRegistration);
     }
 }
diff --git a/...g/odpi/openmetadata/accessservices/assetconsumer/server/spring/AssetConsumerResource.java b/...g/odpi/openmetadata/accessservices/assetconsumer/server/spring/AssetConsumerResource.java
@@ -6,7 +6,6 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.odpi.openmetadata.accessservices.assetconsumer.rest.CommentRequestBody;
-import org.odpi.openmetadata.accessservices.assetconsumer.properties.InformalTagProperties;
 import org.odpi.openmetadata.accessservices.assetconsumer.rest.RatingRequestBody;
 import org.odpi.openmetadata.accessservices.assetconsumer.rest.*;
 import org.odpi.openmetadata.accessservices.assetconsumer.server.AssetConsumerRESTServices;

diff --git a/.../main/java/org/odpi/openmetadata/accessservices/assetlineage/admin/AssetLineageAdmin.java b/.../main/java/org/odpi/openmetadata/accessservices/assetlineage/admin/AssetLineageAdmin.java
@@ -11,7 +11,7 @@
 import org.odpi.openmetadata.accessservices.assetlineage.util.AssetLineageTypesValidator;
 import org.odpi.openmetadata.accessservices.assetlineage.util.Converter;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.OMAGAdminErrorCode;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;

diff --git a/...va/org/odpi/openmetadata/accessservices/assetlineage/server/AssetLineageRegistration.java b/...va/org/odpi/openmetadata/accessservices/assetlineage/server/AssetLineageRegistration.java
@@ -4,9 +4,9 @@
 
 
 import org.odpi.openmetadata.accessservices.assetlineage.admin.AssetLineageAdmin;
-import org.odpi.openmetadata.adminservices.configuration.OMAGAccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.registration.OMAGAccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistrationEntry;
 import org.odpi.openmetadata.adminservices.configuration.registration.ServiceOperationalStatus;
 
 /**
@@ -24,9 +24,9 @@ private AssetLineageRegistration() {}
     static void registerAccessService() {
         AccessServiceDescription myDescription = AccessServiceDescription.ASSET_LINEAGE_OMAS;
 
-        AccessServiceRegistration myRegistration = new AccessServiceRegistration(myDescription,
-                ServiceOperationalStatus.ENABLED,
-                AssetLineageAdmin.class.getName());
+        AccessServiceRegistrationEntry myRegistration = new AccessServiceRegistrationEntry(myDescription,
+                                                                                           ServiceOperationalStatus.ENABLED,
+                                                                                           AssetLineageAdmin.class.getName());
         OMAGAccessServiceRegistration.registerAccessService(myRegistration);
     }
 }
diff --git a/.../main/java/org/odpi/openmetadata/accessservices/assetmanager/admin/AssetManagerAdmin.java b/.../main/java/org/odpi/openmetadata/accessservices/assetmanager/admin/AssetManagerAdmin.java
@@ -9,7 +9,7 @@
 import org.odpi.openmetadata.accessservices.assetmanager.outtopic.AssetManagerOutTopicPublisher;
 import org.odpi.openmetadata.accessservices.assetmanager.server.AssetManagerServicesInstance;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;

diff --git a/...rg/odpi/openmetadata/accessservices/assetmanager/server/AssetManagerOMASRegistration.java b/...rg/odpi/openmetadata/accessservices/assetmanager/server/AssetManagerOMASRegistration.java
@@ -3,9 +3,9 @@
 package org.odpi.openmetadata.accessservices.assetmanager.server;
 
 import org.odpi.openmetadata.accessservices.assetmanager.admin.AssetManagerAdmin;
-import org.odpi.openmetadata.adminservices.configuration.OMAGAccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistrationEntry;
+import org.odpi.openmetadata.adminservices.registration.OMAGAccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.ServiceOperationalStatus;
 
 
@@ -23,9 +23,9 @@ public class AssetManagerOMASRegistration
     static void registerAccessService()
     {
         AccessServiceDescription myDescription = AccessServiceDescription.ASSET_MANAGER_OMAS;
-        AccessServiceRegistration myRegistration = new AccessServiceRegistration(myDescription,
-                                                                                 ServiceOperationalStatus.ENABLED,
-                                                                                 AssetManagerAdmin.class.getName());
+        AccessServiceRegistrationEntry myRegistration = new AccessServiceRegistrationEntry(myDescription,
+                                                                                           ServiceOperationalStatus.ENABLED,
+                                                                                           AssetManagerAdmin.class.getName());
 
         OMAGAccessServiceRegistration.registerAccessService(myRegistration);
     }

diff --git a/.../src/main/java/org/odpi/openmetadata/accessservices/assetowner/admin/AssetOwnerAdmin.java b/.../src/main/java/org/odpi/openmetadata/accessservices/assetowner/admin/AssetOwnerAdmin.java
@@ -10,7 +10,7 @@
 import org.odpi.openmetadata.accessservices.assetowner.outtopic.AssetOwnerOutTopicPublisher;
 import org.odpi.openmetadata.accessservices.assetowner.server.AssetOwnerServicesInstance;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;

diff --git a/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRegistration.java b/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRegistration.java
@@ -4,10 +4,10 @@
 
 
 import org.odpi.openmetadata.accessservices.assetowner.admin.AssetOwnerAdmin;
-import org.odpi.openmetadata.adminservices.configuration.OMAGAccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistrationEntry;
+import org.odpi.openmetadata.adminservices.registration.OMAGAccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.configuration.registration.ServiceOperationalStatus;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistration;
 
 /**
  * AssetOwnerRegistration registers the access service with the OMAG Server administration services.
@@ -24,9 +24,9 @@ static void registerAccessService()
     {
         AccessServiceDescription myDescription = AccessServiceDescription.ASSET_OWNER_OMAS;
 
-        AccessServiceRegistration myRegistration = new AccessServiceRegistration(myDescription,
-                                                                                 ServiceOperationalStatus.ENABLED,
-                                                                                 AssetOwnerAdmin.class.getName());
+        AccessServiceRegistrationEntry myRegistration = new AccessServiceRegistrationEntry(myDescription,
+                                                                                           ServiceOperationalStatus.ENABLED,
+                                                                                           AssetOwnerAdmin.class.getName());
         OMAGAccessServiceRegistration.registerAccessService(myRegistration);
     }
 }
diff --git a/...va/org/odpi/openmetadata/accessservices/communityprofile/admin/CommunityProfileAdmin.java b/...va/org/odpi/openmetadata/accessservices/communityprofile/admin/CommunityProfileAdmin.java
@@ -9,16 +9,14 @@
 import org.odpi.openmetadata.accessservices.communityprofile.outtopic.CommunityProfileOutTopicPublisher;
 import org.odpi.openmetadata.accessservices.communityprofile.server.CommunityProfileServicesInstance;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;
 import org.odpi.openmetadata.frameworks.connectors.properties.beans.Connection;
 import org.odpi.openmetadata.frameworks.connectors.properties.beans.Endpoint;
 import org.odpi.openmetadata.repositoryservices.auditlog.OMRSAuditingComponent;
 import org.odpi.openmetadata.repositoryservices.connectors.omrstopic.OMRSTopicConnector;
-import org.odpi.openmetadata.repositoryservices.connectors.omrstopic.OMRSTopicListener;
-import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicConnector;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryConnector;
 
 import java.util.List;

diff --git a/...dpi/openmetadata/accessservices/communityprofile/server/CommunityProfileRegistration.java b/...dpi/openmetadata/accessservices/communityprofile/server/CommunityProfileRegistration.java
@@ -4,10 +4,10 @@
 
 
 import org.odpi.openmetadata.accessservices.communityprofile.admin.CommunityProfileAdmin;
-import org.odpi.openmetadata.adminservices.configuration.OMAGAccessServiceRegistration;
+import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistrationEntry;
+import org.odpi.openmetadata.adminservices.registration.OMAGAccessServiceRegistration;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.configuration.registration.ServiceOperationalStatus;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceRegistration;
 
 /**
  * CommunityProfileRegistration registers the access service with the OMAG Server administration services.
@@ -24,9 +24,9 @@ static void registerAccessService()
     {
         AccessServiceDescription myDescription = AccessServiceDescription.COMMUNITY_PROFILE_OMAS;
 
-        AccessServiceRegistration myRegistration = new AccessServiceRegistration(myDescription,
-                                                                                 ServiceOperationalStatus.ENABLED,
-                                                                                 CommunityProfileAdmin.class.getName());
+        AccessServiceRegistrationEntry myRegistration = new AccessServiceRegistrationEntry(myDescription,
+                                                                                           ServiceOperationalStatus.ENABLED,
+                                                                                           CommunityProfileAdmin.class.getName());
         OMAGAccessServiceRegistration.registerAccessService(myRegistration);
     }
 }
diff --git a/...in/java/org/odpi/openmetadata/accessservices/dataengine/server/admin/DataEngineAdmin.java b/...in/java/org/odpi/openmetadata/accessservices/dataengine/server/admin/DataEngineAdmin.java
@@ -8,7 +8,7 @@
 import org.odpi.openmetadata.accessservices.dataengine.server.listeners.DataEngineInTopicListener;
 import org.odpi.openmetadata.accessservices.dataengine.server.processors.DataEngineEventProcessor;
 import org.odpi.openmetadata.adminservices.configuration.properties.AccessServiceConfig;
-import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceAdmin;
+import org.odpi.openmetadata.adminservices.registration.AccessServiceAdmin;
 import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription;
 import org.odpi.openmetadata.adminservices.ffdc.exception.OMAGConfigurationErrorException;
 import org.odpi.openmetadata.frameworks.auditlog.AuditLog;