Skip to content

Commit d917da4

Browse files
ZPascalZPascal
committed
fix: Adjust the code and tests
1 parent 62f0115 commit d917da4

File tree

3 files changed

+69
-129
lines changed

3 files changed

+69
-129
lines changed

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,6 @@ public interface Applications {
117117
*/
118118
Flux<Task> listTasks(ListApplicationTasksRequest request);
119119

120-
/**
121-
* List the applications logs from dopplerClient
122-
* @deprecated Only for compatibility. Switch to logCacheClient method below.
123-
* @param request the application logs request
124-
* @return the applications logs
125-
*/
126-
Flux<LogMessage> logs(LogsRequest request);
127-
128120
/**
129121
* List the applications logs. Uses Doppler under the hood.
130122
* Only works with {@code Loggregator < 107.0}, shipped in {@code CFD < 24.3}
@@ -135,7 +127,7 @@ public interface Applications {
135127
* @deprecated Use {@link #logs(ApplicationLogsRequest)} instead.
136128
*/
137129
@Deprecated
138-
Flux<Log> logs(LogsRequest request);
130+
Flux<LogMessage> logs(LogsRequest request);
139131

140132
/**
141133
* List the applications logs from logCacheClient.

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

Lines changed: 20 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,11 @@
154154
import org.cloudfoundry.doppler.LogMessage;
155155
import org.cloudfoundry.doppler.RecentLogsRequest;
156156
import org.cloudfoundry.doppler.StreamRequest;
157+
import org.cloudfoundry.doppler.Envelope;
157158
import org.cloudfoundry.logcache.v1.Log;
158159
import org.cloudfoundry.logcache.v1.LogCacheClient;
159160
import org.cloudfoundry.logcache.v1.ReadRequest;
160-
import org.cloudfoundry.logcache.v1.ReadResponse;
161161
import org.cloudfoundry.logcache.v1.EnvelopeBatch;
162-
import org.cloudfoundry.logcache.v1.Envelope;
163162
import org.cloudfoundry.operations.util.OperationsLogging;
164163
import org.cloudfoundry.util.DateUtils;
165164
import org.cloudfoundry.util.DelayTimeoutException;
@@ -566,25 +565,25 @@ public Flux<Log> logsRecent(ReadRequest request) {
566565
.checkpoint();
567566
}
568567

569-
// @Override
570-
// public Flux<ApplicationLog> logs(ApplicationLogsRequest request) {
571-
// return logs(LogsRequest.builder()
572-
// .name(request.getName())
573-
// .recent(request.getRecent())
574-
// .build())
575-
// .map(
576-
// logMessage ->
577-
// ApplicationLog.builder()
578-
// .sourceId(logMessage.getApplicationId())
579-
// .sourceType(logMessage.getSourceType())
580-
// .instanceId(logMessage.getSourceInstance())
581-
// .message(logMessage.getMessage())
582-
// .timestamp(logMessage.getTimestamp())
583-
// .logType(
584-
// ApplicationLogType.from(
585-
// logMessage.getMessageType().name()))
586-
// .build());
587-
// }
568+
@Override
569+
public Flux<ApplicationLog> logs(ApplicationLogsRequest request) {
570+
return logs(LogsRequest.builder()
571+
.name(request.getName())
572+
.recent(request.getRecent())
573+
.build())
574+
.map(
575+
logMessage ->
576+
ApplicationLog.builder()
577+
.sourceId(logMessage.getApplicationId())
578+
.sourceType(logMessage.getSourceType())
579+
.instanceId(logMessage.getSourceInstance())
580+
.message(logMessage.getMessage())
581+
.timestamp(logMessage.getTimestamp())
582+
.logType(
583+
ApplicationLogType.from(
584+
logMessage.getMessageType().name()))
585+
.build());
586+
}
588587

589588
@Override
590589
@SuppressWarnings("deprecation")
@@ -2445,57 +2444,6 @@ private static Mono<AbstractApplicationResource> requestGetApplication(
24452444
.cast(AbstractApplicationResource.class);
24462445
}
24472446

2448-
private static void requestInstancesApplicationFailing(
2449-
CloudFoundryClient cloudFoundryClient, String applicationId) {
2450-
when(cloudFoundryClient
2451-
.applicationsV2()
2452-
.instances(
2453-
ApplicationInstancesRequest.builder()
2454-
.applicationId(applicationId)
2455-
.build()))
2456-
.thenReturn(
2457-
Mono.just(
2458-
fill(
2459-
ApplicationInstancesResponse.builder(),
2460-
"application-instances-")
2461-
.instance(
2462-
"instance-0",
2463-
fill(
2464-
ApplicationInstanceInfo.builder(),
2465-
"application-instance-info-")
2466-
.state("FAILED")
2467-
.build())
2468-
.build()));
2469-
}
2470-
2471-
private static void requestLogsRecentLogCache(
2472-
LogCacheClient logCacheClient, String applicationName, String payload) {
2473-
when(logCacheClient.recentLogs(any()))
2474-
.thenReturn(
2475-
Mono.just(
2476-
fill(ReadResponse.builder())
2477-
.envelopes(
2478-
fill(EnvelopeBatch.builder())
2479-
.batch(
2480-
Arrays.asList(
2481-
fill(org.cloudfoundry
2482-
.logcache.v1
2483-
.Envelope
2484-
.builder())
2485-
.log(
2486-
Log
2487-
.builder()
2488-
.payload(
2489-
payload)
2490-
.type(
2491-
LogType
2492-
.OUT)
2493-
.build())
2494-
.build()))
2495-
.build())
2496-
.build()));
2497-
}
2498-
24992447
private static Flux<DomainResource> requestListDomains(
25002448
CloudFoundryClient cloudFoundryClient, String organizationId) {
25012449
return PaginationUtils.requestClientV3Resources(

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

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5054,44 +5054,72 @@ private static void requestGetApplicationFailing(
50545054
.build()));
50555055
}
50565056

5057-
private static void requestInstancesApplicationFailing(
5057+
private static void requestGetApplicationTimeout(
50585058
CloudFoundryClient cloudFoundryClient, String applicationId) {
50595059
when(cloudFoundryClient
50605060
.applicationsV2()
5061-
.instances(
5062-
ApplicationInstancesRequest.builder()
5061+
.get(
5062+
org.cloudfoundry.client.v2.applications.GetApplicationRequest
5063+
.builder()
50635064
.applicationId(applicationId)
50645065
.build()))
5066+
.thenReturn(
5067+
Mono.just(
5068+
fill(GetApplicationResponse.builder())
5069+
.entity(
5070+
fill(ApplicationEntity.builder())
5071+
.packageState("STAGING")
5072+
.build())
5073+
.build()));
5074+
}
5075+
5076+
private static void requestInstancesApplicationFailing(
5077+
CloudFoundryClient cloudFoundryClient, String applicationId) {
5078+
when(cloudFoundryClient
5079+
.applicationsV2()
5080+
.instances(
5081+
ApplicationInstancesRequest.builder()
5082+
.applicationId(applicationId)
5083+
.build()))
50655084
.thenReturn(
50665085
Mono.just(
50675086
fill(
5068-
ApplicationInstancesResponse.builder(),
5069-
"application-instances-")
5087+
ApplicationInstancesResponse.builder(),
5088+
"application-instances-")
50705089
.instance(
50715090
"instance-0",
50725091
fill(
5073-
ApplicationInstanceInfo.builder(),
5074-
"application-instance-info-")
5092+
ApplicationInstanceInfo.builder(),
5093+
"application-instance-info-")
50755094
.state("FAILED")
50765095
.build())
50775096
.build()));
50785097
}
50795098

5080-
private static void requestGetApplicationTimeout(
5081-
CloudFoundryClient cloudFoundryClient, String applicationId) {
5082-
when(cloudFoundryClient
5083-
.applicationsV2()
5084-
.get(
5085-
org.cloudfoundry.client.v2.applications.GetApplicationRequest
5086-
.builder()
5087-
.applicationId(applicationId)
5088-
.build()))
5099+
private static void requestLogsRecentLogCache(
5100+
LogCacheClient logCacheClient, String applicationName, String payload) {
5101+
when(logCacheClient.recentLogs(any()))
50895102
.thenReturn(
50905103
Mono.just(
5091-
fill(GetApplicationResponse.builder())
5092-
.entity(
5093-
fill(ApplicationEntity.builder())
5094-
.packageState("STAGING")
5104+
fill(ReadResponse.builder())
5105+
.envelopes(
5106+
fill(EnvelopeBatch.builder())
5107+
.batch(
5108+
Arrays.asList(
5109+
fill(org.cloudfoundry
5110+
.logcache.v1
5111+
.Envelope
5112+
.builder())
5113+
.log(
5114+
Log
5115+
.builder()
5116+
.payload(
5117+
payload)
5118+
.type(
5119+
LogType
5120+
.OUT)
5121+
.build())
5122+
.build()))
50955123
.build())
50965124
.build()));
50975125
}
@@ -5342,34 +5370,6 @@ private static void requestListTasksEmpty(
53425370
.build()));
53435371
}
53445372

5345-
private static void requestLogsRecentLogCache(
5346-
LogCacheClient logCacheClient, String applicationName, String payload) {
5347-
when(logCacheClient.recentLogs(any()))
5348-
.thenReturn(
5349-
Mono.just(
5350-
fill(ReadResponse.builder())
5351-
.envelopes(
5352-
fill(EnvelopeBatch.builder())
5353-
.batch(
5354-
Arrays.asList(
5355-
fill(org.cloudfoundry
5356-
.logcache.v1
5357-
.Envelope
5358-
.builder())
5359-
.log(
5360-
Log
5361-
.builder()
5362-
.payload(
5363-
payload)
5364-
.type(
5365-
LogType
5366-
.OUT)
5367-
.build())
5368-
.build()))
5369-
.build())
5370-
.build()));
5371-
}
5372-
53735373
private static void requestLogsStream(DopplerClient dopplerClient, String applicationId) {
53745374
when(dopplerClient.stream(StreamRequest.builder().applicationId(applicationId).build()))
53755375
.thenReturn(

0 commit comments

Comments
 (0)