2 files changed, 13 insertions, 18 deletions

diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java
index 52ee416..538a84b 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java
@@ -55,9 +55,7 @@ public class SpringServiceImpl implements SpringService {
     @Autowired
     private String aaiBaseUrl;
     @Autowired
-    private String aaiPathToSearchNodeQuery;
-    @Autowired
-    private String aaiPathToCustomerQuery;
+    private String aaiPathToServiceInstanceQuery;
 
     public static final String APP_NAME = "SdncContextBuilder";
     public static final String MDC_REQUEST_ID = "RequestId";
@@ -92,14 +90,14 @@ public class SpringServiceImpl implements SpringService {
         ModelContext context = null;
 
         // Call AAI system to populate ServiceData
-        ServiceEntity serviceEntity = RestUtil.getServiceEntity(aaiClient, aaiBaseUrl, aaiBasicAuthorization, aaiPathToSearchNodeQuery, aaiPathToCustomerQuery, serviceInstanceId, transactionId);
+        ServiceEntity serviceEntity = RestUtil.getServiceEntity(aaiClient, aaiBaseUrl, aaiBasicAuthorization, aaiPathToServiceInstanceQuery, serviceInstanceId, transactionId);
 
         if (null == serviceEntity) {
             return context;
         }
 
         processApiMappingRules(serviceEntity);
-        log.info("SDN-C determined API: " + serviceEntity.getApiName());
+        log.info("SDN-C determined API: {}", serviceEntity.getApiName());
 
         context = producerTemplate.requestBody("direct:startRoutingProcess", serviceEntity, ModelContext.class);
 
@@ -126,10 +124,10 @@ public class SpringServiceImpl implements SpringService {
         }
     }
 
-    private void processApiMappingRules(ServiceEntity serviceData){
+    private void processApiMappingRules(ServiceEntity serviceData) {
 
         KieSession kieSession = kieContainer.newKieSession();
-        log.info ("KIE Session is created");
+        log.info("KIE Session is created");
         kieSession.insert(serviceData);
         kieSession.fireAllRules();
         log.info("Rules are fired");
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java
index b3d21bf..3822a58 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java
@@ -39,19 +39,15 @@ public class RestServiceImpl implements RestService {
     @Autowired
     private SpringService service;
 
-
-    public RestServiceImpl() {
-    }
-
     @Override
     public Response getContext(HttpServletRequest request, HttpHeaders headers, String serviceInstanceId) {
 
         Response response = null;
-        ModelContext sdncContext= null;
+        ModelContext sdncContext = null;
         Gson gson = new GsonBuilder().create();
         try {
             // Validate URL parameters
-            RestUtil.validateURL(serviceInstanceId);
+            RestUtil.validateUrl(serviceInstanceId);
 
             // Validate Headers and extract Partner Name
             String partnerName = RestUtil.validateHeader(headers, service.getSdncAuthoriztion());
@@ -61,17 +57,18 @@ public class RestServiceImpl implements RestService {
 
             sdncContext = service.getContext(request, serviceInstanceId, transactionId, partnerName);
 
-            if (sdncContext==null) {
+            if (sdncContext == null) {
                 // Return empty JSON
                 response = Response.ok().entity(EMPTY_JSON_STRING).build();
-            }else {
+            } else {
                 response = Response.ok().entity(gson.toJson(sdncContext)).build();
             }
         } catch (AuditException ce) {
-            if (ce.getHttpStatus() !=null) {
+            if (ce.getHttpStatus() != null) {
                 response = Response.status(ce.getHttpStatus()).entity(ce.getMessage()).build();
-            }else {
-                // No response received, could be the cases of network issue: i.e. unreachable host
+            } else {
+                // No response received, could be the cases of network issue: i.e. unreachable
+                // host
                 response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(ce.getMessage()).build();
             }
         } catch (Exception e) {