diff options
11 files changed, 352 insertions, 405 deletions
diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java index fc45f1c27..e29218d9f 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -82,8 +82,7 @@ import java.util.List; @EnableAspectJAutoProxy(proxyTargetClass=true) public class ExternalAppConfig extends AppConfig implements Configurable { - private RegistryAdapter schedulerRegistryAdapter; - /** The Constant LOG. */ + /** The Constant LOG. */ private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppConfig.class); /** The vid schema script. */ @@ -103,30 +102,12 @@ public class ExternalAppConfig extends AppConfig implements Configurable { } /** - * @see org.onap.portalsdk.core.conf.AppConfig#viewResolver() - */ - @Override - public ViewResolver viewResolver() { - return super.viewResolver(); - } - - /** - * @see org.onap.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry) - * - * @param registry - */ - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - super.addResourceHandlers(registry); - } - - /** * @see org.onap.portalsdk.core.conf.AppConfig#dataAccessService() */ @Override public DataAccessService dataAccessService() { // Echo the JDBC URL to assist developers when starting the app. - System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is " + LOG.info("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is " + SystemProperties.getProperty(SystemProperties.DB_CONNECTIONURL)); return super.dataAccessService(); } @@ -211,25 +192,6 @@ public class ExternalAppConfig extends AppConfig implements Configurable { populator.addScript(vidDataScript); return populator; } - - - /*@Bean - public SpringLiquibase liquibaseBean(DataSource dataSource) { - SpringLiquibase springLiquibase = new SpringLiquibase(); - springLiquibase.setDataSource(dataSource); - springLiquibase.setChangeLog("classpath:db-master-changelog.xml"); - return springLiquibase; - }*/ - - /** - * Sets the scheduler registry adapter. - * - * @param schedulerRegistryAdapter - */ - @Autowired - public void setSchedulerRegistryAdapter(final RegistryAdapter schedulerRegistryAdapter) { - this.schedulerRegistryAdapter = schedulerRegistryAdapter; - } @Bean public LoginStrategy loginStrategy() { diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java index dc6973fef..7c1b5c693 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java @@ -38,43 +38,22 @@ package org.onap.portalapp.conf; import org.onap.portalsdk.core.conf.AppInitializer; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import java.util.TimeZone; public class ExternalAppInitializer extends AppInitializer { - @Override - protected Class<?>[] getRootConfigClasses() { - return super.getRootConfigClasses(); - } + private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppInitializer.class); @Override protected Class<?>[] getServletConfigClasses() { Class<?> appConfigClass = ExternalAppConfig.class; // Show something on stdout to indicate the app is starting. - System.out.println("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName()); + LOG.info("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName()); return new Class[] { appConfigClass }; } - /* - * URL request will direct to the Spring dispatcher for processing - */ - @Override - protected String[] getServletMappings() { - return super.getServletMappings(); - } - -// @Override -// public void onStartup(ServletContext servletContext) throws ServletException { -// super.onStartup(servletContext); -// setDefaultTimeZoneToUTC(); -// servletContext.addFilter("requestFromLocalhost", LocalhostFilter.class) -// .addMappingForUrlPatterns(null, false, -// String.format("/%s/%s/*", ChangeManagementController.CHANGE_MANAGEMENT, ChangeManagementController.VNF_WORKFLOW_RELATION), -// String.format("/%s/*", RoleGeneratorController.GENERATE_ROLE_SCRIPT), -// String.format("/%s/*", MaintenanceController.MAINTENANCE)); -// } - //set time zone to UTC so Dates would be written to DB in UTC timezone private void setDefaultTimeZoneToUTC() { System.setProperty("user.timezone", "UTC"); diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java index 71ab7359a..d9d1b6dcd 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java @@ -89,13 +89,13 @@ public class SecurityXssFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - if (request.getMethod().equalsIgnoreCase("POST") || request.getMethod().equalsIgnoreCase("PUT")) { + if ("POST".equalsIgnoreCase(request.getMethod())|| "PUT".equalsIgnoreCase(request.getMethod())) { HttpServletRequest requestToCache = new ContentCachingRequestWrapper(request); HttpServletResponse responseToCache = new ContentCachingResponseWrapper(response); filterChain.doFilter(requestToCache, responseToCache); String requestData = getRequestData(requestToCache); - String responseData = getResponseData(responseToCache); + getResponseData(responseToCache); if (StringUtils.isNotBlank(requestData) && validator.denyXSS(requestData)) { throw new SecurityException(BAD_REQUEST); } diff --git a/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java b/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java index 120ea25ec..693df2f24 100644 --- a/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java +++ b/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java @@ -72,7 +72,6 @@ public class ExternalAppConfigTest { // default test testSubject = createTestSubject(); - testSubject.setSchedulerRegistryAdapter(schedulerRegistryAdapter); } @Test diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java b/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java index 2f8d6e299..579f17a7d 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java +++ b/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java @@ -4,12 +4,14 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright 2019 Nokia + * ================================================================================ * 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. @@ -22,12 +24,11 @@ package org.onap.vid.controller; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.onap.portalsdk.core.util.SystemProperties; import org.onap.vid.category.CategoryParametersResponse; import org.onap.vid.model.CategoryParameter.Family; import org.onap.vid.services.CategoryParameterService; +import org.onap.vid.utils.SystemPropertiesWrapper; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -35,92 +36,59 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import static org.onap.vid.utils.Logging.getMethodName; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; +import static org.springframework.http.HttpStatus.OK; -/** - * The Class PropertyController. - */ @RestController -public class PropertyController extends RestrictedBaseController{ - +public class PropertyController extends RestrictedBaseController { - /** The logger. */ - private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(PropertyController.class); + private static final String ERROR_MESSAGE = "Internal error occurred: "; + private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(PropertyController.class); + private final CategoryParameterService categoryParameterService; + private final SystemPropertiesWrapper systemPropertiesWrapper; - @Autowired - protected CategoryParameterService categoryParameterService; + @Autowired + public PropertyController(CategoryParameterService service, SystemPropertiesWrapper systemPropertiesWrapper) { + categoryParameterService = service; + this.systemPropertiesWrapper = systemPropertiesWrapper; + } - - /** - * Welcome. - * - * @param request the request - * @return the model and view - */ - @RequestMapping(value = {"/propertyhome" }, method = RequestMethod.GET) - public ModelAndView welcome(HttpServletRequest request) { - LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== PropertyController welcome start"); - return new ModelAndView(getViewName()); - } - - /** - * Gets the property. - * - * @param name the name - * @param defaultvalue the defaultvalue - * @param request the request - * @return the property - * @throws Exception the exception - */ - @RequestMapping(value = "/get_property/{name}/{defaultvalue}", method = RequestMethod.GET) - public ResponseEntity<String> getProperty (@PathVariable("name") String name, @PathVariable("defaultvalue") String defaultvalue, - HttpServletRequest request) { - - String methodName = "getProperty"; - ResponseEntity<String> resp = null; - String pvalue = null; - LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== " + methodName + " start"); - - try { - // convert "_" to "." in the property name - if (name == null || name.length() == 0 ) { - return ( new ResponseEntity<String> (defaultvalue, HttpStatus.OK)); - } - // convert "_" to "." in the property name - String propertyName = name.replace('_', '.'); - pvalue = SystemProperties.getProperty(propertyName); - if ( ( pvalue == null ) || ( pvalue.length() == 0 ) ) { - pvalue = defaultvalue; - } - resp = new ResponseEntity<>(pvalue, HttpStatus.OK); - } - catch (Exception e) { - LOGGER.info(EELFLoggerDelegate.errorLogger, "<== " + "." + methodName + e.toString()); - LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== " + "." + methodName + e.toString()); - throw e; - } - LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== " + methodName + " returning " + pvalue); - return ( resp ); - } + @RequestMapping(value = {"/propertyhome"}, method = RequestMethod.GET) + public ModelAndView welcome(HttpServletRequest request) { + LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== PropertyController welcome start"); + return new ModelAndView(getViewName()); + } - /** - * Gets the owning entity properties. - * @param request the request - * @return the property - * @throws Exception the exception - */ - @RequestMapping(value = "/category_parameter", method = RequestMethod.GET) - public ResponseEntity getCategoryParameter(HttpServletRequest request, @RequestParam(value="familyName", required = true) Family familyName) { - LOGGER.debug(EELFLoggerDelegate.debugLogger, "start {}({})", getMethodName()); - try { - CategoryParametersResponse response = categoryParameterService.getCategoryParameters(familyName); - LOGGER.debug(EELFLoggerDelegate.debugLogger, "end {}() => {}", getMethodName(), response); - return new ResponseEntity<>(response, HttpStatus.OK); - } - catch (Exception exception) { - LOGGER.error("failed to retrieve category parameter list from DB.", exception); - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } - } + @RequestMapping(value = "/get_property/{name}/{defaultvalue}", method = RequestMethod.GET) + public ResponseEntity<String> getProperty(@PathVariable("name") String name, + @PathVariable("defaultvalue") String defaultvalue, + HttpServletRequest request) { + String methodName = "getProperty"; + LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== {} {}", methodName, " start"); + try { + String propertyName = name.replace('_', '.'); + String pvalue = systemPropertiesWrapper.getOrDefault(propertyName, defaultvalue); + LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== {} {} {}", methodName, "returning", pvalue); + return ResponseEntity.status(OK).body(pvalue); + } catch (Exception e) { + LOGGER.info(EELFLoggerDelegate.errorLogger, "<== {} {}", methodName, e.toString()); + LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== {} {}", methodName, e.toString()); + return ResponseEntity.status(INTERNAL_SERVER_ERROR).body(ERROR_MESSAGE + e.getMessage()); + } + } + @RequestMapping(value = "/category_parameter", method = RequestMethod.GET) + public ResponseEntity getCategoryParameter(HttpServletRequest request, + @RequestParam(value = "familyName", required = true) Family familyName) { + LOGGER.debug(EELFLoggerDelegate.debugLogger, "start {}({})", getMethodName()); + try { + CategoryParametersResponse response = categoryParameterService.getCategoryParameters(familyName); + LOGGER.debug(EELFLoggerDelegate.debugLogger, "end {}() => {}", getMethodName(), response); + return ResponseEntity.status(OK).body(response); + } catch (Exception e) { + LOGGER.error("failed to retrieve category parameter list from DB.", e); + return ResponseEntity.status(INTERNAL_SERVER_ERROR).body(ERROR_MESSAGE + e.getMessage()); + } + } } diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoResponseWrapper.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoResponseWrapper.java index 5a35e1092..95b039bad 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoResponseWrapper.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoResponseWrapper.java @@ -48,8 +48,12 @@ public class MsoResponseWrapper implements MsoResponseWrapperInterface { setStatus(response.getStatus()); } + public MsoResponseWrapper(int status, String entity) { + this.status = status; + this.entity = entity; + } - /** The status. */ + /** The status. */ @JsonProperty("status") private int status; diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java index 999188ffc..6a1030cfc 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java @@ -3,13 +3,14 @@ * VID * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Nokia. All rights reserved. * ================================================================================ * 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. @@ -20,111 +21,27 @@ package org.onap.vid.mso; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import io.joshworks.restclient.http.HttpResponse; -import org.apache.commons.lang3.ObjectUtils; -import org.glassfish.jersey.client.ClientResponse; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import static org.onap.vid.utils.Logging.getMethodName; +import java.util.Objects; -/** - * The Class MsoUtil. - */ public class MsoUtil { - - /** The logger. */ - private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoUtil.class); - - /** - * Wrap response. - * - * @param body the body - * @param statusCode the status code - * @return the mso response wrapper - */ - public static MsoResponseWrapper wrapResponse ( String body, int statusCode ) { - - MsoResponseWrapper w = new MsoResponseWrapper(); - w.setStatus (statusCode); - w.setEntity(body); - - return w; - } - - /** - * Wrap response. - * - * @param cres the cres - * @return the mso response wrapper - */ - public static MsoResponseWrapper wrapResponse (ClientResponse cres) { - String respStr = ""; - int statuscode = 0; - if ( cres != null ) { - respStr = cres.readEntity(String.class); - statuscode = cres.getStatus(); - } - MsoResponseWrapper w = MsoUtil.wrapResponse ( respStr, statuscode ); - return (w); - } - - /** - * Wrap response. - * - * @param rs the rs - * @return the mso response wrapper - */ - public static MsoResponseWrapper wrapResponse (RestObject<String> rs) { - String respStr = null; - int status = 0; - if ( rs != null ) { - respStr = rs.get() != null ? rs.get() : rs.getRaw(); - status = rs.getStatusCode(); - } - MsoResponseWrapper w = MsoUtil.wrapResponse ( respStr, status ); - return (w); - } - - public static <T> MsoResponseWrapper wrapResponse (HttpResponse<T> rs) { - MsoResponseWrapper w = new MsoResponseWrapper(); - w.setStatus (rs.getStatus()); - if(rs.getRawBody() != null) { - w.setEntity(ObjectUtils.toString(rs.getBody())); - } - return w; - } - - /** - * Convert pojo to string. - * - * @param <T> the generic type - * @param t the t - * @return the string - * @throws JsonProcessingException the json processing exception - */ - public static <T> String convertPojoToString ( T t ) { - ObjectMapper mapper = new ObjectMapper(); - String rJsonStr = ""; - if ( t != null ) { - try { - rJsonStr = mapper.writeValueAsString(t); - } - catch ( com.fasterxml.jackson.core.JsonProcessingException j ) { - logger.debug(EELFLoggerDelegate.debugLogger,getMethodName() + " Unable to parse object of type " + t.getClass().getName() + " as json", j); - } - } - return (rJsonStr); - } - - /** - * The main method. - * - * @param args the arguments - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - } + private MsoUtil() { + } + + public static MsoResponseWrapper wrapResponse(RestObject<String> restObject) { + String response = restObject.get() != null ? restObject.get() : restObject.getRaw(); + int status = restObject.getStatusCode(); + return new MsoResponseWrapper(status, response); + } + + public static <T> MsoResponseWrapper wrapResponse(HttpResponse<T> httpResponse) { + MsoResponseWrapper msoResponseWrapper = new MsoResponseWrapper(); + msoResponseWrapper.setStatus(httpResponse.getStatus()); + if (httpResponse.getRawBody() != null) { + msoResponseWrapper.setEntity(Objects.toString(httpResponse.getBody())); + } + return msoResponseWrapper; + } } diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java b/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java index 7ebecba57..cf3941478 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/RestObject.java @@ -3,13 +3,14 @@ * VID * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 Nokia. All rights reserved. * ================================================================================ * 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. @@ -20,97 +21,37 @@ package org.onap.vid.mso; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.MoreObjects; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; - -import javax.ws.rs.core.Response; - -import static org.onap.vid.utils.Logging.getMethodCallerName; -/** - * The Class RestObject. - * - * @param <T> the generic type - */ public class RestObject<T> { - static final ObjectMapper objectMapper = new ObjectMapper(); - - /** - * Generic version of the RestObject class. - * - */ - // T stands for "Type" private T t; - - // The string source of t, if available + + /** + * The string source of t, if available + */ private String rawT; - /** The status code. */ - private int statusCode= 0; + private int statusCode = 0; public RestObject() { } - public void copyFrom(RestObject<T> src) { - set(src.get()); - setRaw(src.getRaw()); - setStatusCode(src.getStatusCode()); + public void set(T t) { + this.t = t; } - public RestObject(Response cres, Class<?> tClass, EELFLoggerDelegate logger) { - - String rawEntity = null; - try { - cres.bufferEntity(); - rawEntity = cres.readEntity(String.class); - T t = (T) objectMapper.readValue(rawEntity, tClass); - this.set(t); - } - catch ( Exception e ) { - try { - this.setRaw(rawEntity); - logger.debug(EELFLoggerDelegate.debugLogger, "<== " + getMethodCallerName() + " Error reading response entity as " + tClass + ": , e=" - + e.getMessage() + ", Entity=" + rawEntity); - } catch (Exception e2) { - logger.debug(EELFLoggerDelegate.debugLogger, "<== " + getMethodCallerName() + " No response entity, this is probably ok, e=" - + e.getMessage()); - } - } - - int status = cres.getStatus(); - this.setStatusCode (status); + public T get() { + return t; } + public void setStatusCode(int v) { + this.statusCode = v; + } - /** - * Sets the. - * - * @param t the t - */ - public void set(T t) { this.t = t; } - - /** - * Gets the. - * - * @return the t - */ - public T get() { return t; } - - /** - * Sets the status code. - * - * @param v the new status code - */ - public void setStatusCode(int v) { this.statusCode = v; } - - /** - * Gets the status code. - * - * @return the status code - */ - public int getStatusCode() { return this.statusCode; } + public int getStatusCode() { + return this.statusCode; + } public String getRaw() { return rawT; @@ -120,6 +61,12 @@ public class RestObject<T> { this.rawT = rawT; } + public void copyFrom(RestObject<T> src) { + set(src.get()); + setRaw(src.getRaw()); + setStatusCode(src.getStatusCode()); + } + @Override public String toString() { return MoreObjects.toStringHelper(this) diff --git a/vid-app-common/src/main/java/org/onap/vid/utils/SystemPropertiesWrapper.java b/vid-app-common/src/main/java/org/onap/vid/utils/SystemPropertiesWrapper.java new file mode 100644 index 000000000..d24be4dcc --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/utils/SystemPropertiesWrapper.java @@ -0,0 +1,38 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Modifications Copyright 2019 Nokia + * ================================================================================ + * 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.vid.utils; + +import org.apache.commons.lang.StringUtils; + +import org.onap.portalsdk.core.util.SystemProperties; +import org.springframework.stereotype.Component; + +@Component +public class SystemPropertiesWrapper { + public String getProperty(String key) { + return SystemProperties.getProperty(key); + } + public String getOrDefault(String key, String defaultValue) { + return StringUtils.defaultIfEmpty(getProperty(key), defaultValue); + } +} diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java index e9d2cfd44..5dbe010bf 100644 --- a/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java @@ -1,39 +1,139 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Modifications Copyright 2019 Nokia + * ================================================================================ + * 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.vid.controller; -import org.junit.Test; -import org.springframework.http.ResponseEntity; -import org.springframework.web.servlet.ModelAndView; +import static org.mockito.BDDMockito.given; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import javax.servlet.http.HttpServletRequest; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.apache.log4j.BasicConfigurator; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.onap.vid.category.CategoryParameterOptionRep; +import org.onap.vid.category.CategoryParametersResponse; +import org.onap.vid.model.CategoryParameter.Family; +import org.onap.vid.services.CategoryParameterService; +import org.onap.vid.utils.SystemPropertiesWrapper; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +@RunWith(MockitoJUnitRunner.class) public class PropertyControllerTest { - private PropertyController createTestSubject() { - return new PropertyController(); - } - - @Test - public void testWelcome() throws Exception { - PropertyController testSubject; - HttpServletRequest request = null; - ModelAndView result; - - // default test - testSubject = createTestSubject(); - result = testSubject.welcome(request); - } - - - @Test - public void testGetProperty() throws Exception { - PropertyController testSubject; - String name = ""; - String defaultvalue = ""; - HttpServletRequest request = null; - ResponseEntity<String> result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getProperty(name, defaultvalue, request); - } + private static final String GET_PROPERTY = "/get_property/{name}/{defaultvalue}"; + private static final String CATEGORY_PARAMETER = "/category_parameter"; + + private static final String ERROR_MSG = "Internal error occurred: "; + private static final String FAMILY_NAME = "familyName"; + + private PropertyController propertyController; + private MockMvc mockMvc; + private ObjectMapper objectMapper; + + @Mock + private CategoryParameterService service; + @Mock + private SystemPropertiesWrapper systemPropertiesWrapper; + + @Before + public void setUp() { + propertyController = new PropertyController(service, systemPropertiesWrapper); + BasicConfigurator.configure(); + mockMvc = MockMvcBuilders.standaloneSetup(propertyController).build(); + objectMapper = new ObjectMapper(); + } + + @Test + public void shouldReturnInputJson_whenPropertyIsNotFound() throws Exception { + String inputJson = "{key1: val1}"; + given(systemPropertiesWrapper.getOrDefault("name.1", inputJson)).willReturn(inputJson); + + mockMvc.perform(get(GET_PROPERTY, "name_1", inputJson) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().json(inputJson)); + } + + @Test + public void shouldReturnGivenJson_whenPropertyIsFound() throws Exception { + String propertyJson = "{key1: val1}"; + String inputJson = "{key2: val2}"; + given(systemPropertiesWrapper.getOrDefault("name.1", inputJson)).willReturn(propertyJson); + + mockMvc.perform(get(GET_PROPERTY, "name_1", inputJson) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().json(propertyJson)); + } + + @Test + public void shouldReturnInternalServerError_whenExceptionIsThrownFromSystemProperties() throws Exception { + String exceptionMessage = "Test exception message from system properties"; + String inputJson = "{key1: val1}"; + given(systemPropertiesWrapper.getOrDefault("name.1", inputJson)).willThrow(new RuntimeException(exceptionMessage)); + + mockMvc.perform(get(GET_PROPERTY, "name_1", inputJson) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isInternalServerError()) + .andExpect(content().string(ERROR_MSG + exceptionMessage)); + } + + @Test + public void shouldReturnResponse_whenResponseIsFound() throws Exception { + + CategoryParametersResponse categoryParametersResponse = + new CategoryParametersResponse( + ImmutableMap.of( + "key1", ImmutableList.of( + new CategoryParameterOptionRep("testId", "testName")))); + + given(service.getCategoryParameters(Family.PARAMETER_STANDARDIZATION)).willReturn(categoryParametersResponse); + + mockMvc.perform(get(CATEGORY_PARAMETER) + .param(FAMILY_NAME, "PARAMETER_STANDARDIZATION") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().json(objectMapper.writeValueAsString(categoryParametersResponse))); + } + + @Test + public void shouldReturnInternalServerError_whenExceptionIsThrownFromService() throws Exception { + String exceptionMessage = "Test exception message from category parameter service"; + given(service.getCategoryParameters(Family.PARAMETER_STANDARDIZATION)).willThrow(new RuntimeException( + exceptionMessage)); + + mockMvc.perform(get(CATEGORY_PARAMETER) + .param(FAMILY_NAME, "PARAMETER_STANDARDIZATION") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isInternalServerError()) + .andExpect(content().string(ERROR_MSG + exceptionMessage)); + } }
\ No newline at end of file diff --git a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java index 9d625c4f7..82242b6d1 100644 --- a/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/mso/MsoUtilTest.java @@ -1,50 +1,83 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 Nokia. All rights reserved. + * ================================================================================ + * 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.vid.mso; -import org.glassfish.jersey.client.ClientResponse; -import org.junit.Assert; +import io.joshworks.restclient.http.HttpResponse; +import io.joshworks.restclient.http.mapper.ObjectMapper; +import org.apache.http.HttpResponseFactory; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.DefaultHttpResponseFactory; +import org.apache.http.message.BasicStatusLine; import org.junit.Test; -public class MsoUtilTest { - - private MsoUtil createTestSubject() { - return new MsoUtil(); - } - - @Test - public void testWrapResponse() throws Exception { - String body = ""; - int statusCode = 0; - MsoResponseWrapper result; +import static org.apache.http.HttpStatus.SC_OK; +import static org.apache.http.HttpVersion.HTTP_1_1; +import static org.assertj.core.api.Assertions.assertThat; - // default test - result = MsoUtil.wrapResponse(body, statusCode); - } - - - @Test - public void testWrapResponse_2() throws Exception { - RestObject<String> rs = null; - MsoResponseWrapper result; - - // test 1 - result = MsoUtil.wrapResponse(rs); - Assert.assertNotNull(result); - } +public class MsoUtilTest { - @Test - public void testConvertPojoToString() throws Exception { - String result; + @Test + public void shouldWrapRestObject() { + // given + String entity = "entity"; + RestObject<String> restObject = new RestObject<>(); + restObject.set(entity); + restObject.setStatusCode(SC_OK); + // when + MsoResponseWrapper result = MsoUtil.wrapResponse(restObject); + // then + assertThat(result.getEntity()).isEqualTo(entity); + assertThat(result.getStatus()).isEqualTo(SC_OK); + } - // test 1 - result = MsoUtil.convertPojoToString(null); - Assert.assertEquals("", result); - } + @Test + public void shouldWrapHttpResponse() throws Exception { + // given + HttpResponse<String> httpResponse = createTestHttpResponse(SC_OK, null); + // when + MsoResponseWrapper result = MsoUtil.wrapResponse(httpResponse); + // then + assertThat(result.getEntity()).isEqualTo(null); + assertThat(result.getStatus()).isEqualTo(SC_OK); + } - @Test - public void testMain() throws Exception { - String[] args = new String[] { "" }; + @Test + public void shouldWrapHttpResponseWithEntity() throws Exception { + // given + String entity = "entity"; + HttpResponse<String> httpResponse = createTestHttpResponse(SC_OK, entity); + // when + MsoResponseWrapper result = MsoUtil.wrapResponse(httpResponse); + // then + assertThat(result.getEntity()).isEqualTo(entity); + assertThat(result.getStatus()).isEqualTo(SC_OK); + } - // default test - MsoUtil.main(args); - } + private HttpResponse<String> createTestHttpResponse(int statusCode, String entity) throws Exception { + HttpResponseFactory factory = new DefaultHttpResponseFactory(); + org.apache.http.HttpResponse response = factory.newHttpResponse(new BasicStatusLine(HTTP_1_1, statusCode, null), null); + if (entity != null) { + response.setEntity(new StringEntity(entity)); + } + return new HttpResponse<>(response, String.class, null); + } }
\ No newline at end of file |