Merge "Watchdog-process that syncs 'ADVISED' CM Handles"

diff --combined cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
index a981022,11683ad..997e7d5
--- 1/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
--- 2/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
@@@ -21,19 -21,23 +21,24 @@@
  package org.onap.cps.ncmp.api.impl.config;
  
  import java.util.Arrays;
+ import lombok.AccessLevel;
  import lombok.Getter;
+ import lombok.RequiredArgsConstructor;
  import org.springframework.beans.factory.annotation.Value;
 +import org.springframework.beans.factory.config.ConfigurableBeanFactory;
  import org.springframework.boot.web.client.RestTemplateBuilder;
  import org.springframework.context.annotation.Bean;
  import org.springframework.context.annotation.Configuration;
  import org.springframework.context.annotation.Scope;
  import org.springframework.http.MediaType;
  import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+ import org.springframework.scheduling.annotation.EnableScheduling;
  import org.springframework.stereotype.Component;
  import org.springframework.web.client.RestTemplate;
  
+ @EnableScheduling
  @Configuration
+ @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
  public class NcmpConfiguration {
  
      @Getter
@@@ -54,7 -58,7 +59,7 @@@
       * @return rest template instance
       */
      @Bean
 -    @Scope("singleton")
 +    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
      public static RestTemplate restTemplate(final RestTemplateBuilder restTemplateBuilder) {
          final RestTemplate restTemplate = restTemplateBuilder.build();
          setRestTemplateMessageConverters(restTemplate);
@@@ -68,4 -72,5 +73,5 @@@
              Arrays.asList(MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN));
          restTemplate.getMessageConverters().add(mappingJackson2HttpMessageConverter);
      }
+ 
  }