no need of system property for this

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
jetty · Jul 8, 2020 · 7bcbc21 · 7bcbc21
1 parent 6c161ca
commit 7bcbc21
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.../test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java b/.../test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java
@@ -57,18 +57,19 @@ public class MongoTestHelper
 
     static MongoClient mongoClient;
 
+    static String mongoHost;
+    static int mongoPort;
+
     public static void startMongo()
     {
         try
         {
             long start = System.currentTimeMillis();
             mongo.start();
-            String containerIpAddress =  mongo.getContainerIpAddress();
-            int mongoPort = mongo.getMappedPort(27017);
-            LOG.info("Mongo container started for {}:{} - {}ms", containerIpAddress, mongoPort,
+            mongoHost =  mongo.getHost();
+            mongoPort = mongo.getMappedPort(27017);
+            LOG.info("Mongo container started for {}:{} - {}ms", mongoHost, mongoPort,
                      System.currentTimeMillis() - start);
-            System.setProperty("embedmongoHost", containerIpAddress);
-            System.setProperty("embedmongoPort", Integer.toString(mongoPort));
         }
         catch (Exception e)
         {
@@ -93,7 +94,7 @@ public static MongoClient getMongoClient() throws UnknownHostException
         }
         if (mongoClient == null || restart)
         {
-            mongoClient = new MongoClient(System.getProperty("embedmongoHost"), Integer.getInteger("embedmongoPort"));
+            mongoClient = new MongoClient(mongoHost, mongoPort);
         }
         return mongoClient;
     }
@@ -116,8 +117,8 @@ public static DBCollection getCollection() throws UnknownHostException, MongoExc
     public static MongoSessionDataStoreFactory newSessionDataStoreFactory()
     {
         MongoSessionDataStoreFactory storeFactory = new MongoSessionDataStoreFactory();
-        storeFactory.setHost(System.getProperty("embedmongoHost"));
-        storeFactory.setPort(Integer.getInteger("embedmongoPort"));
+        storeFactory.setHost(mongoHost);
+        storeFactory.setPort(mongoPort);
         storeFactory.setCollectionName(COLLECTION_NAME);
         storeFactory.setDbName(DB_NAME);
         return storeFactory;