Process review comments

Author: marioschlipf

README.md

@@ -42,6 +42,17 @@ Use another Keycloak Docker image/version than used in this Testcontainer:
 KeycloakContainer keycloak = new KeycloakContainer("quay.io/keycloak/keycloak:26.0");
 ```
 
+### Initial admin user credentials
+
+Use different admin credentials than the default internal (`admin`/`admin`) ones:
+
+```java
+@Container
+KeycloakContainer keycloak = new KeycloakContainer()
+    .withAdminUsername("myKeycloakAdminUser")
+    .withAdminPassword("tops3cr3t");
+```
+
 ### Realm Import
 
 Power up a Keycloak instance with one or more existing realm JSON config files (from classpath):
@@ -56,13 +67,24 @@ or
     .withRealmImportFiles("/test-realm-1.json", "/test-realm-2.json");
 ```
 
-### Initial admin user credentials
+If your realm JSON configuration file includes user definitions - particularly the admin user 
+for the master realm - ensure you disable the automatic bootstrapping of the admin user:
+
+```java
+@Container
+KeycloakContainer keycloak = new KeycloakContainer()
+    .withBootstrapAdminDisabled()
+    .withRealmImportFile("/test-realm.json");
+```
 
-Use different admin credentials than the defaut internal (`admin`/`admin`) ones:
+To retrieve a working Keycloak Admin Client from the container, make sure to override the admin 
+credentials to match those in your imported realm JSON configuration file:
 
 ```java
 @Container
 KeycloakContainer keycloak = new KeycloakContainer()
+    .withBootstrapAdminDisabled()
+    .withRealmImportFile("/test-realm.json")
     .withAdminUsername("myKeycloakAdminUser")
     .withAdminPassword("tops3cr3t");
 ```

src/main/java/dasniko/testcontainers/keycloak/ExtendableKeycloakContainer.java

@@ -166,7 +166,7 @@ protected void configure() {
             withEnv("KC_FEATURES_DISABLED", String.join(",", featuresDisabled));
         }
 
-        if(bootstrapAdmin) {
+        if (bootstrapAdmin) {
             withEnv("KC_BOOTSTRAP_ADMIN_USERNAME", adminUsername);
             withEnv("KC_BOOTSTRAP_ADMIN_PASSWORD", adminPassword);
         }
@@ -521,7 +521,7 @@ private SELF withDebug(int hostPort, boolean suspend) {
     }
 
     /** Disable default bootstrapping of the keycloak admin. Useful when realms are imported. */
-    public SELF withoutBootstrapAdmin() {
+    public SELF withBootstrapAdminDisabled() {
         this.bootstrapAdmin = false;
         return self();
     }

src/test/java/dasniko/testcontainers/keycloak/KeycloakContainerTest.java

@@ -34,7 +34,7 @@
 public class KeycloakContainerTest {
 
     public static final String TEST_REALM_JSON = "/test-realm.json";
-    public static final String MASTER_REALM_USERS_JSON = "/master-realm.json";
+    public static final String MASTER_REALM_WITH_ADMIN_USER_JSON = "/master-realm-with-admin-user.json";
 
     @Test
     public void shouldStartKeycloak() {
@@ -52,7 +52,7 @@ public void shouldConsiderConfiguredStartupTimeout() {
             try (KeycloakContainer keycloak = new KeycloakContainer().withStartupTimeout(duration)) {
                 keycloak.start();
             }
-        } catch(ContainerLaunchException ex) {
+        } catch (ContainerLaunchException ex) {
             Duration observedDuration = Duration.between(start, Instant.now());
             assertTrue(observedDuration.toSeconds() >= MAX_TIMEOUT && observedDuration.toSeconds() < 30,
                 String.format("Startup time should consider configured limit of %d seconds, but took %d seconds",
@@ -97,8 +97,8 @@ public void shouldImportMultipleRealms() {
     @Test
     public void shouldImportMasterRealmAdmin() {
         try (KeycloakContainer keycloak = new KeycloakContainer()
-            .withoutBootstrapAdmin()
-            .withRealmImportFiles(MASTER_REALM_USERS_JSON)) {
+            .withBootstrapAdminDisabled()
+            .withRealmImportFiles(MASTER_REALM_WITH_ADMIN_USER_JSON)) {
             keycloak.start();
 
             // Throws because we have imported a different admin user with different password