Issue 351 In Liberty, BoosterConfigurator with wrong version leads to NPE

Signed-off-by: Mike Andrasak <andrasak@us.ibm.com>

Author: uberskigeek

boost-common/src/main/java/org/microshed/boost/common/boosters/AbstractBoosterConfig.java

@@ -19,6 +19,7 @@
 import java.util.List;
 
 import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
 
 /**
  * Interface to describe common function across all technology Booster Pack
@@ -62,6 +63,7 @@ public abstract class AbstractBoosterConfig {
     public static final String MP_RESTCLIENT_VERSION_11 = "1.1" + boostVersion + emptyString;
     public static final String MP_RESTCLIENT_VERSION_12 = "1.2" + boostVersion + emptyString;
     public static final String MP_RESTCLIENT_VERSION_13 = "1.3" + boostVersion + emptyString;
+    protected BoostLoggerI logger;
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.TYPE)
@@ -81,8 +83,10 @@ public static String getCoordinates(Class<?> klass) throws BoostException {
 
     private final String version;
 
-    protected AbstractBoosterConfig(String version) {
+    protected AbstractBoosterConfig(String version, BoostLoggerI logger) {
         this.version = version;
+        this.logger = logger;
+
     }
 
     /**

boost-common/src/main/java/org/microshed/boost/common/boosters/BeanValidationBoosterConfig.java

@@ -22,7 +22,7 @@
 public class BeanValidationBoosterConfig extends AbstractBoosterConfig {
 
     public BeanValidationBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(BeanValidationBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(BeanValidationBoosterConfig.class)), logger);
     }
 
     @Override

boost-common/src/main/java/org/microshed/boost/common/boosters/CDIBoosterConfig.java

@@ -22,7 +22,7 @@
 public class CDIBoosterConfig extends AbstractBoosterConfig {
 
     public CDIBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(CDIBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(CDIBoosterConfig.class)), logger);
     }
 
     @Override

boost-common/src/main/java/org/microshed/boost/common/boosters/JAXRSBoosterConfig.java

@@ -22,7 +22,7 @@
 public class JAXRSBoosterConfig extends AbstractBoosterConfig {
 
     public JAXRSBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(JAXRSBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(JAXRSBoosterConfig.class)), logger);
     }
 
     @Override

boost-common/src/main/java/org/microshed/boost/common/boosters/JDBCBoosterConfig.java

@@ -58,7 +58,7 @@ public class JDBCBoosterConfig extends AbstractBoosterConfig {
     private Map<String, String> driverInfo;
 
     public JDBCBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(JDBCBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(JDBCBoosterConfig.class)), logger);
 
         this.logger = logger;
 
@@ -122,11 +122,13 @@ public Properties getDatasourceProperties() {
 
         // Verify correct property configuration
         if (dependency.contains(DERBY_GROUP_ID)) {
-            // If there's no DB name and there's no server name then we can create an embedded DB at a default location
-            if ((!datasourceProperties.containsKey(BoostProperties.DATASOURCE_DATABASE_NAME)) &&
-                (!datasourceProperties.containsKey(BoostProperties.DATASOURCE_SERVER_NAME))) {
+            // If there's no DB name and there's no server name then we can create an
+            // embedded DB at a default location
+            if ((!datasourceProperties.containsKey(BoostProperties.DATASOURCE_DATABASE_NAME))
+                    && (!datasourceProperties.containsKey(BoostProperties.DATASOURCE_SERVER_NAME))) {
                 datasourceProperties.put(BoostProperties.DATASOURCE_DATABASE_NAME, DERBY_DB);
-                // Though we want to auto-create our default location DB, I guess if someone already specified a property will honor it
+                // Though we want to auto-create our default location DB, I guess if someone
+                // already specified a property will honor it
                 // even though not sure how useful that would be.
                 if (!datasourceProperties.containsKey(BoostProperties.DATASOURCE_CREATE_DATABASE)) {
                     datasourceProperties.put(BoostProperties.DATASOURCE_CREATE_DATABASE, "create");

boost-common/src/main/java/org/microshed/boost/common/boosters/JPABoosterConfig.java

@@ -22,7 +22,7 @@
 public class JPABoosterConfig extends AbstractBoosterConfig {
 
     public JPABoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(JPABoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(JPABoosterConfig.class)), logger);
     }
 
     @Override

boost-common/src/main/java/org/microshed/boost/common/boosters/JSONBBoosterConfig.java

@@ -22,7 +22,7 @@
 public class JSONBBoosterConfig extends AbstractBoosterConfig {
 
     public JSONBBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(JSONBBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(JSONBBoosterConfig.class)), logger);
     }
 
     @Override

boost-common/src/main/java/org/microshed/boost/common/boosters/JSONPBoosterConfig.java

@@ -22,7 +22,7 @@
 public class JSONPBoosterConfig extends AbstractBoosterConfig {
 
     public JSONPBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(JSONPBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(JSONPBoosterConfig.class)), logger);
     }
 
     @Override

boost-common/src/main/java/org/microshed/boost/common/boosters/MPConfigBoosterConfig.java

@@ -22,7 +22,7 @@
 public class MPConfigBoosterConfig extends AbstractBoosterConfig {
 
     public MPConfigBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(MPConfigBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(MPConfigBoosterConfig.class)), logger);
     }
 
     @Override

boost-common/src/main/java/org/microshed/boost/common/boosters/MPFaultToleranceBoosterConfig.java

@@ -22,7 +22,7 @@
 public class MPFaultToleranceBoosterConfig extends AbstractBoosterConfig {
 
     public MPFaultToleranceBoosterConfig(BoosterConfigParams params, BoostLoggerI logger) throws BoostException {
-        super(params.getProjectDependencies().get(getCoordinates(MPFaultToleranceBoosterConfig.class)));
+        super(params.getProjectDependencies().get(getCoordinates(MPFaultToleranceBoosterConfig.class)), logger);
     }
 
     @Override