fixing class shading and review comment

Author: tanderson-ld

lib/sdk/server/build.gradle

@@ -291,7 +291,7 @@ javadoc {
 // enclosing packages like "com" that don't have any classes in them.
 def getAllSdkPackages() {
     // base package classes come from launchdarkly-java-sdk-common
-    def names = [ "com.launchdarkly.sdk", "com.launchdarkly.sdk.json", "com.launchdarkly.logging" ]
+    def names = [ "com.launchdarkly.sdk", "com.launchdarkly.sdk.json", "com.launchdarkly.sdk.fdv2", "com.launchdarkly.logging" ]
     project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output.each { baseDir ->
         if (baseDir.getPath().contains("classes" + File.separator + "java" + File.separator + "main")) {
             baseDir.eachFileRecurse { f ->

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

@@ -142,6 +142,9 @@ public static FullDataSet<ItemDescriptor> sortAllCollections(FullDataSet<ItemDes
    * @return a sorted copy of the changeset
    */
   public static ChangeSet<Iterable<Map.Entry<DataKind, KeyedItems<ItemDescriptor>>>> sortChangeset(ChangeSet<Iterable<Map.Entry<DataKind, KeyedItems<ItemDescriptor>>>> inSet) {
+    if (inSet.getData() == null) {
+      return inSet;
+    }
     ImmutableSortedMap.Builder<DataKind, KeyedItems<ItemDescriptor>> builder =
         ImmutableSortedMap.orderedBy(dataKindPriorityOrder);
     for (Map.Entry<DataKind, KeyedItems<ItemDescriptor>> entry: inSet.getData()) {

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

@@ -15,6 +15,7 @@
 import com.launchdarkly.sdk.json.SerializationException;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Date;
 import java.util.concurrent.CompletableFuture;
@@ -91,7 +92,7 @@ protected CompletableFuture<FDv2SourceResult> poll(Selector selector, boolean on
                 return FDv2SourceResult.changeSet(
                         new ChangeSet<>(ChangeSetType.None,
                                 Selector.EMPTY,
-                                null,
+                                Collections.emptyList(),
                                 null, // Header derived values will have been handled on initial response.
                                 true // Polling data from LaunchDarkly should be persisted
                         ),