bot comments

Author: tanderson-ld

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/integrations/TestDataV2.java

@@ -362,8 +362,6 @@ public CompletableFuture<FDv2SourceResult> next() {
             queue.addFirst(FDv2SourceResult.changeSet(makeFullChangeSet(), false));
           }
         }
-      }
-      synchronized (queueLock) {
         if (!queue.isEmpty()) {
           return CompletableFuture.completedFuture(queue.removeFirst());
         }

lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/integrations/TestDataTest.java

@@ -95,6 +95,8 @@ public void initializesWithFlags() throws Exception {
     ItemDescriptor flag2 = flags.get("flag2");
     assertThat(flag1, not(nullValue()));
     assertThat(flag2, not(nullValue()));
+    assertThat(flag1.getVersion(), equalTo(1));
+    assertThat(flag2.getVersion(), equalTo(1));
 
     assertJsonEquals(flagJson(expectedFlag1, 1), flagJson(flag1));
     assertJsonEquals(flagJson(expectedFlag2, 1), flagJson(flag2));
@@ -119,8 +121,8 @@ public void addsFlag() throws Exception {
     assertThat(up.kind, is(DataModel.FEATURES));
     assertThat(up.key, equalTo("flag1"));
     ItemDescriptor flag1 = up.item;
-    
-    assertJsonEquals(flagJson(expectedFlag, 2), flagJson(flag1));
+    assertThat(flag1.getVersion(), equalTo(1));
+    assertJsonEquals(flagJson(expectedFlag, 1), flagJson(flag1));
   }
 
   @Test
@@ -150,7 +152,7 @@ public void updatesFlag() throws Exception {
     assertThat(up.kind, is(DataModel.FEATURES));
     assertThat(up.key, equalTo("flag1"));
     ItemDescriptor flag1 = up.item;
-    
+    assertThat(flag1.getVersion(), equalTo(2));
     expectedFlag.on(true).version(2);
     assertJsonEquals(flagJson(expectedFlag, 2), flagJson(flag1));
   }
@@ -442,6 +444,7 @@ private void verifyFlag(
     assertThat(updates.upserts.size(), equalTo(1));
     UpsertParams up = updates.upserts.take();
     ItemDescriptor flag = up.item;
+    assertThat(flag.getVersion(), equalTo(1));
     assertJsonEquals(flagJson(expectedFlag, 1), flagJson(flag));
   }
 

lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/integrations/TestDataV2Test.java

@@ -108,6 +108,8 @@ public void initializesWithFlags() throws Exception {
     ItemDescriptor flag2 = flags.get("flag2");
     assertThat(flag1, not(nullValue()));
     assertThat(flag2, not(nullValue()));
+    assertThat(flag1.getVersion(), equalTo(1));
+    assertThat(flag2.getVersion(), equalTo(1));
 
     assertJsonEquals(flagJson(expectedFlag1, 1), flagJson(flag1));
     assertJsonEquals(flagJson(expectedFlag2, 1), flagJson(flag2));
@@ -134,10 +136,11 @@ public void addsFlag() throws Exception {
     assertThat(items.size(), equalTo(1));
     ItemDescriptor flag1 = items.get("flag1");
     assertThat(flag1, not(nullValue()));
+    assertThat(flag1.getVersion(), equalTo(1));
 
     ModelBuilders.FlagBuilder expectedFlag = flagBuilder("flag1").version(1).salt("")
         .on(true).offVariation(1).fallthroughVariation(0).variations(true, false);
-    assertJsonEquals(flagJson(expectedFlag, 2), flagJson(flag1));
+    assertJsonEquals(flagJson(expectedFlag, 1), flagJson(flag1));
   }
 
   @Test
@@ -158,6 +161,7 @@ public void updatesFlag() throws Exception {
     ChangeSet<ItemDescriptor> changeSet = updateResult.getChangeSet();
     Map<String, ItemDescriptor> items = ImmutableMap.copyOf(get(changeSet.getData(), 0).getValue().getItems());
     ItemDescriptor flag1 = items.get("flag1");
+    assertThat(flag1.getVersion(), equalTo(2));
 
     ModelBuilders.FlagBuilder expectedFlag = flagBuilder("flag1").version(2).salt("")
         .on(true).offVariation(1).fallthroughVariation(0).variations(true, false)
@@ -253,6 +257,7 @@ private void verifyFlag(
     ChangeSet<ItemDescriptor> changeSet = result.getChangeSet();
     Map<String, ItemDescriptor> items = ImmutableMap.copyOf(get(changeSet.getData(), 0).getValue().getItems());
     ItemDescriptor flag = items.get("flagkey");
+    assertThat(flag.getVersion(), equalTo(1));
     assertJsonEquals(flagJson(expectedFlag, 1), flagJson(flag));
   }