Skip to content

Commit 4f3dab1

Browse files
Yavor16Yavor16
committed
fix comments
1 parent 8da103c commit 4f3dab1

File tree

21 files changed

+115
-127
lines changed

21 files changed

+115
-127
lines changed

‎multiapps-controller-core/src/main/java/module-info.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
exports org.cloudfoundry.multiapps.controller.core.validators.parameters;
3939
exports org.cloudfoundry.multiapps.controller.core.validators.parameters.v2;
4040
exports org.cloudfoundry.multiapps.controller.core.validators.parameters.v3;
41-
exports org.cloudfoundry.multiapps.controller.core.application.shutdown;
4241

4342
requires transitive jakarta.persistence;
4443
requires transitive org.cloudfoundry.multiapps.controller.client;

‎multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ public final class Messages {
177177
public static final String FSS_CACHE_UPDATE_TIMEOUT = "Fss cache update timeout: {0} minutes";
178178
public static final String THREAD_MONITOR_CACHE_TIMEOUT = "Flowable thread monitor cache timeout: {0} seconds";
179179
public static final String SPACE_DEVELOPERS_CACHE_TIME_IN_SECONDS = "Cache for list of space developers per SpaceGUID: {0} seconds";
180-
public static final String APP_SHUTDOWN_STATUS_MONITOR = "Monitor shutdown status of application with id:\"{0}\"";
181-
public static final String APP_INSTANCE_WITH_ID_AND_INDEX_SCHEDULED_FOR_DELETION = "Application with ID \"{0}\" and index \"{1}\" has been scheduled for deletion";
182-
public static final String CLEARING_OLD_ENTRY = "Clearing old entry with id: ";
183180
public static final String CONTROLLER_CLIENT_SSL_HANDSHAKE_TIMEOUT_IN_SECONDS = "Controller client SSL handshake timeout in seconds: {0}";
184181
public static final String CONTROLLER_CLIENT_CONNECT_TIMEOUT_IN_SECONDS = "Controller client connect timeout in seconds: {0}";
185182
public static final String CONTROLLER_CLIENT_CONNECTION_POOL_SIZE = "Controller client connection pool size: {0}";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ enum Status {
2121

2222
int getApplicationInstanceIndex();
2323

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

2626
@Value.Default
27-
default String getStatus() {
28-
return Status.INITIAL.name();
27+
default Status getStatus() {
28+
return Status.INITIAL;
2929
}
3030

3131
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
import jakarta.persistence.Column;
66
import jakarta.persistence.Entity;
77
import jakarta.persistence.Id;
8-
import jakarta.persistence.SequenceGenerator;
98
import jakarta.persistence.Table;
109
import jakarta.persistence.Temporal;
1110
import jakarta.persistence.TemporalType;
11+
import org.cloudfoundry.multiapps.controller.persistence.model.PersistenceMetadata;
1212

1313
@Entity
14-
@Table(name = "application_shutdown")
15-
@SequenceGenerator(name = "application_shutdown_sequence", sequenceName = "application_shutdown_sequence", allocationSize = 1)
14+
@Table(name = PersistenceMetadata.TableNames.APPLICATION_SHUTDOWN_TABLE)
1615
public class ApplicationShutdownDto implements DtoWithPrimaryKey<String> {
1716

1817
public static class AttributeNames {
@@ -27,27 +26,28 @@ private AttributeNames() {
2726
}
2827

2928
@Id
30-
@Column(name = "id", nullable = false, unique = true)
29+
@Column(name = PersistenceMetadata.TableColumnNames.APPLICATION_SHUTDOWN_ID, nullable = false, unique = true)
3130
private String id;
3231

33-
@Column(name = "application_instance_index", nullable = false, unique = true)
32+
@Column(name = PersistenceMetadata.TableColumnNames.APPLICATION_SHUTDOWN_APPLICATION_INSTANCE_INDEX, nullable = false, unique = true)
3433
private int applicationInstanceIndex;
3534

36-
@Column(name = "application_id", nullable = false)
35+
@Column(name = PersistenceMetadata.TableColumnNames.APPLICATION_SHUTDOWN_APPLICATION_ID, nullable = false)
3736
private String applicationId;
3837

39-
@Column(name = "shutdown_status", nullable = false)
40-
private String shutdownStatus;
38+
@Column(name = PersistenceMetadata.TableColumnNames.APPLICATION_SHUTDOWN_SHUTDOWN_STATUS, nullable = false)
39+
private ApplicationShutdown.Status shutdownStatus;
4140

42-
@Column(name = "started_at", nullable = false)
41+
@Column(name = PersistenceMetadata.TableColumnNames.APPLICATION_SHUTDOWN_STARTED_AT, nullable = false)
4342
@Temporal(TemporalType.TIMESTAMP)
4443
private Date startedAt;
4544

4645
public ApplicationShutdownDto() {
4746
// Required by JPA
4847
}
4948

50-
public ApplicationShutdownDto(String id, String applicationId, int applicationInstanceIndex, String shutdownStatus, Date startedAt) {
49+
public ApplicationShutdownDto(String id, String applicationId, int applicationInstanceIndex, ApplicationShutdown.Status shutdownStatus,
50+
Date startedAt) {
5151
this.id = id;
5252
this.applicationId = applicationId;
5353
this.applicationInstanceIndex = applicationInstanceIndex;
@@ -73,7 +73,7 @@ public void setPrimaryKey(String id) {
7373
return applicationInstanceIndex;
7474
}
7575

76-
public String getShutdownStatus() {
76+
public ApplicationShutdown.Status getShutdownStatus() {
7777
return shutdownStatus;
7878
}
7979

‎multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/model/PersistenceMetadata.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ private TableNames() {
2020
public static final String LOCK_OWNERS_TABLE = "lock_owners";
2121
public static final String ASYNC_UPLOAD_JOB_TABLE = "async_upload_job";
2222
public static final String BACKUP_DESCRIPTOR_TABLE = "backup_descriptor";
23+
public static final String APPLICATION_SHUTDOWN_TABLE = "application_shutdown";
2324

2425
}
2526

@@ -113,6 +114,12 @@ private TableColumnNames() {
113114
public static final String BACKUP_DESCRIPTOR_SPACE_ID = "space_id";
114115
public static final String BACKUP_DESCRIPTOR_NAMESPACE = "namespace";
115116
public static final String BACKUP_DESCRIPTOR_TIMESTAMP = "timestamp";
117+
118+
public static final String APPLICATION_SHUTDOWN_ID = "id";
119+
public static final String APPLICATION_SHUTDOWN_APPLICATION_INSTANCE_INDEX = "application_instance_index";
120+
public static final String APPLICATION_SHUTDOWN_APPLICATION_ID = "application_id";
121+
public static final String APPLICATION_SHUTDOWN_SHUTDOWN_STATUS = "shutdown_status";
122+
public static final String APPLICATION_SHUTDOWN_STARTED_AT = "started_at";
116123
}
117124

118125
}

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,21 @@
44
import java.util.List;
55

66
import jakarta.persistence.EntityManager;
7-
import jakarta.persistence.NoResultException;
8-
import jakarta.persistence.NonUniqueResultException;
97
import org.cloudfoundry.multiapps.controller.persistence.dto.ApplicationShutdown;
108
import org.cloudfoundry.multiapps.controller.persistence.dto.ApplicationShutdownDto;
119
import org.cloudfoundry.multiapps.controller.persistence.dto.ApplicationShutdownDto.AttributeNames;
1210
import org.cloudfoundry.multiapps.controller.persistence.query.ApplicationShutdownQuery;
1311
import org.cloudfoundry.multiapps.controller.persistence.query.criteria.ImmutableQueryAttributeRestriction;
1412
import org.cloudfoundry.multiapps.controller.persistence.query.criteria.QueryCriteria;
15-
import org.cloudfoundry.multiapps.controller.persistence.services.ApplicationShutdownMapper;
13+
import org.cloudfoundry.multiapps.controller.persistence.services.ApplicationShutdownService;
1614

1715
public class ApplicationShutdownQueryImpl extends AbstractQueryImpl<ApplicationShutdown, ApplicationShutdownQuery>
1816
implements ApplicationShutdownQuery {
1917
private final QueryCriteria queryCriteria = new QueryCriteria();
20-
private final ApplicationShutdownMapper applicationShutdownMapper;
18+
private final ApplicationShutdownService.ApplicationShutdownMapper applicationShutdownMapper;
2119

2220
public ApplicationShutdownQueryImpl(EntityManager entityManager,
23-
ApplicationShutdownMapper applicationShutdownMapper) {
21+
ApplicationShutdownService.ApplicationShutdownMapper applicationShutdownMapper) {
2422
super(entityManager);
2523
this.applicationShutdownMapper = applicationShutdownMapper;
2624
}
@@ -76,9 +74,10 @@ public ApplicationShutdownQuery startedAt(Date startedAt) {
7674
}
7775

7876
@Override
79-
public ApplicationShutdown singleResult() throws NoResultException, NonUniqueResultException {
77+
public ApplicationShutdown singleResult() {
8078
ApplicationShutdownDto dto = executeInTransaction(manager -> createQuery(manager, queryCriteria,
81-
ApplicationShutdownDto.class).getResultStream()
79+
ApplicationShutdownDto.class).getResultList()
80+
.stream()
8281
.findFirst()
8382
.orElse(null));
8483
return dto != null ? applicationShutdownMapper.fromDto(dto) : null;
@@ -87,8 +86,7 @@ public ApplicationShutdown singleResult() throws NoResultException, NonUniqueRes
8786
@Override
8887
public List<ApplicationShutdown> list() {
8988
List<ApplicationShutdownDto> dtos = executeInTransaction(manager -> createQuery(manager, queryCriteria,
90-
ApplicationShutdownDto.class).getResultStream()
91-
.toList());
89+
ApplicationShutdownDto.class).getResultList());
9290

9391
return dtos.stream()
9492
.map(applicationShutdownMapper::fromDto)

‎multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/ApplicationShutdownMapper.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/ApplicationShutdownService.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
@Named
1515
public class ApplicationShutdownService extends PersistenceService<ApplicationShutdown, ApplicationShutdownDto, String> {
1616

17-
private final ApplicationShutdownMapper applicationShutdownMapper;
17+
private final ApplicationShutdownService.ApplicationShutdownMapper applicationShutdownMapper;
1818

19-
public ApplicationShutdownService(EntityManagerFactory entityManagerFactory, ApplicationShutdownMapper applicationShutdownMapper) {
19+
public ApplicationShutdownService(EntityManagerFactory entityManagerFactory,
20+
ApplicationShutdownService.ApplicationShutdownMapper applicationShutdownMapper) {
2021
super(entityManagerFactory);
2122
this.applicationShutdownMapper = applicationShutdownMapper;
2223
}
@@ -40,25 +41,25 @@ protected void onEntityNotFound(String primaryKey) {
4041
throw new NotFoundException(Messages.APPLICATION_SHUTDOWN_WITH_APPLICATION_INSTANCE_ID_DOES_NOT_EXIST, primaryKey);
4142
}
4243

43-
public ApplicationShutdown getApplicationShutdownInstanceByInstanceId(String instanceId, String applicationId) {
44-
return createQuery().id(instanceId)
45-
.applicationId(applicationId)
46-
.singleResult();
47-
}
44+
@Named
45+
public static class ApplicationShutdownMapper implements PersistenceObjectMapper<ApplicationShutdown, ApplicationShutdownDto> {
4846

49-
public ApplicationShutdown getApplicationsByApplicationIndex(int applicationInstanceIndex) {
50-
return createQuery().applicationInstanceIndex(applicationInstanceIndex)
51-
.singleResult();
52-
}
47+
@Override
48+
public ApplicationShutdown fromDto(ApplicationShutdownDto dto) {
49+
return ImmutableApplicationShutdown.builder()
50+
.id(dto.getPrimaryKey())
51+
.applicationId(dto.getАpplicationId())
52+
.applicationInstanceIndex(dto.getАpplicationIndex())
53+
.status(dto.getShutdownStatus())
54+
.startedAt(dto.getStartedAt())
55+
.build();
56+
}
5357

54-
public int deleteApplicationsByIndex(int applicationInstanceIndex) {
55-
return createQuery().applicationInstanceIndex(applicationInstanceIndex)
56-
.delete();
58+
@Override
59+
public ApplicationShutdownDto toDto(ApplicationShutdown object) {
60+
return new ApplicationShutdownDto(object.getId(), object.getApplicationId(), object.getApplicationInstanceIndex(),
61+
object.getStatus(), object.getStartedAt());
62+
}
5763
}
5864

59-
public ApplicationShutdown updateApplicationShutdownStatus(ApplicationShutdown oldApplicationShutdown, String status) {
60-
ApplicationShutdown newApplicationShutdown = ImmutableApplicationShutdown.copyOf(oldApplicationShutdown)
61-
.withStatus(status);
62-
return update(oldApplicationShutdown, newApplicationShutdown);
63-
}
6465
}

‎multiapps-controller-persistence/src/main/resources/org/cloudfoundry/multiapps/controller/persistence/db/changelog/db-changelog-2.36.0-persistence.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<tableExists tableName="application_shutdown"/>
1111
</not>
1212
</preConditions>
13-
<createSequence sequenceName="application_shutdown_sequence" startValue="1" incrementBy="1"/>
1413
<createTable tableName="application_shutdown">
1514
<column name="id" type="VARCHAR(255)">
1615
<constraints primaryKey="true" primaryKeyName="id_pk"/>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -789,10 +789,8 @@ public class Messages {
789789
public static final String GETTING_FEATURES_FOR_APPLICATION_0 = "Getting features for application \"{0}\"";
790790

791791
public static final String TOTAL_SIZE_OF_ALL_RESOLVED_CONTENT_0 = "Total size for all resolved content {0}";
792-
public static final String IGNORING_NOT_FOUND_OPTIONAL_SERVICE = "Service {0} not found but is optional";
793-
public static final String IGNORING_NOT_FOUND_INACTIVE_SERVICE = "Service {0} not found but is inactive";
794-
public static final String SHUTTING_DOWN_APPLICATION_WITH_ID_AND_INDEX = "Shutting down application with ID: \"{0}\" and index: \"{1}\"";
795-
public static final String SHUT_DOWN_APPLICATION_WITH_ID_AND_INDEX = "Shut down application with ID: \"{0}\" and index: \"{1}\"";
792+
public static final String STARTED_SHUTTING_DOWN_APPLICATION_WITH_ID_AND_INDEX = "Started shutting down application with ID: \"{0}\" and index: \"{1}\"";
793+
public static final String SHUT_DOWN_APPLICATION_WITH_ID_AND_INDEX_FINISHED_SUCCESSFULLY = "Shut down application with ID: \"{0}\" and index: \"{1}\" finished successfully";
796794

797795
// Not log messages
798796
public static final String SERVICE_TYPE = "{0}/{1}";

0 commit comments

Comments
 (0)