Merge branch 'release/3.57.0'

Author: msqr

net.solarnetwork.node.control.mock/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Mock Control
 Bundle-SymbolicName: net.solarnetwork.node.control.mock
 Automatic-Module-Name: net.solarnetwork.node.control.mock
 Bundle-Description: Control simulator to be used for development and testing.
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Vendor: SolarNetwork
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: 

net.solarnetwork.node.control.mock/src/net/solarnetwork/node/control/mock/MockNodeControlProvider.java

@@ -65,7 +65,7 @@
  * </p>
  *
  * @author matt
- * @version 3.0
+ * @version 3.1
  */
 public class MockNodeControlProvider extends BaseIdentifiable implements NodeControlProvider,
 		InstructionHandler, SettingSpecifierProvider, SettingsChangeObserver, ServiceLifecycleObserver {
@@ -163,6 +163,9 @@ public InstructionStatus processInstruction(Instruction instruction) {
 		}
 		// look for a parameter name that matches a control ID
 		final String controlId = getControlId();
+		if ( controlId == null || controlId.isEmpty() ) {
+			return null;
+		}
 		InstructionState result = null;
 		for ( String paramName : instruction.getParameterNames() ) {
 			if ( controlId.equals(paramName) ) {

net.solarnetwork.node.dao.jdbc.con/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Core Database Connection
 Bundle-Description: Provides database storage connection configuration for the SolarNode application.
 Bundle-SymbolicName: net.solarnetwork.node.dao.jdbc.con
-Bundle-Version: 1.1.0
+Bundle-Version: 1.2.0
 Bundle-Activator: net.solarnetwork.node.dao.jdbc.con.Activator
 Bundle-Vendor: SolarNetwork
 Bundle-RequiredExecutionEnvironment: JavaSE-11

net.solarnetwork.node.dao.jdbc.con/src/net/solarnetwork/node/dao/jdbc/con/Activator.java

@@ -9,21 +9,21 @@
 
 /**
  * Bundle activator.
- * 
+ *
  * <p>
  * This activator will look for a {@link ConfigurationAdmin} service, and if
  * found initialize a {@link DefaultDataSourceConfigurer} to set up a default
  * data source configuration if one does not already exist.
  * </p>
- * 
+ *
  * @author matt
- * @version 1.1
+ * @version 1.2
  */
 public class Activator implements BundleActivator {
 
 	/**
 	 * A system property key for the startup sleep time, in milliseconds.
-	 * 
+	 *
 	 * @since 1.1
 	 */
 	private static final String SYS_PROP_STARTUP_SLEEP = "net.solarnetwork.node.dao.jdbc.con.startupSleepMs";
@@ -45,7 +45,8 @@ public void run() {
 					if ( caRef != null ) {
 						ConfigurationAdmin ca = bundleContext.getService(caRef);
 						if ( ca != null ) {
-							DefaultDataSourceConfigurer configurer = new DefaultDataSourceConfigurer(ca);
+							DefaultDataSourceConfigurer configurer = new DefaultDataSourceConfigurer(
+									bundleContext, ca);
 							configurer.init();
 						}
 					}

net.solarnetwork.node.dao.jdbc.con/src/net/solarnetwork/node/dao/jdbc/con/DefaultDataSourceConfigurer.java

@@ -1,21 +1,21 @@
 /* ==================================================================
  * DefaultDataSourceConfigurer.java - 11/06/2021 10:49:53 AM
- * 
+ *
  * Copyright 2021 SolarNetwork.net Dev Team
- * 
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  * 02111-1307 USA
  * ==================================================================
  */
@@ -24,9 +24,13 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.Hashtable;
 import java.util.Properties;
+import javax.sql.DataSource;
+import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
@@ -35,9 +39,9 @@
 /**
  * Publish a data source managed service factory configuration, if one does not
  * already exist.
- * 
+ *
  * @author matt
- * @version 1.0
+ * @version 1.1
  */
 public class DefaultDataSourceConfigurer {
 
@@ -49,25 +53,31 @@ public class DefaultDataSourceConfigurer {
 
 	private final Logger log = LoggerFactory.getLogger(getClass());
 
+	private final BundleContext bundleContext;
 	private final ConfigurationAdmin configurationAdmin;
 	private final Class<?> propertiesClass;
 	private final String propertiesPath;
 	private final String dbServiceName;
 
 	/**
 	 * Constructor.
-	 * 
+	 *
+	 * @param bundleContext
+	 *        the bundle context
 	 * @param configurationAdmin
 	 *        the configuration admin
 	 */
-	public DefaultDataSourceConfigurer(ConfigurationAdmin configurationAdmin) {
-		this(configurationAdmin, DefaultDataSourceConfigurer.class, DEFAULT_PROPERTIES_PATH,
-				DEFAULT_DB_SERVICE_NAME);
+	public DefaultDataSourceConfigurer(BundleContext bundleContext,
+			ConfigurationAdmin configurationAdmin) {
+		this(bundleContext, configurationAdmin, DefaultDataSourceConfigurer.class,
+				DEFAULT_PROPERTIES_PATH, DEFAULT_DB_SERVICE_NAME);
 	}
 
 	/**
 	 * Constructor.
-	 * 
+	 *
+	 * @param bundleContext
+	 *        the bundle context
 	 * @param configurationAdmin
 	 *        the configuration admin
 	 * @param propertiesClass
@@ -77,9 +87,11 @@ public DefaultDataSourceConfigurer(ConfigurationAdmin configurationAdmin) {
 	 * @param dbServiceName
 	 *        the {@literal db} service property name
 	 */
-	public DefaultDataSourceConfigurer(ConfigurationAdmin configurationAdmin, Class<?> propertiesClass,
-			String propertiesPath, String dbServiceName) {
+	public DefaultDataSourceConfigurer(BundleContext bundleContext,
+			ConfigurationAdmin configurationAdmin, Class<?> propertiesClass, String propertiesPath,
+			String dbServiceName) {
 		super();
+		this.bundleContext = bundleContext;
 		this.configurationAdmin = configurationAdmin;
 		this.propertiesClass = propertiesClass;
 		this.propertiesPath = propertiesPath;
@@ -103,8 +115,7 @@ public void init() {
 			return;
 		}
 		try {
-			Configuration cfg = findExistingConfiguration(factoryPid);
-			if ( cfg == null ) {
+			if ( !hasExistingDataSource() ) {
 				createConfiguration(factoryPid, props);
 			}
 		} catch ( IOException | InvalidSyntaxException e ) {
@@ -122,16 +133,11 @@ private void createConfiguration(String factoryPid, Properties props) throws IOE
 		cfg.update((Hashtable) props); // making assumption Properties has only String keys here
 	}
 
-	private Configuration findExistingConfiguration(String pid)
-			throws IOException, InvalidSyntaxException {
-		String filter = "(&(" + ConfigurationAdmin.SERVICE_FACTORYPID + "=" + pid
-				+ ")(serviceProperty.db=" + dbServiceName + "))";
-		Configuration[] configurations = configurationAdmin.listConfigurations(filter);
-		if ( configurations != null && configurations.length > 0 ) {
-			return configurations[0];
-		} else {
-			return null;
-		}
+	private boolean hasExistingDataSource() throws IOException, InvalidSyntaxException {
+		String filter = "(db=" + dbServiceName + ")";
+		Collection<ServiceReference<DataSource>> refs = bundleContext
+				.getServiceReferences(DataSource.class, filter);
+		return !refs.isEmpty();
 	}
 
 }

net.solarnetwork.node.dao.jdbc.con/src/net/solarnetwork/node/dao/jdbc/con/net.solarnetwork.jdbc.pool.default.properties

@@ -1,10 +1,10 @@
 service.factoryPid = net.solarnetwork.jdbc.pool.hikari
 serviceProperty.db = node
-dataSourceFactory.filter = (osgi.jdbc.driver.class=org.apache.derby.jdbc.EmbeddedDriver)
+dataSourceFactory.filter = (osgi.jdbc.driver.class=org.h2.Driver)
 pingTest.query = VALUES CURRENT_DATE
 minimumIdle = 1
-maximumPoolSize = 3
+maximumPoolSize = 8
 factory.exceptionHandlerSupport = true
-dataSource.url = jdbc:derby:solarnode;create=true;upgrade=true
-dataSource.user = solarnode
-dataSource.password = solarnode
+dataSource.url = jdbc:h2:./var/solarnode-h2
+dataSource.user = sa
+dataSource.password =