Merge "Update Logging"

diff --combined mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
index dbe69d9,ac21f5f..8da24c9
--- 1/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
--- 2/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
@@@ -46,7 -46,7 +46,7 @@@ import org.onap.so.db.catalog.beans.Vnf
  import org.onap.so.db.catalog.beans.macro.NorthBoundRequest;
  import org.onap.so.db.catalog.beans.macro.OrchestrationFlow;
  import org.onap.so.db.catalog.beans.macro.RainyDayHandlerStatus;
- import org.onap.so.logging.jaxrs.filter.jersey.SpringClientFilter;
+ import org.onap.so.logging.jaxrs.filter.SpringClientFilter;
  import org.springframework.beans.factory.annotation.Value;
  import org.springframework.http.HttpHeaders;
  import org.springframework.http.client.BufferingClientHttpRequestFactory;
@@@ -433,6 -433,13 +433,6 @@@ public class CatalogDbClient 
                                .queryParam(ACTION,action).build());
        }
        
 -      public ControllerSelectionReference getControllerSelectionReferenceByVnfType(String vnfType) {
 -              return this.getSingleResource(controllerSelectionReferenceClient, UriBuilder
 -                              .fromUri(endpoint + "/controllerSelectionReference/search/findControllerSelectionReferenceByVnfType")
 -                                              .queryParam("VNF_TYPE", vnfType).build());
 -
 -      }
 -      
        public ControllerSelectionReference getControllerSelectionReferenceByVnfTypeAndActionCategory(String vnfType, String actionCategory) {
                return this.getSingleResource(controllerSelectionReferenceClient, UriBuilder
                                .fromUri(endpoint + "/controllerSelectionReference/search/findControllerSelectionReferenceByVnfTypeAndActionCategory")

diff --combined mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java
index 9aa2ca0,bc34883..016d1d6
--- 1/mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java
--- 2/mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java
+++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java
@@@ -26,7 -26,6 +26,6 @@@ import static org.junit.Assert.assertTr
  import org.junit.Ignore;
  import org.junit.Test;
  import org.junit.runner.RunWith;
- import org.onap.so.TestApplication;
  import org.onap.so.db.catalog.beans.ControllerSelectionReference;
  import org.onap.so.db.catalog.data.repository.ControllerSelectionReferenceRepository;
  import org.springframework.beans.factory.annotation.Autowired;
@@@ -42,6 -41,16 +41,6 @@@ public class ControllerSelectionReferen
        @Autowired
        private ControllerSelectionReferenceRepository controllerSelectionReferenceRepository;
        
 -      
 -      @Test
 -      public void Find_ControllerNameByVnfType_Test() {
 -              String vnfType = "vLoadBalancerMS/vLoadBalancerMS 0";
 -              String controllerName = "APPC";
 -              ControllerSelectionReference controller = controllerSelectionReferenceRepository.findControllerSelectionReferenceByVnfType(vnfType);
 -              assertEquals(vnfType, controller.getVnfType());
 -              assertEquals(controllerName, controller.getControllerName());
 -      }
 -      
        @Test
        public void Find_ControllerNameByVnfTypeAndAction_Test() {
                String vnfType = "vLoadBalancerMS/vLoadBalancerMS 0";