Skip to content

Commit dbcbea0

Browse files
KehrlannKehrlann
committed
DefaultApplications: .get() uses v3 ApplicationResource for name, id, state
1 parent b2d6758 commit dbcbea0

File tree

2 files changed

+42
-37
lines changed

2 files changed

+42
-37
lines changed

‎cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
import reactor.core.publisher.Flux;
169169
import reactor.core.publisher.Mono;
170170
import reactor.util.function.Tuple2;
171-
import reactor.util.function.Tuple4;
171+
import reactor.util.function.Tuple5;
172172
import reactor.util.function.Tuples;
173173

174174
public final class DefaultApplications implements Applications {
@@ -1085,7 +1085,13 @@ private Mono<ApplicationResource> getApplicationV3(String application) {
10851085
"Application %s does not exist", application));
10861086
}
10871087

1088-
private Mono<Tuple4<List<String>, SummaryApplicationResponse, String, List<InstanceDetail>>>
1088+
private Mono<
1089+
Tuple5<
1090+
List<String>,
1091+
SummaryApplicationResponse,
1092+
String,
1093+
List<InstanceDetail>,
1094+
ApplicationResource>>
10891095
getAuxiliaryContent(ApplicationResource applicationResource) {
10901096
String applicationId = applicationResource.getId();
10911097
LifecycleData data = applicationResource.getLifecycle().getData();
@@ -1103,7 +1109,8 @@ private Mono<ApplicationResource> getApplicationV3(String application) {
11031109
getApplicationBuildpacks(applicationId),
11041110
requestApplicationSummary(applicationId),
11051111
Mono.just(stackName),
1106-
appInstanceDetails);
1112+
appInstanceDetails,
1113+
Mono.just(applicationResource));
11071114
}
11081115

