Skip to content

Commit

Permalink
#1341 update java client library feature flag methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@kawcl
kawcl committed Sep 19, 2024
1 parent 76b1063 commit 5b8441a
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 219 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
.dccache
node_modules
.vscode
setup_upgrade.sh
setup_upgrade.sh
.idea
*.iml
141 changes: 66 additions & 75 deletions clientlibs/java/src/main/java/org/upgradeplatform/client/ExperimentClient.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
package org.upgradeplatform.client;

import static org.upgradeplatform.utils.Utils.*;
import static org.upgradeplatform.utils.Utils.ADD_MATRIC;
import static org.upgradeplatform.utils.Utils.FEATURE_FLAGS;
import static org.upgradeplatform.utils.Utils.GET_ALL_EXPERIMENTS;
import static org.upgradeplatform.utils.Utils.INITIALIZE_USER;
import static org.upgradeplatform.utils.Utils.INVALID_STUDENT_ID;
import static org.upgradeplatform.utils.Utils.LOG_EVENT;
import static org.upgradeplatform.utils.Utils.MARK_EXPERIMENT_POINT;
import static org.upgradeplatform.utils.Utils.MAX_RETRIES;
import static org.upgradeplatform.utils.Utils.PATCH;
import static org.upgradeplatform.utils.Utils.SET_ALT_USER_IDS;
import static org.upgradeplatform.utils.Utils.SET_GROUP_MEMBERSHIP;
import static org.upgradeplatform.utils.Utils.SET_WORKING_GROUP;
import static org.upgradeplatform.utils.Utils.isStringNull;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand All @@ -21,6 +32,7 @@
import org.eclipse.jdt.annotation.NonNull;
import org.upgradeplatform.interfaces.ResponseCallback;
import org.upgradeplatform.requestbeans.ExperimentRequest;
import org.upgradeplatform.requestbeans.FeatureFlagsRequest;
import org.upgradeplatform.requestbeans.GroupMetric;
import org.upgradeplatform.requestbeans.LogInput;
import org.upgradeplatform.requestbeans.LogRequest;
Expand All @@ -29,31 +41,30 @@
import org.upgradeplatform.requestbeans.MetricUnitBody;
import org.upgradeplatform.requestbeans.SingleMetric;
import org.upgradeplatform.requestbeans.UserAlias;
import org.upgradeplatform.responsebeans.UserAliasResponse;
import org.upgradeplatform.responsebeans.Assignment;
import org.upgradeplatform.responsebeans.Condition;
import org.upgradeplatform.responsebeans.ErrorResponse;
import org.upgradeplatform.responsebeans.ExperimentUser;
import org.upgradeplatform.responsebeans.ExperimentsResponse;
import org.upgradeplatform.responsebeans.Factor;
import org.upgradeplatform.responsebeans.FeatureFlag;
import org.upgradeplatform.responsebeans.InitializeUser;
import org.upgradeplatform.responsebeans.LogEventResponse;
import org.upgradeplatform.responsebeans.MarkDecisionPoint;
import org.upgradeplatform.responsebeans.Metric;
import org.upgradeplatform.responsebeans.Variation;
import org.upgradeplatform.responsebeans.UserAliasResponse;
import org.upgradeplatform.utils.APIService;
import org.upgradeplatform.utils.PublishingRetryCallback;
import org.upgradeplatform.utils.Utils.MarkedDecisionPointStatus;
import org.upgradeplatform.utils.Utils.RequestType;

