This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 612fd48d9a5 CAMEL-16488: ensure resource setup/cleanup on the right
time
612fd48d9a5 is described below
commit 612fd48d9a5b742907c49e8d86e45339ff791104
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Tue Sep 6 16:32:08 2022 +0200
CAMEL-16488: ensure resource setup/cleanup on the right time
---
.../remote/integration/FtpServerTestSupport.java | 2 +-
.../sftp/integration/SftpServerTestSupport.java | 2 +-
.../infra/common/services/AbstractTestService.java | 31 +++------------------
.../test/infra/ftp/services/FtpRemoteService.java | 16 +----------
.../camel/test/infra/ftp/services/FtpService.java | 14 ++--------
.../test/infra/ftp/services/FtpServiceFactory.java | 3 +-
.../ftp/services/embedded/FtpEmbeddedService.java | 32 +++++++++++++++++++++-
.../ftp/services/embedded/SftpEmbeddedService.java | 30 ++++++++++++++++++++
8 files changed, 73 insertions(+), 57 deletions(-)
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
index be6ab4ee9f6..1aed1d02ea2 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
@@ -31,7 +31,7 @@ import static
org.apache.camel.language.simple.SimpleLanguage.simple;
public abstract class FtpServerTestSupport extends BaseServerTestSupport {
@RegisterExtension
- static FtpEmbeddedService service = new FtpEmbeddedService();
+ public FtpEmbeddedService service = new FtpEmbeddedService();
public void sendFile(String url, Object body, String fileName) {
template.sendBodyAndHeader(url, body, Exchange.FILE_NAME,
simple(fileName));
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpServerTestSupport.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpServerTestSupport.java
index b92778ffb19..00ca8f36fc5 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpServerTestSupport.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpServerTestSupport.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class SftpServerTestSupport extends BaseServerTestSupport {
@RegisterExtension
- protected static SftpEmbeddedService service = new SftpEmbeddedService();
+ protected SftpEmbeddedService service = new SftpEmbeddedService();
protected Path ftpFile(String file) {
return service.getFtpRootDir().resolve(file);
diff --git
a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/AbstractTestService.java
b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/AbstractTestService.java
index a760c8e4c9a..045c3d124fd 100644
---
a/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/AbstractTestService.java
+++
b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/AbstractTestService.java
@@ -19,19 +19,8 @@ package org.apache.camel.test.infra.common.services;
import java.util.function.BiConsumer;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-public abstract class AbstractTestService implements TestService,
BeforeAllCallback, AfterAllCallback {
-
- protected ExtensionContext context;
-
- @Override
- public void registerProperties() {
- ExtensionContext.Store store =
context.getStore(ExtensionContext.Namespace.GLOBAL);
- registerProperties(store::put);
- }
+public abstract class AbstractTestService implements TestService {
@Override
public void initialize() {
@@ -52,25 +41,13 @@ public abstract class AbstractTestService implements
TestService, BeforeAllCallb
}
}
- protected void registerProperties(BiConsumer<String, String> store) {
- }
+ protected abstract void registerProperties(BiConsumer<String, String>
store);
+ @Deprecated
protected void setUp() throws Exception {
}
+ @Deprecated
protected void tearDown() throws Exception {
}
-
- @Override
- public void beforeAll(ExtensionContext extensionContext) throws Exception {
- this.context = extensionContext;
- initialize();
- }
-
- @Override
- public void afterAll(ExtensionContext extensionContext) throws Exception {
- shutdown();
- this.context = null;
- }
-
}
diff --git
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpRemoteService.java
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpRemoteService.java
index 175660999ee..a769b7baf3c 100644
---
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpRemoteService.java
+++
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpRemoteService.java
@@ -16,20 +16,6 @@
*/
package org.apache.camel.test.infra.ftp.services;
-public class FtpRemoteService implements FtpService {
+public interface FtpRemoteService extends FtpService {
- @Override
- public void registerProperties() {
- // NO-OP
- }
-
- @Override
- public void initialize() {
- registerProperties();
- }
-
- @Override
- public void shutdown() {
- // NO-OP
- }
}
diff --git
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpService.java
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpService.java
index c6bf6aca481..b105c1da4d6 100644
---
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpService.java
+++
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpService.java
@@ -18,21 +18,13 @@ package org.apache.camel.test.infra.ftp.services;
import org.apache.camel.test.infra.common.services.TestService;
import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
/**
* Test infra service for Ftp
*/
-public interface FtpService extends BeforeAllCallback, AfterAllCallback,
TestService {
+public interface FtpService extends TestService, BeforeAllCallback,
AfterAllCallback, BeforeEachCallback, AfterEachCallback {
- @Override
- default void beforeAll(ExtensionContext extensionContext) throws Exception
{
- initialize();
- }
-
- @Override
- default void afterAll(ExtensionContext extensionContext) throws Exception {
- shutdown();
- }
}
diff --git
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java
index d9d1bdc4bdc..cda7cdc37bb 100644
---
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java
+++
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java
@@ -17,6 +17,7 @@
package org.apache.camel.test.infra.ftp.services;
import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedService;
public final class FtpServiceFactory {
@@ -30,7 +31,7 @@ public final class FtpServiceFactory {
public static FtpService createService() {
return builder()
- .addRemoteMapping(FtpRemoteService::new)
+ .addLocalMapping(FtpEmbeddedService::new)
.build();
}
}
diff --git
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java
index d127e9cb85c..7edaa5b0a47 100644
---
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java
+++
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java
@@ -42,6 +42,7 @@ import
org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
import org.apache.ftpserver.usermanager.impl.BaseUser;
import org.apache.ftpserver.usermanager.impl.WritePermission;
+import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,8 +57,8 @@ public class FtpEmbeddedService extends AbstractTestService
implements FtpServic
protected Path rootDir;
private final EmbeddedConfigurationBuilder embeddedConfigurationTemplate;
+ private ExtensionContext context;
- @Deprecated
public FtpEmbeddedService() {
this(EmbeddedConfigurationBuilder.defaultConfigurationTemplate());
}
@@ -126,6 +127,7 @@ public class FtpEmbeddedService extends AbstractTestService
implements FtpServic
ListenerFactory factory = new ListenerFactory();
factory.setPort(port);
factory.setServerAddress(embeddedConfiguration.getServerAddress());
+
final Listener listener = factory.createListener();
serverFactory.addListener(DEFAULT_LISTENER, listener);
@@ -172,6 +174,12 @@ public class FtpEmbeddedService extends
AbstractTestService implements FtpServic
store.accept(FtpProperties.ROOT_DIR, rootDir.toString());
}
+ @Override
+ public void registerProperties() {
+ ExtensionContext.Store store =
context.getStore(ExtensionContext.Namespace.GLOBAL);
+ registerProperties(store::put);
+ }
+
public Path getFtpRootDir() {
return rootDir;
}
@@ -201,4 +209,26 @@ public class FtpEmbeddedService extends
AbstractTestService implements FtpServic
return count;
}
+
+ @Override
+ public void beforeAll(ExtensionContext extensionContext) throws Exception {
+ this.context = extensionContext;
+ }
+
+ @Override
+ public void afterAll(ExtensionContext extensionContext) throws Exception {
+ this.context = null;
+ }
+
+ @Override
+ public void afterEach(ExtensionContext extensionContext) throws Exception {
+ shutdown();
+ this.context = null;
+ }
+
+ @Override
+ public void beforeEach(ExtensionContext extensionContext) throws Exception
{
+ this.context = extensionContext;
+ initialize();
+ }
}
diff --git
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java
index 08be46c4db5..f3eea95c38b 100644
---
a/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java
+++
b/test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java
@@ -40,6 +40,7 @@ import org.apache.sshd.scp.server.ScpCommandFactory;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.apache.sshd.sftp.server.SftpSubsystemFactory;
+import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,6 +54,7 @@ public class SftpEmbeddedService extends AbstractTestService
implements FtpServi
private Path rootDir;
private Path knownHosts;
private final EmbeddedConfiguration embeddedConfiguration;
+ private ExtensionContext context;
public SftpEmbeddedService() {
this(false);
@@ -164,7 +166,35 @@ public class SftpEmbeddedService extends
AbstractTestService implements FtpServi
store.accept(FtpProperties.ROOT_DIR, rootDir.toString());
}
+ @Override
+ public void registerProperties() {
+ ExtensionContext.Store store =
context.getStore(ExtensionContext.Namespace.GLOBAL);
+ registerProperties(store::put);
+ }
+
public int getPort() {
return port;
}
+
+ @Override
+ public void beforeAll(ExtensionContext extensionContext) throws Exception {
+ this.context = extensionContext;
+ }
+
+ @Override
+ public void afterAll(ExtensionContext extensionContext) throws Exception {
+ this.context = null;
+ }
+
+ @Override
+ public void afterEach(ExtensionContext extensionContext) throws Exception {
+ shutdown();
+ this.context = null;
+ }
+
+ @Override
+ public void beforeEach(ExtensionContext extensionContext) throws Exception
{
+ this.context = extensionContext;
+ initialize();
+ }
}