2 files changed, 45 insertions, 49 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
index 1acf84f05..3aff7fea7 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
@@ -3,6 +3,7 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nokia.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +25,10 @@ import static org.onap.vid.utils.Logging.getMethodName;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.QueryParam;
@@ -77,35 +76,26 @@ import org.springframework.web.servlet.ModelAndView;
 @RestController
 public class AaiController extends RestrictedBaseController {
 
-    /**
-     * The from app id.
-     */
-    private String fromAppId = "VidAaiController";
-    /**
-     * The logger.
-     */
     private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(AaiController.class);
-    /**
-     * The model.
-     */
-    private Map<String, Object> model = new HashMap<>();
-    /**
-     * The servlet context.
-     */
-    @Autowired
-    private ServletContext servletContext;
-    /**
-     * aai service
-     */
-    @Autowired
+    private static final String FROM_APP_ID = "VidAaiController";
+
     private AaiService aaiService;
-    @Autowired
-    private RoleProvider roleProvider;
-    @Autowired
     private AAIRestInterface aaiRestInterface;
-    @Autowired
+    private RoleProvider roleProvider;
     private SystemPropertiesWrapper systemPropertiesWrapper;
 
+    @Autowired
+    public AaiController(AaiService aaiService,
+        AAIRestInterface aaiRestInterface,
+        RoleProvider roleProvider,
+        SystemPropertiesWrapper systemPropertiesWrapper) {
+
+        this.aaiService = aaiService;
+        this.aaiRestInterface = aaiRestInterface;
+        this.roleProvider = roleProvider;
+        this.systemPropertiesWrapper = systemPropertiesWrapper;
+    }
+
     /**
      * Welcome method.
      *
@@ -624,7 +614,7 @@ public class AaiController extends RestrictedBaseController {
         try {
 
 
-            resp = aaiRestInterface.RestGet(fromAppId, transId, Unchecked.toURI(uri), xml).getResponse();
+            resp = aaiRestInterface.RestGet(FROM_APP_ID, transId, Unchecked.toURI(uri), xml).getResponse();
 
         } catch (WebApplicationException e) {
             final String message = e.getResponse().readEntity(String.class);
@@ -653,7 +643,7 @@ public class AaiController extends RestrictedBaseController {
         Response resp = null;
         try {
 
-            resp = aaiRestInterface.RestPost(fromAppId, uri, payload, xml);
+            resp = aaiRestInterface.RestPost(FROM_APP_ID, uri, payload, xml);
 
         } catch (Exception e) {
             LOGGER.info(EELFLoggerDelegate.errorLogger, "<== " + "." + methodName + e.toString());
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
index 6d4508dbf..0abf6cd57 100644
--- a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
@@ -3,13 +3,14 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nokia.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,33 +21,41 @@
 
 package org.onap.vid.controller;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.mockito.InjectMocks;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.vid.aai.AaiResponseTranslator;
+import org.onap.vid.aai.util.AAIRestInterface;
+import org.onap.vid.roles.RoleProvider;
 import org.onap.vid.services.AaiService;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
+import org.onap.vid.utils.SystemPropertiesWrapper;
 
+@RunWith(MockitoJUnitRunner.class)
 public class AaiControllerTest {
 
-    @InjectMocks
-    AaiController aaiController = new AaiController();
-
     @Mock
-    AaiService aaiService;
+    private AaiService aaiService;
+    @Mock
+    private AAIRestInterface aaiRestInterface;
+    @Mock
+    private RoleProvider roleProvider;
+    @Mock
+    private SystemPropertiesWrapper systemPropertiesWrapper;
 
-    @BeforeMethod
-    public void initMocks(){
-        MockitoAnnotations.initMocks(this);
+    private AaiController aaiController;
+
+    @Before
+    public void setUp(){
+        aaiController = new AaiController(aaiService, aaiRestInterface, roleProvider, systemPropertiesWrapper);
     }
 
     @Test
@@ -70,7 +79,4 @@ public class AaiControllerTest {
                 "c", toBeReturnedForC
         )));
     }
-
-
-
 }