Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into fixsedsyntax

Author: vanajamukkara

operator/src/main/java/oracle/kubernetes/operator/calls/AsyncRequestStep.java

@@ -151,12 +151,12 @@ public NextAction apply(Packet packet) {
               new BaseApiCallback<T>() {
                 @Override
                 public void onFailure(
-                    ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
+                    ApiException ae, int statusCode, Map<String, List<String>> responseHeaders) {
                   if (didResume.compareAndSet(false, true)) {
                     if (statusCode != CallBuilder.NOT_FOUND) {
                       LOGGER.info(
                           MessageKeys.ASYNC_FAILURE,
-                          e,
+                          ae.getMessage(),
                           statusCode,
                           responseHeaders,
                           requestParams.call,
@@ -165,7 +165,8 @@ public void onFailure(
                           requestParams.body,
                           fieldSelector,
                           labelSelector,
-                          resourceVersion);
+                          resourceVersion,
+                          ae.getResponseBody());
                     }
 
                     helper.recycle(client);
@@ -176,7 +177,7 @@ public void onFailure(
                             Component.createFor(
                                 RetryStrategy.class,
                                 r,
-                                new CallResponse<Void>(null, e, statusCode, responseHeaders)));
+                                new CallResponse<Void>(null, ae, statusCode, responseHeaders)));
                     fiber.resume(packet);
                   }
                 }
@@ -233,9 +234,14 @@ public void onSuccess(
                     timeoutSeconds,
                     TimeUnit.SECONDS);
           } catch (Throwable t) {
+            String responseBody = "";
+            if (t instanceof ApiException) {
+              ApiException ae = (ApiException) t;
+              responseBody = ae.getResponseBody();
+            }
             LOGGER.warning(
                 MessageKeys.ASYNC_FAILURE,
-                t,
+                t.getMessage(),
                 0,
                 null,
                 requestParams,
@@ -244,7 +250,8 @@ public void onSuccess(
                 requestParams.body,
                 fieldSelector,
                 labelSelector,
-                resourceVersion);
+                resourceVersion,
+                responseBody);
             if (didResume.compareAndSet(false, true)) {
               packet
                   .getComponents()

operator/src/main/resources/Operator.properties

@@ -4,7 +4,7 @@ WLSKO-0002=The Kuberenetes Master URL is set to {0}
 WLSKO-0003=
 WLSKO-0004=
 WLSKO-0005=The Oracle WebLogic Server Operator for Kubernetes is shutting down
-WLSKO-0006=Exception thrown: {0}
+WLSKO-0006=Exception thrown
 WLSKO-0007=Created Service: {0}
 WLSKO-0008=Status: {0}
 WLSKO-0009=Created Network Policy: {0}
@@ -93,7 +93,7 @@ WLSKO-0091=External Channel {0} is using {1} protocol. For non-T3 channels use I
 WLSKO-0092=External Channel {0} is not defined in server {1}
 WLSKO-0093=External Channel {0} port {1} is outside the NodePort range starting at {2} through {3} 
 WLSKO-0094=Async call invoking: {0}, namespace: {1}, name: {2}, body: {3}, fieldSelector: {4}, labelSelector: {5}, resourceVersion: {6}
-WLSKO-0095=Async call failed: {0}, code: {1}, headers {2} after invoking {3}, namespace: {4}, name: {5}, body: {6}, fieldSelector: {7}, labelSelector: {8}, resourceVersion: {9}
+WLSKO-0095=Async call failed: {0}, code: {1}, headers {2} after invoking {3}, namespace: {4}, name: {5}, body: {6}, fieldSelector: {7}, labelSelector: {8}, resourceVersion: {9}, response body: {10}
 WLSKO-0096=Async call succeeded: {0}, code: {1}, headers {2}
 WLSKO-0097=Async call will not be retried: {0}, code: {1}, headers {2}
 WLSKO-0098=Async call will be retried after delay: {0} ms