refactor: restore original parameter order

Author: beekld

libs/internal/include/launchdarkly/data_model/change_set.hpp

@@ -13,8 +13,8 @@ enum class ChangeSetType {
 template <typename T>
 struct ChangeSet {
     ChangeSetType type;
-    Selector selector;
     T data;
+    Selector selector;
 };
 
 }  // namespace launchdarkly::data_model

libs/server-sdk/src/data_systems/fdv2/fdv2_changeset_translation.cpp

@@ -84,7 +84,7 @@ std::optional<ChangeSet<ChangeSetData>> TranslateChangeSet(
     Logger const& logger) {
     if (change_set.type == ChangeSetType::kNone) {
         return ChangeSet<ChangeSetData>{
-            change_set.type, change_set.selector, {}};
+            change_set.type, {}, change_set.selector};
     }
 
     ChangeSetData changes;
@@ -112,8 +112,8 @@ std::optional<ChangeSet<ChangeSetData>> TranslateChangeSet(
         }
     }
 
-    return ChangeSet<ChangeSetData>{change_set.type, change_set.selector,
-                                    std::move(changes)};
+    return ChangeSet<ChangeSetData>{change_set.type, std::move(changes),
+                                    change_set.selector};
 }
 
 }  // namespace launchdarkly::server_side::data_systems

libs/server-sdk/src/data_systems/fdv2/fdv2_polling_impl.cpp

@@ -168,7 +168,7 @@ data_interfaces::FDv2SourceResult HandleFDv2PollResponse(
     if (res.Status() == 304) {
         return FDv2SourceResult{FDv2SourceResult::ChangeSet{
             data_model::ChangeSet<data_interfaces::ChangeSetData>{
-                data_model::ChangeSetType::kNone, data_model::Selector{}, {}},
+                data_model::ChangeSetType::kNone, {}, data_model::Selector{}},
             false}};
     }
 

libs/server-sdk/tests/memory_store_apply_test.cpp

@@ -31,7 +31,7 @@ TEST(MemoryStoreApplyTest, ApplyNone_IsNoOp) {
             {"segA", SegmentDescriptor(seg_a)}},
     });
 
-    store.Apply(ChangeSet<ChangeSetData>{ChangeSetType::kNone, Selector{}, {}});
+    store.Apply(ChangeSet<ChangeSetData>{ChangeSetType::kNone, {}, Selector{}});
 
     auto fetched_flag = store.GetFlag("flagA");
     ASSERT_TRUE(fetched_flag);
@@ -43,7 +43,7 @@ TEST(MemoryStoreApplyTest, ApplyNone_IsNoOp) {
 
 TEST(MemoryStoreApplyTest, ApplyNone_DoesNotInitialize) {
     MemoryStore store;
-    store.Apply(ChangeSet<ChangeSetData>{ChangeSetType::kNone, Selector{}, {}});
+    store.Apply(ChangeSet<ChangeSetData>{ChangeSetType::kNone, {}, Selector{}});
     EXPECT_FALSE(store.Initialized());
 }
 
@@ -54,7 +54,7 @@ TEST(MemoryStoreApplyTest, ApplyNone_DoesNotInitialize) {
 TEST(MemoryStoreApplyTest, ApplyFull_SetsInitialized) {
     MemoryStore store;
     ASSERT_FALSE(store.Initialized());
-    store.Apply(ChangeSet<ChangeSetData>{ChangeSetType::kFull, Selector{}, {}});
+    store.Apply(ChangeSet<ChangeSetData>{ChangeSetType::kFull, {}, Selector{}});
     EXPECT_TRUE(store.Initialized());
 }
 
@@ -70,9 +70,9 @@ TEST(MemoryStoreApplyTest, ApplyFull_StoresItems) {
 
     store.Apply(ChangeSet<ChangeSetData>{
         ChangeSetType::kFull,
-        Selector{},
         ChangeSetData{ItemChange{"flagA", FlagDescriptor(flag_a)},
                       ItemChange{"segA", SegmentDescriptor(seg_a)}},
+        Selector{},
     });
 
     auto fetched_flag = store.GetFlag("flagA");
@@ -120,9 +120,9 @@ TEST(MemoryStoreApplyTest, ApplyFull_ClearsExistingItems) {
 
     store.Apply(ChangeSet<ChangeSetData>{
         ChangeSetType::kFull,
-        Selector{},
         ChangeSetData{ItemChange{"flagC", FlagDescriptor(flag_c)},
                       ItemChange{"segB", SegmentDescriptor(seg_b)}},
+        Selector{},
     });
 
     EXPECT_FALSE(store.GetFlag("flagA"));
@@ -163,9 +163,9 @@ TEST(MemoryStoreApplyTest, ApplyPartial_AppliesItems) {
 
     store.Apply(ChangeSet<ChangeSetData>{
         ChangeSetType::kPartial,
-        Selector{},
         ChangeSetData{ItemChange{"flagA", FlagDescriptor(flag_a_new)},
                       ItemChange{"segA", SegmentDescriptor(seg_a_new)}},
+        Selector{},
     });
 
     ASSERT_TRUE(store.GetFlag("flagA"));
@@ -211,9 +211,9 @@ TEST(MemoryStoreApplyTest, ApplyPartial_PreservesUnchangedItems) {
 
     store.Apply(ChangeSet<ChangeSetData>{
         ChangeSetType::kPartial,
-        Selector{},
         ChangeSetData{ItemChange{"flagB", FlagDescriptor(flag_b_new)},
                       ItemChange{"segB", SegmentDescriptor(seg_b_new)}},
+        Selector{},
     });
 
     ASSERT_TRUE(store.GetFlag("flagA"));