summaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/main/java/org
diff options
context:
space:
mode:
authorWojciech Sliwka <wojciech.sliwka@nokia.com>2019-02-18 08:24:22 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-18 08:24:22 +0000
commit2cfbe3407713a48fb81783ae2a560c5fe6face5e (patch)
tree8cec17542088d746e7b11812eb036e4b17bd3f6c /vid-app-common/src/main/java/org
parente9381e08b6a48468ff6f3ccaa03d0b19dd47d535 (diff)
parent3899593de4f545a8900f148586ba367eeb465126 (diff)
Merge "Add tests for AaiServiceImpl"
Diffstat (limited to 'vid-app-common/src/main/java/org')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java5
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java30
2 files changed, 20 insertions, 15 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java b/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java
index 68d5b71d0..8fe7c1fa1 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java
@@ -70,8 +70,9 @@ public class WebConfig {
}
@Bean
- public AaiService getAaiService() {
- return new AaiServiceImpl();
+ public AaiService getAaiService(AaiClientInterface aaiClient, AaiOverTLSClientInterface aaiOverTLSClient,
+ AaiResponseTranslator aaiResponseTranslator, AAITreeNodeBuilder aaiTreeNode, AAIServiceTree aaiServiceTree) {
+ return new AaiServiceImpl(aaiClient, aaiOverTLSClient, aaiResponseTranslator, aaiTreeNode, aaiServiceTree);
}
@Bean
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
index fe4a66185..63da27828 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
@@ -63,23 +63,29 @@ public class AaiServiceImpl implements AaiService {
private static final String CLOUD_REGION_NODE_TYPE = "cloud-region";
private int indexOfSubscriberName = 6;
- @Autowired
private AaiClientInterface aaiClient;
-
- @Autowired
private AaiOverTLSClientInterface aaiOverTLSClient;
-
- @Autowired
private AaiResponseTranslator aaiResponseTranslator;
-
- @Autowired
private AAITreeNodeBuilder aaiTreeNode;
-
- @Autowired
private AAIServiceTree aaiServiceTree;
private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(AaiServiceImpl.class);
+ @Autowired
+ public AaiServiceImpl(
+ AaiClientInterface aaiClient,
+ AaiOverTLSClientInterface aaiOverTLSClient,
+ AaiResponseTranslator aaiResponseTranslator,
+ AAITreeNodeBuilder aaiTreeNode,
+ AAIServiceTree aaiServiceTree)
+ {
+ this.aaiClient = aaiClient;
+ this.aaiOverTLSClient = aaiOverTLSClient;
+ this.aaiResponseTranslator = aaiResponseTranslator;
+ this.aaiTreeNode = aaiTreeNode;
+ this.aaiServiceTree = aaiServiceTree;
+ }
+
private List<Service> convertModelToService(Model model) {
List<Service> services = new ArrayList<>();
String category = "";
@@ -332,13 +338,11 @@ public class AaiServiceImpl implements AaiService {
AaiResponse<GetTenantsResponse[]> aaiGetTenantsResponse = aaiClient.getTenants(globalCustomerId, serviceType);
GetTenantsResponse[] tenants = aaiGetTenantsResponse.getT();
if (tenants != null) {
- for (int i = 0; i < tenants.length; i++) {
- tenants[i].isPermitted = roleValidator.isTenantPermitted(globalCustomerId, serviceType, tenants[i].tenantName);
+ for (GetTenantsResponse tenant : tenants) {
+ tenant.isPermitted = roleValidator.isTenantPermitted(globalCustomerId, serviceType, tenant.tenantName);
}
}
return aaiGetTenantsResponse;
-
-
}
@Override