Marge conflicts while cherry-picking 24daa4f

Signed-off-by: Ljupcho Palashevski <lpalashevski@gmail.com>
odpi · Sep 8, 2023 · a21129e · a21129e
1 parent 29a4040
commit a21129e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...assis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServer.java b/...assis-spring/src/main/java/org/odpi/openmetadata/serverchassis/springboot/OMAGServer.java
@@ -3,10 +3,10 @@
 package org.odpi.openmetadata.serverchassis.springboot;
 
 import org.odpi.openmetadata.adminservices.configuration.properties.OMAGServerConfig;
-import org.odpi.openmetadata.platformservices.rest.SuccessMessageResponse;
-import org.odpi.openmetadata.platformservices.server.OMAGServerOperationalServices;
 import org.odpi.openmetadata.serverchassis.springboot.config.OMAGConfigHelper;
 import org.odpi.openmetadata.serverchassis.springboot.exception.OMAGServerActivationError;
+import org.odpi.openmetadata.serveroperations.rest.SuccessMessageResponse;
+import org.odpi.openmetadata.serveroperations.server.OMAGServerOperationalServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...java/org/odpi/openmetadata/serverchassis/springboot/config/OMAGServicesConfiguration.java b/...java/org/odpi/openmetadata/serverchassis/springboot/config/OMAGServicesConfiguration.java
@@ -3,8 +3,8 @@
 package org.odpi.openmetadata.serverchassis.springboot.config;
 
 import org.odpi.openmetadata.adapters.repositoryservices.ConnectorConfigurationFactory;
-import org.odpi.openmetadata.platformservices.server.OMAGServerOperationalServices;
 import org.odpi.openmetadata.repositoryservices.admin.OMRSConfigurationFactory;
+import org.odpi.openmetadata.serveroperations.server.OMAGServerOperationalServices;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -20,7 +20,7 @@ public class OMAGServicesConfiguration {
      * Provides singleton bean instance of OMAGServerOperationalServices
      *
      * @return OMAGServerOperationalServices instance
-     * @see org.odpi.openmetadata.platformservices.server.OMAGServerOperationalServices
+     * @see OMAGServerOperationalServices
      */
     @Primary
     @Bean(name = {"platformOperationalServices"})