Skip to content

Commit 711ff13

Browse files
khvn26khvn26
committed
...but they don't belong to the engine anymore
1 parent c5821d9 commit 711ff13

12 files changed

Lines changed: 38 additions & 38 deletions

‎src/main/java/com/flagsmith/mappers/EngineMappers.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
import com.flagsmith.flagengine.SegmentRule;
1414
import com.flagsmith.flagengine.Segments;
1515
import com.flagsmith.flagengine.Traits;
16-
import com.flagsmith.flagengine.environments.EnvironmentModel;
17-
import com.flagsmith.flagengine.features.FeatureModel;
18-
import com.flagsmith.flagengine.features.FeatureSegmentModel;
19-
import com.flagsmith.flagengine.features.FeatureStateModel;
20-
import com.flagsmith.flagengine.features.MultivariateFeatureStateValueModel;
21-
import com.flagsmith.flagengine.identities.IdentityModel;
22-
import com.flagsmith.flagengine.projects.ProjectModel;
23-
import com.flagsmith.flagengine.segments.SegmentConditionModel;
24-
import com.flagsmith.flagengine.segments.SegmentModel;
25-
import com.flagsmith.flagengine.segments.SegmentRuleModel;
2616
import com.flagsmith.flagengine.segments.constants.SegmentConditions;
2717
import com.flagsmith.models.SegmentMetadata;
18+
import com.flagsmith.models.environments.EnvironmentModel;
19+
import com.flagsmith.models.features.FeatureModel;
20+
import com.flagsmith.models.features.FeatureSegmentModel;
21+
import com.flagsmith.models.features.FeatureStateModel;
22+
import com.flagsmith.models.features.MultivariateFeatureStateValueModel;
23+
import com.flagsmith.models.identities.IdentityModel;
24+
import com.flagsmith.models.projects.ProjectModel;
25+
import com.flagsmith.models.segments.SegmentConditionModel;
26+
import com.flagsmith.models.segments.SegmentModel;
27+
import com.flagsmith.models.segments.SegmentRuleModel;
2828
import java.util.ArrayList;
2929
import java.util.HashMap;
3030
import java.util.List;

src/main/java/com/flagsmith/flagengine/environments/EnvironmentModel.java renamed to src/main/java/com/flagsmith/models/environments/EnvironmentModel.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.flagsmith.flagengine.environments;
1+
package com.flagsmith.models.environments;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.flagsmith.flagengine.features.FeatureStateModel;
5-
import com.flagsmith.flagengine.identities.IdentityModel;
6-
import com.flagsmith.flagengine.projects.ProjectModel;
4+
import com.flagsmith.models.features.FeatureStateModel;
5+
import com.flagsmith.models.identities.IdentityModel;
6+
import com.flagsmith.models.projects.ProjectModel;
77
import com.flagsmith.utils.models.BaseModel;
88
import java.util.List;
99
import lombok.Data;
@@ -25,4 +25,4 @@ public class EnvironmentModel extends BaseModel {
2525

2626
@JsonProperty("identity_overrides")
2727
private List<IdentityModel> identityOverrides;
28-
}
28+
}

src/main/java/com/flagsmith/flagengine/features/FeatureModel.java renamed to src/main/java/com/flagsmith/models/features/FeatureModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flagsmith.flagengine.features;
1+
package com.flagsmith.models.features;
22

33
import lombok.Data;
44

@@ -7,4 +7,4 @@ public class FeatureModel {
77
private Integer id;
88
private String name;
99
private String type;
10-
}
10+
}

src/main/java/com/flagsmith/flagengine/features/FeatureSegmentModel.java renamed to src/main/java/com/flagsmith/models/features/FeatureSegmentModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.flagsmith.flagengine.features;
1+
package com.flagsmith.models.features;
22

3-
import com.flagsmith.flagengine.utils.models.BaseModel;
3+
import com.flagsmith.utils.models.BaseModel;
44
import lombok.Data;
55

66
@Data
77
public class FeatureSegmentModel extends BaseModel {
88
private Integer priority;
9-
}
9+
}

src/main/java/com/flagsmith/flagengine/features/FeatureStateModel.java renamed to src/main/java/com/flagsmith/models/features/FeatureStateModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flagsmith.flagengine.features;
1+
package com.flagsmith.models.features;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.flagsmith.utils.models.BaseModel;
@@ -20,4 +20,4 @@ public class FeatureStateModel extends BaseModel {
2020
private Object value;
2121
@JsonProperty("feature_segment")
2222
private FeatureSegmentModel featureSegment;
23-
}
23+
}

src/main/java/com/flagsmith/flagengine/features/MultivariateFeatureOptionModel.java renamed to src/main/java/com/flagsmith/models/features/MultivariateFeatureOptionModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.flagsmith.flagengine.features;
1+
package com.flagsmith.models.features;
22

33
import com.flagsmith.utils.models.BaseModel;
44
import lombok.Data;
55

66
@Data
77
public class MultivariateFeatureOptionModel extends BaseModel {
88
private String value;
9-
}
9+
}

src/main/java/com/flagsmith/flagengine/features/MultivariateFeatureStateValueModel.java renamed to src/main/java/com/flagsmith/models/features/MultivariateFeatureStateValueModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flagsmith.flagengine.features;
1+
package com.flagsmith.models.features;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.flagsmith.utils.models.BaseModel;
@@ -14,4 +14,4 @@ public class MultivariateFeatureStateValueModel extends BaseModel {
1414
private Integer id;
1515
@JsonProperty("mv_fs_value_uuid")
1616
private String mvFsValueUuid = UUID.randomUUID().toString();
17-
}
17+
}

src/main/java/com/flagsmith/flagengine/identities/IdentityModel.java renamed to src/main/java/com/flagsmith/models/identities/IdentityModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.flagsmith.flagengine.identities;
1+
package com.flagsmith.models.identities;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.flagsmith.flagengine.features.FeatureStateModel;
4+
import com.flagsmith.models.features.FeatureStateModel;
55
import com.flagsmith.utils.models.BaseModel;
66
import java.sql.Date;
77
import java.util.ArrayList;
@@ -20,4 +20,4 @@ public class IdentityModel extends BaseModel {
2020
private String identityUuid = UUID.randomUUID().toString();
2121
@JsonProperty("identity_features")
2222
private List<FeatureStateModel> identityFeatures = new ArrayList<>();
23-
}
23+
}

src/main/java/com/flagsmith/flagengine/projects/ProjectModel.java renamed to src/main/java/com/flagsmith/models/projects/ProjectModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.flagsmith.flagengine.projects;
1+
package com.flagsmith.models.projects;
22

3-
import com.flagsmith.flagengine.segments.SegmentModel;
3+
import com.flagsmith.models.segments.SegmentModel;
44
import com.flagsmith.utils.models.BaseModel;
55
import java.util.List;
66
import lombok.Data;
77

88
@Data
99
public class ProjectModel extends BaseModel {
1010
private List<SegmentModel> segments;
11-
}
11+
}

src/main/java/com/flagsmith/flagengine/segments/SegmentConditionModel.java renamed to src/main/java/com/flagsmith/models/segments/SegmentConditionModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.flagsmith.flagengine.segments;
1+
package com.flagsmith.models.segments;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.flagsmith.flagengine.segments.constants.SegmentConditions;
@@ -10,4 +10,4 @@ public class SegmentConditionModel {
1010
private String value;
1111
@JsonProperty("property_")
1212
private String property;
13-
}
13+
}

0 commit comments

Comments
 (0)