From 03d4ca49282a960954ec47b2c224fd5879634c10 Mon Sep 17 00:00:00 2001
From: danoswaltCL <97542869+danoswaltCL@users.noreply.github.com>
Date: Thu, 11 Apr 2024 16:30:25 -0400
Subject: [PATCH] no assignedCondition null in java lib

---
 clientlibs/java/pom.xml                                   | 4 +---
 .../src/main/java/org/upgradeplatform/client/Main.java    | 6 +++++-
 .../requestbeans/MarkExperimentRequestData.java           | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/clientlibs/java/pom.xml b/clientlibs/java/pom.xml
index e407f45721..66f135727b 100644
--- a/clientlibs/java/pom.xml
+++ b/clientlibs/java/pom.xml
@@ -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>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/clientlibs/java/src/main/java/org/upgradeplatform/client/Main.java b/clientlibs/java/src/main/java/org/upgradeplatform/client/Main.java
index 4dd6e40a94..577b5122a4 100644
--- a/clientlibs/java/src/main/java/org/upgradeplatform/client/Main.java
+++ b/clientlibs/java/src/main/java/org/upgradeplatform/client/Main.java
@@ -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;
@@ -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());
diff --git a/clientlibs/java/src/main/java/org/upgradeplatform/requestbeans/MarkExperimentRequestData.java b/clientlibs/java/src/main/java/org/upgradeplatform/requestbeans/MarkExperimentRequestData.java
index 4361c7b976..669e553fa2 100644
--- a/clientlibs/java/src/main/java/org/upgradeplatform/requestbeans/MarkExperimentRequestData.java
+++ b/clientlibs/java/src/main/java/org/upgradeplatform/requestbeans/MarkExperimentRequestData.java
@@ -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(){
@@ -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;
   }
 
@@ -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() {