summaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/ApplicationConfiguration.java54
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapApplicationConfigEntityToApplicationConfigDto.java19
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapConfigurationDataToConfigurationDataDto.java19
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/services/ApplicationConfigurationImpl.java73
4 files changed, 76 insertions, 89 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/ApplicationConfiguration.java b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/ApplicationConfiguration.java
index 1731688e06..5145b048aa 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/ApplicationConfiguration.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/ApplicationConfiguration.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,29 +17,30 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdcrests.applicationconfig.rest;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
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 java.io.InputStream;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import org.openecomp.sdcrests.applicationconfiguration.types.ApplicationConfigDto;
import org.openecomp.sdcrests.applicationconfiguration.types.ConfigurationDataDto;
-import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
import org.springframework.validation.annotation.Validated;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-import java.util.List;
-
@Path("/v1.0/application-configuration")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@@ -47,23 +48,20 @@ import java.util.List;
@Validated
public interface ApplicationConfiguration {
- @POST
- @Path("/")
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- @Operation(description = "Insert JSON schema into application config table")
- Response insertToTable(@QueryParam("namespace") String namespace, @QueryParam("key") String key,
- @Multipart("description") InputStream fileContainingSchema);
-
-
- @GET
- @Path("/{namespace}/{key}")
- @Operation(description = "Get JSON schema by namespace and key", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = ConfigurationDataDto.class))))
- Response getFromTable(@PathParam("namespace") String namespace, @PathParam("key") String key);
-
+ @POST
+ @Path("/")
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Operation(description = "Insert JSON schema into application config table")
+ Response insertToTable(@QueryParam("namespace") String namespace, @QueryParam("key") String key,
+ @Multipart("description") InputStream fileContainingSchema);
- @GET
- @Path("/{namespace}")
- @Operation(description = "Get List of keys and descriptions by namespace", responses = @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApplicationConfigDto.class)))))
- Response getListOfConfigurationByNamespaceFromTable(@PathParam("namespace") String namespace);
+ @GET
+ @Path("/{namespace}/{key}")
+ @Operation(description = "Get JSON schema by namespace and key", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = ConfigurationDataDto.class))))
+ Response getFromTable(@PathParam("namespace") String namespace, @PathParam("key") String key);
+ @GET
+ @Path("/{namespace}")
+ @Operation(description = "Get List of keys and descriptions by namespace", responses = @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApplicationConfigDto.class)))))
+ Response getListOfConfigurationByNamespaceFromTable(@PathParam("namespace") String namespace);
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapApplicationConfigEntityToApplicationConfigDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapApplicationConfigEntityToApplicationConfigDto.java
index 4ced6ba302..60fdecd714 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapApplicationConfigEntityToApplicationConfigDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapApplicationConfigEntityToApplicationConfigDto.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,7 +17,6 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdcrests.applicationconfig.rest.mapping;
import org.openecomp.core.utilities.applicationconfig.dao.type.ApplicationConfigEntity;
@@ -27,11 +26,11 @@ import org.openecomp.sdcrests.mapping.MappingBase;
/**
* Created by Talio on 8/10/2016.
*/
-public class MapApplicationConfigEntityToApplicationConfigDto
- extends MappingBase<ApplicationConfigEntity, ApplicationConfigDto> {
- @Override
- public void doMapping(ApplicationConfigEntity source, ApplicationConfigDto target) {
- target.setKey(source.getKey());
- target.setValue(source.getValue());
- }
+public class MapApplicationConfigEntityToApplicationConfigDto extends MappingBase<ApplicationConfigEntity, ApplicationConfigDto> {
+
+ @Override
+ public void doMapping(ApplicationConfigEntity source, ApplicationConfigDto target) {
+ target.setKey(source.getKey());
+ target.setValue(source.getValue());
+ }
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapConfigurationDataToConfigurationDataDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapConfigurationDataToConfigurationDataDto.java
index c86628d301..1730a21801 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapConfigurationDataToConfigurationDataDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/mapping/MapConfigurationDataToConfigurationDataDto.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,7 +17,6 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdcrests.applicationconfig.rest.mapping;
import org.openecomp.core.utilities.applicationconfig.type.ConfigurationData;
@@ -27,11 +26,11 @@ import org.openecomp.sdcrests.mapping.MappingBase;
/**
* Created by Talio on 8/9/2016.
*/
-public class MapConfigurationDataToConfigurationDataDto
- extends MappingBase<ConfigurationData, ConfigurationDataDto> {
- @Override
- public void doMapping(ConfigurationData source, ConfigurationDataDto target) {
- target.setValue(source.getValue());
- target.setTimeStamp(source.getTimeStamp());
- }
+public class MapConfigurationDataToConfigurationDataDto extends MappingBase<ConfigurationData, ConfigurationDataDto> {
+
+ @Override
+ public void doMapping(ConfigurationData source, ConfigurationDataDto target) {
+ target.setValue(source.getValue());
+ target.setTimeStamp(source.getTimeStamp());
+ }
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/services/ApplicationConfigurationImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/services/ApplicationConfigurationImpl.java
index 349ec87276..2f6c8a8be6 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/services/ApplicationConfigurationImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/src/main/java/org/openecomp/sdcrests/applicationconfig/rest/services/ApplicationConfigurationImpl.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.
@@ -19,9 +19,12 @@
* Modifications copyright (c) 2019 Nokia
* ================================================================================
*/
-
package org.openecomp.sdcrests.applicationconfig.rest.services;
+import java.io.InputStream;
+import java.util.Collection;
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
import org.openecomp.core.utilities.applicationconfig.dao.type.ApplicationConfigEntity;
import org.openecomp.core.utilities.applicationconfig.type.ConfigurationData;
import org.openecomp.core.utilities.file.FileUtils;
@@ -36,55 +39,43 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-import java.util.Collection;
-
/**
* Created by Talio on 8/8/2016.
*/
-
@Named
@Service("applicationConfiguration")
@Scope(value = "prototype")
public class ApplicationConfigurationImpl implements ApplicationConfiguration {
- private final ApplicationConfigManager applicationConfigManager;
-
- @Autowired
- public ApplicationConfigurationImpl(ApplicationConfigManager applicationConfigManager) {
- this.applicationConfigManager = applicationConfigManager;
- }
+ private final ApplicationConfigManager applicationConfigManager;
- @Override
- public Response insertToTable(String namespace, String key, InputStream fileContainingSchema) {
- String value = new String(FileUtils.toByteArray(fileContainingSchema));
- applicationConfigManager.insertIntoTable(namespace, key, value);
- return Response.ok().build();
- }
+ @Autowired
+ public ApplicationConfigurationImpl(ApplicationConfigManager applicationConfigManager) {
+ this.applicationConfigManager = applicationConfigManager;
+ }
- @Override
- public Response getFromTable(String namespace, String key) {
- ConfigurationData value = applicationConfigManager.getFromTable(namespace, key);
- ConfigurationDataDto valueDto = new MapConfigurationDataToConfigurationDataDto()
- .applyMapping(value, ConfigurationDataDto.class);
- return Response.ok(valueDto).build();
- }
+ @Override
+ public Response insertToTable(String namespace, String key, InputStream fileContainingSchema) {
+ String value = new String(FileUtils.toByteArray(fileContainingSchema));
+ applicationConfigManager.insertIntoTable(namespace, key, value);
+ return Response.ok().build();
+ }
- @Override
- public Response getListOfConfigurationByNamespaceFromTable(String namespace) {
- Collection<ApplicationConfigEntity> applicationConfigEntities =
- applicationConfigManager.getListOfConfigurationByNamespace(namespace);
- GenericCollectionWrapper<ApplicationConfigDto> applicationConfigWrapper =
- new GenericCollectionWrapper<>();
- MapApplicationConfigEntityToApplicationConfigDto mapper =
- new MapApplicationConfigEntityToApplicationConfigDto();
+ @Override
+ public Response getFromTable(String namespace, String key) {
+ ConfigurationData value = applicationConfigManager.getFromTable(namespace, key);
+ ConfigurationDataDto valueDto = new MapConfigurationDataToConfigurationDataDto().applyMapping(value, ConfigurationDataDto.class);
+ return Response.ok(valueDto).build();
+ }
- for (ApplicationConfigEntity applicationConfigEntity : applicationConfigEntities) {
- applicationConfigWrapper
- .add(mapper.applyMapping(applicationConfigEntity, ApplicationConfigDto.class));
+ @Override
+ public Response getListOfConfigurationByNamespaceFromTable(String namespace) {
+ Collection<ApplicationConfigEntity> applicationConfigEntities = applicationConfigManager.getListOfConfigurationByNamespace(namespace);
+ GenericCollectionWrapper<ApplicationConfigDto> applicationConfigWrapper = new GenericCollectionWrapper<>();
+ MapApplicationConfigEntityToApplicationConfigDto mapper = new MapApplicationConfigEntityToApplicationConfigDto();
+ for (ApplicationConfigEntity applicationConfigEntity : applicationConfigEntities) {
+ applicationConfigWrapper.add(mapper.applyMapping(applicationConfigEntity, ApplicationConfigDto.class));
+ }
+ return Response.ok(applicationConfigWrapper).build();
}
- return Response.ok(applicationConfigWrapper).build();
- }
}