diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java index a7edbfa..941f175 100755 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java @@ -12,6 +12,8 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; @@ -34,7 +36,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController public class GatewayController { - Logger log = LoggerFactory.getLogger(this.getClass()); + Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private ApiGatewayProperties apiGatewayProperties; @@ -51,11 +53,12 @@ public class GatewayController { } @RequestMapping(value = "/**", method = {GET, POST}) - public String proxyRequest(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, IOException, URISyntaxException { + public ResponseEntity proxyRequest(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, IOException, URISyntaxException { HttpUriRequest proxiedRequest = createHttpUriRequest(request); - log.info("request: {}", proxiedRequest); + logger.info("request: {}", proxiedRequest); HttpResponse proxiedResponse = httpClient.execute(proxiedRequest); - return read(proxiedResponse.getEntity().getContent()); + logger.info("Response {}", proxiedResponse.getStatusLine().getStatusCode()); + return new ResponseEntity<>(read(proxiedResponse.getEntity().getContent()), HttpStatus.valueOf(proxiedResponse.getStatusLine().getStatusCode())); } private HttpUriRequest createHttpUriRequest(HttpServletRequest request) throws URISyntaxException, NoSuchRequestHandlingMethodException, IOException { diff --git a/java-spring/api-gateway-service/src/main/resources/logback.xml b/java-spring/api-gateway-service/src/main/resources/logback.xml index 5d568b7..3469522 100755 --- a/java-spring/api-gateway-service/src/main/resources/logback.xml +++ b/java-spring/api-gateway-service/src/main/resources/logback.xml @@ -14,6 +14,11 @@ - + + + + + + \ No newline at end of file diff --git a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/utils/BasicAuthUtils.java b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/utils/BasicAuthUtils.java index e97d94b..4f29ba1 100644 --- a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/utils/BasicAuthUtils.java +++ b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/utils/BasicAuthUtils.java @@ -1,9 +1,8 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.utils; import org.apache.tomcat.util.codec.binary.Base64; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; +import org.springframework.http.*; +import org.springframework.util.Assert; import org.springframework.web.client.RestTemplate; import java.nio.charset.Charset; @@ -32,14 +31,16 @@ public class BasicAuthUtils { public static T doBasicAuthenticatedRequest(RestTemplate restTemplate, String url, HttpMethod httpMethod, Class responseType, Object requestObject) { HttpEntity httpEntity; if (requestObject != null) { - httpEntity = new HttpEntity(requestObject, BasicAuthUtils.basicAuthHeaders("test_user@mail.com")); + httpEntity = new HttpEntity<>(requestObject, BasicAuthUtils.basicAuthHeaders("test_user@mail.com")); } else { httpEntity = new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")); } - return restTemplate.exchange(url, + ResponseEntity responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, - responseType).getBody(); + responseType); + Assert.isTrue(HttpStatus.OK == responseEntity.getStatusCode(), "Bad response: " + responseEntity.getStatusCode()); + return responseEntity.getBody(); } } diff --git a/java-spring/common-backend/src/main/resources/logback.xml b/java-spring/common-backend/src/main/resources/logback.xml index d4123dc..011b839 100644 --- a/java-spring/common-backend/src/main/resources/logback.xml +++ b/java-spring/common-backend/src/main/resources/logback.xml @@ -16,7 +16,10 @@ - + + + + diff --git a/java-spring/gradle.properties b/java-spring/gradle.properties index 4dbcb10..e538042 100644 --- a/java-spring/gradle.properties +++ b/java-spring/gradle.properties @@ -5,5 +5,5 @@ eventuateMavenRepoUrl=http://mavenrepo.eventuate.io/release springBootVersion=1.3.5.RELEASE -eventuateClientVersion=0.4.0.RELEASE +eventuateClientVersion=0.8.0.RELEASE