Skip to content

chore(unleash): update dependency io.getunleash:unleash-client-java to v11.0.2 (#1551) #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion providers/unleash/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>io.getunleash</groupId>
<artifactId>unleash-client-java</artifactId>
<version>9.3.2</version>
<version>11.0.2</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.openfeature.contrib.providers.unleash;

import static io.getunleash.Variant.DISABLED_VARIANT;
import static io.getunleash.variant.Variant.DISABLED_VARIANT;

import dev.openfeature.sdk.EvaluationContext;
import dev.openfeature.sdk.EventProvider;
Expand All @@ -12,8 +12,8 @@
import io.getunleash.DefaultUnleash;
import io.getunleash.Unleash;
import io.getunleash.UnleashContext;
import io.getunleash.Variant;
import io.getunleash.util.UnleashConfig;
import io.getunleash.variant.Variant;
import java.util.concurrent.atomic.AtomicBoolean;
import lombok.AccessLevel;
import lombok.Getter;
Expand All @@ -34,13 +34,13 @@ public class UnleashProvider extends EventProvider {
public static final String UNKNOWN_ERROR = "unknown error";

@Getter(AccessLevel.PROTECTED)
private UnleashProviderConfig unleashProviderConfig;
private final UnleashProviderConfig unleashProviderConfig;

@Setter(AccessLevel.PROTECTED)
@Getter
private Unleash unleash;

private AtomicBoolean isInitialized = new AtomicBoolean(false);
private final AtomicBoolean isInitialized = new AtomicBoolean(false);

/**
* Constructor.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
import dev.openfeature.sdk.ProviderEventDetails;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.getunleash.UnleashException;
import io.getunleash.event.ClientFeaturesResponse;
import io.getunleash.event.FeatureSet;
import io.getunleash.event.ImpressionEvent;
import io.getunleash.event.ToggleEvaluated;
import io.getunleash.event.UnleashEvent;
import io.getunleash.event.UnleashReady;
import io.getunleash.event.UnleashSubscriber;
import io.getunleash.metric.ClientMetrics;
import io.getunleash.metric.ClientRegistration;
import io.getunleash.repository.FeatureCollection;
import io.getunleash.repository.FeatureToggleResponse;
import io.getunleash.repository.ToggleCollection;
import javax.annotation.Nullable;
import lombok.Generated;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -24,8 +23,8 @@
@Generated
public class UnleashSubscriberWrapper implements UnleashSubscriber {

private UnleashSubscriber unleashSubscriber;
private EventProvider eventProvider;
private final UnleashSubscriber unleashSubscriber;
private final EventProvider eventProvider;

/**
* Constructor.
Expand Down Expand Up @@ -67,9 +66,9 @@ public void toggleEvaluated(ToggleEvaluated toggleEvaluated) {
}

@Override
public void togglesFetched(FeatureToggleResponse toggleResponse) {
public void togglesFetched(ClientFeaturesResponse toggleResponse) {
unleashSubscriber.togglesFetched(toggleResponse);
if (FeatureToggleResponse.Status.CHANGED.equals(toggleResponse.getStatus())) {
if (ClientFeaturesResponse.Status.CHANGED.equals(toggleResponse.getStatus())) {
eventProvider.emitProviderConfigurationChanged(ProviderEventDetails.builder()
.eventMetadata(ImmutableMetadata.builder().build())
.build());
Expand All @@ -87,33 +86,18 @@ public void clientRegistered(ClientRegistration clientRegistration) {
}

@Override
public void togglesBackedUp(ToggleCollection toggleCollection) {
unleashSubscriber.togglesBackedUp(toggleCollection);
public void featuresBackedUp(FeatureSet toggleCollection) {
unleashSubscriber.featuresBackedUp(toggleCollection);
}

@Override
public void toggleBackupRestored(ToggleCollection toggleCollection) {
unleashSubscriber.toggleBackupRestored(toggleCollection);
public void featuresBackupRestored(FeatureSet toggleCollection) {
unleashSubscriber.featuresBackupRestored(toggleCollection);
}

@Override
public void togglesBootstrapped(ToggleCollection toggleCollection) {
unleashSubscriber.togglesBootstrapped(toggleCollection);
}

@Override
public void featuresBootstrapped(FeatureCollection featureCollection) {
unleashSubscriber.featuresBootstrapped(featureCollection);
}

@Override
public void featuresBackedUp(FeatureCollection featureCollection) {
unleashSubscriber.featuresBackedUp(featureCollection);
}

@Override
public void featuresBackupRestored(FeatureCollection featureCollection) {
unleashSubscriber.featuresBackupRestored(featureCollection);
public void featuresBootstrapped(FeatureSet toggleCollection) {
unleashSubscriber.featuresBootstrapped(toggleCollection);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import dev.openfeature.sdk.Value;
import io.getunleash.UnleashContext;
import io.getunleash.UnleashException;
import io.getunleash.event.ClientFeaturesResponse;
import io.getunleash.event.ToggleEvaluated;
import io.getunleash.event.UnleashEvent;
import io.getunleash.event.UnleashSubscriber;
import io.getunleash.repository.FeatureToggleResponse;
import io.getunleash.util.UnleashConfig;
import java.net.URI;
import java.net.URL;
Expand Down Expand Up @@ -230,7 +230,9 @@ void getEvaluationMetadataTest() {
ProviderEvaluation<String> stringEvaluation =
unleashProvider.getStringEvaluation(VARIANT_FLAG_NAME, "", new ImmutableContext());
ImmutableMetadata flagMetadata = stringEvaluation.getFlagMetadata();
assertEquals("default", flagMetadata.getString("variant-stickiness"));
// TODO since v11 this returns null instead of the value features.json, while it returned "default" before
// cf https://github.com/Unleash/unleash-java-sdk/issues/316
assertEquals(null, flagMetadata.getString("variant-stickiness"));
assertEquals("string", flagMetadata.getString("payload-type"));
assertEquals(true, flagMetadata.getBoolean("enabled"));
ProviderEvaluation<String> nonExistingFlagEvaluation =
Expand Down Expand Up @@ -286,16 +288,12 @@ void subscriberWrapperTest() {
unleashSubscriberWrapper.featuresBootstrapped(null);
unleashSubscriberWrapper.impression(null);
unleashSubscriberWrapper.toggleEvaluated(new ToggleEvaluated("dummy", false));
unleashSubscriberWrapper.togglesFetched(
new FeatureToggleResponse(FeatureToggleResponse.Status.NOT_CHANGED, 200));
unleashSubscriberWrapper.toggleBackupRestored(null);
unleashSubscriberWrapper.togglesBackedUp(null);
unleashSubscriberWrapper.togglesBootstrapped(null);
unleashSubscriberWrapper.togglesFetched(ClientFeaturesResponse.notChanged());
}

private class TestSubscriber implements UnleashSubscriber {

private FeatureToggleResponse.Status status;
private ClientFeaturesResponse.Status status;

private String toggleName;
private boolean toggleEnabled;
Expand All @@ -320,7 +318,7 @@ public void toggleEvaluated(ToggleEvaluated toggleEvaluated) {
}

@Override
public void togglesFetched(FeatureToggleResponse toggleResponse) {
public void togglesFetched(ClientFeaturesResponse toggleResponse) {
this.status = toggleResponse.getStatus();
}
}
Expand Down
2 changes: 1 addition & 1 deletion providers/unleash/src/test/resources/features.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"features": [
{
"name": "variant-flag",
Expand Down