* ============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.restclient.client;
import org.onap.aai.restclient.enums.RestAuthenticationMode;
import org.onap.aai.restclient.logging.RestClientMsgs;
import org.onap.aai.restclient.rest.RestClientBuilder;
-import org.openecomp.cl.api.LogFields;
-import org.openecomp.cl.api.LogLine;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.cl.mdc.MdcOverride;
+import org.onap.aai.cl.api.LogFields;
+import org.onap.aai.cl.api.LogLine;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcOverride;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
*/
private RestClientBuilder clientBuilder;
- private final ConcurrentMap<String,InitializedClient> CLIENT_CACHE = new ConcurrentHashMap<String,InitializedClient>();
+ private final ConcurrentMap<String,InitializedClient> CLIENT_CACHE = new ConcurrentHashMap<>();
private static final String REST_CLIENT_INSTANCE = "REST_CLIENT_INSTANCE";
/** Standard logger for producing log statements. */
}
// If we've gotten this far, then we failed all of our retries.
+ if (result == null) {
+ result = new OperationResult();
+ }
+
result.setNumRetries(numRetries);
result.setResultCode(504);
- result.setFailureCause(
- "Failed to get a successful result after multiple retries to target server.");
+ result.setFailureCause("Failed to get a successful result after multiple retries to target server.");
+
return result;
}
logger.info(RestClientMsgs.HEALTH_CHECK_SUCCESS, destAppName, url);
return true;
} else {
- logger.error(RestClientMsgs.HEALTH_CHECK_FAILURE, destAppName, url,
- result.getFailureCause());
+ logger.error(RestClientMsgs.HEALTH_CHECK_FAILURE, destAppName, url, result != null ? result.getFailureCause()
+ : null);
return false;
}
} catch (Exception e) {
Map<String, List<String>> headers, MediaType contentType, MediaType responseType) {
WebResource resource = client.resource(url);
- Builder builder = null;
-
- builder = resource.accept(responseType);
+ Builder builder = resource.accept(responseType);
if (contentType != null) {
builder.type(contentType);