Revert "Make Neo4jContainer generic and drop deprecated method (#10388)"

This reverts commit 71cc729.

Author: eddumelendez

examples/neo4j-container/src/test/java/org/testcontainers/containers/Neo4jExampleTest.java

@@ -27,7 +27,7 @@
 class Neo4jExampleTest {
 
     @Container
-    private static Neo4jContainer neo4jContainer = new Neo4jContainer(DockerImageName.parse("neo4j:4.4"))
+    private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(DockerImageName.parse("neo4j:4.4"))
         .withoutAuthentication(); // Disable password
 
     @Test

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

@@ -34,7 +34,7 @@
  * @deprecated use {@link org.testcontainers.neo4j.Neo4jContainer} instead.
  */
 @Deprecated
-public class Neo4jContainer extends GenericContainer<Neo4jContainer> {
+public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContainer<S> {
 
     /**
      * The image defaults to the official Neo4j image: <a href="https://hub.docker.com/_/neo4j/">Neo4j</a>.
@@ -217,7 +217,7 @@ public String getHttpsUrl() {
      *
      * @return This container.
      */
-    public Neo4jContainer withEnterpriseEdition() {
+    public S withEnterpriseEdition() {
         if (!standardImage) {
             throw new IllegalStateException(
                 String.format("Cannot use enterprise version with alternative image %s.", getDockerImageName())
@@ -239,7 +239,7 @@ public Neo4jContainer withEnterpriseEdition() {
      * @param adminPassword The admin password for the default database account.
      * @return This container.
      */
-    public Neo4jContainer withAdminPassword(final String adminPassword) {
+    public S withAdminPassword(final String adminPassword) {
         if (adminPassword != null && adminPassword.length() < 8) {
             logger().warn("Your provided admin password is too short and will not work with Neo4j 5.3+.");
         }
@@ -252,7 +252,7 @@ public Neo4jContainer withAdminPassword(final String adminPassword) {
      *
      * @return This container.
      */
-    public Neo4jContainer withoutAuthentication() {
+    public S withoutAuthentication() {
         return withAdminPassword(null);
     }
 
@@ -276,7 +276,7 @@ public Neo4jContainer withoutAuthentication() {
      * @throws IllegalArgumentException If the database version is not 3.5.
      * @return This container.
      */
-    public Neo4jContainer withDatabase(MountableFile graphDb) {
+    public S withDatabase(MountableFile graphDb) {
         if (!isNeo4jDatabaseVersionSupportingDbCopy()) {
             throw new IllegalArgumentException(
                 "Copying database folder is not supported for Neo4j instances with version 4.0 or higher."
@@ -295,7 +295,7 @@ public Neo4jContainer withDatabase(MountableFile graphDb) {
      * @param plugins
      * @return This container.
      */
-    public Neo4jContainer withPlugins(MountableFile plugins) {
+    public S withPlugins(MountableFile plugins) {
         return withCopyFileToContainer(plugins, "/var/lib/neo4j/plugins/");
     }
 
@@ -307,7 +307,7 @@ public Neo4jContainer withPlugins(MountableFile plugins) {
      * @param value The value to set
      * @return This container.
      */
-    public Neo4jContainer withNeo4jConfig(String key, String value) {
+    public S withNeo4jConfig(String key, String value) {
         addEnv(formatConfigurationKey(key), value);
         return self();
     }
@@ -330,7 +330,7 @@ public String getAdminPassword() {
      * @param plugins The Neo4j plugins that should get started with the server.
      * @return This container.
      */
-    public Neo4jContainer withPlugins(String... plugins) {
+    public S withPlugins(String... plugins) {
         this.labsPlugins.addAll(Arrays.asList(plugins));
         return self();
     }
@@ -363,7 +363,7 @@ private boolean isNeo4jDatabaseVersionSupportingDbCopy() {
         return false;
     }
 
-    public Neo4jContainer withRandomPassword() {
+    public S withRandomPassword() {
         return withAdminPassword(UUID.randomUUID().toString());
     }
 }