SpringCloud/spring-functions-catalog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various improvements for MQTT modules code style

Browse Source
This commit is contained in:
Artem Bilan
2024-01-05 14:05:59 -05:00
parent fbe0d220f7
commit e1a1845dab
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/mqtt/MosquittoContainerTest.java
View File

@@ -32,6 +32,9 @@ import org.testcontainers.junit.jupiter.Testcontainers;
@Testcontainers(disabledWithoutDocker = true)
public interface MosquittoContainerTest {
/**
* The Mosquitto Testcontainers instance.
*/
GenericContainer<?> MOSQUITTO_CONTAINER = new GenericContainer<>("eclipse-mosquitto:2.0.13")
.withCommand("mosquitto -c /mosquitto-no-auth.conf")
.withExposedPorts(1883);

8
common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java
View File

@@ -59,12 +59,8 @@ public class SftpTestSupport extends RemoteFileTestSupport {
public static void createServer() throws Exception {
server = SshServer.setUpDefaultServer();
server.setPasswordAuthenticator(
(username, password, session) -> StringUtils.hasText(password) && !"badPassword".equals(password)); // fail
// if
// pub
// key
// validation
// failed
// fail if pub key validation failed
(username, password, session) -> StringUtils.hasText(password) && !"badPassword".equals(password));
server.setPublickeyAuthenticator((username, key, session) -> key.equals(decodePublicKey("id_rsa_pp.pub")));
server.setPort(0);
server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath()));

2
consumer/spring-mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java
View File

@@ -59,7 +59,7 @@ public class MqttConsumerTests implements MosquittoContainerTest {
@DynamicPropertySource
static void mongoDbProperties(DynamicPropertyRegistry registry) {
registry.add("mqtt.url", () -> "tcp://localhost:" + MOSQUITTO_CONTAINER.getMappedPort(1883));
registry.add("mqtt.url", MosquittoContainerTest::mqttUrl);
}
@Test

2
supplier/spring-mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java
View File

@@ -58,7 +58,7 @@ public class MqttSupplierTests implements MosquittoContainerTest {
@DynamicPropertySource
static void mongoDbProperties(DynamicPropertyRegistry registry) {
registry.add("mqtt.url", () -> "tcp://localhost:" + MOSQUITTO_CONTAINER.getMappedPort(1883));
registry.add("mqtt.url", MosquittoContainerTest::mqttUrl);
}
@Autowired