Clean unused spec generated. 57/84357/1
authorMuthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
Fri, 5 Apr 2019 14:48:59 +0000 (10:48 -0400)
committerMuthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
Fri, 5 Apr 2019 14:48:59 +0000 (10:48 -0400)
Change-Id: I005608cbfad3b4c89110c2acbb35d425899e2c2f
Issue-ID: CCSDK-1127
Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/SwaggerConfig.java [deleted file]
ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/SchemaGeneratorService.java [deleted file]
ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SchemaGeneratorServiceTest.java [deleted file]

diff --git a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/SwaggerConfig.java b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/SwaggerConfig.java
deleted file mode 100644 (file)
index 9318276..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *  Copyright © 2017-2018 AT&T Intellectual Property.
- *  Modifications Copyright © 2018 IBM.
- *
- *  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.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints;
-
-import com.google.common.collect.Lists;
-import org.jetbrains.annotations.NotNull;
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.RequestMethod;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.builders.ResponseMessageBuilder;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.Header;
-import springfox.documentation.service.ResponseMessage;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * SwaggerConfig
- *
- * @author Brinda Santh 8/13/2018
- */
-@Deprecated
-//@Configuration
-//@EnableSwagger2
-@SuppressWarnings("unused")
-public class SwaggerConfig {
-    @Value("${appVersion}")
-    private String appVersion;
-    @Value("${swagger.contact.name}")
-    private String contactName;
-    @Value("${swagger.contact.url}")
-    private String contactUrl;
-    @Value("${swagger.contact.email}")
-    private String contactEmail;
-    private String stringModelRef = "string";
-
-    @Bean
-    @SuppressWarnings("unused")
-    public Docket api() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .globalResponseMessage(RequestMethod.GET, getDefaultGetResponseMessages())
-                .globalResponseMessage(RequestMethod.POST, getDefaultPostResponseMessages())
-                .globalResponseMessage(RequestMethod.PUT, getDefaultPutResponseMessages())
-                .globalResponseMessage(RequestMethod.DELETE, getDefaultDeleteResponseMessages())
-                .select()
-                .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                .build()
-                .apiInfo(apiInfo());
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfo(
-                "Controller Blueprints API",
-                "Controller blueprints API for VNF Self Service.",
-                appVersion,
-                "Terms of service",
-                new Contact(contactName, contactUrl, contactEmail),
-                "Apache 2.0", "http://www.apache.org/licenses/LICENSE-2.0", Collections.emptyList());
-    }
-
-    private List<ResponseMessage> getDefaultGetResponseMessages() {
-        List<ResponseMessage> defaultResponseMessages = Lists.newArrayList();
-        Map<String, Header> defaultHeaders = getDefaultResponseHeaders();
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.OK, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.BAD_REQUEST, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.UNAUTHORIZED, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.FORBIDDEN, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.NOT_FOUND, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.INTERNAL_SERVER_ERROR, defaultHeaders));
-        return defaultResponseMessages;
-    }
-
-    private List<ResponseMessage> getDefaultPostResponseMessages() {
-        List<ResponseMessage> defaultResponseMessages = Lists.newArrayList();
-        Map<String, Header> defaultHeaders = getDefaultResponseHeaders();
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.OK, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.CREATED, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.BAD_REQUEST, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.UNAUTHORIZED, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.FORBIDDEN, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.INTERNAL_SERVER_ERROR, defaultHeaders));
-        return defaultResponseMessages;
-    }
-
-    private List<ResponseMessage> getDefaultPutResponseMessages() {
-        List<ResponseMessage> defaultResponseMessages = Lists.newArrayList();
-        Map<String, Header> defaultHeaders = getDefaultResponseHeaders();
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.OK, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.BAD_REQUEST, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.UNAUTHORIZED, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.FORBIDDEN, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.INTERNAL_SERVER_ERROR, defaultHeaders));
-        return defaultResponseMessages;
-    }
-
-    private List<ResponseMessage> getDefaultDeleteResponseMessages() {
-        List<ResponseMessage> defaultResponseMessages = Lists.newArrayList();
-        Map<String, Header> defaultHeaders = getDefaultResponseHeaders();
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.OK, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.BAD_REQUEST, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.UNAUTHORIZED, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.FORBIDDEN, defaultHeaders));
-        defaultResponseMessages.add(getResponseBuilder(HttpStatus.INTERNAL_SERVER_ERROR, defaultHeaders));
-        return defaultResponseMessages;
-    }
-
-    private ResponseMessage getResponseBuilder(@NotNull HttpStatus httpStatus, Map<String, Header> defaultHeaders) {
-        ResponseMessageBuilder responseMessageBuilder = new ResponseMessageBuilder();
-        responseMessageBuilder.code(httpStatus.value())
-                .message(httpStatus.getReasonPhrase())
-                .headersWithDescription(defaultHeaders)
-                .build();
-        return responseMessageBuilder.build();
-    }
-
-    private Map<String, Header> getDefaultResponseHeaders() {
-        Map<String, Header> defaultHeaders = new HashMap<>();
-        defaultHeaders.put(BluePrintConstants.RESPONSE_HEADER_TRANSACTION_ID,
-                new Header(BluePrintConstants.RESPONSE_HEADER_TRANSACTION_ID, "Transaction Id", new ModelRef(stringModelRef)));
-        defaultHeaders.put(BluePrintConstants.RESPONSE_HEADER_LATEST_VERSION,
-                new Header(BluePrintConstants.RESPONSE_HEADER_LATEST_VERSION, "API Latest Version", new ModelRef(stringModelRef)));
-        defaultHeaders.put(BluePrintConstants.RESPONSE_HEADER_MINOR_VERSION,
-                new Header(BluePrintConstants.RESPONSE_HEADER_MINOR_VERSION, "API Minor Version", new ModelRef(stringModelRef)));
-        defaultHeaders.put(BluePrintConstants.RESPONSE_HEADER_PATCH_VERSION,
-                new Header(BluePrintConstants.RESPONSE_HEADER_PATCH_VERSION, "API Patch Version", new ModelRef(stringModelRef)));
-        return defaultHeaders;
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/SchemaGeneratorService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/SchemaGeneratorService.java
deleted file mode 100644 (file)
index 7d4d93b..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * 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.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service;
-
-import com.google.common.base.Preconditions;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException;
-import org.onap.ccsdk.cds.controllerblueprints.core.data.DataType;
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ServiceTemplate;
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils;
-import org.onap.ccsdk.cds.controllerblueprints.service.common.SwaggerGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * SchemaGeneratorService.java Purpose: Provide Service to generate service template input schema definition and Sample
- * Json generation.
- *
- * @author Brinda Santh
- * @version 1.0
- */
-@Deprecated
-public class SchemaGeneratorService {
-    private static Logger log = LoggerFactory.getLogger(SchemaGeneratorService.class);
-
-    private Map<String, DataType> dataTypes;
-
-    /**
-     * This is a SchemaGeneratorService constructor
-     */
-    public SchemaGeneratorService() {
-        dataTypes = new HashMap<>();
-    }
-
-    /**
-     * This is a generateSchema
-     *
-     * @param serviceTemplateContent service template content
-     * @return String
-     * @throws BluePrintException Blueprint Exception
-     */
-    public String generateSchema(String serviceTemplateContent) throws BluePrintException {
-        if (StringUtils.isNotBlank(serviceTemplateContent)) {
-            ServiceTemplate serviceTemplate = JacksonUtils.Companion.readValue(serviceTemplateContent,
-                    ServiceTemplate.class);
-            return generateSchema(serviceTemplate);
-        } else {
-            throw new BluePrintException(
-                    "Service Template Content is  (" + serviceTemplateContent + ") not Defined.");
-        }
-    }
-
-    /**
-     * This is a generateSchema
-     *
-     * @param serviceTemplate service template content
-     * @return String
-     * @throws BluePrintException Blueprint Exception
-     */
-    public String generateSchema(ServiceTemplate serviceTemplate) throws BluePrintException {
-        String schemaContent = null;
-        Preconditions.checkNotNull(serviceTemplate, "Service Template is not defined.");
-        try {
-            if (serviceTemplate.getTopologyTemplate() != null
-                    && serviceTemplate.getTopologyTemplate().getInputs() != null) {
-                SwaggerGenerator swaggerGenerator = new SwaggerGenerator(serviceTemplate);
-                schemaContent = swaggerGenerator.generateSwagger();
-            }
-        } catch (Exception e) {
-            throw new BluePrintException(e.getMessage(), e);
-        }
-
-        return schemaContent;
-    }
-
-    private void manageServiceTemplateActions(ServiceTemplate serviceTemplate, String actionName) {
-        if (serviceTemplate != null && serviceTemplate.getTopologyTemplate() != null
-                && StringUtils.isNotBlank(actionName)) {
-
-            if (MapUtils.isNotEmpty(serviceTemplate.getTopologyTemplate().getInputs())) {
-
-                serviceTemplate.getTopologyTemplate().getInputs().entrySet().removeIf(entity -> {
-                    String keyName = entity.getKey();
-                    String replacedAction = actionName.replace("-action", "-request");
-                    log.debug("Key name : " + keyName + ", actionName "
-                            + actionName + ", replacedAction :" + replacedAction);
-                    if (keyName.endsWith("-request") && !keyName.equals(replacedAction)) {
-                        log.info("deleting input property {} ", keyName);
-                        return true;
-                    }
-                    return false;
-                });
-            }
-
-        }
-    }
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SchemaGeneratorServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/cds/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
deleted file mode 100644 (file)
index f17d637..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * 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.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service.common;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.cds.controllerblueprints.service.SchemaGeneratorService;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class SchemaGeneratorServiceTest {
-
-    private static Logger log = LoggerFactory.getLogger(SchemaGeneratorServiceTest.class);
-
-    @Test
-    public void test01GenerateSwaggerData() throws Exception {
-        log.info("******************* test01GenerateSwaggerData  ******************************");
-
-        String file = "src/test/resources/enhance/enhanced-template.json";
-        String serviceTemplateContent = FileUtils.readFileToString(new File(file), Charset.defaultCharset());
-        SchemaGeneratorService schemaGeneratorService = new SchemaGeneratorService();
-        String schema = schemaGeneratorService.generateSchema(serviceTemplateContent);
-        log.trace("Generated Schema " + schema);
-        Assert.assertNotNull("failed to generate Sample Data", schema);
-
-    }
-
-}