Skip to content

Commit ae49f0a

Browse files
authored
Upgrade to java 17 (#13)
Signed-off-by: Abdelsalem <[email protected]>
1 parent d347c34 commit ae49f0a

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- name: Set up JDK 11
17+
- name: Set up JDK 17
1818
uses: actions/setup-java@v1
1919
with:
20-
java-version: 11
20+
java-version: 17
2121

2222
- name: Checkout sources
2323
uses: actions/checkout@v1

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.powsybl</groupId>
1717
<artifactId>powsybl-parent-ws</artifactId>
18-
<version>10</version>
18+
<version>11</version>
1919
<relativePath/>
2020
</parent>
2121

@@ -44,7 +44,6 @@
4444
</developers>
4545

4646
<properties>
47-
<java.version>11</java.version>
4847
<gridsuite-dependencies.version>23</gridsuite-dependencies.version>
4948
<liquibase-hibernate-package>org.gridsuite.useradmin.server</liquibase-hibernate-package>
5049
</properties>

src/main/java/org/gridsuite/useradmin/server/service/ConnectionsService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.springframework.transaction.annotation.Transactional;
1313

1414
import java.time.LocalDateTime;
15+
import java.time.temporal.ChronoUnit;
1516
import java.util.List;
1617
import java.util.Map;
1718
import java.util.Objects;
@@ -33,10 +34,11 @@ public ConnectionsService(ConnectionRepository connectionRepository) {
3334
public void recordConnectionAttempt(String sub, Boolean isAllowed) {
3435
ConnectionEntity connectionEntity = connectionRepository.findBySub(sub).stream().findFirst().orElse(null);
3536
if (connectionEntity == null) {
36-
connectionEntity = new ConnectionEntity(sub, LocalDateTime.now(), LocalDateTime.now(), isAllowed);
37+
//To avoid consistency issue we truncate the time to microseconds since postgres and h2 can only store a precision of microseconds
38+
connectionEntity = new ConnectionEntity(sub, LocalDateTime.now().truncatedTo(ChronoUnit.MICROS), LocalDateTime.now().truncatedTo(ChronoUnit.MICROS), isAllowed);
3739
connectionRepository.save(connectionEntity);
3840
} else {
39-
connectionEntity.setLastConnexionDate(LocalDateTime.now());
41+
connectionEntity.setLastConnexionDate(LocalDateTime.now().truncatedTo(ChronoUnit.MICROS));
4042
connectionEntity.setConnectionAccepted(isAllowed);
4143
}
4244
}

0 commit comments

Comments
 (0)