Skip to content

Commit ae96225

Browse files
Merge branch 'steve-community:master' into master
2 parents ec78bdc + 8605b61 commit ae96225

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
<java.version>17</java.version>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737

38-
<jooq.version>3.19.9</jooq.version>
39-
<flyway.version>10.13.0</flyway.version>
38+
<jooq.version>3.19.10</jooq.version>
39+
<flyway.version>10.15.0</flyway.version>
4040
<cxf.version>3.5.5</cxf.version>
41-
<spring.version>5.3.36</spring.version>
41+
<spring.version>5.3.37</spring.version>
4242
<spring.security.version>5.7.11</spring.security.version>
4343
<mysql.jdbc.version>8.0.30</mysql.jdbc.version>
4444
<jetty.version>10.0.14</jetty.version>
@@ -188,14 +188,14 @@
188188
<plugin>
189189
<groupId>org.apache.maven.plugins</groupId>
190190
<artifactId>maven-surefire-plugin</artifactId>
191-
<version>3.2.5</version>
191+
<version>3.3.0</version>
192192
</plugin>
193193

194194
<!-- Static analysis and check style -->
195195
<plugin>
196196
<groupId>org.apache.maven.plugins</groupId>
197197
<artifactId>maven-pmd-plugin</artifactId>
198-
<version>3.22.0</version>
198+
<version>3.23.0</version>
199199
<configuration>
200200
<rulesets>
201201
<ruleset>${project.basedir}/src/main/resources/maven-pmd-plugin-default.xml</ruleset>
@@ -221,7 +221,7 @@
221221
<plugin>
222222
<groupId>org.apache.maven.plugins</groupId>
223223
<artifactId>maven-checkstyle-plugin</artifactId>
224-
<version>3.3.1</version>
224+
<version>3.4.0</version>
225225
<configuration>
226226
<configLocation>${basedir}/src/main/resources/checkstyle.xml</configLocation>
227227
</configuration>
@@ -230,7 +230,7 @@
230230
<plugin>
231231
<groupId>io.github.git-commit-id</groupId>
232232
<artifactId>git-commit-id-maven-plugin</artifactId>
233-
<version>8.0.2</version>
233+
<version>9.0.0</version>
234234
<executions>
235235
<execution>
236236
<phase>initialize</phase>
@@ -268,7 +268,7 @@
268268
<plugin>
269269
<groupId>org.apache.maven.plugins</groupId>
270270
<artifactId>maven-dependency-plugin</artifactId>
271-
<version>3.6.1</version>
271+
<version>3.7.0</version>
272272
<executions>
273273
<execution>
274274
<id>copy-dependencies</id>

src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public class ChargingProfileRepositoryImpl implements ChargingProfileRepository
6868

6969
@Override
7070
public void setProfile(int chargingProfilePk, String chargeBoxId, int connectorId) {
71+
OcppServerRepositoryImpl.insertIgnoreConnector(ctx, chargeBoxId, connectorId);
72+
7173
SelectConditionStep<Record1<Integer>> connectorPkSelect = ctx.select(CONNECTOR.CONNECTOR_PK)
7274
.from(CONNECTOR)
7375
.where(CONNECTOR.CHARGE_BOX_ID.eq(chargeBoxId))

src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ private void insertConnectorStatus(DSLContext ctx,
379379
/**
380380
* If the connector information was not received before, insert it. Otherwise, ignore.
381381
*/
382-
private void insertIgnoreConnector(DSLContext ctx, String chargeBoxIdentity, int connectorId) {
382+
public static void insertIgnoreConnector(DSLContext ctx, String chargeBoxIdentity, int connectorId) {
383383
int count = ctx.insertInto(CONNECTOR,
384384
CONNECTOR.CHARGE_BOX_ID, CONNECTOR.CONNECTOR_ID)
385385
.values(chargeBoxIdentity, connectorId)

0 commit comments

Comments
 (0)