diff --git a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java index e869b13..5eb2fd7 100644 --- a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java +++ b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java @@ -6,6 +6,7 @@ import java.math.BigDecimal; import java.net.ConnectException; import java.net.SocketTimeoutException; import java.net.URI; +import java.net.URISyntaxException; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Enumeration; @@ -366,20 +367,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp switch (HttpMethodType.getValue(rmethod)) { case GET: case DELETE: - HashMap h = getParameters(dataObject); - URIBuilder uriBuilder = new URIBuilder(uri); - for (Map.Entry entry : h.entrySet()) { - uriBuilder.addParameter(entry.getKey(), entry.getValue()); - } - URI fullUri = uriBuilder.build(); - if (method instanceof HttpGet) { - ((HttpGet) method).setUri(fullUri); - } else if (method instanceof HttpDelete) { - ((HttpDelete) method).setUri(fullUri); - } - if (logger.isDebug()) { - logger.debug("HttpClientAdapterServiceRest] (get Method) QueryString = [" + fullUri.getQuery() + "]"); - } + assignGetParam(dataObject, uri, method); break; case PUT: case POST: @@ -393,8 +381,9 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp default: break; } - + if (logger.isDebugEnabled()) { + logger.debug("HttpClientAdapterServiceRest] Request URI : " + method.getRequestUri()); logger.debug("HttpClientAdapterServiceRest] SEND (" + vo.getAdapterGroupName() + ") method.getParams()=[" + method.getEntity() + "] "); } @@ -403,7 +392,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp // 전달 header 셋팅 // Adapter 레벨 header 보다 data로 넘어온 httpHeader를 우선 적용(header명이 같다면 덮어씀) - assignRequestHeaders(method, httpHeader, prop); + assignRequestHeaders(method, httpHeader, prop, tempProp); int status = -1; @@ -716,6 +705,24 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp } } + private void assignGetParam(Object dataObject, String uri, HttpUriRequestBase method) + throws Exception, URISyntaxException { + HashMap h = getParameters(dataObject); + URIBuilder uriBuilder = new URIBuilder(uri); + for (Map.Entry entry : h.entrySet()) { + uriBuilder.addParameter(entry.getKey(), entry.getValue()); + } + URI fullUri = uriBuilder.build(); + if (method instanceof HttpGet) { + ((HttpGet) method).setUri(fullUri); + } else if (method instanceof HttpDelete) { + ((HttpDelete) method).setUri(fullUri); + } + if (logger.isDebug()) { + logger.debug("HttpClientAdapterServiceRest] (get Method) QueryString = [" + fullUri.getQuery() + "]"); + } + } + private void assignOutboundPropertyMap(Properties tempProp, int status, String responseString, Properties responseHeaderProp) { Map map = new HashMap(); @@ -896,7 +903,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp return false; } - protected void assignRequestHeaders(HttpUriRequestBase method, Object httpHeader, Properties prop) { + protected void assignRequestHeaders(HttpUriRequestBase method, Object httpHeader, Properties prop, Properties tempProp) { if (httpHeader != null) { if ( httpHeader instanceof ObjectNode) { ObjectNode objectNode = (ObjectNode) httpHeader;