refactor: removing HttpRequestLoggerUtil.java

system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer02consumerPullTest.java

@@ -38,7 +38,6 @@
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.getConsumer;
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.getProvider;
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.runPrerequisites;
-import static org.eclipse.edc.samples.util.HttpRequestLoggerUtil.getHttpRequestLoggerContainer;
 import static org.eclipse.edc.samples.util.TransferUtil.checkTransferStatus;
 import static org.eclipse.edc.samples.util.TransferUtil.startTransfer;
 import static org.hamcrest.Matchers.emptyString;
@@ -59,7 +58,7 @@ public class Transfer02consumerPullTest {
     static EdcRuntimeExtension consumer = getConsumer();
 
     @Container
-    public static HttpRequestLoggerContainer httpRequestLoggerContainer = getHttpRequestLoggerContainer(LOG_CONSUMER);
+    public static HttpRequestLoggerContainer httpRequestLoggerContainer = new HttpRequestLoggerContainer(LOG_CONSUMER);
 
     @BeforeAll
     static void setUp() {

system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer03providerPushTest.java

@@ -32,7 +32,6 @@
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.getConsumer;
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.getProvider;
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.runPrerequisites;
-import static org.eclipse.edc.samples.util.HttpRequestLoggerUtil.getHttpRequestLoggerContainer;
 import static org.eclipse.edc.samples.util.TransferUtil.checkTransferStatus;
 import static org.eclipse.edc.samples.util.TransferUtil.startTransfer;
 
@@ -50,7 +49,7 @@ public class Transfer03providerPushTest {
     static EdcRuntimeExtension consumer = getConsumer();
 
     @Container
-    public static HttpRequestLoggerContainer httpRequestLoggerContainer = getHttpRequestLoggerContainer(LOG_CONSUMER);
+    public static HttpRequestLoggerContainer httpRequestLoggerContainer = new HttpRequestLoggerContainer(LOG_CONSUMER);
 
     @BeforeAll
     static void setUp() {

system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer04eventConsumerTest.java

@@ -33,7 +33,6 @@
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.getConsumer;
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.getProvider;
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.runPrerequisites;
-import static org.eclipse.edc.samples.util.HttpRequestLoggerUtil.getHttpRequestLoggerContainer;
 import static org.eclipse.edc.samples.util.TransferUtil.checkTransferStatus;
 import static org.eclipse.edc.samples.util.TransferUtil.startTransfer;
 
@@ -49,7 +48,7 @@ public class Transfer04eventConsumerTest {
     static EdcRuntimeExtension consumer = getConsumer(CONSUMER_WITH_LISTENER_MODULE_PATH);
 
     @Container
-    static HttpRequestLoggerContainer httpRequestLoggerContainer = getHttpRequestLoggerContainer();
+    static HttpRequestLoggerContainer httpRequestLoggerContainer = new HttpRequestLoggerContainer();
 
     @BeforeAll
     static void setUp() {

system-tests/src/test/java/org/eclipse/edc/samples/util/HttpRequestLoggerContainer.java

@@ -1,11 +1,41 @@
+/*
+ *  Copyright (c) 2022 Microsoft Corporation
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Mercedes-Benz Tech Innovation GmbH - initial implementation
+ *
+ */
+
 package org.eclipse.edc.samples.util;
 
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.ToStringConsumer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
+import java.util.List;
+
+import static org.eclipse.edc.samples.common.FileTransferCommon.getFileFromRelativePath;
+
 public class HttpRequestLoggerContainer extends GenericContainer<HttpRequestLoggerContainer> {
 
-    public HttpRequestLoggerContainer(ImageFromDockerfile dockerImage) {
-        super(dockerImage);
+    private static final String HTTP_REQUEST_LOGGER_DOCKERFILE_PATH = "util/http-request-logger/Dockerfile";
+    private static final ImageFromDockerfile IMAGE_FROM_DOCKERFILE = new ImageFromDockerfile()
+            .withDockerfile(getFileFromRelativePath(HTTP_REQUEST_LOGGER_DOCKERFILE_PATH).toPath());
+    private static final String PORT_BINDING = "4000:4000";
+
+    public HttpRequestLoggerContainer() {
+        super(IMAGE_FROM_DOCKERFILE);
+        this.setPortBindings(List.of(PORT_BINDING));
+    }
+
+    public HttpRequestLoggerContainer(ToStringConsumer toStringConsumer) {
+        this();
+        this.setLogConsumers(List.of(toStringConsumer));
     }
 }