Remove org.testcontainers.neo4j.Neo4jContainer#withEnterpriseEdition (#11106)

Author: eddumelendez

modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java

@@ -7,7 +7,6 @@
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.LicenseAcceptance;
 import org.testcontainers.utility.MountableFile;
 
 import java.net.HttpURLConnection;
@@ -39,13 +38,6 @@ public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
      */
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("neo4j");
 
-    /**
-     * The default tag (version) to use.
-     */
-    private static final String DEFAULT_TAG = "4.4";
-
-    private static final String ENTERPRISE_TAG = DEFAULT_TAG + "-enterprise";
-
     /**
      * Default port for the binary Bolt protocol.
      */
@@ -68,8 +60,6 @@ public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
 
     private static final String AUTH_FORMAT = "neo4j/%s";
 
-    private final boolean standardImage;
-
     private String adminPassword = DEFAULT_ADMIN_PASSWORD;
 
     private final Set<String> labsPlugins = new HashSet<>();
@@ -100,8 +90,6 @@ public Neo4jContainer(String dockerImageName) {
      */
     public Neo4jContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        this.standardImage = dockerImageName.getUnversionedPart().equals(DEFAULT_IMAGE_NAME.getUnversionedPart());
-
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         waitingFor(
@@ -197,26 +185,12 @@ public String getHttpsUrl() {
     }
 
     /**
-     * Configures the container to use the enterprise edition of the default docker image.
-     * <br><br>
-     * Please have a look at the <a href="https://neo4j.com/licensing/">Neo4j Licensing page</a>. While the Neo4j
-     * Community Edition can be used for free in your projects under the GPL v3 license, Neo4j Enterprise edition
-     * needs either a commercial, education or evaluation license.
+     * Accepts the license agreement of the container.
      *
-     * @return This container.
+     * @return this
      */
-    public Neo4jContainer withEnterpriseEdition() {
-        if (!standardImage) {
-            throw new IllegalStateException(
-                String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName())
-            );
-        }
-
-        setDockerImageName(DEFAULT_IMAGE_NAME.withTag(ENTERPRISE_TAG).asCanonicalNameString());
-        LicenseAcceptance.assertLicenseAccepted(getDockerImageName());
-
+    public Neo4jContainer acceptLicense() {
         addEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes");
-
         return self();
     }
 

modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java

@@ -21,7 +21,6 @@
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assumptions.assumeThat;
@@ -132,25 +131,14 @@ private static void assertThatCustomPluginWasCopied(Session session) {
         assertThat(singleRecord.get("greeting").asString()).isEqualTo("Hello, Testcontainers");
     }
 
-    @Test
-    void shouldCheckEnterpriseLicense() {
-        assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNull();
-
-        String expectedImageName = "neo4j:4.4-enterprise";
-
-        assertThatExceptionOfType(IllegalStateException.class)
-            .isThrownBy(() -> new Neo4jContainer("neo4j:4.4").withEnterpriseEdition())
-            .withMessageContaining("The image " + expectedImageName + " requires you to accept a license agreement.");
-    }
-
     @Test
     void shouldRunEnterprise() {
         assumeThat(Neo4jContainerTest.class.getResource(ACCEPTANCE_FILE_LOCATION)).isNotNull();
 
         try (
             // enterpriseEdition {
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
-                .withEnterpriseEdition()
+            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4-enterprise")
+                .acceptLicense()
                 // }
                 .withAdminPassword("Picard123")
         ) {