diff options
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src')
2 files changed, 61 insertions, 69 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/UniqueTypes.java b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/UniqueTypes.java index 2e91c7a6b7..1bd3b460f7 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/UniqueTypes.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/UniqueTypes.java @@ -15,22 +15,24 @@ */ package org.openecomp.sdcrests.uniquevalue.rest; +import static org.openecomp.sdcrests.common.RestConstants.USER_ID_HEADER_PARAM; +import static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.info.Info; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tags; -import org.springframework.validation.annotation.Validated; - import javax.validation.constraints.NotNull; -import javax.ws.rs.*; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - -import static org.openecomp.sdcrests.common.RestConstants.USER_ID_HEADER_PARAM; -import static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG; +import org.springframework.validation.annotation.Validated; @Path("/v1.0/unique-types") @Produces(MediaType.APPLICATION_JSON) @@ -39,19 +41,17 @@ import static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG @Validated public interface UniqueTypes { - @GET - @Path("/") - @Operation(description = "Lists unique value types") - Response listUniqueTypes(@NotNull(message = USER_MISSING_ERROR_MSG) - @HeaderParam(USER_ID_HEADER_PARAM) String user); + @GET + @Path("/") + @Operation(description = "Lists unique value types") + Response listUniqueTypes(@NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user); - @GET - @Path("/{type}/values/{value}") - @Operation(description = "Gets unique value") - @ApiResponse(responseCode = "200", description = "Indication whether the unique value is occupied") - @ApiResponse(responseCode = "404", description = "Unsupported unique type") - Response getUniqueValue( - @Parameter(description = "The unique value type, for example: 'VlmName'") @PathParam("type") String type, - @Parameter(description = "The unique value") @PathParam("value") String value, - @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user); + @GET + @Path("/{type}/values/{value}") + @Operation(description = "Gets unique value") + @ApiResponse(responseCode = "200", description = "Indication whether the unique value is occupied") + @ApiResponse(responseCode = "404", description = "Unsupported unique type") + Response getUniqueValue(@Parameter(description = "The unique value type, for example: 'VlmName'") @PathParam("type") String type, + @Parameter(description = "The unique value") @PathParam("value") String value, + @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user); } diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java index 0e657903b6..4df0ff5532 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java @@ -18,7 +18,16 @@ */ package org.openecomp.sdcrests.uniquevalue.rest.services; +import static javax.ws.rs.core.Response.Status.NOT_FOUND; + import com.google.common.annotations.VisibleForTesting; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.ServiceLoader; +import javax.inject.Named; +import javax.ws.rs.core.Response; import org.openecomp.core.dao.UniqueValueDaoFactory; import org.openecomp.core.util.UniqueValueUtil; import org.openecomp.sdc.common.errors.ErrorCategory; @@ -30,65 +39,48 @@ import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; -import javax.inject.Named; -import javax.ws.rs.core.Response; - -import java.util.*; - -import static javax.ws.rs.core.Response.Status.NOT_FOUND; - @Named @Service("uniqueTypes") @Scope(value = "prototype") public class UniqueTypesImpl implements UniqueTypes { - private static final String UNIQUE_TYPE_NOT_FOUND_ERR_ID = "UNIQUE_TYPE_NOT_FOUND"; - private static final String UNIQUE_TYPE_NOT_FOUND_MSG = "%s is not a supported unique type."; - - private static final Map<String, String> UNIQUE_TYPE_TO_INTERNAL; - private UniqueValueUtil uniqueValueUtil; - - static { - Map<String, String> uniqueTypes = new HashMap<>(); - ServiceLoader.load(UniqueTypesProvider.class) - .forEach(typesProvider -> uniqueTypes.putAll(typesProvider.listUniqueTypes())); - UNIQUE_TYPE_TO_INTERNAL = Collections.unmodifiableMap(uniqueTypes); - } + private static final String UNIQUE_TYPE_NOT_FOUND_ERR_ID = "UNIQUE_TYPE_NOT_FOUND"; + private static final String UNIQUE_TYPE_NOT_FOUND_MSG = "%s is not a supported unique type."; + private static final Map<String, String> UNIQUE_TYPE_TO_INTERNAL; + static { + Map<String, String> uniqueTypes = new HashMap<>(); + ServiceLoader.load(UniqueTypesProvider.class).forEach(typesProvider -> uniqueTypes.putAll(typesProvider.listUniqueTypes())); + UNIQUE_TYPE_TO_INTERNAL = Collections.unmodifiableMap(uniqueTypes); + } - @Override - public Response listUniqueTypes(String user) { - return Response.ok( - new GenericCollectionWrapper<>(new ArrayList<>(UNIQUE_TYPE_TO_INTERNAL.keySet()))) - .build(); - } - - @Override - public Response getUniqueValue(String type, String value, String user) { - String internalType = UNIQUE_TYPE_TO_INTERNAL.get(type); + private UniqueValueUtil uniqueValueUtil; - if (internalType == null) { - ErrorCode error = new ErrorCode.ErrorCodeBuilder() - .withCategory(ErrorCategory.APPLICATION) - .withId(UNIQUE_TYPE_NOT_FOUND_ERR_ID) - .withMessage(String.format(UNIQUE_TYPE_NOT_FOUND_MSG, type)).build(); - return Response.status(NOT_FOUND).entity(new ErrorCodeAndMessage(NOT_FOUND, error)).build(); + @Override + public Response listUniqueTypes(String user) { + return Response.ok(new GenericCollectionWrapper<>(new ArrayList<>(UNIQUE_TYPE_TO_INTERNAL.keySet()))).build(); } - return Response.ok(Collections - .singletonMap("occupied", getUniqueValueUtil().isUniqueValueOccupied(internalType, value))) - .build(); - } + @Override + public Response getUniqueValue(String type, String value, String user) { + String internalType = UNIQUE_TYPE_TO_INTERNAL.get(type); + if (internalType == null) { + ErrorCode error = new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION).withId(UNIQUE_TYPE_NOT_FOUND_ERR_ID) + .withMessage(String.format(UNIQUE_TYPE_NOT_FOUND_MSG, type)).build(); + return Response.status(NOT_FOUND).entity(new ErrorCodeAndMessage(NOT_FOUND, error)).build(); + } + return Response.ok(Collections.singletonMap("occupied", getUniqueValueUtil().isUniqueValueOccupied(internalType, value))).build(); + } - @VisibleForTesting - void setUniqueValueUtil(UniqueValueUtil uniqueValueUtil) { - this.uniqueValueUtil = uniqueValueUtil; - } + private UniqueValueUtil getUniqueValueUtil() { + if (uniqueValueUtil == null) { + uniqueValueUtil = new UniqueValueUtil(UniqueValueDaoFactory.getInstance().createInterface()); + } + return uniqueValueUtil; + } - private UniqueValueUtil getUniqueValueUtil() { - if (uniqueValueUtil == null){ - uniqueValueUtil = new UniqueValueUtil(UniqueValueDaoFactory.getInstance().createInterface()); + @VisibleForTesting + void setUniqueValueUtil(UniqueValueUtil uniqueValueUtil) { + this.uniqueValueUtil = uniqueValueUtil; } - return uniqueValueUtil; - } } |