body전문 없는 variablepath 및 예외처리 추가
This commit is contained in:
+7
-2
@@ -1523,12 +1523,17 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
|
|||||||
}
|
}
|
||||||
for (Object tempObject : uriVariables) {
|
for (Object tempObject : uriVariables) {
|
||||||
String urlVaribleId = (String) tempObject;
|
String urlVaribleId = (String) tempObject;
|
||||||
String uriVariable = (String) jsonObject.get(urlVaribleId);
|
String uriVariable = null;
|
||||||
|
if( jsonObject != null ) {
|
||||||
|
uriVariable = (String) jsonObject.get(urlVaribleId);
|
||||||
|
jsonObject.remove(urlVaribleId);
|
||||||
|
}
|
||||||
|
|
||||||
if (StringUtils.isBlank(uriVariable) && inboundPathVariables.containsKey(urlVaribleId)) {
|
if (StringUtils.isBlank(uriVariable) && inboundPathVariables.containsKey(urlVaribleId)) {
|
||||||
uriVariable = inboundPathVariables.get(urlVaribleId);
|
uriVariable = inboundPathVariables.get(urlVaribleId);
|
||||||
}
|
}
|
||||||
urlVariableList.add(uriVariable);
|
urlVariableList.add(uriVariable);
|
||||||
jsonObject.remove(urlVaribleId);
|
|
||||||
}
|
}
|
||||||
} else if (MessageType.XML.equals(messageType)) {
|
} else if (MessageType.XML.equals(messageType)) {
|
||||||
Document doc;
|
Document doc;
|
||||||
|
|||||||
+1
-1
@@ -131,7 +131,7 @@ public class HttpAdapterServiceBypass extends HttpAdapterServiceSupport {
|
|||||||
prop.put(INBOUND_URI, request.getRequestURI());
|
prop.put(INBOUND_URI, request.getRequestURI());
|
||||||
prop.put(INBOUND_QUERY_STRING, StringUtils.defaultString(request.getQueryString()));
|
prop.put(INBOUND_QUERY_STRING, StringUtils.defaultString(request.getQueryString()));
|
||||||
prop.put(INBOUND_HEADER, getHeaders(request));
|
prop.put(INBOUND_HEADER, getHeaders(request));
|
||||||
prop.put(INBOUND_EXTPARAMS, request.getQueryString());
|
prop.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
|
||||||
if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|
if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|
||||||
|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
|
|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
|
||||||
// /api/v1/public/getUserInfo.svc
|
// /api/v1/public/getUserInfo.svc
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ public class HttpAdapterServiceRest extends HttpAdapterServiceSupport {
|
|||||||
prop = new Properties();
|
prop = new Properties();
|
||||||
prop.put(INBOUND_METHOD, request.getMethod());
|
prop.put(INBOUND_METHOD, request.getMethod());
|
||||||
prop.put(INBOUND_URI, request.getRequestURI());
|
prop.put(INBOUND_URI, request.getRequestURI());
|
||||||
prop.put(INBOUND_EXTPARAMS, request.getQueryString());
|
prop.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
|
||||||
prop.put(INBOUND_HEADER, getHeaders(request));
|
prop.put(INBOUND_HEADER, getHeaders(request));
|
||||||
if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|
if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|
||||||
|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
|
|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
|
||||||
|
|||||||
+1
-1
@@ -172,7 +172,7 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
|
|||||||
prop.put(INBOUND_METHOD, request.getMethod());
|
prop.put(INBOUND_METHOD, request.getMethod());
|
||||||
prop.put(INBOUND_URI, request.getRequestURI());
|
prop.put(INBOUND_URI, request.getRequestURI());
|
||||||
prop.put(INBOUND_HEADER, getHeaders(request));
|
prop.put(INBOUND_HEADER, getHeaders(request));
|
||||||
prop.put(INBOUND_EXTPARAMS, request.getQueryString());
|
prop.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
|
||||||
if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|
if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|
||||||
|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
|
|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
|
||||||
// /api/v1/public/getUserInfo.svc
|
// /api/v1/public/getUserInfo.svc
|
||||||
|
|||||||
Reference in New Issue
Block a user