Skip to content

Commit 9105a92

Browse files
committed
fix: Fix compile errors from rebase
- Add missing import for org.cloudfoundry.logcache.v1.Log - Restore getRecentLogsLogCache helper method dropped during rebase - Remove duplicate test methods introduced by rebase conflict resolution
1 parent 4e11f4c commit 9105a92

2 files changed

Lines changed: 12 additions & 65 deletions

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
import org.cloudfoundry.doppler.RecentLogsRequest;
156156
import org.cloudfoundry.doppler.StreamRequest;
157157
import org.cloudfoundry.logcache.v1.EnvelopeBatch;
158+
import org.cloudfoundry.logcache.v1.Log;
158159
import org.cloudfoundry.logcache.v1.LogCacheClient;
159160
import org.cloudfoundry.logcache.v1.ReadRequest;
160161
import org.cloudfoundry.logcache.v1.TailLogsRequest;
@@ -2565,6 +2566,17 @@ private static Flux<Envelope> requestLogsRecent(
25652566
RecentLogsRequest.builder().applicationId(applicationId).build()));
25662567
}
25672568

2569+
private static Flux<Log> getRecentLogsLogCache(
2570+
Mono<LogCacheClient> logCacheClient, ReadRequest readRequest) {
2571+
return logCacheClient
2572+
.flatMap(client -> client.recentLogs(readRequest))
2573+
.flatMap(response -> Mono.justOrEmpty(response.getEnvelopes()))
2574+
.flatMapIterable(EnvelopeBatch::getBatch)
2575+
.filter(e -> e.getLog() != null)
2576+
.sort(LOG_MESSAGE_COMPARATOR_LOG_CACHE)
2577+
.map(org.cloudfoundry.logcache.v1.Envelope::getLog);
2578+
}
2579+
25682580
private static Flux<org.cloudfoundry.logcache.v1.Envelope> requestLogsRecentLogCache(
25692581
Mono<LogCacheClient> logCacheClient, String applicationId) {
25702582
return logCacheClient

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

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,71 +1462,6 @@ void logsTailLogCacheOutAndErrEnvelopes() {
14621462
.verify(Duration.ofSeconds(5));
14631463
}
14641464

1465-
@Test
1466-
void logsTailLogCache() {
1467-
TailLogsRequest tailRequest = TailLogsRequest.builder().sourceId("test-source-id").build();
1468-
requestLogsTailLogCache(this.logCacheClient, tailRequest, "test-tail-payload");
1469-
1470-
this.applications
1471-
.logsTail(tailRequest)
1472-
.take(1)
1473-
.as(StepVerifier::create)
1474-
.expectNextMatches(
1475-
envelope ->
1476-
envelope.getLog() != null
1477-
&& LogType.OUT.equals(envelope.getLog().getType()))
1478-
.expectComplete()
1479-
.verify(Duration.ofSeconds(5));
1480-
}
1481-
1482-
@Test
1483-
void logsTailLogCacheMultipleEnvelopes() {
1484-
TailLogsRequest tailRequest = TailLogsRequest.builder().sourceId("test-source-id").build();
1485-
requestLogsTailLogCacheMultiple(this.logCacheClient, tailRequest);
1486-
1487-
this.applications
1488-
.logsTail(tailRequest)
1489-
.take(3)
1490-
.map(e -> e.getLog().getType())
1491-
.as(StepVerifier::create)
1492-
.expectNext(LogType.OUT)
1493-
.expectNext(LogType.ERR)
1494-
.expectNext(LogType.OUT)
1495-
.expectComplete()
1496-
.verify(Duration.ofSeconds(5));
1497-
}
1498-
1499-
@Test
1500-
void logsTailLogCacheError() {
1501-
TailLogsRequest tailRequest = TailLogsRequest.builder().sourceId("test-source-id").build();
1502-
when(this.logCacheClient.logsTail(tailRequest))
1503-
.thenReturn(Flux.error(new RuntimeException("log-cache unavailable")));
1504-
1505-
this.applications
1506-
.logsTail(tailRequest)
1507-
.as(StepVerifier::create)
1508-
.expectErrorMatches(
1509-
t ->
1510-
t instanceof RuntimeException
1511-
&& "log-cache unavailable".equals(t.getMessage()))
1512-
.verify(Duration.ofSeconds(5));
1513-
}
1514-
1515-
@Test
1516-
void logsTailLogCacheOutAndErrEnvelopes() {
1517-
TailLogsRequest tailRequest = TailLogsRequest.builder().sourceId("test-source-id").build();
1518-
requestLogsTailLogCacheOutAndErr(this.logCacheClient, tailRequest);
1519-
1520-
this.applications
1521-
.logsTail(tailRequest)
1522-
.take(2)
1523-
.as(StepVerifier::create)
1524-
.expectNextMatches(e -> LogType.OUT.equals(e.getLog().getType()))
1525-
.expectNextMatches(e -> LogType.ERR.equals(e.getLog().getType()))
1526-
.expectComplete()
1527-
.verify(Duration.ofSeconds(5));
1528-
}
1529-
15301465
@SuppressWarnings("deprecation")
15311466
@Test
15321467
void logsRecentNotSetDoppler() {

0 commit comments

Comments
 (0)