Deprecate fields that are derived from containerInfo (#1585)

Author: bsideup

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -559,7 +559,7 @@ public void invoke() {
 
         AuditLogger.doComposeLog(this.getCommandParts(), this.getEnv());
 
-        final Integer exitCode = this.dockerClient.inspectContainerCmd(containerId)
+        final Integer exitCode = this.dockerClient.inspectContainerCmd(getContainerId())
                 .exec()
                 .getState()
                 .getExitCode();

core/src/main/java/org/testcontainers/containers/GenericContainer.java

@@ -143,13 +143,23 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
     @Setter(AccessLevel.NONE)
     protected Info dockerDaemonInfo = null;
 
-    /*
+    /**
      * Set during container startup
+     * // TODO make it private
+     *
+     * @deprecated use {@link ContainerState#getContainerId()}
      */
     @Setter(AccessLevel.NONE)
+    @Deprecated
     protected String containerId;
 
+    /**
+     * Set during container startup
+     *
+     * @deprecated use {@link GenericContainer#getContainerInfo()}
+     */
     @Setter(AccessLevel.NONE)
+    @Deprecated
     protected String containerName;
 
     @Setter(AccessLevel.NONE)
@@ -188,6 +198,10 @@ public GenericContainer(@NonNull final Future<String> image) {
         this.image = image;
     }
 
+    public String getContainerId() {
+        return containerId;
+    }
+
     /**
      * Starts the container using docker, pulling an image if necessary.
      */

core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java

@@ -78,7 +78,7 @@ public void onNext(Frame frame) {
                         };
 
                         try (
-                                Closeable __ = dockerClient.logContainerCmd(containerId)
+                                Closeable __ = dockerClient.logContainerCmd(getContainerId())
                                         .withFollowStream(true)
                                         .withSince(0)
                                         .withStdErr(true)
@@ -122,7 +122,7 @@ protected void configure() {
     @SneakyThrows
     public InputStream streamRecording() {
         TarArchiveInputStream archiveInputStream = new TarArchiveInputStream(
-                dockerClient.copyArchiveFromContainerCmd(containerId, RECORDING_FILE_NAME).exec()
+                dockerClient.copyArchiveFromContainerCmd(getContainerId(), RECORDING_FILE_NAME).exec()
         );
         archiveInputStream.getNextEntry();
         return archiveInputStream;
@@ -134,4 +134,4 @@ public void saveRecordingToFile(File file) {
             Files.copy(inputStream, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
         }
     }
-}
+}