Merge branch 'release/3.24.2'

SolarNetwork · Jul 11, 2024 · 33ae3f7 · 33ae3f7
2 parents 86715d2 + 5b785fe
commit 33ae3f7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/solarnet/ocpp/build.gradle b/solarnet/ocpp/build.gradle
@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: OCPP'
-version = '2.6.0'
+version = '2.6.1'
 
 base {
 	archivesName = 'solarnet-ocpp'

diff --git a/solarnet/ocpp/src/main/java/net/solarnetwork/central/ocpp/config/OcppDaoConfig.java b/solarnet/ocpp/src/main/java/net/solarnetwork/central/ocpp/config/OcppDaoConfig.java
@@ -22,10 +22,8 @@
 
 package net.solarnetwork.central.ocpp.config;
 
-import javax.sql.DataSource;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcOperations;
@@ -38,7 +36,6 @@
 import net.solarnetwork.central.ocpp.dao.ChargePointSettingsDao;
 import net.solarnetwork.central.ocpp.dao.ChargePointStatusDao;
 import net.solarnetwork.central.ocpp.dao.UserSettingsDao;
-import net.solarnetwork.central.ocpp.dao.jdbc.AsyncJdbcChargePointActionStatusDao;
 import net.solarnetwork.central.ocpp.dao.jdbc.JdbcChargePointActionStatusDao;
 import net.solarnetwork.central.ocpp.dao.jdbc.JdbcChargePointStatusDao;
 import net.solarnetwork.central.ocpp.dao.mybatis.MyBatisCentralAuthorizationDao;
@@ -53,7 +50,7 @@
  * OCPP DAO configuration.
  * 
  * @author matt
- * @version 1.0
+ * @version 1.1
  */
 @Configuration(proxyBeanMethods = false)
 public class OcppDaoConfig {
@@ -64,9 +61,6 @@ public class OcppDaoConfig {
 	@Autowired
 	private JdbcOperations jdbcOperations;
 
-	@Autowired
-	private DataSource dataSource;
-
 	@Bean
 	public CentralAuthorizationDao ocppCentralAuthorizationDao() {
 		MyBatisCentralAuthorizationDao dao = new MyBatisCentralAuthorizationDao();
@@ -126,10 +120,4 @@ public ChargePointActionStatusDao ocppChargePointActionStatusDao() {
 		return new JdbcChargePointActionStatusDao(jdbcOperations);
 	}
 
-	@ConfigurationProperties(prefix = "app.ocpp.async-action-status-updater")
-	@Bean(initMethod = "serviceDidStartup", destroyMethod = "serviceDidShutdown")
-	public AsyncJdbcChargePointActionStatusDao ocppChargePointActionStatusUpdateDao() {
-		return new AsyncJdbcChargePointActionStatusDao(dataSource);
-	}
-
 }
diff --git a/solarnet/solarocpp/build.gradle b/solarnet/solarocpp/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarOCPP'
-version = '2.9.0'
+version = '2.9.1'
 
 base {
 	archivesName = 'solarocpp'

diff --git a/...rnet/solarocpp/src/main/java/net/solarnetwork/central/in/ocpp/config/OcppInDaoConfig.java b/...rnet/solarocpp/src/main/java/net/solarnetwork/central/in/ocpp/config/OcppInDaoConfig.java
@@ -22,23 +22,29 @@
 
 package net.solarnetwork.central.in.ocpp.config;
 
+import javax.sql.DataSource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.TaskScheduler;
 import net.solarnetwork.central.ocpp.dao.AsyncChargePointStatusDao;
 import net.solarnetwork.central.ocpp.dao.ChargePointStatusDao;
+import net.solarnetwork.central.ocpp.dao.jdbc.AsyncJdbcChargePointActionStatusDao;
 
 /**
  * OCPP DAO configuration.
  * 
  * @author matt
- * @version 1.0
+ * @version 1.1
  */
 @Configuration(proxyBeanMethods = false)
 public class OcppInDaoConfig {
 
+	@Autowired
+	private DataSource dataSource;
+
 	@ConfigurationProperties(prefix = "app.ocpp.async-status-updater")
 	@Bean(initMethod = "serviceDidStartup", destroyMethod = "serviceDidShutdown")
 	@Primary
@@ -47,4 +53,10 @@ public ChargePointStatusDao ocppAsyncChargePointStatusDao(TaskScheduler taskSche
 		return new AsyncChargePointStatusDao(taskScheduler, delegate);
 	}
 
+	@ConfigurationProperties(prefix = "app.ocpp.async-action-status-updater")
+	@Bean(initMethod = "serviceDidStartup", destroyMethod = "serviceDidShutdown")
+	public AsyncJdbcChargePointActionStatusDao ocppChargePointActionStatusUpdateDao() {
+		return new AsyncJdbcChargePointActionStatusDao(dataSource);
+	}
+
 }
diff --git a/solarnet/solaruser/build.gradle b/solarnet/solaruser/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 description = 'SolarUser'
-version = '2.15.2'
+version = '2.15.3'
 
 base {
 	archivesName = 'solaruser'