Skip to content

Commit a040377

Browse files
Yavor16Yavor16
committed
fix comments
1 parent 52c689d commit a040377

File tree

13 files changed

+57
-64
lines changed

13 files changed

+57
-64
lines changed

‎multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/dto/ApplicationShutdown.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cloudfoundry.multiapps.controller.persistence.dto;
22

3-
import java.util.Date;
3+
import java.time.LocalDateTime;
44

55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
66
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -21,7 +21,7 @@ enum Status {
2121

2222
int getApplicationInstanceIndex();
2323

24-
Date getStartedAt();
24+
LocalDateTime getStartedAt();
2525

2626
@Value.Default
2727
default Status getStatus() {

‎multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/dto/ApplicationShutdownDto.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.cloudfoundry.multiapps.controller.persistence.dto;
22

3-
import java.util.Date;
3+
import java.time.LocalDateTime;
44

55
import jakarta.persistence.Column;
66
import jakarta.persistence.Entity;
77
import jakarta.persistence.Id;
88
import jakarta.persistence.Table;
9-
import jakarta.persistence.Temporal;
10-
import jakarta.persistence.TemporalType;
119
import org.cloudfoundry.multiapps.controller.persistence.model.PersistenceMetadata;
1210

1311
@Entity
@@ -39,15 +37,14 @@ private AttributeNames() {
3937
private ApplicationShutdown.Status shutdownStatus;
4038

4139
@Column(name = PersistenceMetadata.TableColumnNames.APPLICATION_SHUTDOWN_STARTED_AT, nullable = false)
42-
@Temporal(TemporalType.TIMESTAMP)
43-
private Date startedAt;
40+
private LocalDateTime startedAt;
4441

4542
public ApplicationShutdownDto() {
4643
// Required by JPA
4744
}
4845

4946
public ApplicationShutdownDto(String id, String applicationId, int applicationInstanceIndex, ApplicationShutdown.Status shutdownStatus,
50-
Date startedAt) {
47+
LocalDateTime startedAt) {
5148
this.id = id;
5249
this.applicationId = applicationId;
5350
this.applicationInstanceIndex = applicationInstanceIndex;
@@ -77,7 +74,7 @@ public ApplicationShutdown.Status getShutdownStatus() {
7774
return shutdownStatus;
7875
}
7976

80-
public Date getStartedAt() {
77+
public LocalDateTime getStartedAt() {
8178
return startedAt;
8279
}
8380

‎multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/query/ApplicationShutdownQuery.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cloudfoundry.multiapps.controller.persistence.query;
22

3-
import java.util.Date;
3+
import java.time.LocalDateTime;
44

55
import org.cloudfoundry.multiapps.controller.persistence.dto.ApplicationShutdown;
66

@@ -14,7 +14,7 @@ public interface ApplicationShutdownQuery extends Query<ApplicationShutdown, App
1414

1515
ApplicationShutdownQuery shutdownStatus(ApplicationShutdown.Status shutdownStatus);
1616

17-
ApplicationShutdownQuery startedAt(Date startedAt);
17+
ApplicationShutdownQuery startedAt(LocalDateTime startedAt);
1818

19-
ApplicationShutdownQuery startedAtBefore(Date startedAt);
19+
ApplicationShutdownQuery startedAtBefore(LocalDateTime startedAt);
2020
}

‎multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/query/impl/ApplicationShutdownQueryImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cloudfoundry.multiapps.controller.persistence.query.impl;
22

3-
import java.util.Date;
3+
import java.time.LocalDateTime;
44
import java.util.List;
55

66
import jakarta.persistence.EntityManager;
@@ -64,8 +64,8 @@ public ApplicationShutdownQuery shutdownStatus(ApplicationShutdown.Status shutdo
6464
}
6565

6666
@Override
67-
public ApplicationShutdownQuery startedAtBefore(Date startedAt) {
68-
queryCriteria.addRestriction(ImmutableQueryAttributeRestriction.<Date> builder()
67+
public ApplicationShutdownQuery startedAtBefore(LocalDateTime startedAt) {
68+
queryCriteria.addRestriction(ImmutableQueryAttributeRestriction.<LocalDateTime> builder()
6969
.attribute(AttributeNames.STARTED_AT)
7070
.condition(getCriteriaBuilder()::lessThan)
7171
.value(startedAt)
@@ -74,7 +74,7 @@ public ApplicationShutdownQuery startedAtBefore(Date startedAt) {
7474
}
7575

7676
@Override
77-
public ApplicationShutdownQuery startedAt(Date startedAt) {
77+
public ApplicationShutdownQuery startedAt(LocalDateTime startedAt) {
7878
queryCriteria.addRestriction(ImmutableQueryAttributeRestriction.builder()
7979
.attribute(AttributeNames.STARTED_AT)
8080
.condition(getCriteriaBuilder()::equal)

‎multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/ApplicationShutdownServiceTest.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.cloudfoundry.multiapps.controller.persistence.services;
22

3-
import java.time.Instant;
4-
import java.util.Date;
3+
import java.time.LocalDateTime;
4+
import java.time.ZoneOffset;
55
import java.util.List;
66
import java.util.UUID;
77

@@ -26,10 +26,14 @@ class ApplicationShutdownServiceTest {
2626
.toString();
2727
private final String INSTANCE_ID_2 = UUID.randomUUID()
2828
.toString();
29+
private final LocalDateTime TIME_1 = LocalDateTime.now(ZoneOffset.UTC);
30+
private final LocalDateTime TIME_2 = LocalDateTime.now(ZoneOffset.UTC)
31+
.plusMinutes(10);
2932
private final ApplicationShutdown APPLICATION_SHUTDOWN = createApplicationShutdownInstance(INSTANCE_ID, 0,
30-
ApplicationShutdown.Status.FINISHED);
33+
ApplicationShutdown.Status.FINISHED, TIME_1);
3134
private final ApplicationShutdown APPLICATION_SHUTDOWN_2 = createApplicationShutdownInstance(INSTANCE_ID_2, 1,
32-
ApplicationShutdown.Status.RUNNING);
35+
ApplicationShutdown.Status.RUNNING,
36+
TIME_2);
3337

3438
private final ApplicationShutdownService applicationShutdownService = createApplicationShutdownService();
3539

@@ -95,7 +99,7 @@ void testQueryByApplicationInstanceIndex() {
9599

96100
@Test
97101
void testQueryByStartedAt() {
98-
testQueryByCriteria((query, applicationShutdown) -> query.startedAt(applicationShutdown.getStartedAt()), 2, false);
102+
testQueryByCriteria((query, applicationShutdown) -> query.startedAt(applicationShutdown.getStartedAt()), 1, true);
99103
}
100104

101105
@Test
@@ -131,12 +135,13 @@ private void addApplicationShutdown(List<ApplicationShutdown> applicationShutdow
131135
applicationShutdowns.forEach(applicationShutdownService::add);
132136
}
133137

134-
private ApplicationShutdown createApplicationShutdownInstance(String instanceId, int index, ApplicationShutdown.Status status) {
138+
private ApplicationShutdown createApplicationShutdownInstance(String instanceId, int index, ApplicationShutdown.Status status,
139+
LocalDateTime time) {
135140
return ImmutableApplicationShutdown.builder()
136141
.id(instanceId)
137142
.applicationId(APPLICATION_ID)
138143
.applicationInstanceIndex(index)
139-
.startedAt(Date.from(Instant.now()))
144+
.startedAt(time)
140145
.status(status)
141146
.build();
142147
}

‎multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/jobs/LeftoverApplicationShutdownCleaner.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.cloudfoundry.multiapps.controller.process.jobs;
22

33
import java.text.MessageFormat;
4-
import java.time.Instant;
54
import java.time.LocalDateTime;
6-
import java.util.Date;
75

86
import jakarta.inject.Named;
97
import org.cloudfoundry.multiapps.controller.persistence.services.ApplicationShutdownService;
@@ -25,11 +23,11 @@ public LeftoverApplicationShutdownCleaner(ApplicationShutdownService application
2523

2624
@Override
2725
public void execute(LocalDateTime expirationTime) {
28-
Instant timeNow = Instant.now();
29-
Instant secondsAfterStartedDate = timeNow.minusSeconds(ONE_DAY_IN_SECONDS);
26+
LocalDateTime timeNow = LocalDateTime.now();
27+
LocalDateTime secondsAfterStartedDate = timeNow.minusSeconds(ONE_DAY_IN_SECONDS);
3028

3129
int countOfDeletedApplicationShutdowns = applicationShutdownService.createQuery()
32-
.startedAtBefore(Date.from(secondsAfterStartedDate))
30+
.startedAtBefore(secondsAfterStartedDate)
3331
.delete();
3432

3533
LOGGER.info(MessageFormat.format(Messages.DELETED_LEFTOVER_APPLICATION_SHUTDOWNS, countOfDeletedApplicationShutdowns));

‎multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/jobs/ApplicationShutdownJobTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.cloudfoundry.multiapps.controller.process.jobs;
22

3-
import java.time.Instant;
4-
import java.util.Date;
3+
import java.time.LocalDateTime;
54
import java.util.UUID;
65

76
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
@@ -100,7 +99,7 @@ private ApplicationShutdown createApplicationShutdownInstance(ApplicationShutdow
10099
.id(INSTANCE_ID)
101100
.applicationId(APPLICATION_ID)
102101
.applicationInstanceIndex(APPLICATION_INSTANCE_INDEX)
103-
.startedAt(Date.from(Instant.now()))
102+
.startedAt(LocalDateTime.now())
104103
.status(status)
105104
.build();
106105
}

‎multiapps-controller-shutdown-client/src/main/java/org/cloudfoundry/multiapps/controller/shutdown/client/ApplicationShutdownScheduler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package org.cloudfoundry.multiapps.controller.shutdown.client;
22

33
import java.text.MessageFormat;
4-
import java.time.Instant;
4+
import java.time.LocalDateTime;
55
import java.util.ArrayList;
6-
import java.util.Date;
76
import java.util.List;
87
import java.util.UUID;
98

@@ -57,7 +56,7 @@ private ApplicationShutdown buildApplicationShutdown(String applicationId,
5756
return ImmutableApplicationShutdown.builder()
5857
.id(UUID.randomUUID()
5958
.toString())
60-
.startedAt(Date.from(Instant.now()))
59+
.startedAt(LocalDateTime.now())
6160
.applicationId(applicationId)
6261
.applicationInstanceIndex(applicationInstanceIndex)
6362
.build();

‎multiapps-controller-shutdown-client/src/main/java/org/cloudfoundry/multiapps/controller/shutdown/client/util/ShutdownUtil.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.cloudfoundry.multiapps.controller.shutdown.client.util;
22

33
import java.text.MessageFormat;
4-
import java.time.Instant;
4+
import java.time.LocalDateTime;
55
import java.util.List;
66

77
import org.cloudfoundry.multiapps.controller.persistence.dto.ApplicationShutdown;
@@ -25,10 +25,9 @@ public static boolean areThereUnstoppedInstances(List<ApplicationShutdown> shutd
2525
}
2626

2727
public static boolean isTimeoutExceeded(ApplicationShutdown applicationShutdown) {
28-
Instant secondsAfterStartedDate = Instant.from(applicationShutdown.getStartedAt()
29-
.toInstant())
30-
.plusSeconds(TIMEOUT_IN_SECONDS);
31-
Instant timeNow = Instant.now();
28+
LocalDateTime secondsAfterStartedDate = applicationShutdown.getStartedAt()
29+
.plusSeconds(TIMEOUT_IN_SECONDS);
30+
LocalDateTime timeNow = LocalDateTime.now();
3231
return timeNow.isAfter(secondsAfterStartedDate);
3332
}
3433

‎multiapps-controller-shutdown-client/src/test/java/org/cloudfoundry/multiapps/controller/shutdown/client/ApplicationShutdownExecutorTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.cloudfoundry.multiapps.controller.shutdown.client;
22

3-
import java.time.Instant;
4-
import java.util.Date;
3+
import java.time.LocalDateTime;
54
import java.util.List;
65
import java.util.UUID;
76

@@ -80,7 +79,7 @@ private ApplicationShutdown createApplicationShutdownInstance(String instanceId)
8079
.id(instanceId)
8180
.applicationId(APPLICATION_ID)
8281
.applicationInstanceIndex(0)
83-
.startedAt(Date.from(Instant.now()))
82+
.startedAt(LocalDateTime.now())
8483
.status(ApplicationShutdown.Status.FINISHED)
8584
.build();
8685
}

0 commit comments

Comments
 (0)