Skip to content

Commit 8196b4e

Browse files
committed
Fix some issues
* fix some things that I noticed went wrong during rebase * prefer `List.of()` over `Arrays.asList()` for single object * Fix `assertThat()` actually asserting in integration test
1 parent 210376c commit 8196b4e

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/AbstractUaaTokenProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public abstract class AbstractUaaTokenProvider implements TokenProvider {
7474

7575
private static final ZoneId UTC = ZoneId.of("UTC");
7676

77-
protected final ConcurrentMap<ConnectionContext, Mono<String>> accessTokens =
77+
private final ConcurrentMap<ConnectionContext, Mono<String>> accessTokens =
7878
new ConcurrentHashMap<>(1);
7979

8080
private final ConcurrentMap<ConnectionContext, RefreshToken> refreshTokenStreams =

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/_ClientCredentialsGrantTokenProvider.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.cloudfoundry.reactor.tokenprovider;
1818

19-
import org.cloudfoundry.reactor.ConnectionContext;
2019
import org.cloudfoundry.reactor.TokenProvider;
2120
import org.immutables.value.Value;
2221
import reactor.netty.http.client.HttpClientForm;
@@ -36,10 +35,4 @@ void tokenRequestTransformer(HttpClientRequest request, HttpClientForm form) {
3635
.attr("grant_type", "client_credentials")
3736
.attr("response_type", "token");
3837
}
39-
40-
@Override
41-
public void invalidate(ConnectionContext connectionContext) {
42-
this.accessTokens.remove(connectionContext);
43-
}
44-
4538
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.Collections;
3434
import java.util.Date;
3535
import java.util.LinkedList;
36+
import java.util.List;
3637
import java.util.Map;
3738
import java.util.Optional;
3839
import java.util.Queue;
@@ -144,6 +145,7 @@
144145
import org.cloudfoundry.doppler.LogMessage;
145146
import org.cloudfoundry.doppler.RecentLogsRequest;
146147
import org.cloudfoundry.doppler.StreamRequest;
148+
import org.cloudfoundry.logcache.v1.Envelope;
147149
import org.cloudfoundry.logcache.v1.EnvelopeBatch;
148150
import org.cloudfoundry.logcache.v1.Log;
149151
import org.cloudfoundry.logcache.v1.LogCacheClient;
@@ -5105,11 +5107,8 @@ private static void requestLogsRecentLogCache(
51055107
.envelopes(
51065108
fill(EnvelopeBatch.builder())
51075109
.batch(
5108-
Arrays.asList(
5109-
fill(org.cloudfoundry
5110-
.logcache.v1
5111-
.Envelope
5112-
.builder())
5110+
List.of(
5111+
fill(Envelope.builder())
51135112
.log(
51145113
Log
51155114
.builder()

integration-test/src/test/java/org/cloudfoundry/operations/ApplicationsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,8 @@ public void logs() throws IOException {
529529
this.cloudFoundryOperations
530530
.applications()
531531
.logs(
532-
ApplicationLogsRequest.builder()
532+
ApplicationLogsRequest
533+
.builder()
533534
.name(applicationName)
534535
.recent(true)
535536
.build()))
@@ -2205,7 +2206,7 @@ private static Mono<String> getAppGuidFromAppName(
22052206
}
22062207

22072208
private static Log checkOneLogEntry(Log log) {
2208-
assertThat(log.getType().equals(LogType.OUT));
2209+
assertThat(log.getType()).isEqualTo(LogType.OUT);
22092210
OperationsLogging.log("one log entry: " + log.getType() + " " + log.getPayloadAsText());
22102211
return log;
22112212
}

0 commit comments

Comments
 (0)