diff options
Diffstat (limited to 'vid-app-common')
5 files changed, 124 insertions, 28 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java index f7327acf1..d416420e9 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/PombaRequest.java @@ -1,7 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2018 AT&T + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ package org.onap.vid.model.PombaInstance; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.collect.ImmutableList; import java.util.List; -public class PombaRequest { - public List<ServiceInstance> serviceInstanceList; +public final class PombaRequest { + + private ImmutableList<ServiceInstance> serviceInstanceList; + + @JsonCreator + public PombaRequest(@JsonProperty("serviceInstanceList") List<ServiceInstance> serviceInstanceList) { + this.serviceInstanceList = ImmutableList.copyOf(serviceInstanceList); + } + + public List<ServiceInstance> getServiceInstanceList() { + return serviceInstanceList; + } } diff --git a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java index 08b224a3b..f42f35a4d 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/PombaInstance/ServiceInstance.java @@ -1,21 +1,66 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2018 AT&T + * ================================================================================ + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ package org.onap.vid.model.PombaInstance; -import com.fasterxml.jackson.annotation.JsonProperty; +public final class ServiceInstance { -public class ServiceInstance { + private String serviceInstanceId; + private String modelVersionId; + private String modelInvariantId; + private String customerId; + private String serviceType; - @JsonProperty - public String serviceInstanceId; + public ServiceInstance() { + } - @JsonProperty - public String modelVersionId; + public ServiceInstance(String serviceInstanceId, + String modelVersionId, + String modelInvariantId, + String customerId, + String serviceType) { + this.serviceInstanceId = serviceInstanceId; + this.modelVersionId = modelVersionId; + this.modelInvariantId = modelInvariantId; + this.customerId = customerId; + this.serviceType = serviceType; + } - @JsonProperty - public String modelInvariantId; + public String getServiceInstanceId() { + return serviceInstanceId; + } - @JsonProperty - public String customerId; + public String getModelVersionId() { + return modelVersionId; + } - @JsonProperty - public String serviceType; + public String getModelInvariantId() { + return modelInvariantId; + } + + public String getCustomerId() { + return customerId; + } + + public String getServiceType() { + return serviceType; + } } diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java index b1c4139b7..4e832d5f7 100644 --- a/vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/aai/PombaClientImplTest.java @@ -2,9 +2,7 @@ * ============LICENSE_START======================================================= * VID * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Modifications Copyright 2019 Nokia + * 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. @@ -74,19 +72,18 @@ public class PombaClientImplTest { ServiceInstance serviceInstance2 = createServiceInstance("serviceType2", "serviceInstanceId2", "customerId2", "modelVersion2", "modelInvariantId2"); - PombaRequest pombaRequest = new PombaRequest(); - pombaRequest.serviceInstanceList = Lists.newArrayList(serviceInstance1, serviceInstance2); + PombaRequest pombaRequest = new PombaRequest(Lists.newArrayList(serviceInstance1, serviceInstance2)); return pombaRequest; } private ServiceInstance createServiceInstance(String serviceType, String serviceInstanceId, String customerId, String modelVersionId, String modelInvariantId) { - ServiceInstance serviceInstance = new ServiceInstance(); - serviceInstance.serviceType = serviceType; - serviceInstance.serviceInstanceId = serviceInstanceId; - serviceInstance.customerId = customerId; - serviceInstance.modelInvariantId = modelInvariantId; - serviceInstance.modelVersionId = modelVersionId; + ServiceInstance serviceInstance = new ServiceInstance( + serviceInstanceId, + modelVersionId, + modelInvariantId, + customerId, + serviceType); return serviceInstance; } diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java index aeb03b60c..8f0eb087d 100644 --- a/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java @@ -151,8 +151,7 @@ public class VidControllerTest { @Test public void verifyServiceInstance_shouldReturnOk() throws Exception { - PombaRequest pombaRequest = new PombaRequest(); - pombaRequest.serviceInstanceList = ImmutableList.of(new ServiceInstance()); + PombaRequest pombaRequest = new PombaRequest(ImmutableList.of(new ServiceInstance())); mockMvc.perform(post(REST_MODELS_SERVICES_VERIFY_SERVICE) .contentType(MediaType.APPLICATION_JSON) diff --git a/vid-app-common/src/test/java/org/onap/vid/services/PombaServiceImplTest.java b/vid-app-common/src/test/java/org/onap/vid/services/PombaServiceImplTest.java index d0eec2619..aaa64484f 100644 --- a/vid-app-common/src/test/java/org/onap/vid/services/PombaServiceImplTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/services/PombaServiceImplTest.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2018 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ package org.onap.vid.services; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; + +import com.google.common.collect.ImmutableList; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -32,7 +53,7 @@ public class PombaServiceImplTest { @Test public void testVerify() { - PombaRequest pombaRequest = new PombaRequest(); + PombaRequest pombaRequest = new PombaRequest(ImmutableList.of()); testSubject.verify(pombaRequest); verify(pombaClientInterface, times(1)) .verify(pombaRequest); |