Spring/spring-statemachine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix use of deprecated method in MongoDbRule

Browse Source 
- Switch to use a simple port check instead of trying
  to actually connect via mongo client.
- Relates #397
This commit is contained in:
Janne Valkealahti
2019-05-12 08:07:49 +01:00
parent aa3c8415b8
commit 0de68f9d85
2 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbRule.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2017 the original author or authors.
* Copyright 2016-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,11 @@ import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientOptions;
import com.mongodb.ServerAddress;
import org.springframework.util.SocketUtils;
/**
* Rule skipping tests if MongoDb is not available from localhost with default settings.
* Rule skipping tests if MongoDb is not available from localhost simply by
* checking if port can be bind.
*
* @author Janne Valkealahti
*
@@ -33,22 +32,16 @@ public class MongoDbRule extends TestWatcher implements TestRule {
@Override
public Statement apply(Statement base, Description description) {
MongoClient client = null;
try {
client = new MongoClient(new ServerAddress(),
MongoClientOptions.builder().connectTimeout(50).serverSelectionTimeout(50).build());
client.getAddress();
} catch (Exception e) {
SocketUtils.findAvailableTcpPort(27017, 27017);
return super.apply(new Statement() {
@Override
public void evaluate() throws Throwable {
}
}, Description.EMPTY);
} finally {
if (client != null) {
client.close();
}
} catch (Exception e) {
return super.apply(base, description);
}
return super.apply(base, description);
}
}

23
spring-statemachine-data/mongodb/src/test/java/org/springframework/statemachine/data/mongodb/MongoDbRule.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2017 the original author or authors.
* Copyright 2016-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,11 @@ import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import com.mongodb.MongoClient;
import com.mongodb.MongoClientOptions;
import com.mongodb.ServerAddress;
import org.springframework.util.SocketUtils;
/**
* Rule skipping tests if MongoDb is not available from localhost with default settings.
* Rule skipping tests if MongoDb is not available from localhost simply by
* checking if port can be bind.
*
* @author Janne Valkealahti
*
@@ -33,22 +32,16 @@ public class MongoDbRule extends TestWatcher implements TestRule {
@Override
public Statement apply(Statement base, Description description) {
MongoClient client = null;
try {
client = new MongoClient(new ServerAddress(),
MongoClientOptions.builder().connectTimeout(50).serverSelectionTimeout(50).build());
client.getAddress();
} catch (Exception e) {
SocketUtils.findAvailableTcpPort(27017, 27017);
return super.apply(new Statement() {
@Override
public void evaluate() throws Throwable {
}
}, Description.EMPTY);
} finally {
if (client != null) {
client.close();
}
} catch (Exception e) {
return super.apply(base, description);
}
return super.apply(base, description);
}
}