Cleanup of Discovery Service (our code)

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/ApiCatalogApplication.java

@@ -11,7 +11,7 @@
 
 import com.ca.mfaas.enable.EnableApiDiscovery;
 import com.ca.mfaas.product.monitoring.LatencyUtilsConfigInitializer;
-import com.ca.mfaas.product.service.BuildInfo;
+import com.ca.mfaas.product.version.BuildInfo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/config/BeanConfig.java

@@ -12,7 +12,6 @@
 import com.ca.mfaas.message.core.MessageService;
 import com.ca.mfaas.product.gateway.GatewayClient;
 import com.ca.mfaas.product.routing.transform.TransformService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -21,7 +20,6 @@
  * General configuration of the API Catalog.
  */
 @Configuration
-@Slf4j
 public class BeanConfig {
 
     @Bean

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/config/TomcatConfiguration.java

@@ -9,7 +9,6 @@
  */
 package com.ca.mfaas.apicatalog.config;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
@@ -19,7 +18,6 @@
  * Configuration of Tomcat for the API Gateway.
  */
 @Configuration
-@Slf4j
 public class TomcatConfiguration {
 
     @Bean

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/controllers/api/CatalogApiDocController.java

@@ -11,7 +11,6 @@
 
 import com.ca.mfaas.apicatalog.services.status.APIServiceStatusService;
 import io.swagger.annotations.*;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -24,7 +23,6 @@
 /**
  * Main API for handling requests from the API Catalog UI, routed through the gateway
  */
-@Slf4j
 @RestController
 @RequestMapping("/apidoc")
 @Api(tags = {"API Documentation"},

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/controllers/handlers/ApiCatalogControllerExceptionHandler.java

@@ -15,7 +15,6 @@
 import com.ca.mfaas.message.core.Message;
 import com.ca.mfaas.message.core.MessageService;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -24,7 +23,6 @@
 /**
  * This class creates responses for exceptional behavior of the ApiCatalogController
  */
-@Slf4j
 @ControllerAdvice(assignableTypes = {ApiCatalogController.class})
 @RequiredArgsConstructor
 public class ApiCatalogControllerExceptionHandler {

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/controllers/handlers/CatalogApiDocControllerExceptionHandler.java

@@ -16,7 +16,6 @@
 import com.ca.mfaas.message.core.Message;
 import com.ca.mfaas.message.core.MessageService;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -25,7 +24,6 @@
 /**
  * This class creates responses for exceptional behavior of the CatalogApiDocController
  */
-@Slf4j
 @ControllerAdvice(assignableTypes = {CatalogApiDocController.class})
 @RequiredArgsConstructor
 public class CatalogApiDocControllerExceptionHandler {

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/controllers/handlers/NotFoundErrorController.java

@@ -9,7 +9,6 @@
  */
 package com.ca.mfaas.apicatalog.controllers.handlers;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -24,7 +23,6 @@
 /**
  * Handles errors in REST API processing.
  */
-@Slf4j
 @Controller
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class NotFoundErrorController implements ErrorController {

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/services/status/APIDocRetrievalService.java

@@ -22,7 +22,6 @@
 import com.netflix.appinfo.InstanceInfo;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -35,7 +34,6 @@
 /**
  * Retrieves the API documentation for a registered service
  */
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class APIDocRetrievalService {

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/services/status/listeners/AppReadyListener.java

@@ -10,15 +10,13 @@
 package com.ca.mfaas.apicatalog.services.status.listeners;
 
 import com.ca.mfaas.product.service.ServiceStartupEventHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 /**
  * This class fires on ApplicationReadyEvent event during Spring context initialization
  */
-@Slf4j
 @Component
 public class AppReadyListener {
 

api-catalog-services/src/main/java/com/ca/mfaas/apicatalog/services/status/listeners/GatewayLookupEventListener.java

@@ -13,7 +13,6 @@
 import com.ca.mfaas.product.gateway.GatewayLookupCompleteEvent;
 import com.ca.mfaas.product.registry.CannotRegisterServiceException;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -23,7 +22,6 @@
  * This class fires on GatewayLookupCompleteEvent event
  * Initializes Catalog instances from Eureka
  */
-@Slf4j
 @Component
 @RequiredArgsConstructor
 @Order(Ordered.HIGHEST_PRECEDENCE)