11091116
private Mono<String> getDefaultDomainId() {
@@ -2273,7 +2280,8 @@ private static ApplicationDetail toApplicationDetail(
22732280
List<String> buildpacks,
22742281
SummaryApplicationResponse summaryApplicationResponse,
22752282
String stackName,
2276-
List<InstanceDetail> instanceDetails) {
2283+
List<InstanceDetail> instanceDetails,
2284+
ApplicationResource application) {
22772285
Long runningInstances =
22782286
instanceDetails.stream()
22792287
.filter(
@@ -2285,19 +2293,16 @@ private static ApplicationDetail toApplicationDetail(
22852293

22862294
return ApplicationDetail.builder()
22872295
.buildpacks(buildpacks)
2288-
.id(summaryApplicationResponse.getId()) // TODO: app id
2289-
.name(summaryApplicationResponse.getName()) // TODO: app name
2290-
.requestedState(summaryApplicationResponse.getState()) // TODO: app state
2296+
.id(application.getId())
2297+
.name(application.getName())
2298+
.requestedState(application.getState().getValue())
22912299
.instanceDetails(instanceDetails)
22922300
.instances(instanceDetails.size())
22932301
.runningInstances(runningInstances.intValue())
22942302
.diskQuota(summaryApplicationResponse.getDiskQuota())
22952303
.memoryLimit(summaryApplicationResponse.getMemory())
2296-
.lastUploaded(
2297-
toDate(
2298-
summaryApplicationResponse
2299-
.getPackageUpdatedAt())) // TODO: package object
2300-
.urls(toUrls(summaryApplicationResponse.getRoutes())) // TODO: ??
2304+
.lastUploaded(toDate(summaryApplicationResponse.getPackageUpdatedAt()))
2305+
.urls(toUrls(summaryApplicationResponse.getRoutes()))
23012306
.stack(stackName)
23022307
.build();
23032308
}

‎cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ void get() {
520520
.expectNext(
521521
fill(ApplicationDetail.builder())
522522
.buildpack("test-buildpack")
523-
.id("test-application-summary-id")
523+
.id("test-application-id")
524524
.instanceDetails(
525525
fill(InstanceDetail.builder())
526526
.since(null)
@@ -540,8 +540,8 @@ void get() {
540540
.runningInstances(2)
541541
.instances(3)
542542
.lastUploaded(new Date(0))
543-
.name("test-application-summary-name")
544-
.requestedState("test-application-summary-state")
543+
.name("test-name")
544+
.requestedState("STARTED")
545545
.stack("test-stack")
546546
.url("test-route-host.test-domain-name/test-path")
547547
.build())
@@ -713,10 +713,10 @@ void getBuildpackError() {
713713
.instances(0)
714714
.runningInstances(0)
715715
.buildpack("test-buildpack")
716-
.id("test-application-summary-id")
716+
.id("test-application-id")
717717
.lastUploaded(new Date(0))
718-
.name("test-application-summary-name")
719-
.requestedState("test-application-summary-state")
718+
.name("test-name")
719+
.requestedState("STARTED")
720720
.stack("test-stack")
721721
.url("test-route-host.test-domain-name/test-path")
722722
.build())
@@ -996,10 +996,10 @@ void getInstancesError() {
996996
.instances(0)
997997
.runningInstances(0)
998998
.buildpack("test-buildpack")
999-
.id("test-application-summary-id")
999+
.id("test-application-id")
10001000
.lastUploaded(new Date(0))
1001-
.name("test-application-summary-name")
1002-
.requestedState("test-application-summary-state")
1001+
.name("test-name")
1002+
.requestedState("STARTED")
10031003
.stack("test-stack")
10041004
.url("test-route-host.test-domain-name/test-path")
10051005
.build())
@@ -1021,7 +1021,7 @@ void getNoBuildpack() {
10211021
.as(StepVerifier::create)
10221022
.expectNext(
10231023
fill(ApplicationDetail.builder())
1024-
.id("test-application-summary-id")
1024+
.id("test-application-id")
10251025
.instanceDetails(
10261026
fill(InstanceDetail.builder())
10271027
.since(null)
@@ -1041,8 +1041,8 @@ void getNoBuildpack() {
10411041
.lastUploaded(new Date(0))
10421042
.runningInstances(2)
10431043
.instances(3)
1044-
.name("test-application-summary-name")
1045-
.requestedState("test-application-summary-state")
1044+
.name("test-name")
1045+
.requestedState("STARTED")
10461046
.stack("test-stack")
10471047
.url("test-route-host.test-domain-name/test-path")
10481048
.build())
@@ -1067,10 +1067,10 @@ void getStagingError() {
10671067
.instances(0)
10681068
.runningInstances(0)
10691069
.buildpack("test-buildpack")
1070-
.id("test-application-summary-id")
1070+
.id("test-application-id")
10711071
.lastUploaded(new Date(0))
1072-
.name("test-application-summary-name")
1073-
.requestedState("test-application-summary-state")
1072+
.name("test-name")
1073+
.requestedState("STARTED")
10741074
.stack("test-stack")
10751075
.url("test-route-host.test-domain-name/test-path")
10761076
.build())
@@ -1095,10 +1095,10 @@ void getStoppedError() {
10951095
.instances(0)
10961096
.runningInstances(0)
10971097
.buildpack("test-buildpack")
1098-
.id("test-application-summary-id")
1098+
.id("test-application-id")
10991099
.lastUploaded(new Date(0))
1100-
.name("test-application-summary-name")
1101-
.requestedState("test-application-summary-state")
1100+
.name("test-name")
1101+
.requestedState("STARTED")
11021102
.stack("test-stack")
11031103
.url("test-route-host.test-domain-name/test-path")
11041104
.build())
@@ -1123,10 +1123,10 @@ void getWithEmptyInstance() {
11231123
.instances(0)
11241124
.runningInstances(0)
11251125
.buildpack("test-buildpack")
1126-
.id("test-application-summary-id")
1126+
.id("test-application-id")
11271127
.lastUploaded(new Date(0))
1128-
.name("test-application-summary-name")
1129-
.requestedState("test-application-summary-state")
1128+
.name("test-name")
1129+
.requestedState("STARTED")
11301130
.stack("test-stack")
11311131
.url("test-route-host.test-domain-name/test-path")
11321132
.build())
@@ -1150,7 +1150,7 @@ void getWithNullUsage() {
11501150
.expectNext(
11511151
fill(ApplicationDetail.builder())
11521152
.buildpack("test-buildpack")
1153-
.id("test-application-summary-id")
1153+
.id("test-application-id")
11541154
.instanceDetail(
11551155
InstanceDetail.builder()
11561156
.index("1")
@@ -1160,8 +1160,8 @@ void getWithNullUsage() {
11601160
.state("RUNNING")
11611161
.build())
11621162
.lastUploaded(new Date(0))
1163-
.name("test-application-summary-name")
1164-
.requestedState("test-application-summary-state")
1163+
.name("test-name")
1164+
.requestedState("STARTED")
11651165
.stack("test-stack")
11661166
.url("test-route-host.test-domain-name/test-path")
11671167
.build())
@@ -4738,7 +4738,7 @@ private static void requestApplicationsV3(
47384738
.build())
47394739
.build())
47404740
.id(applicationId)
4741-
.state(ApplicationState.STOPPED)
4741+
.state(ApplicationState.STARTED)
47424742
.build())
47434743
.build()));
47444744
}

0 commit comments

Comments
 (0)