self review

Author: tanderson-ld

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/DataSourceUpdatesImpl.java

@@ -368,9 +368,7 @@ private void onTimeout() {
   private static String describeErrorCount(Map.Entry<ErrorInfo, Integer> entry) {
     return entry.getKey() + " (" + entry.getValue() + (entry.getValue() == 1 ? " time" : " times") + ")";
   }
-  
-  // ===== ITransactionalDataSourceUpdates methods =====
-  
+    
   @Override
   public boolean apply(ChangeSet<ItemDescriptor> changeSet) {
     if (store instanceof TransactionalDataStore) {

lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DataSourceUpdatesImplTest.java

@@ -158,8 +158,78 @@ private static ChangeSet<ItemDescriptor> makePartialChangeSet(FeatureFlag... fla
         null
     );
   }
-  
-  // ===== Tests =====
+
+  private static class LegacyDataStore implements DataStore {
+    private final Map<DataKind, Map<String, ItemDescriptor>> data = new HashMap<>();
+    
+    @Override
+    public void init(FullDataSet<ItemDescriptor> allData) {
+      data.clear();
+      for (Map.Entry<DataKind, KeyedItems<ItemDescriptor>> kindEntry : allData.getData()) {
+        DataKind kind = kindEntry.getKey();
+        Map<String, ItemDescriptor> items = new HashMap<>();
+        for (Map.Entry<String, ItemDescriptor> itemEntry : kindEntry.getValue().getItems()) {
+          items.put(itemEntry.getKey(), itemEntry.getValue());
+        }
+        data.put(kind, items);
+      }
+    }
+    
+    @Override
+    public boolean upsert(DataKind kind, String key, ItemDescriptor item) {
+      Map<String, ItemDescriptor> items = data.get(kind);
+      if (items == null) {
+        items = new HashMap<>();
+        data.put(kind, items);
+      }
+      
+      ItemDescriptor oldItem = items.get(key);
+      if (oldItem != null && oldItem.getVersion() >= item.getVersion()) {
+        return false;
+      }
+      
+      items.put(key, item);
+      return true;
+    }
+    
+    @Override
+    public ItemDescriptor get(DataKind kind, String key) {
+      Map<String, ItemDescriptor> items = data.get(kind);
+      if (items != null) {
+        return items.get(key);
+      }
+      return null;
+    }
+    
+    @Override
+    public KeyedItems<ItemDescriptor> getAll(DataKind kind) {
+      Map<String, ItemDescriptor> items = data.get(kind);
+      if (items != null) {
+        return new KeyedItems<>(ImmutableList.copyOf(items.entrySet()));
+      }
+      return new KeyedItems<>(ImmutableList.of());
+    }
+    
+    @Override
+    public boolean isInitialized() {
+      return !data.isEmpty();
+    }
+    
+    @Override
+    public boolean isStatusMonitoringEnabled() {
+      return false;
+    }
+    
+    @Override
+    public DataStoreStatusProvider.CacheStats getCacheStats() {
+      return null;
+    }
+    
+    @Override
+    public void close() throws IOException {
+      // No-op
+    }
+  }
 
   @Test
   public void sendsEventsOnInitForNewlyAddedFlags() throws Exception {
@@ -823,80 +893,6 @@ public void applyPartialChangeSetSendsEventsForFlagsWhoseSegmentsChanged() throw
     expectEvents(eventSink, "flag2", "flag4");
   }
 
-  // Tests for legacy (non-transactional) data store path
-  
-  private static class LegacyDataStore implements DataStore {
-    private final Map<DataKind, Map<String, ItemDescriptor>> data = new HashMap<>();
-    
-    @Override
-    public void init(FullDataSet<ItemDescriptor> allData) {
-      data.clear();
-      for (Map.Entry<DataKind, KeyedItems<ItemDescriptor>> kindEntry : allData.getData()) {
-        DataKind kind = kindEntry.getKey();
-        Map<String, ItemDescriptor> items = new HashMap<>();
-        for (Map.Entry<String, ItemDescriptor> itemEntry : kindEntry.getValue().getItems()) {
-          items.put(itemEntry.getKey(), itemEntry.getValue());
-        }
-        data.put(kind, items);
-      }
-    }
-    
-    @Override
-    public boolean upsert(DataKind kind, String key, ItemDescriptor item) {
-      Map<String, ItemDescriptor> items = data.get(kind);
-      if (items == null) {
-        items = new HashMap<>();
-        data.put(kind, items);
-      }
-      
-      ItemDescriptor oldItem = items.get(key);
-      if (oldItem != null && oldItem.getVersion() >= item.getVersion()) {
-        return false;
-      }
-      
-      items.put(key, item);
-      return true;
-    }
-    
-    @Override
-    public ItemDescriptor get(DataKind kind, String key) {
-      Map<String, ItemDescriptor> items = data.get(kind);
-      if (items != null) {
-        return items.get(key);
-      }
-      return null;
-    }
-    
-    @Override
-    public KeyedItems<ItemDescriptor> getAll(DataKind kind) {
-      Map<String, ItemDescriptor> items = data.get(kind);
-      if (items != null) {
-        return new KeyedItems<>(ImmutableList.copyOf(items.entrySet()));
-      }
-      return new KeyedItems<>(ImmutableList.of());
-    }
-    
-    @Override
-    public boolean isInitialized() {
-      return !data.isEmpty();
-    }
-    
-    @Override
-    public boolean isStatusMonitoringEnabled() {
-      return false;
-    }
-    
-    @Override
-    public DataStoreStatusProvider.CacheStats getCacheStats() {
-      return null;
-    }
-    
-    @Override
-    public void close() throws IOException {
-      // No-op
-    }
-  }
-  
   @Test
   public void applyFullChangeSetToLegacyStoreCallsInit() throws Exception {
     LegacyDataStore legacyStore = new LegacyDataStore();