Merge pull request #12 from AITestingOrg/add-userservice-to-properties

Added userservice route to application.yml

Author: Castyr

.gitignore

@@ -1,6 +1,7 @@
 .gradle
 /build/
 !gradle/wrapper/gradle-wrapper.jar
+/out/
 
 ### STS ###
 .apt_generated

build.gradle

@@ -68,4 +68,11 @@ dependencyManagement {
 checkstyle {
     toolVersion = "8.7"
     configFile = new File(rootDir, "checkstyle.xml")
+}
+
+test {
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
 }

src/main/resources/application.yml

@@ -15,10 +15,14 @@ zuul:
     trip-query:
       path: /trip/query/**
       url: http://tripmanagementquery:8080/api
+    userservice:
+      path: /userservice/**
+      url: http://userservice:8080/
+      sensitiveHeaders: Cookie,Set-Cookie
 security:
   oauth2:
     resource:
-      userInfoUri: http://localhost:8080/uaa/user
+      userInfoUri: http://userservice:8080/auth/user
   ignored: /catalog/**
 eureka:
   instance:
@@ -46,10 +50,14 @@ zuul:
     trip-query:
       path: /trip/query/**
       url: http://tripmanagementquery:8080/api
+    userservice:
+      path: /userservice/**
+      url: http://userservice:8080/
+      sensitiveHeaders: Cookie,Set-Cookie
 security:
   oauth2:
     resource:
-      userInfoUri: http://localhost:8181/uaa/user
+      userInfoUri: http://userservice:8080/auth/user
   ignored: /catalog/**
 eureka:
   instance:

src/test/java/aist/edge/edgeservice/EdgeServiceIntegrationTests.java

@@ -211,7 +211,8 @@ public void gmapsAdapterRequestSuccess() {
         headers.add("Authorization", "Bearer " + token);
         headers.add("Content-Type", "application/json");
 
-        String body = "{ \"origin\": \"Weston, FL\", \"destination\": \"Miami, FL\", \"departureTime\": \"15220998650000000\" }";
+        String body = "{ \"origin\": \"Weston, FL\", \"destination\": \"Miami, FL\","
+                + " \"departureTime\": \"15220998650000000\" }";
         HttpEntity<String> request = new HttpEntity<>(body, headers);
 
         //when: