remove extra FeatureStateModel

Author: khvn26

src/main/java/com/flagsmith/FlagsmithApiWrapper.java

@@ -9,9 +9,9 @@
 import com.flagsmith.interfaces.FlagsmithCache;
 import com.flagsmith.interfaces.FlagsmithSdk;
 import com.flagsmith.mappers.EngineMappers;
-import com.flagsmith.models.FeatureStateModel;
 import com.flagsmith.models.Flags;
 import com.flagsmith.models.TraitModel;
+import com.flagsmith.models.features.FeatureStateModel;
 import com.flagsmith.responses.FlagsAndTraitsResponse;
 import com.flagsmith.threads.AnalyticsProcessor;
 import com.flagsmith.threads.RequestProcessor;

src/main/java/com/flagsmith/models/FeatureStateModel.java

@@ -1,6 +1,7 @@
 package com.flagsmith.models;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.flagsmith.models.features.FeatureStateModel;
 import lombok.Data;
 
 @Data

src/main/java/com/flagsmith/models/Flag.java

@@ -7,6 +7,7 @@
 import com.flagsmith.flagengine.EvaluationResult;
 import com.flagsmith.flagengine.FlagResult;
 import com.flagsmith.interfaces.DefaultFlagHandler;
+import com.flagsmith.models.features.FeatureStateModel;
 import com.flagsmith.threads.AnalyticsProcessor;
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/flagsmith/models/Flags.java

@@ -1,7 +1,7 @@
 package com.flagsmith.responses;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.flagsmith.models.FeatureStateModel;
+import com.flagsmith.models.features.FeatureStateModel;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/flagsmith/responses/FlagsAndTraitsResponse.java

@@ -15,7 +15,7 @@
 import com.flagsmith.config.FlagsmithConfig;
 import com.flagsmith.config.Retry;
 import com.flagsmith.interfaces.FlagsmithCache;
-import com.flagsmith.models.FeatureStateModel;
+import com.flagsmith.models.features.FeatureStateModel;
 import com.flagsmith.models.Flags;
 import com.flagsmith.models.TraitModel;
 import com.flagsmith.responses.FlagsAndTraitsResponse;

src/test/java/com/flagsmith/FlagsmithApiWrapperCachingTest.java

@@ -19,7 +19,8 @@
 import com.flagsmith.config.FlagsmithConfig;
 import com.flagsmith.config.Retry;
 import com.flagsmith.models.BaseFlag;
-import com.flagsmith.models.FeatureStateModel;
+import com.flagsmith.models.features.FeatureStateModel;
+import com.flagsmith.models.features.FeatureModel;
 import com.flagsmith.models.Flag;
 import com.flagsmith.models.Flags;
 import com.flagsmith.models.TraitModel;
@@ -194,7 +195,7 @@ public void testClose_ClosesAnalyticsProcessor() {
 
   private FeatureStateModel getNewFlag() {
     final FeatureStateModel flag = new FeatureStateModel();
-    final FeatureStateModel.FeatureModel feature = flag.new FeatureModel();
+    final FeatureModel feature = new FeatureModel();
     feature.setName("my-test-flag");
     feature.setId(123);
     flag.setFeature(feature);

src/test/java/com/flagsmith/FlagsmithApiWrapperTest.java

@@ -24,7 +24,7 @@
 import com.flagsmith.models.BaseFlag;
 import com.flagsmith.models.DefaultFlag;
 import com.flagsmith.models.environments.EnvironmentModel;
-import com.flagsmith.models.FeatureStateModel;
+import com.flagsmith.models.features.FeatureStateModel;
 import com.flagsmith.models.Flags;
 import com.flagsmith.models.SdkTraitModel;
 import com.flagsmith.models.Segment;

src/test/java/com/flagsmith/FlagsmithClientTest.java

@@ -10,7 +10,8 @@
 import com.flagsmith.flagengine.EvaluationContext;
 import com.flagsmith.mappers.EngineMappers;
 import com.flagsmith.models.BaseFlag;
-import com.flagsmith.models.FeatureStateModel;
+import com.flagsmith.models.features.FeatureStateModel;
+import com.flagsmith.models.features.FeatureModel;
 import com.flagsmith.models.Flag;
 import com.flagsmith.models.TraitModel;
 import com.flagsmith.models.environments.EnvironmentModel;
@@ -245,7 +246,7 @@ public static BaseFlag flag(
     result.setEnabled(enabled);
     result.setValue(value);
 
-    final FeatureStateModel.FeatureModel feature = result.new FeatureModel();
+    final FeatureModel feature = result.new FeatureModel();
     feature.setName(name);
     feature.setType(type);