Skip to content

Commit 5cc92bf

Browse files
committed
chore: refactored result builders for SwitcherResult factory
1 parent 4775106 commit 5cc92bf

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/main/java/com/github/switcherapi/client/service/SwitcherFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public static SwitcherResult buildFromDefault(SwitcherRequest switcher) {
1717
DEFAULT_REASON, switcher.getEntry());
1818
}
1919

20-
public static SwitcherResult buildResultFail(String reason, SwitcherRequest switcher) {
20+
public static SwitcherResult buildResultDisabled(String reason, SwitcherRequest switcher) {
2121
return new SwitcherResult(switcher.getSwitcherKey(), Boolean.FALSE, reason, switcher.getEntry());
2222
}
2323

24-
public static SwitcherResult buildResultSuccess(SwitcherRequest switcher) {
24+
public static SwitcherResult buildResultEnabled(SwitcherRequest switcher) {
2525
return new SwitcherResult(switcher.getSwitcherKey(), Boolean.TRUE, DEFAULT_SUCCESS, switcher.getEntry());
2626
}
2727

src/main/java/com/github/switcherapi/client/service/local/ClientLocalService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public List<String> checkSwitchers(final Set<String> switchers, final Domain dom
6565
@Override
6666
public SwitcherResult executeCriteria(final SwitcherRequest switcher, final Domain domain) {
6767
if (!domain.isActivated()) {
68-
return SwitcherFactory.buildResultFail(DISABLED_DOMAIN, switcher);
68+
return SwitcherFactory.buildResultDisabled(DISABLED_DOMAIN, switcher);
6969
}
7070

7171
Config config;
@@ -82,22 +82,22 @@ public SwitcherResult executeCriteria(final SwitcherRequest switcher, final Doma
8282

8383
private SwitcherResult getSwitcherResult(SwitcherRequest switcher, Group group, Config config) {
8484
if (!group.isActivated()) {
85-
return SwitcherFactory.buildResultFail(DISABLED_GROUP, switcher);
85+
return SwitcherFactory.buildResultDisabled(DISABLED_GROUP, switcher);
8686
}
8787

8888
if (!config.isActivated()) {
89-
return SwitcherFactory.buildResultFail(DISABLED_CONFIG, switcher);
89+
return SwitcherFactory.buildResultDisabled(DISABLED_CONFIG, switcher);
9090
}
9191

9292
if (config.hasRelayEnabled() && switcher.isRelayRestricted()) {
93-
return SwitcherFactory.buildResultFail(HAS_RELAY, switcher);
93+
return SwitcherFactory.buildResultDisabled(HAS_RELAY, switcher);
9494
}
9595

9696
if (ArrayUtils.isNotEmpty(config.getStrategies())) {
9797
return this.processOperation(config.getStrategies(), switcher.getEntry(), switcher);
9898
}
9999

100-
return SwitcherFactory.buildResultSuccess(switcher);
100+
return SwitcherFactory.buildResultEnabled(switcher);
101101
}
102102

103103
private Config findConfigInGroup(final Group group, final String switcherKey) {
@@ -135,11 +135,11 @@ private SwitcherResult processOperation(final Strategy[] configStrategies, final
135135
}
136136
}
137137

138-
return SwitcherFactory.buildResultSuccess(switcher);
138+
return SwitcherFactory.buildResultEnabled(switcher);
139139
}
140140

141141
private SwitcherResult strategyFailed(SwitcherRequest switcher, Strategy strategy, String pattern) {
142-
return SwitcherFactory.buildResultFail(String.format(pattern, strategy.getStrategy()), switcher);
142+
return SwitcherFactory.buildResultDisabled(String.format(pattern, strategy.getStrategy()), switcher);
143143
}
144144

145145
private Entry tryGetSwitcherInput(final List<Entry> input, Strategy strategy) {

0 commit comments

Comments
 (0)