Skip to content

no assignedCondition null in java lib #1441

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.

Sign up for GitHub

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

Merged
danoswaltCL merged 1 commit into from
Apr 11, 2024
Merged

no assignedCondition null in java lib #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions clientlibs/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
at the same time that happen to rev to the same new version will be caught
by a merge conflict. -->

<!-- 5.0.12 -> 5.0.13: no retries for 4xx, retry other errors once instead of 3 times -->

<version>5.0.13</version>
<version>5.0.14</version>
Copy link
Copy Markdown
Contributor

@jerith666 jerith666 Apr 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's worthwhile to keep the comments, it guards against two different PRs trying to claim the same version at the same time.

<build>
<plugins>
<plugin>
Expand Down
6 changes: 5 additions & 1 deletion clientlibs/java/src/main/java/org/upgradeplatform/client/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import org.eclipse.jdt.annotation.NonNull;
import org.upgradeplatform.interfaces.ResponseCallback;
import org.upgradeplatform.requestbeans.MarkExperimentRequestData;
import org.upgradeplatform.responsebeans.Assignment;
import org.upgradeplatform.responsebeans.Condition;
import org.upgradeplatform.responsebeans.ErrorResponse;
Expand Down Expand Up @@ -72,7 +73,10 @@ public void onSuccess(@NonNull Assignment expResult){
String code = condition == null ? null : condition.getConditionCode();
System.out.println(condition);
System.out.println(code);
expResult.markDecisionPoint(MarkedDecisionPointStatus.CONDITION_APPLIED, new Date().toString(), new ResponseCallback<MarkDecisionPoint>(){
MarkExperimentRequestData data = new MarkExperimentRequestData(site, target, null);
System.out.println(data.getAssignedCondition());

experimentClient.markDecisionPoint(MarkedDecisionPointStatus.CONDITION_APPLIED, data, new ResponseCallback<MarkDecisionPoint>(){
@Override
public void onSuccess(@NonNull MarkDecisionPoint markResult){
result.complete("marked " + code + ": " + markResult.toString());
Expand Down
8 changes: 4 additions & 4 deletions ...ntlibs/java/src/main/java/org/upgradeplatform/requestbeans/MarkExperimentRequestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class MarkExperimentRequestData {

private String site;
private String target;
private Condition assignedCondition;
private Condition assignedCondition = new Condition();
private Map<String, Factor> assignedFactor;

public MarkExperimentRequestData(){
Expand All @@ -25,14 +25,14 @@ public MarkExperimentRequestData(String site, String target, Condition assignedC
super();
this.site = site;
this.target = target;
this.assignedCondition = assignedCondition;
this.assignedCondition = assignedCondition != null ? assignedCondition : new Condition();
}

public MarkExperimentRequestData(String site, String target, Condition assignedCondition, Map<String, Factor> assignedFactor){
super();
this.site = site;
this.target = target;
this.assignedCondition = assignedCondition;
this.assignedCondition = assignedCondition != null ? assignedCondition : new Condition();
this.assignedFactor = assignedFactor;
}

Expand All @@ -57,7 +57,7 @@ public Condition getAssignedCondition() {
}

public void setAssignedCondition(Condition assignedCondition) {
this.assignedCondition = assignedCondition;
this.assignedCondition = assignedCondition != null ? assignedCondition : new Condition();
}

public Map<String, Factor> getAssignedFactor() {
Expand Down