Merge "Fix Sonar issues"

diff --cc prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java
index e412bff,74de87b..3f018b5
--- 1/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java
--- 2/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java
@@@ -41,8 -46,13 +41,9 @@@ import reactor.core.scheduler.Scheduler
  import java.util.Optional;
  
  @Configuration
 -@ComponentScan("org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers")
 -@EnableConfigurationProperties
 -@EnableScheduling
 -@Primary
 -public class CbsConfiguration extends PrhAppConfig {
 +public class CbsConfiguration implements Config {
      private static final Logger LOGGER = LoggerFactory.getLogger(CbsConfiguration.class);
+     private static final String CBS_CONFIG_MISSING = "CBS config missing";
      private AaiClientConfiguration aaiClientCBSConfiguration;
      private MessageRouterPublisher messageRouterPublisher;
      private MessageRouterSubscriber messageRouterSubscriber;