Skip to content

Commit 0ef3026

Browse files
refactor: More cleanups
1 parent b67ef41 commit 0ef3026

18 files changed

+52
-691
lines changed

openfeature-provider-local/src/main/java/com/spotify/confidence/Account.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

openfeature-provider-local/src/main/java/com/spotify/confidence/AssignLogger.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.Collection;
2020
import java.util.List;
2121
import java.util.Timer;
22-
import java.util.TimerTask;
2322
import java.util.concurrent.ConcurrentLinkedQueue;
2423
import java.util.concurrent.atomic.AtomicLong;
2524
import java.util.concurrent.atomic.LongAdder;
@@ -29,7 +28,6 @@
2928
class AssignLogger implements Closeable {
3029
private static final Logger logger = LoggerFactory.getLogger(AssignLogger.class);
3130

32-
private static final Logger LOG = LoggerFactory.getLogger(AssignLogger.class);
3331
// Max size minus some wiggle room
3432
private static final int GRPC_MESSAGE_MAX_SIZE = 4194304 - 1048576;
3533

@@ -63,31 +61,6 @@ private Long timeSinceLastAssigned() {
6361
return Duration.between(lastFlagAssigned, Instant.now()).toMillis();
6462
}
6563

66-
static AssignLogger createStarted(
67-
InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub flagLoggerStub,
68-
Duration checkpointInterval,
69-
MetricRegistry metricRegistry,
70-
long capacity) {
71-
final Timer timer = new Timer("assign-logger-timer", true);
72-
final AssignLogger assignLogger =
73-
new AssignLogger(flagLoggerStub, timer, metricRegistry, capacity);
74-
75-
timer.scheduleAtFixedRate(
76-
new TimerTask() {
77-
@Override
78-
public void run() {
79-
try {
80-
assignLogger.checkpoint();
81-
} catch (Exception e) {
82-
LOG.error("Failed to checkpoint assignments", e);
83-
}
84-
}
85-
},
86-
checkpointInterval.toMillis(),
87-
checkpointInterval.toMillis());
88-
return assignLogger;
89-
}
90-
9164
@VisibleForTesting
9265
Collection<FlagAssigned> queuedAssigns() {
9366
return ImmutableList.copyOf(queue);

openfeature-provider-local/src/main/java/com/spotify/confidence/BadRequestException.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

openfeature-provider-local/src/main/java/com/spotify/confidence/DefaultDeadlineClientInterceptor.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,6 @@ class DefaultDeadlineClientInterceptor implements ClientInterceptor {
3232
this.duration = duration;
3333
}
3434

35-
/**
36-
* Get the current default deadline duration.
37-
*
38-
* @return the current default deadline duration
39-
*/
40-
Duration getDuration() {
41-
return duration;
42-
}
43-
44-
/**
45-
* Set a new default deadline duration.
46-
*
47-
* @param duration the new default deadline duration
48-
*/
49-
void setDuration(Duration duration) {
50-
this.duration = duration;
51-
}
52-
5335
@Override
5436
public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
5537
MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {

openfeature-provider-local/src/main/java/com/spotify/confidence/EvalUtil.java

Lines changed: 0 additions & 158 deletions
This file was deleted.
Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,15 @@
11
package com.spotify.confidence;
22

3-
import static com.spotify.confidence.ResolvedValue.resolveToAssignmentReason;
4-
5-
import com.google.protobuf.Struct;
63
import com.google.protobuf.Timestamp;
4+
import com.spotify.confidence.shaded.flags.resolver.v1.ResolveReason;
75
import com.spotify.confidence.shaded.flags.resolver.v1.Sdk;
86
import com.spotify.confidence.shaded.flags.resolver.v1.events.ClientInfo;
9-
import com.spotify.confidence.shaded.flags.resolver.v1.events.FallthroughAssignment;
107
import com.spotify.confidence.shaded.flags.resolver.v1.events.FlagAssigned;
11-
import java.util.ArrayList;
8+
import com.spotify.confidence.shaded.flags.resolver.v1.events.FlagAssigned.DefaultAssignment.DefaultAssignmentReason;
129
import java.util.List;
1310

1411
interface FlagLogger {
1512

16-
void logResolve(
17-
String resolveId,
18-
Struct evaluationContext,
19-
Sdk sdk,
20-
AccountClient accountClient,
21-
List<ResolvedValue> values);
22-
23-
void logAssigns(
24-
String resolveId, Sdk sdk, List<FlagToApply> flagsToApply, AccountClient accountClient);
25-
26-
static List<String> getResources(FlagAssigned flagAssigned) {
27-
final List<String> resources = new ArrayList<>();
28-
for (var flag : flagAssigned.getFlagsList()) {
29-
if (flag.hasAssignmentInfo()) {
30-
if (!flag.getAssignmentInfo().getSegment().isBlank()) {
31-
resources.add(flag.getAssignmentInfo().getSegment());
32-
}
33-
if (!flag.getAssignmentInfo().getVariant().isBlank()) {
34-
resources.add(flag.getAssignmentInfo().getVariant());
35-
}
36-
}
37-
38-
for (FallthroughAssignment fallthroughAssignment : flag.getFallthroughAssignmentsList()) {
39-
resources.add(fallthroughAssignment.getRule());
40-
}
41-
42-
resources.add(flag.getFlag());
43-
resources.add(flag.getRule());
44-
}
45-
resources.add(flagAssigned.getClientInfo().getClient());
46-
resources.add(flagAssigned.getClientInfo().getClientCredential());
47-
return resources;
48-
}
49-
5013
static FlagAssigned createFlagAssigned(
5114
String resolveId, Sdk sdk, List<FlagToApply> flagsToApply, AccountClient accountClient) {
5215
final var clientInfo =
@@ -90,4 +53,13 @@ static FlagAssigned createFlagAssigned(
9053

9154
return builder.build();
9255
}
56+
57+
private static DefaultAssignmentReason resolveToAssignmentReason(ResolveReason reason) {
58+
return switch (reason) {
59+
case RESOLVE_REASON_NO_SEGMENT_MATCH -> DefaultAssignmentReason.NO_SEGMENT_MATCH;
60+
case RESOLVE_REASON_NO_TREATMENT_MATCH -> DefaultAssignmentReason.NO_TREATMENT_MATCH;
61+
case RESOLVE_REASON_FLAG_ARCHIVED -> DefaultAssignmentReason.FLAG_ARCHIVED;
62+
default -> DefaultAssignmentReason.DEFAULT_ASSIGNMENT_REASON_UNSPECIFIED;
63+
};
64+
}
9365
}

openfeature-provider-local/src/main/java/com/spotify/confidence/HealthStatus.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ synchronized void setStatus(HealthCheckResponse.ServingStatus status) {
2121
this.status.set(status);
2222
healthStatusManager.setStatus(SERVICE_NAME_ALL_SERVICES, status);
2323
}
24-
25-
HealthCheckResponse.ServingStatus get() {
26-
return status.get();
27-
}
2824
}

openfeature-provider-local/src/main/java/com/spotify/confidence/InternalServerException.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

openfeature-provider-local/src/main/java/com/spotify/confidence/JwtUtils.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
import java.util.Optional;
1010

1111
class JwtUtils {
12-
public static final String AUTH0_ISSUER = "https://auth.confidence.dev/";
13-
public static final String[] AUTH0_ISSUERS =
14-
new String[] {"https://konfidens.eu.auth0.com/", AUTH0_ISSUER};
1512

16-
public static final String BEARER_TYPE = "Bearer";
1713
public static final Metadata.Key<String> AUTHORIZATION_METADATA_KEY =
1814
Metadata.Key.of("Authorization", ASCII_STRING_MARSHALLER);
1915

@@ -38,10 +34,6 @@ public static Optional<Claim> getClaim(final DecodedJWT jwt, final String claim)
3834
}
3935
}
4036

41-
public static boolean isValidToken(String token) {
42-
return token.startsWith(BEARER_TYPE);
43-
}
44-
4537
public static String getTokenAsHeader(String rawToken) {
4638
return String.format("Bearer %s", rawToken);
4739
}

openfeature-provider-local/src/main/java/com/spotify/confidence/Region.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)