* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
package org.onap.aai.sa.rest;
-import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
-import org.onap.aai.cl.mdc.MdcContext;
-import org.slf4j.MDC;
-
import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
+import org.onap.aai.cl.mdc.MdcContext;
+import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
+import org.slf4j.MDC;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+// Spring Imports
public class ApiUtils {
public enum Action {
POST, GET, PUT, DELETE
- }
-
- ;
-
+ };
/**
* This method uses the contents of the supplied HTTP headers and request
* @param httpReq - HTTP request structure.
* @param headers - HTTP headers
*/
- protected static void initMdcContext(HttpServletRequest httpReq, HttpHeaders headers) {
+// protected static void initMdcContext(HttpServletRequest httpReq, HttpHeaders headers) {
+//
+// // Auto generate a transaction if we were not provided one.
+// String transId = null;
+// if (headers != null) {
+// // transId = headers.getRequestHeaders().getFirst("X-TransactionId");
+// transId = headers.getFirst("X-TransactionId");
+//
+// if ((transId == null) || (transId.equals(""))) {
+// transId = UUID.randomUUID().toString();
+// }
+// }
+//
+// String fromIp = (httpReq != null) ? httpReq.getRemoteAddr() : "";
+// String fromApp = (headers != null) ? headers.getFirst("X-FromAppId") : "";
+//
+// MdcContext.initialize(transId, SearchDbConstants.SDB_SERVICE_NAME, "", fromApp, fromIp);
+// }
+
+ protected static void initMdcContext ( HttpServletRequest httpReq, HttpHeaders headers) {
// Auto generate a transaction if we were not provided one.
String transId = null;
if (headers != null) {
- transId = headers.getRequestHeaders().getFirst("X-TransactionId");
+ // transId = headers.getRequestHeaders().getFirst("X-TransactionId");
+ transId = headers.getFirst("X-TransactionId");
if ((transId == null) || (transId.equals(""))) {
transId = UUID.randomUUID().toString();
}
}
- String fromIp = (httpReq != null) ? httpReq.getRemoteAddr() : "";
- String fromApp = (headers != null) ? headers.getRequestHeaders().getFirst("X-FromAppId") : "";
+
+ String fromIp = (httpReq != null) ? httpReq.getRemoteHost () : "";
+ String fromApp = (headers != null) ? headers.getFirst("X-FromAppId") : "";
MdcContext.initialize(transId, SearchDbConstants.SDB_SERVICE_NAME, "", fromApp, fromIp);
}
-
protected static void clearMdcContext() {
MDC.clear();
}
if (requireId) {
return (tokens.length == 8) && (tokens[4].equals("indexes")
- && (tokens[6].equals("documents")));
+ && (tokens[6].equals("documents")));
} else {
return ((tokens.length == 8) || (tokens.length == 7))
- && (tokens[4].equals("indexes") && (tokens[6].equals("documents")));
+ && (tokens[4].equals("indexes") && (tokens[6].equals("documents")));
}
}
// recognized in the javax library. We need to manually translate these to human-readable
// strings.
String statusString = "Unknown";
- Response.Status status = Response.Status.fromStatusCode(httpStatusCode);
+ HttpStatus status = null;
+
+ try {
+ status = HttpStatus.valueOf ( httpStatusCode );
+ } catch (IllegalArgumentException e) {}
+
if (status == null) {
switch (httpStatusCode) {
- case 207:
- statusString = "Multi Status";
- break;
- default:
+ case 207:
+ statusString = "Multi Status";
+ break;
+ default:
}
} else {
- statusString = status.toString();
+ statusString = status.getReasonPhrase ();
}
return statusString;