public class ExperimentClient implements AutoCloseable {

private List<ExperimentsResponse> allExperiments;
private List<FeatureFlag> allFeatureFlag;
private final String userId;
private final APIService apiService;

private List<ExperimentsResponse> allExperiments;
private List<String> allFeatureFlags;

/** @param properties
* Properties to permit users to control how the underlying JAX-RS
* client behaves. These are passed through to
Expand Down Expand Up @@ -406,82 +417,62 @@ public void failed(Throwable throwable) {

}

public void getAllFeatureFlags(final ResponseCallback<List<FeatureFlag>> callbacks) {

AsyncInvoker invocation = this.apiService.prepareRequest(GET_ALL_FEATURE_FLAGS);

invocation.get(new PublishingRetryCallback<>(invocation, MAX_RETRIES, RequestType.GET,new InvocationCallback<Response>() {

@Override
public void completed(Response response) {
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
readResponseToCallback(response, callbacks, new GenericType<List<FeatureFlag>>() {})
.ifPresent(aff -> allFeatureFlag = aff);

} else {
String status = Response.Status.fromStatusCode(response.getStatus()).toString();
ErrorResponse error = new ErrorResponse(response.getStatus(), response.readEntity( String.class ), status );
if (callbacks != null)
callbacks.onError(error);
}
}

@Override
public void failed(Throwable throwable) {
callbacks.onError(new ErrorResponse(throwable.getMessage()));
}
}));

}

public void getFeatureFlag(String key, final ResponseCallback<FeatureFlag> callbacks) {
if (this.allFeatureFlag != null) {

FeatureFlag result = findFeatureFlag(key, allFeatureFlag);

public void getAllFeatureFlags(String context, final ResponseCallback<List<String>> callbacks) {
if (this.allFeatureFlags != null) {
if (callbacks != null) {
callbacks.onSuccess(result);
callbacks.onSuccess(allFeatureFlags);
}
} else {
throw new IllegalArgumentException(FEATURE_FLAGS_EMPTY);
}
}

private FeatureFlag findFeatureFlag(String key, List<FeatureFlag> featureFlags) {
FeatureFlag featureFlag = featureFlags.stream()
.filter(t -> t.getKey().equals(key))
.findFirst()
.orElse(new FeatureFlag());
Entity<FeatureFlagsRequest> requestContent = Entity.json(new FeatureFlagsRequest(this.userId, context));

return getActiveVariation(featureFlag);
}

private FeatureFlag getActiveVariation(FeatureFlag featureFlag) {
AsyncInvoker invocation = this.apiService.prepareRequest(FEATURE_FLAGS);
invocation.post(requestContent, new PublishingRetryCallback<>(invocation, requestContent, MAX_RETRIES, RequestType.POST, new InvocationCallback<Response>() {
@Override
public void completed(Response response) {
if (response.getStatus() == Response.Status.OK.getStatusCode()) {
// Cache featureFlag data for future requests
readResponseToCallback(response, callbacks, new GenericType<List<String>>() {})
.ifPresent(flags -> allFeatureFlags = flags);
} else {
String status = Response.Status.fromStatusCode(response.getStatus()).toString();
ErrorResponse error = new ErrorResponse(response.getStatus(), response.readEntity(String.class), status);
if (callbacks != null)
callbacks.onError(error);
}
}

if(isStringNull(featureFlag.getId())) {
return featureFlag;
@Override
public void failed(Throwable throwable) {
callbacks.onError(new ErrorResponse(throwable.getMessage()));
}
}));
}

FeatureFlag resultFeatureFlag = new FeatureFlag(featureFlag);

if(featureFlag.getVariations().size() > 0) {
List<Variation> variations = featureFlag.getVariations();
Variation activeVariation;

activeVariation = variations.stream()
.filter(t -> t.getDefaultVariation().contains(featureFlag.getStatus()))
.findFirst()
.orElse(new Variation());

List<Variation> result = new ArrayList<>();
result.add(activeVariation);

resultFeatureFlag.setVariations(result);
}

return resultFeatureFlag;
}

public void getFeatureFlag(String context, String featureFlag, final ResponseCallback<Boolean> callbacks) {
if (this.allFeatureFlags != null) {
if (callbacks != null) {
callbacks.onSuccess(this.allFeatureFlags.contains(featureFlag));
}
} else {
this.getAllFeatureFlags(context, new ResponseCallback<List<String>>() {
@Override
public void onSuccess(@NonNull List<String> featureFlags) {
if (callbacks != null) {
callbacks.onSuccess(featureFlags.contains(featureFlag));
}
}

@Override
public void onError(@NonNull ErrorResponse error) {
if (callbacks != null) {
callbacks.onError(error);
}
}
});
}
}

public void setAltUserIds(final List<String> altUserIds, final ResponseCallback<UserAliasResponse> callbacks) {

UserAlias userAlias = new UserAlias(this.userId, altUserIds );
Expand Down
25 changes: 24 additions & 1 deletion clientlibs/java/src/main/java/org/upgradeplatform/client/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -122,6 +121,30 @@ public void onError(@NonNull ErrorResponse error){
result.complete(error.toString());
}
});

System.out.println(prefix() + "getting feature flags");
experimentClient.getAllFeatureFlags("assign-prog-test", new ResponseCallback<List<String>>() {
@Override
public void onSuccess(@NonNull List<String> featureFlags) {
System.out.println(prefix() + "featureFlags = " + featureFlags);
experimentClient.getFeatureFlag("assign-prog-test", "main-java".toUpperCase(), new ResponseCallback<Boolean>() {
@Override
public void onSuccess(@NonNull Boolean found) {
System.out.println(prefix() + "featureFlag (MAIN-JAVA) found = " + found);
}

@Override
public void onError(@NonNull ErrorResponse error) {
result.complete(error.toString());
}
});
}

@Override
public void onError(@NonNull ErrorResponse error) {
result.complete(error.toString());
}
});
}

@Override
Expand Down
29 changes: 29 additions & 0 deletions clientlibs/java/src/main/java/org/upgradeplatform/requestbeans/FeatureFlagsRequest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.upgradeplatform.requestbeans;

public class FeatureFlagsRequest {
private String userId;
private String context;

public FeatureFlagsRequest() {}

public FeatureFlagsRequest(String userId, String context) {
this.userId = userId;
this.context = context;
}

public String getContext() {
return context;
}

public void setContext(String context) {
this.context = context;
}

public String getUserId() {
return userId;
}

public void setUserId(String userId) {
this.userId = userId;
}
}
Loading

0 comments on commit 5b8441a

Please sign in to comment.