fixed merge conflict

Author: Ivetted

build.gradle

@@ -48,6 +48,9 @@ dependencies {
     compile('org.springframework.cloud:spring-cloud-starter-oauth2')
     compile('org.springframework.cloud:spring-cloud-starter-zuul')
     compile('org.springframework.boot:spring-boot-starter-web')
+    compile('org.springframework.boot:spring-boot-starter-actuator')
+    compile('org.springframework.boot:spring-boot-starter-security')
+    compile('org.springframework.data:spring-data-rest-hal-browser')
     providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
     testCompile ('org.springframework.cloud:spring-cloud-starter-eureka-server')
     testCompile('com.jayway.restassured:rest-assured:2.5.0')

readme.md

@@ -2,13 +2,12 @@
 The edge service is one of the backing services that serves as the front door for the API. The services utilizes Zuul.
 
 # Running the service:
-
 After making sure the project assembled properly run:  ```docker-compose up --build```
 
 ## Running with locally build images.
-
-Build the images locally but tag them with version ```:local``` instead of default, for example instead of just building gmaps-adapter as aista/gmaps-adapter tag it aista/gmaps-adapter:local 
-
+Build the images locally but tag them with version ```:local``` instead of default, for example instead of just building gmaps-adapter as aista/gmaps-adapter tag it aista/gmaps-adapter:local
 Run ```docker-compose -f docker-compose-local.yml up```
-
 remove the :local from the docker-compose-local.yml file for images that wont be changed locally.
+
+# Performance Metrics API
+Once edge service is UP, you can access the metrics at http://localhost:8080/actuator

src/main/resources/application.yml

@@ -18,7 +18,7 @@ zuul:
 security:
   oauth2:
     resource:
-      userInfoUri: http://localhost:8181/uaa/user
+      userInfoUri: http://localhost:8080/uaa/user
   ignored: /catalog/**
 eureka:
   instance:
@@ -28,7 +28,10 @@ eureka:
     fetchRegistry: true
     serviceUrl:
       defaultZone: http://discovery-service:8761/eureka/
-
+management:
+  security:
+    enabled: false
+  context-path: /actuator
 ---
 spring:
   profiles: docker

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

@@ -77,6 +77,10 @@ public static void initialize() {
                 .port(8080);
         calculationServiceURL = String.format("http://%s:%s", calculationService.getIp(),
                 calculationService.getExternalPort());
+        while (!docker.containers().container("calculationservice").portIsListeningOnHttp(8080,
+            (port) -> port.inFormat(calculationServiceURL)).succeeded()) {
+            LOG.info("Waiting for calculation service to respond over HTTP");
+        }
         LOG.info("Calculation Service url found: " + calculationServiceURL);
 
         DockerPort userService = docker.containers().container("userservice")
@@ -152,14 +156,16 @@ public void tripQueryGETSpecificTripRequestSuccess() throws JSONException {
         String body = "{ \"originAddress\": \"Weston, FL\", \"destinationAddress\": "
                 + "\"Miami, FL\", \"userId\": \"123e4567-e89b-12d3-a456-426655440000\" }";
         HttpEntity<String> request = new HttpEntity<>(body, headers);
-        ResponseEntity<String> postResponse = restTemplate.postForEntity(tripCommandURL + "/api/v1/trip", request, String.class);
+        ResponseEntity<String> postResponse = restTemplate.postForEntity(tripCommandURL + "/api/v1/trip", request,
+                String.class);
         assertThat(postResponse.getStatusCodeValue()).isEqualTo(201);
 
         JSONObject json = new JSONObject(postResponse.getBody());
         tripId = json.getString("id");
 
         //when:
-        ResponseEntity<String> response = restTemplate.getForEntity(tripQueryURL + "/api/v1/trip/" + tripId, String.class);
+        ResponseEntity<String> response = restTemplate.getForEntity(tripQueryURL + "/api/v1/trip/" + tripId,
+                String.class);
 
         //then:
         assertThat(response.getStatusCodeValue()).isEqualTo(200);
@@ -178,4 +184,23 @@ public void tripQueryGETAllTripsRequestSuccess() {
         //then:
         assertThat(response.getStatusCodeValue()).isEqualTo(200);
     }
+
+    @Test
+    public void calculationServiceRequestSuccess() {
+        //given:
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Authorization", "Bearer " + token);
+        headers.add("Content-Type", "application/json");
+
+        String body = "{ \"origin\": \"Weston, FL\", \"destination\": \"Miami, FL\" }";
+        HttpEntity<String> request = new HttpEntity<>(body, headers);
+
+        //when:
+        ResponseEntity<String> response = restTemplate.postForEntity(calculationServiceURL + "/api/v1/cost", request,
+                String.class);
+
+        //then:
+        assertThat(response.getStatusCodeValue()).isEqualTo(200);
+
+    }
 }