diff options
author | deepikasatheesh <deepika.s84@wipro.com> | 2021-02-04 14:54:53 +0000 |
---|---|---|
committer | deepikasatheesh <deepika.s84@wipro.com> | 2021-02-22 09:08:34 +0000 |
commit | 49f60702c82398abadb0bc28bf9a3b902b1deee7 (patch) | |
tree | 1e0ce351712eb9cd46e4bf90f5373326b298cf04 /ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config | |
parent | 7365105475e82c302bb32094ac3c708ef5c21a72 (diff) |
Refactored & enhanced code check-in RANSim Controller and RANSim GUI
Issue-ID: INT-1849
Signed-off-by: deepikasatheesh <deepika.s84@wipro.com>
Change-Id: I8f92d8eae6eb67708098ccd696dbfff0eaa5f87f
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config')
2 files changed, 41 insertions, 98 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config/RansimRestConfig.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config/RansimRestConfig.java index 6e57945..aafb0b3 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config/RansimRestConfig.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config/RansimRestConfig.java @@ -27,12 +27,10 @@ import java.util.Properties; import javax.annotation.PostConstruct; import javax.servlet.MultipartConfigElement; +import org.apache.log4j.Logger; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; @@ -43,57 +41,51 @@ import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration -@EnableWebMvc @EnableSwagger2 @ComponentScan(basePackages = { "org.onap.*", "com.*" }) -public class RansimRestConfig extends WebMvcConfigurerAdapter { +public class RansimRestConfig { + private static final Logger log = Logger.getLogger(RansimRestConfig.class); - /** - * init. - */ - @PostConstruct - public void init() { - Properties prop = new Properties(); - try (InputStream input = new FileInputStream("rs.properties")) { - // load a properties file - prop.load(input); - } catch (Exception e) { - System.out.println("Exception Occured while loading properties file" + e); - } - } + /** + * init. + */ + @PostConstruct + public void init() { + Properties prop = new Properties(); + try (InputStream input = new FileInputStream("rs.properties")) { + // load a properties file + prop.load(input); + } catch (Exception e) { + log.error("Exception Occured while loading properties file : {} ", e); + } + } - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - } + private ApiInfo apiInfo() { + return new ApiInfoBuilder().title("Ran Simulator Controller REST API") + .description("This API helps to make queries against Ran Simulator Controller").version("3.0").build(); + } - private ApiInfo apiInfo() { - return new ApiInfoBuilder().title("Ran Simulator Controller REST API") - .description("This API helps to make queries against Ran Simulator Controller").version("3.0").build(); - } + /** + * ransimappApi . + * + * @return returns api info + */ + @Bean + public Docket ransimappApi() { + return new Docket(DocumentationType.SWAGGER_2).select() + .apis(RequestHandlerSelectors.basePackage("org.onap.ransim.rest.api")).paths(PathSelectors.any()) + .build().apiInfo(apiInfo()); + } - /** - * ransimappApi . - * - * @return returns api info - */ - @Bean - public Docket ransimappApi() { - return new Docket(DocumentationType.SWAGGER_2).select() - .apis(RequestHandlerSelectors.basePackage("org.onap.ransim.rest.api")).paths(PathSelectors.any()) - .build().apiInfo(apiInfo()); - } + /** + * MultipartConfigElement. + * + * @return returns MultipartConfigElement + */ + @Bean + public MultipartConfigElement multipartConfigElement() { + String location = System.getProperty("java.io.tmpdir"); + return new MultipartConfigElement(location); + } - /** - * MultipartConfigElement. - * - * @return returns MultipartConfigElement - */ - @Bean - public MultipartConfigElement multipartConfigElement() { - String location = System.getProperty("java.io.tmpdir"); - MultipartConfigElement mp = new MultipartConfigElement(location); - return mp; - } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config/RansimRestInitializer.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config/RansimRestInitializer.java deleted file mode 100644 index 427e871..0000000 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/config/RansimRestInitializer.java +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Ran Simulator Controller - * ================================================================================ - * Copyright (C) 2020 Wipro Limited. - * ================================================================================ - * 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.ransim.rest.config; - -import javax.servlet.MultipartConfigElement; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; - -import org.springframework.web.WebApplicationInitializer; -import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.web.servlet.DispatcherServlet; - -/** - * REST API configuration initialization. - * - * @version 0.1 - */ -public class RansimRestInitializer implements WebApplicationInitializer { - @Override - public void onStartup(ServletContext container) throws ServletException { - AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext(); - ctx.register(RansimRestConfig.class); - ctx.setServletContext(container); - ctx.refresh(); - ServletRegistration.Dynamic servlet = container.addServlet("dispatcher", new DispatcherServlet(ctx)); - servlet.setLoadOnStartup(1); - servlet.addMapping("/api/*"); - servlet.setMultipartConfig(ctx.getBean(MultipartConfigElement.class)); - } -} |