From edbcdab380d4ba6c33d7dc1aa14f5dcde509b60b Mon Sep 17 00:00:00 2001
From: Nicholas Yip <nicholasyip@obceit.cc>
Date: Wed, 12 May 2021 08:50:16 +0900
Subject: [PATCH] Revert "couchbase: include error response from couchbase in
 checkSuccessfulResponse() (#3006)"

This reverts commit 6e8c18e1a3d9a75c86e86577b684bfdb8ce61160.
---
 .../couchbase/CouchbaseContainer.java         | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
index 11960304ee6..867e1806b31 100644
--- a/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
+++ b/modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
@@ -181,7 +181,7 @@ protected void configure() {
                             .map("healthy"::equals)
                             .orElse(false);
                     } catch (IOException e) {
-                        logger().error("Unable to parse response {}", response, e);
+                        logger().error("Unable to parse response {}", response);
                         return false;
                     }
                 })
@@ -350,10 +350,10 @@ private void configureIndexer() {
      * Based on the user-configured bucket definitions, creating buckets and corresponding indexes if needed.
      */
     private void createBuckets() {
-        logger().debug("Creating {} buckets (and corresponding indexes).", buckets.size());
+        logger().debug("Creating " + buckets.size() + " buckets (and corresponding indexes).");
 
         for (BucketDefinition bucket : buckets) {
-            logger().debug("Creating bucket \"{}\"", bucket.getName());
+            logger().debug("Creating bucket \"" + bucket.getName() + "\"");
 
             @Cleanup Response response = doHttpRequest(MGMT_PORT, "/pools/default/buckets", "POST", new FormBody.Builder()
                 .add("name", bucket.getName())
@@ -395,7 +395,7 @@ private void createBuckets() {
 
                     checkSuccessfulResponse(queryResponse, "Could not create primary index for bucket " + bucket.getName());
                 } else {
-                    logger().info("Primary index creation for bucket {} ignored, since QUERY service is not present.", bucket.getName());
+                    logger().info("Primary index creation for bucket " + bucket.getName() + " ignored, since QUERY service is not present.");
                 }
             }
         }
@@ -419,16 +419,7 @@ private String getInternalIpAddress() {
      */
     private void checkSuccessfulResponse(final Response response, final String message) {
         if (!response.isSuccessful()) {
-            String body = null;
-            if (response.body() != null) {
-                try {
-                    body = response.body().string();
-                } catch (IOException e) {
-                    logger().debug("Unable to read body of response: {}", response, e);
-                }
-            }
-
-            throw new IllegalStateException(message + ": " + response.toString() + ", body=" + (body == null ? "<null>" : body));
+            throw new IllegalStateException(message + ": " + response.toString());
         }
     }