1 files changed, 57 insertions, 74 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java
index 6a6cbd0e60..e25ef8e324 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/NetworksImpl.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,9 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vsp.rest.services;
 
+import java.util.Collection;
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
 import org.apache.commons.collections4.CollectionUtils;
 import org.openecomp.sdc.vendorsoftwareproduct.NetworkManager;
 import org.openecomp.sdc.vendorsoftwareproduct.NetworkManagerFactory;
@@ -33,93 +35,74 @@ import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityVali
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.NetworkDto;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.NetworkRequestDto;
 import org.openecomp.sdcrests.vsp.rest.Networks;
-import org.openecomp.sdcrests.vsp.rest.mapping.*;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapCompositionEntityResponseToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapCompositionEntityValidationDataToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapNetworkEntityToNetworkDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapNetworkRequestDtoToNetworkEntity;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapNetworkToNetworkDto;
 import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
 import org.openecomp.sdcrests.wrappers.StringWrapperResponse;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.util.Collection;
-
 @Named
 @Service("networks")
 @Scope(value = "prototype")
 public class NetworksImpl implements Networks {
 
-  private final NetworkManager networkManager;
-
-  public NetworksImpl(NetworkManager networkManager) {
-    this.networkManager = networkManager;
-  }
+    private final NetworkManager networkManager;
 
-  public NetworksImpl() {
-    this(NetworkManagerFactory.getInstance().createInterface());
-  }
-
-  @Override
-  public Response list(String vspId, String versionId, String user) {
-    Collection<NetworkEntity> networks =
-        networkManager.listNetworks(vspId, new Version(versionId));
-
-    MapNetworkEntityToNetworkDto mapper = new MapNetworkEntityToNetworkDto();
-    GenericCollectionWrapper<NetworkDto> results = new GenericCollectionWrapper<>();
-    for (NetworkEntity network : networks) {
-      results.add(mapper.applyMapping(network, NetworkDto.class));
+    public NetworksImpl(NetworkManager networkManager) {
+        this.networkManager = networkManager;
     }
 
-    return Response.ok(results).build();
-  }
-
-  @Override
-  public Response create(NetworkRequestDto request, String vspId, String versionId, String user) {
-    NetworkEntity network =
-        new MapNetworkRequestDtoToNetworkEntity().applyMapping(request, NetworkEntity.class);
-    network.setVspId(vspId);
-    network.setVersion(new Version(versionId));
-    NetworkEntity createdNetwork = networkManager.createNetwork(network);
-    return Response
-        .ok(createdNetwork != null ? new StringWrapperResponse(createdNetwork.getId()) : null)
-        .build();
-  }
+    public NetworksImpl() {
+        this(NetworkManagerFactory.getInstance().createInterface());
+    }
 
-  @Override
-  public Response get(String vspId, String versionId, String networkId, String user) {
-    CompositionEntityResponse<Network> response =
-        networkManager.getNetwork(vspId,
-            new Version(versionId), networkId
-        );
+    @Override
+    public Response list(String vspId, String versionId, String user) {
+        Collection<NetworkEntity> networks = networkManager.listNetworks(vspId, new Version(versionId));
+        MapNetworkEntityToNetworkDto mapper = new MapNetworkEntityToNetworkDto();
+        GenericCollectionWrapper<NetworkDto> results = new GenericCollectionWrapper<>();
+        for (NetworkEntity network : networks) {
+            results.add(mapper.applyMapping(network, NetworkDto.class));
+        }
+        return Response.ok(results).build();
+    }
 
-    CompositionEntityResponseDto<NetworkDto> responseDto = new CompositionEntityResponseDto<>();
-    new MapCompositionEntityResponseToDto<>(new MapNetworkToNetworkDto(), NetworkDto.class)
-        .doMapping(response, responseDto);
-    return Response.ok(responseDto).build();
-  }
+    @Override
+    public Response create(NetworkRequestDto request, String vspId, String versionId, String user) {
+        NetworkEntity network = new MapNetworkRequestDtoToNetworkEntity().applyMapping(request, NetworkEntity.class);
+        network.setVspId(vspId);
+        network.setVersion(new Version(versionId));
+        NetworkEntity createdNetwork = networkManager.createNetwork(network);
+        return Response.ok(createdNetwork != null ? new StringWrapperResponse(createdNetwork.getId()) : null).build();
+    }
 
-  @Override
-  public Response delete(String vspId, String versionId, String networkId, String user) {
-    networkManager
-        .deleteNetwork(vspId, new Version(versionId),
-            networkId);
-    return Response.ok().build();
-  }
+    @Override
+    public Response get(String vspId, String versionId, String networkId, String user) {
+        CompositionEntityResponse<Network> response = networkManager.getNetwork(vspId, new Version(versionId), networkId);
+        CompositionEntityResponseDto<NetworkDto> responseDto = new CompositionEntityResponseDto<>();
+        new MapCompositionEntityResponseToDto<>(new MapNetworkToNetworkDto(), NetworkDto.class).doMapping(response, responseDto);
+        return Response.ok(responseDto).build();
+    }
 
-  @Override
-  public Response update(NetworkRequestDto request, String vspId, String versionId,
-                         String networkId, String user) {
-    NetworkEntity networkEntity =
-        new MapNetworkRequestDtoToNetworkEntity().applyMapping(request, NetworkEntity.class);
-    networkEntity.setVspId(vspId);
-    networkEntity.setVersion(new Version(versionId));
-    networkEntity.setId(networkId);
+    @Override
+    public Response delete(String vspId, String versionId, String networkId, String user) {
+        networkManager.deleteNetwork(vspId, new Version(versionId), networkId);
+        return Response.ok().build();
+    }
 
-    CompositionEntityValidationData validationData =
-        networkManager.updateNetwork(networkEntity);
-    return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors())
-        ? Response.status(Response.Status.EXPECTATION_FAILED).entity(
-        new MapCompositionEntityValidationDataToDto()
-            .applyMapping(validationData, CompositionEntityValidationDataDto.class)).build() :
-        Response.ok().build();
-  }
+    @Override
+    public Response update(NetworkRequestDto request, String vspId, String versionId, String networkId, String user) {
+        NetworkEntity networkEntity = new MapNetworkRequestDtoToNetworkEntity().applyMapping(request, NetworkEntity.class);
+        networkEntity.setVspId(vspId);
+        networkEntity.setVersion(new Version(versionId));
+        networkEntity.setId(networkId);
+        CompositionEntityValidationData validationData = networkManager.updateNetwork(networkEntity);
+        return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors()) ? Response.status(Response.Status.EXPECTATION_FAILED)
+            .entity(new MapCompositionEntityValidationDataToDto().applyMapping(validationData, CompositionEntityValidationDataDto.class)).build()
+            : Response.ok().build();
+    }
 }