Merge "Controller Blueprints Microservice"

5 files changed, 77 insertions, 19 deletions

diff --git a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/apps/controllerblueprints/ApplicationExceptionHandler.java b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/apps/controllerblueprints/ApplicationExceptionHandler.java
new file mode 100644
index 00000000..d02be5c2
--- /dev/null
+++ b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/apps/controllerblueprints/ApplicationExceptionHandler.java
@@ -0,0 +1,42 @@
+/*

+ *  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.apps.controllerblueprints;

+

+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;

+import org.onap.ccsdk.apps.controllerblueprints.service.common.ErrorMessage;

+import org.springframework.http.HttpStatus;

+import org.springframework.http.ResponseEntity;

+import org.springframework.web.bind.annotation.ControllerAdvice;

+import org.springframework.web.bind.annotation.ExceptionHandler;

+import org.springframework.web.bind.annotation.RestController;

+import org.springframework.web.context.request.WebRequest;

+

+@ControllerAdvice

+@RestController

+public class ApplicationExceptionHandler {

+    @ExceptionHandler(Exception.class)

+    public final ResponseEntity<ErrorMessage> handleAllExceptions(Exception ex, WebRequest request) {

+        ErrorMessage exceptionResponse = new ErrorMessage( ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR.value(), ex.getLocalizedMessage());

+        return new ResponseEntity<>(exceptionResponse, HttpStatus.INTERNAL_SERVER_ERROR);

+    }

+

+    @ExceptionHandler(BluePrintException.class)

+    public final ResponseEntity<ErrorMessage> handleBlueprintException(BluePrintException ex, WebRequest request) {

+        ErrorMessage exceptionResponse = new ErrorMessage( ex.getMessage(), ex.getCode(), ex.getLocalizedMessage());

+        return new ResponseEntity<>(exceptionResponse, HttpStatus.INTERNAL_SERVER_ERROR);

+    }

+}

diff --git a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/apps/controllerblueprints/CorsConfig.java b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/apps/controllerblueprints/CorsConfig.java
index 5d682ed5..d00d2c84 100644
--- a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/apps/controllerblueprints/CorsConfig.java
+++ b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/apps/controllerblueprints/CorsConfig.java
@@ -20,8 +20,9 @@ package org.onap.ccsdk.apps.controllerblueprints;
 import org.springframework.context.annotation.Bean;

 import org.springframework.context.annotation.Configuration;

 import org.springframework.web.cors.CorsConfiguration;

-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;

-import org.springframework.web.filter.CorsFilter;

+import org.springframework.web.cors.reactive.CorsWebFilter;

+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;

+import java.util.Arrays;

 

 /**

  * CorsConfig.java Purpose: Provide Configuration Generator CorsConfig Information

@@ -29,7 +30,7 @@ import org.springframework.web.filter.CorsFilter;
  * @author Brinda Santh

  * @version 1.0

  */

-//@Configuration

+@Configuration

 public class CorsConfig {

     /**

      * This is a CORS Implementation for different Orgin GUI to access.

@@ -37,15 +38,17 @@ public class CorsConfig {
      * @return CorsFilter

      */

     @Bean

-    public CorsFilter corsFilter() {

-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();

-        CorsConfiguration config = new CorsConfiguration();

-        config.setAllowCredentials(true);

-        config.addAllowedOrigin("*");

-        config.addAllowedHeader("*");

-        config.addAllowedMethod("*");

-        source.registerCorsConfiguration("/**", config);

-        return new CorsFilter(source);

+    CorsWebFilter corsWebFilter() {

+        CorsConfiguration corsConfig = new CorsConfiguration();

+        corsConfig.setAllowedOrigins(Arrays.asList("*"));

+        corsConfig.setMaxAge(8000L);

+        corsConfig.addAllowedMethod("*");

+

+        UrlBasedCorsConfigurationSource source =

+                new UrlBasedCorsConfigurationSource();

+        source.registerCorsConfiguration("/**", corsConfig);

+

+        return new CorsWebFilter(source);

     }

 

 

diff --git a/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java b/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java
index 95639bd3..26b943b6 100644
--- a/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java
+++ b/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/ControllerBluprintsApplicationTest.java
@@ -16,17 +16,18 @@
 

 package org.onap.ccsdk.apps.controllerblueprints;

 

+import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Test;

 import org.junit.runner.RunWith;

+import org.onap.ccsdk.apps.controllerblueprints.service.domain.ConfigModel;

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.boot.test.context.SpringBootTest;

 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;

 import org.springframework.boot.test.web.client.TestRestTemplate;

-import org.springframework.http.HttpStatus;

-import org.springframework.http.ResponseEntity;

+import org.springframework.http.*;

 import org.springframework.test.context.junit4.SpringRunner;

 

 import static org.assertj.core.api.Assertions.assertThat;

@@ -46,8 +47,21 @@ public class ControllerBluprintsApplicationTest {
 

     @Test

     public void testConfigModel() {

-        ResponseEntity<String> entity = this.restTemplate

-                .getForEntity("/api/v1/config-model/1", String.class);

+        HttpHeaders headers = new HttpHeaders();

+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);

+        ResponseEntity<ConfigModel> entity = this.restTemplate

+                .exchange("/api/v1/config-model/1", HttpMethod.GET, new HttpEntity<>(headers),ConfigModel.class);

         assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);

+        Assert.assertNotNull("failed to get response Config model",entity.getBody());

+    }

+

+    @Test

+    public void testConfigModelFailure() {

+        HttpHeaders headers = new HttpHeaders();

+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);

+        ResponseEntity<ConfigModel> entity = this.restTemplate

+                .exchange("/api/v1/config-model-not-found/1", HttpMethod.GET, new HttpEntity<>(headers),ConfigModel.class);

+        assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);

+        Assert.assertNotNull("failed to get response Config model",entity.getBody());

     }

 }

diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 55ffeaf1..a147034f 100644
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and

 # limitations under the License.

 #

-

+spring.jackson.default-property-inclusion=non_null

 #Load Blueprints

 # blueprints.load.initial-data may be overridden by ENV variables

 blueprints.load.initial-data=true

diff --git a/ms/controllerblueprints/application/src/test/resources/logback.xml b/ms/controllerblueprints/application/src/test/resources/logback.xml
index b9b97dc8..53388bc9 100644
--- a/ms/controllerblueprints/application/src/test/resources/logback.xml
+++ b/ms/controllerblueprints/application/src/test/resources/logback.xml
@@ -24,8 +24,7 @@
     </appender>

 

 

-    <logger name="org.springframework" level="info"/>

-    <logger name="org.springframework.web" level="debug"/>

+    <logger name="org.springframework" level="warn"/>

     <logger name="org.hibernate" level="info"/>

     <logger name="org.onap.ccsdk.apps.controllerblueprints" level="info"/>