From 0b7e278604530cd1b535c4641e4ac9da1c74d826 Mon Sep 17 00:00:00 2001 From: Matteo Melli Date: Fri, 21 Apr 2017 09:32:57 +0200 Subject: [PATCH] Adapt configuration to new backends --- .../main/java/com/torodb/standalone/Main.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/main/src/main/java/com/torodb/standalone/Main.java b/main/src/main/java/com/torodb/standalone/Main.java index a14f1d8f..1e1ef683 100644 --- a/main/src/main/java/com/torodb/standalone/Main.java +++ b/main/src/main/java/com/torodb/standalone/Main.java @@ -35,6 +35,7 @@ import com.torodb.mongodb.core.MongoDbCoreBundle; import com.torodb.mongodb.wp.MongoDbWpBundle; import com.torodb.mongodb.wp.MongoDbWpConfig; +import com.torodb.packaging.config.model.backend.BackendImplementation; import com.torodb.packaging.config.model.backend.BackendPasswordConfig; import com.torodb.packaging.config.model.backend.derby.AbstractDerby; import com.torodb.packaging.config.model.backend.postgres.AbstractPostgres; @@ -42,6 +43,7 @@ import com.torodb.packaging.config.model.protocol.mongo.MongoPasswordConfig; import com.torodb.packaging.config.model.protocol.mongo.Net; import com.torodb.packaging.config.util.BackendImplementationVisitor; +import com.torodb.packaging.config.util.BackendImplementationVisitorWithDefault; import com.torodb.packaging.config.util.BundleFactory; import com.torodb.packaging.config.util.ConfigUtils; import com.torodb.packaging.util.Log4jUtils; @@ -290,25 +292,18 @@ private static String readPwd() throws IOException { } private static void parseToropassFile(Config config) { - BackendImplementationVisitor visitor = new BackendImplementationVisitor() { + BackendImplementationVisitor visitor = + new BackendImplementationVisitorWithDefault() { @Override - public Void visit(AbstractDerby value, Void arg) { - parseToropassFile(value); - return null; - } - - @Override - public Void visit(AbstractPostgres value, Void arg) { - parseToropassFile(value); - return null; - } - - public void parseToropassFile(BackendPasswordConfig value) { + public Void defaultVisit(T value, + Void arg) { try { ConfigUtils.parseToropassFile(value, LOGGER); } catch (Exception ex) { throw new SystemException(ex); } + + return null; } };