feat: Sanitize the code

Author: ZPascal

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

@@ -50,6 +50,6 @@ Mono<ReadResponse> read(ReadRequest request) {
     }
 
     Mono<ReadResponse> recentLogs(ReadRequest request) {
-        return get(request, ReadResponse.class, "read", request.getSourceId()).checkpoint();
+        return read(request);
     }
 }

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

@@ -39,13 +39,16 @@ public interface DopplerClient {
      */
     Flux<Envelope> firehose(FirehoseRequest request);
 
-    // TODO Adapt the message
     /**
      * Makes the <a href="https://github.com/cloudfoundry/loggregator/tree/develop/src/trafficcontroller#endpoints">Recent Logs</a> request
      *
-     * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
+     * @deprecated Use {@link org.cloudfoundry.logcache.v1.LogCacheClient#recentLogs(org.cloudfoundry.logcache.v1.ReadRequest)} instead.
+     * Only works with {@code Loggregator < 107.0}, shipped in {@code CFD < 24.3} and {@code TAS < 4.0}.
      * @param request the Recent Logs request
-     * @return the events from the recent logs
+     * @return a flux of events from the recent logs
+     * @see <a href="https://github.com/cloudfoundry/loggregator">Loggregator</a>
+     * @see <a href="https://github.com/cloudfoundry/log-cache">Log Cache</a>
+     * @see org.cloudfoundry.logcache.v1.LogCacheClient#recentLogs(org.cloudfoundry.logcache.v1.ReadRequest)
      */
     @Deprecated
     Flux<Envelope> recentLogs(RecentLogsRequest request);

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

@@ -20,7 +20,6 @@
 import static org.cloudfoundry.client.v3.LifecycleType.BUILDPACK;
 import static org.cloudfoundry.client.v3.LifecycleType.DOCKER;
 import static org.cloudfoundry.operations.TestObjects.fill;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.RETURNS_SMART_NULLS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -144,6 +143,7 @@
 import org.cloudfoundry.doppler.LogMessage;
 import org.cloudfoundry.doppler.RecentLogsRequest;
 import org.cloudfoundry.doppler.StreamRequest;
+import org.cloudfoundry.logcache.v1.Envelope;
 import org.cloudfoundry.logcache.v1.EnvelopeBatch;
 import org.cloudfoundry.logcache.v1.Log;
 import org.cloudfoundry.logcache.v1.LogCacheClient;
@@ -1315,7 +1315,7 @@ void listTasks() {
 
     @SuppressWarnings("deprecation")
     @Test
-    void logsRecent_doppler() {
+    void logsRecentDoppler() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -1332,7 +1332,7 @@ void logsRecent_doppler() {
 
     @SuppressWarnings("deprecation")
     @Test
-    void logsNoApp_doppler() {
+    void logsNoAppDoppler() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
 
         this.applications
@@ -1349,7 +1349,7 @@ void logsNoApp_doppler() {
 
     @SuppressWarnings("deprecation")
     @Test
-    void logs_doppler() {
+    void logsDoppler() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -1365,15 +1365,15 @@ void logs_doppler() {
     }
 
     @Test
-    void logsRecent_LogCache() {
+    void logsRecentLogCache() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
                 TEST_SPACE_ID,
                 "test-metadata-id");
         requestLogsRecentLogCache(this.logCacheClient, "test-metadata-id", "test-payload");
         this.applications
-                .logsRecent(ReadRequest.builder().sourceId("test-application-name").build())
+                .logsRecent(ReadRequest.builder().sourceId("test-metadata-id").build())
                 .as(StepVerifier::create)
                 .expectNext(fill(Log.builder()).type(LogType.OUT).build())
                 .expectComplete()
@@ -1382,7 +1382,7 @@ void logsRecent_LogCache() {
 
     @SuppressWarnings("deprecation")
     @Test
-    void logsRecentNotSet_doppler() {
+    void logsRecentNotSetDoppler() {
         requestApplications(
                 this.cloudFoundryClient,
                 "test-application-name",
@@ -5054,25 +5054,6 @@ private static void requestGetApplicationFailing(
                                         .build()));
     }
 
-    private static void requestGetApplicationTimeout(
-            CloudFoundryClient cloudFoundryClient, String applicationId) {
-        when(cloudFoundryClient
-                        .applicationsV2()
-                        .get(
-                                org.cloudfoundry.client.v2.applications.GetApplicationRequest
-                                        .builder()
-                                        .applicationId(applicationId)
-                                        .build()))
-                .thenReturn(
-                        Mono.just(
-                                fill(GetApplicationResponse.builder())
-                                        .entity(
-                                                fill(ApplicationEntity.builder())
-                                                        .packageState("STAGING")
-                                                        .build())
-                                        .build()));
-    }
-
     private static void requestInstancesApplicationFailing(
             CloudFoundryClient cloudFoundryClient, String applicationId) {
         when(cloudFoundryClient
@@ -5096,20 +5077,36 @@ private static void requestInstancesApplicationFailing(
                                         .build()));
     }
 
+    private static void requestGetApplicationTimeout(
+            CloudFoundryClient cloudFoundryClient, String applicationId) {
+        when(cloudFoundryClient
+                .applicationsV2()
+                .get(
+                        org.cloudfoundry.client.v2.applications.GetApplicationRequest
+                                .builder()
+                                .applicationId(applicationId)
+                                .build()))
+                .thenReturn(
+                        Mono.just(
+                                fill(GetApplicationResponse.builder())
+                                        .entity(
+                                                fill(ApplicationEntity.builder())
+                                                        .packageState("STAGING")
+                                                        .build())
+                                        .build()));
+    }
+
     private static void requestLogsRecentLogCache(
-            LogCacheClient logCacheClient, String applicationName, String payload) {
-        when(logCacheClient.recentLogs(any()))
+            LogCacheClient logCacheClient, String sourceId, String payload) {
+        when(logCacheClient.recentLogs(ReadRequest.builder().sourceId(sourceId).build()))
                 .thenReturn(
                         Mono.just(
                                 fill(ReadResponse.builder())
                                         .envelopes(
                                                 fill(EnvelopeBatch.builder())
                                                         .batch(
                                                                 Arrays.asList(
-                                                                        fill(org.cloudfoundry
-                                                                                        .logcache.v1
-                                                                                        .Envelope
-                                                                                        .builder())
+                                                                        fill(Envelope.builder())
                                                                                 .log(
                                                                                         Log
                                                                                                 .builder()