Skip to content

Commit f952c57

Browse files
committed
feat: Cleanup the recentLogs endpoint
1 parent b236ad3 commit f952c57

File tree

6 files changed

+4
-21
lines changed

6 files changed

+4
-21
lines changed

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/logcache/v1/ReactorLogCacheEndpoints.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,4 @@ Mono<MetaResponse> meta(MetaRequest request) {
4848
Mono<ReadResponse> read(ReadRequest request) {
4949
return get(request, ReadResponse.class, "read", request.getSourceId()).checkpoint();
5050
}
51-
52-
Mono<ReadResponse> recentLogs(ReadRequest request) {
53-
return read(request);
54-
}
5551
}

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/logcache/v1/_ReactorLogCacheClient.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public Mono<ReadResponse> read(ReadRequest request) {
5353
return getReactorLogCacheEndpoints().read(request);
5454
}
5555

56-
@Override
57-
public Mono<ReadResponse> recentLogs(ReadRequest request) {
58-
return getReactorLogCacheEndpoints().recentLogs(request);
59-
}
60-
6156
/**
6257
* The connection context
6358
*/

cloudfoundry-client/src/main/java/org/cloudfoundry/doppler/DopplerClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ public interface DopplerClient {
4242
/**
4343
* Makes the <a href="https://github.com/cloudfoundry/loggregator/tree/develop/src/trafficcontroller#endpoints">Recent Logs</a> request
4444
*
45-
* @deprecated Use {@link org.cloudfoundry.logcache.v1.LogCacheClient#recentLogs(org.cloudfoundry.logcache.v1.ReadRequest)} instead.
45+
* @deprecated Use {@link org.cloudfoundry.logcache.v1.LogCacheClient#read(org.cloudfoundry.logcache.v1.ReadRequest)} instead.
4646
* Only works with {@code Loggregator < 107.0}, shipped in {@code CFD < 24.3} and {@code TAS < 4.0}.
4747
* @param request the Recent Logs request
4848
* @return a flux of events from the recent logs
4949
* @see <a href="https://github.com/cloudfoundry/loggregator">Loggregator</a>
5050
* @see <a href="https://github.com/cloudfoundry/log-cache">Log Cache</a>
51-
* @see org.cloudfoundry.logcache.v1.LogCacheClient#recentLogs(org.cloudfoundry.logcache.v1.ReadRequest)
51+
* @see org.cloudfoundry.logcache.v1.LogCacheClient#read(org.cloudfoundry.logcache.v1.ReadRequest)
5252
*/
5353
@Deprecated
5454
Flux<Envelope> recentLogs(RecentLogsRequest request);

cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/LogCacheClient.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,4 @@ public interface LogCacheClient {
4646
* @return the read response
4747
*/
4848
Mono<ReadResponse> read(ReadRequest request);
49-
50-
/**
51-
* Makes the Log Cache RecentLogs /api/v1/read request
52-
*
53-
* @param request the Recent Logs request
54-
* @return the events from the recent logs
55-
*/
56-
Mono<ReadResponse> recentLogs(ReadRequest request);
5749
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2545,7 +2545,7 @@ private static Mono<EnvelopeBatch> requestLogsRecentLogCache(
25452545
Mono<LogCacheClient> logCacheClient, ReadRequest readRequest) {
25462546
return logCacheClient.flatMap(
25472547
client ->
2548-
client.recentLogs(readRequest)
2548+
client.read(readRequest)
25492549
.flatMap(response -> Mono.justOrEmpty(response.getEnvelopes())));
25502550
}
25512551

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5361,7 +5361,7 @@ private static void requestLogsRecent(DopplerClient dopplerClient, String applic
53615361

53625362
private static void requestLogsRecentLogCache(
53635363
LogCacheClient logCacheClient, String sourceId, String payload) {
5364-
when(logCacheClient.recentLogs(ReadRequest.builder().sourceId(sourceId).build()))
5364+
when(logCacheClient.read(ReadRequest.builder().sourceId(sourceId).build()))
53655365
.thenReturn(
53665366
Mono.just(
53675367
fill(ReadResponse.builder())

0 commit comments

Comments
 (0)