Skip to content

Commit c742ec3

Browse files
committed
minimise formatting changes
1 parent 6a7e1c3 commit c742ec3

File tree

4 files changed

+28
-23
lines changed

4 files changed

+28
-23
lines changed

src/main/java/com/flagsmith/flagengine/utils/types/TypeCasting.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class TypeCasting {
1111
* Compare the values value1 and value2 with the provided condition.
1212
*
1313
* @param condition SegmentCondition criteria to compare values against.
14-
* @param value1 Value to compare.
15-
* @param value2 Value to compare against.
14+
* @param value1 Value to compare.
15+
* @param value2 Value to compare against.
1616
*/
1717
public static Boolean compare(SegmentConditions condition, Object value1, Object value2) {
1818

@@ -39,8 +39,8 @@ public static Boolean compare(SegmentConditions condition, Object value1, Object
3939
* Run comparison with condition of primitive type.
4040
*
4141
* @param condition SegmentCondition criteria to compare values against.
42-
* @param value1 Value to compare.
43-
* @param value2 Value to compare against.
42+
* @param value1 Value to compare.
43+
* @param value2 Value to compare against.
4444
*/
4545
public static Boolean compare(SegmentConditions condition, Comparable value1, Comparable value2) {
4646
if (condition.equals(SegmentConditions.EQUAL)) {
@@ -163,8 +163,7 @@ public static Boolean isBoolean(Object str) {
163163
public static ComparableVersion toSemver(Object str) {
164164
try {
165165
String value = SemanticVersioning.isSemver((String) str)
166-
? SemanticVersioning.removeSemver((String) str)
167-
: ((String) str);
166+
? SemanticVersioning.removeSemver((String) str) : ((String) str);
168167
return new ComparableVersion(value);
169168
} catch (Exception nfe) {
170169
return null;

src/main/java/com/flagsmith/interfaces/FlagsmithSdk.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public interface FlagsmithSdk {
1616
Flags getFeatureFlags(boolean doThrow);
1717

1818
Flags identifyUserWithTraits(
19-
String identifier, List<? extends TraitModel> traits, boolean isTransient, boolean doThrow);
19+
String identifier, List<? extends TraitModel> traits, boolean isTransient, boolean doThrow
20+
);
2021

2122
FlagsmithConfig getConfig();
2223

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class Flags {
2222
/**
2323
* Build flags object from list of feature states.
2424
*
25-
* @param featureStates list of feature states
25+
* @param featureStates list of feature states
2626
* @param analyticsProcessor instance of analytics processor
2727
*/
2828
public static Flags fromFeatureStateModels(
@@ -34,7 +34,7 @@ public static Flags fromFeatureStateModels(
3434
/**
3535
* Build flags object from list of feature states.
3636
*
37-
* @param featureStates list of feature states
37+
* @param featureStates list of feature states
3838
* @param analyticsProcessor instance of analytics processor
3939
* @param defaultFlagHandler default flags (optional)
4040
*/
@@ -60,7 +60,7 @@ public static Flags fromFeatureStateModels(
6060
/**
6161
* Return the flags instance.
6262
*
63-
* @param apiFlags Dictionary with api flags
63+
* @param apiFlags Dictionary with api flags
6464
* @param analyticsProcessor instance of analytics processor
6565
* @param defaultFlagHandler handler for default flags if present
6666
*/
@@ -88,7 +88,7 @@ public static Flags fromApiFlags(
8888
/**
8989
* Return the flags instance.
9090
*
91-
* @param apiFlags Dictionary with api flags
91+
* @param apiFlags Dictionary with api flags
9292
* @param analyticsProcessor instance of analytics processor
9393
* @param defaultFlagHandler handler for default flags if present
9494
*/
@@ -116,7 +116,7 @@ public static Flags fromApiFlags(
116116
/**
117117
* Build flags object from evaluation result.
118118
*
119-
* @param evaluationResult evaluation result
119+
* @param evaluationResult evaluation result
120120
* @param analyticsProcessor instance of analytics processor
121121
* @param defaultFlagHandler handler for default flags if present
122122
*/

src/main/java/com/flagsmith/utils/ModelUtils.java

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ModelUtils {
2222
*/
2323
public static List<TraitModel> getTraitModelsFromTraitMap(Map<String, Object> traits) {
2424
return ModelUtils.getTraitModelStreamFromTraitMap(
25-
traits, () -> new TraitModel()).map(Pair::getLeft).collect(Collectors.toList());
25+
traits, () -> new TraitModel()).map(Pair::getLeft).collect(Collectors.toList());
2626
}
2727

2828
/**
@@ -34,23 +34,28 @@ public static List<TraitModel> getTraitModelsFromTraitMap(Map<String, Object> tr
3434
*/
3535
public static List<SdkTraitModel> getSdkTraitModelsFromTraitMap(Map<String, Object> traits) {
3636
return ModelUtils.getTraitModelStreamFromTraitMap(traits, () -> new SdkTraitModel()).map(
37-
(row) -> {
38-
SdkTraitModel sdkTraitModel = row.getLeft();
39-
TraitConfig traitConfig = row.getRight();
40-
sdkTraitModel.setIsTransient(traitConfig.getIsTransient());
41-
return sdkTraitModel;
42-
}).collect(Collectors.toList());
37+
(row) -> {
38+
SdkTraitModel sdkTraitModel = row.getLeft();
39+
TraitConfig traitConfig = row.getRight();
40+
sdkTraitModel.setIsTransient(traitConfig.getIsTransient());
41+
return sdkTraitModel;
42+
}
43+
).collect(Collectors.toList());
4344
}
4445

4546
private static Stream<Entry<String, TraitConfig>> getTraitConfigStreamFromTraitMap(
46-
Map<String, Object> traits) {
47+
Map<String, Object> traits
48+
) {
4749
return traits.entrySet().stream().map(
4850
row -> new AbstractMap.SimpleEntry<>(
49-
row.getKey(), TraitConfig.fromObject(row.getValue())));
51+
row.getKey(), TraitConfig.fromObject(row.getValue()))
52+
);
5053
}
5154

52-
private static <T extends TraitModel> Stream<Pair<T, TraitConfig>>
53-
getTraitModelStreamFromTraitMap(Map<String, Object> traits, Supplier<T> traitSupplier) {
55+
private static <T extends TraitModel> Stream<Pair<T, TraitConfig>>
56+
getTraitModelStreamFromTraitMap(
57+
Map<String, Object> traits, Supplier<T> traitSupplier
58+
) {
5459
return ModelUtils.getTraitConfigStreamFromTraitMap(traits).map(
5560
(row) -> {
5661
T trait = traitSupplier.get();

0 commit comments

Comments
 (0)