aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSORESTClient/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'bpmn/MSORESTClient/src/main')
-rw-r--r--bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java27
-rw-r--r--bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/HttpHeader.java65
2 files changed, 14 insertions, 78 deletions
diff --git a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
index ea9ca62bf5..e4eee6d695 100644
--- a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
+++ b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
@@ -7,9 +7,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,18 +25,19 @@ import java.util.Arrays;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
+import org.apache.http.message.BasicHeader;
import org.apache.http.util.EntityUtils;
/**
* An immutable class that encapsulates an API response.
- *
+ *
* @version 1.0
* @since 1.0
*/
public class APIResponse {
private final int statusCode;
private final byte[] responseBody;
- private final HttpHeader[] headers;
+ private final BasicHeader[] headers;
/**
* Internal method used to create http headers using the specified
@@ -45,17 +46,17 @@ public class APIResponse {
* @param httpResponse used to create headers
* @return http headers
*/
- private static HttpHeader[] buildHeaders(final HttpResponse httpResponse) {
+ private static BasicHeader[] buildHeaders(final HttpResponse httpResponse) {
final Header[] headers = httpResponse.getAllHeaders();
- HttpHeader[] httpHeaders = new HttpHeader[headers.length];
+ BasicHeader[] httpHeaders = new BasicHeader[headers.length];
for (int i = 0; i < headers.length; ++i) {
final Header header = headers[i];
final String name = header.getName();
- final String value = header.getValue();
- final HttpHeader httpHeader = new HttpHeader(name, value);
+ final String value = header.getValue();
+ final BasicHeader httpHeader = new BasicHeader(name, value);
httpHeaders[i] = httpHeader;
- }
+ }
return httpHeaders;
}
@@ -89,7 +90,7 @@ public class APIResponse {
/**
* Gets the http status code returned by the api server.
* <p>
- * For example, status code 200 represents 'OK.'
+ * For example, status code 200 represents 'OK.'
*
* @return status code
*/
@@ -127,15 +128,15 @@ public class APIResponse {
/**
* Gets a list of all the headers returned by the API response.
*
- * @return an array of all the HttpHeaders
+ * @return an array of all the BasicHeaders
*/
- public HttpHeader[] getAllHeaders() {
+ public BasicHeader[] getAllHeaders() {
// avoid exposing internals, create copy
return Arrays.copyOf(this.headers, this.headers.length);
}
public String getFirstHeader(String name) {
- for (HttpHeader header : headers) {
+ for (BasicHeader header : headers) {
if (header.getName().equals(name)) {
return header.getValue();
}
diff --git a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/HttpHeader.java b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/HttpHeader.java
deleted file mode 100644
index e0d6c3056d..0000000000
--- a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/HttpHeader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.rest;
-
-/**
- * An immutable class used to wrap an http header.
- *
- * @version 1.0
- * @since 1.0
- */
-public class HttpHeader {
- private final String name;
- private final String value;
-
- /**
- * Create an http header using the specified name and value
- *
- * @param name name of http header
- * @param value value of http header
- */
- public HttpHeader(final String name, final String value) {
- if (name == null) {
- throw new IllegalArgumentException("Name may not be null.");
- }
-
- this.name = name;
- this.value = value;
- }
-
- /**
- * Gets the header name.
- *
- * @return header name
- */
- public String getName() {
- return this.name;
- }
-
- /**
- * Gets the header value.
- *
- * @return header value
- */
- public String getValue() {
- return this.value;
- }
-}