diff --git a/README.md b/README.md index 5b26a1bf..ee6944d3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ A Java SDK for Switcher API [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=switcherapi_switcher-client&metric=alert_status)](https://sonarcloud.io/dashboard?id=switcherapi_switcher-client) [![Known Vulnerabilities](https://snyk.io/test/github/switcherapi/switcher-client-java/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/switcherapi/switcher-client-java?targetFile=pom.xml) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![Maven Central](https://img.shields.io/maven-central/v/com.github.switcherapi/switcher-client.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.github.switcherapi/switcher-client) +[![Maven Central](https://img.shields.io/maven-central/v/com.switcherapi/switcher-client.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.switcherapi/switcher-client) [![Slack: Switcher-HQ](https://img.shields.io/badge/slack-@switcher/hq-blue.svg?logo=slack)](https://switcher-hq.slack.com/) @@ -38,7 +38,7 @@ https://github.com/switcherapi/switcher-api - Adding as a dependency - Maven ```xml - com.github.switcherapi + com.switcherapi switcher-client ${switcher-client.version} @@ -94,7 +94,7 @@ Instead of using SwitcherContext, which is used to automatically load from the s ```java MyAppFeatures.configure(ContextBuilder.builder() - .contextLocation("com.github.switcherapi.playground.Features") + .contextLocation("com.switcherapi.playground.Features") .apiKey("API_KEY") .url("https://switcher-api.com") .domain("Playground") diff --git a/pom.xml b/pom.xml index 9c708a56..478f35aa 100644 --- a/pom.xml +++ b/pom.xml @@ -5,10 +5,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.github.switcherapi + com.switcherapi switcher-client jar - 1.7.2 + 1.8.0-SNAPSHOT Switcher Client Switcher Client SDK for working with Switcher API diff --git a/src/main/java/com/github/switcherapi/client/service/validators/DateValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/DateValidator.java deleted file mode 100644 index 06caa4f4..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/DateValidator.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.exception.SwitcherInvalidOperationInputException; -import com.github.switcherapi.client.exception.SwitcherInvalidTimeFormat; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.EntryOperation; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import org.apache.commons.lang3.time.DateUtils; - -import java.text.ParseException; -import java.util.Date; - -public class DateValidator extends DateTimeValidator { - - public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; - - @Override - public StrategyValidator getType() { - return StrategyValidator.DATE; - } - - @Override - public boolean process(final Strategy strategy, final Entry switcherInput) throws SwitcherInvalidOperationException, - SwitcherInvalidTimeFormat, SwitcherInvalidOperationInputException { - - try { - return selectDateOperationCase(strategy, switcherInput); - } catch (ParseException e) { - throw new SwitcherInvalidTimeFormat(strategy.getStrategy(), e); - } - } - - private boolean selectDateOperationCase(final Strategy strategy, final Entry switcherInput) throws ParseException { - Date stgDate; - Date stgDate2; - Date inputDate; - - switch (strategy.getEntryOperation()) { - case LOWER: - stgDate = DateUtils.parseDate(getFullDate(strategy.getValues()[0]), DATE_FORMAT); - inputDate = DateUtils.parseDate(getFullDate(switcherInput.getInput()), DATE_FORMAT); - - return inputDate.before(stgDate); - case GREATER: - stgDate = DateUtils.parseDate(getFullDate(strategy.getValues()[0]), DATE_FORMAT); - inputDate = DateUtils.parseDate(getFullDate(switcherInput.getInput()), DATE_FORMAT); - - return inputDate.after(stgDate); - case BETWEEN: - if (strategy.getValues().length == 2) { - stgDate = DateUtils.parseDate(getFullDate(strategy.getValues()[0]), DATE_FORMAT); - stgDate2 = DateUtils.parseDate(getFullDate(strategy.getValues()[1]), DATE_FORMAT); - inputDate = DateUtils.parseDate(getFullDate(switcherInput.getInput()), DATE_FORMAT); - - return inputDate.after(stgDate) && inputDate.before(stgDate2); - } - - throw new SwitcherInvalidOperationInputException(EntryOperation.BETWEEN.name()); - default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - } - -} diff --git a/src/main/java/com/github/switcherapi/client/service/validators/NetworkValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/NetworkValidator.java deleted file mode 100644 index 5b690251..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/NetworkValidator.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import org.apache.commons.net.util.SubnetUtils; -import org.apache.commons.net.util.SubnetUtils.SubnetInfo; - -public class NetworkValidator extends Validator { - - public static final String CIDR_REGEX = "^(\\d{1,3}\\.){3}\\d{1,3}(/(\\d|[1-2]\\d|3[0-2]))"; - - @Override - public StrategyValidator getType() { - return StrategyValidator.NETWORK; - } - - @Override - public boolean process(final Strategy strategy, final Entry switcherInput) { - switch (strategy.getEntryOperation()) { - case EXIST: - return verifyIfAddressExistInNetwork(strategy, switcherInput); - case NOT_EXIST: - return !verifyIfAddressExistInNetwork(strategy, switcherInput); - default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - } - - private boolean verifyIfAddressExistInNetwork(final Strategy strategy, final Entry switcherInput) { - SubnetInfo subnetInfo; - for (final String value : strategy.getValues()) { - if (value.matches(CIDR_REGEX)) { - subnetInfo = new SubnetUtils(value).getInfo(); - - if (subnetInfo.isInRange(switcherInput.getInput())) { - return true; - } - } else { - if (value.equals(switcherInput.getInput())) { - return true; - } - } - } - - return false; - } - -} diff --git a/src/main/java/com/github/switcherapi/client/service/validators/NumericValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/NumericValidator.java deleted file mode 100644 index e4545c31..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/NumericValidator.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.exception.SwitcherInvalidNumericFormat; -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import org.apache.commons.lang3.math.NumberUtils; - -import java.util.Arrays; - -public class NumericValidator extends Validator { - - @Override - public StrategyValidator getType() { - return StrategyValidator.NUMERIC; - } - - @Override - public boolean process(final Strategy strategy, final Entry switcherInput) { - if (!NumberUtils.isCreatable(switcherInput.getInput())) - throw new SwitcherInvalidNumericFormat(switcherInput.getInput()); - - switch (strategy.getEntryOperation()) { - case EXIST: - return Arrays.stream(strategy.getValues()).anyMatch(val -> val.equals(switcherInput.getInput())); - case NOT_EXIST: - return Arrays.stream(strategy.getValues()).noneMatch(val -> val.equals(switcherInput.getInput())); - case EQUAL: - return strategy.getValues().length == 1 && strategy.getValues()[0].equals(switcherInput.getInput()); - case NOT_EQUAL: - return strategy.getValues().length == 1 && !strategy.getValues()[0].equals(switcherInput.getInput()); - case LOWER: - if (strategy.getValues().length == 1) { - final double numericInput = NumberUtils.createNumber(switcherInput.getInput()).doubleValue(); - final double numericValue = NumberUtils.createNumber(strategy.getValues()[0]).doubleValue(); - return numericInput < numericValue; - } - break; - case GREATER: - if (strategy.getValues().length == 1) { - final double numericInput = NumberUtils.createNumber(switcherInput.getInput()).doubleValue(); - final double numericValue = NumberUtils.createNumber(strategy.getValues()[0]).doubleValue(); - return numericInput > numericValue; - } - break; - case BETWEEN: - if (strategy.getValues().length == 2) { - final double numericInput = NumberUtils.createNumber(switcherInput.getInput()).doubleValue(); - final double numericFirstValue = NumberUtils.createNumber(strategy.getValues()[0]).doubleValue(); - final double numericSecondValue = NumberUtils.createNumber(strategy.getValues()[1]).doubleValue(); - return numericInput >= numericFirstValue && numericFirstValue <= numericSecondValue; - } - break; - default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - -} diff --git a/src/main/java/com/github/switcherapi/client/service/validators/PayloadValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/PayloadValidator.java deleted file mode 100644 index 4d058ad4..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/PayloadValidator.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.utils.SwitcherUtils; - -import java.util.Arrays; -import java.util.Set; - -public class PayloadValidator extends Validator { - - @Override - public StrategyValidator getType() { - return StrategyValidator.PAYLOAD; - } - - @Override - public boolean process(Strategy strategy, Entry switcherInput) { - switch (strategy.getEntryOperation()) { - case HAS_ONE: - return hasOne(strategy, switcherInput); - case HAS_ALL: - return hasAll(strategy, switcherInput); - default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - } - - private boolean hasOne(Strategy strategy, Entry switcherInput) { - try { - final Set keySet = SwitcherUtils.payloadReader(switcherInput.getInput(), null); - return Arrays.stream(strategy.getValues()) - .anyMatch(keySet::contains); - } catch (Exception e) { - return false; - } - } - - private boolean hasAll(Strategy strategy, Entry switcherInput) { - try { - final Set keySet = SwitcherUtils.payloadReader(switcherInput.getInput(), null); - return Arrays.stream(strategy.getValues()) - .allMatch(keySet::contains); - } catch (Exception e) { - return false; - } - } - -} diff --git a/src/main/java/com/github/switcherapi/client/service/validators/RegexValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/RegexValidator.java deleted file mode 100644 index bd23963d..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/RegexValidator.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; - -import java.util.Arrays; - -public class RegexValidator extends Validator { - - private static final String DELIMITER_REGEX = "\\b%s\\b"; - - @Override - public StrategyValidator getType() { - return StrategyValidator.REGEX; - } - - @Override - public boolean process(Strategy strategy, Entry switcherInput) throws SwitcherInvalidOperationException { - switch (strategy.getEntryOperation()) { - case EXIST: - return Arrays.stream(strategy.getValues()).anyMatch(val -> switcherInput.getInput().matches(val)); - case NOT_EXIST: - return Arrays.stream(strategy.getValues()).noneMatch(val -> switcherInput.getInput().matches(val)); - case EQUAL: - return strategy.getValues().length == 1 - && switcherInput.getInput().matches(String.format(DELIMITER_REGEX, strategy.getValues()[0])); - case NOT_EQUAL: - return strategy.getValues().length == 1 - && !switcherInput.getInput().matches(String.format(DELIMITER_REGEX, strategy.getValues()[0])); - default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - } - -} \ No newline at end of file diff --git a/src/main/java/com/github/switcherapi/client/service/validators/TimeValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/TimeValidator.java deleted file mode 100644 index 8cd141b4..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/TimeValidator.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.exception.SwitcherInvalidOperationInputException; -import com.github.switcherapi.client.exception.SwitcherInvalidTimeFormat; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.EntryOperation; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import org.apache.commons.lang3.time.DateUtils; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class TimeValidator extends DateTimeValidator { - - public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; - - @Override - public StrategyValidator getType() { - return StrategyValidator.TIME; - } - - @Override - public boolean process(Strategy strategy, Entry switcherInput) throws SwitcherInvalidOperationException, - SwitcherInvalidTimeFormat, SwitcherInvalidOperationInputException { - - try { - final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - final String today = format.format(new Date()); - return selectTimeOperationCase(strategy, switcherInput, today); - } catch (ParseException e) { - throw new SwitcherInvalidTimeFormat(strategy.getStrategy(), e); - } - - } - - private boolean selectTimeOperationCase(final Strategy strategy, final Entry switcherInput, final String today) - throws ParseException { - Date stgDate; - Date stgDate2; - Date inputDate; - - switch (strategy.getEntryOperation()) { - case LOWER: - stgDate = DateUtils.parseDate(getFullTime(today, strategy.getValues()[0]), DATE_FORMAT); - inputDate = DateUtils.parseDate(getFullTime(today, switcherInput.getInput()), DATE_FORMAT); - - return inputDate.before(stgDate); - case GREATER: - stgDate = DateUtils.parseDate(getFullTime(today, strategy.getValues()[0]), DATE_FORMAT); - inputDate = DateUtils.parseDate(getFullTime(today, switcherInput.getInput()), DATE_FORMAT); - - return inputDate.after(stgDate); - case BETWEEN: - if (strategy.getValues().length == 2) { - stgDate = DateUtils.parseDate(getFullTime(today, strategy.getValues()[0]), DATE_FORMAT); - stgDate2 = DateUtils.parseDate(getFullTime(today, strategy.getValues()[1]), DATE_FORMAT); - inputDate = DateUtils.parseDate(getFullTime(today, switcherInput.getInput()), - DATE_FORMAT); - - return inputDate.after(stgDate) && inputDate.before(stgDate2); - } - - throw new SwitcherInvalidOperationInputException(EntryOperation.BETWEEN.name()); - default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - } - -} diff --git a/src/main/java/com/github/switcherapi/client/service/validators/Validator.java b/src/main/java/com/github/switcherapi/client/service/validators/Validator.java deleted file mode 100644 index 6fc76f46..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/Validator.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.utils.SwitcherUtils; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.criteria.Strategy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public abstract class Validator { - - protected static final Logger logger = LoggerFactory.getLogger(Validator.class); - - public static final String DEBUG_SWITCHER_INPUT = "switcherInput: {}"; - public static final String DEBUG_STRATEGY = "strategy: {}"; - - public boolean execute(final Strategy strategy, final Entry switcherInput) - throws SwitcherException { - SwitcherUtils.debug(logger, DEBUG_STRATEGY, strategy); - SwitcherUtils.debug(logger, DEBUG_SWITCHER_INPUT, switcherInput); - return process(strategy, switcherInput); - } - - public abstract boolean process(final Strategy strategy, final Entry switcherInput) - throws SwitcherException; - - public abstract StrategyValidator getType(); - -} diff --git a/src/main/java/com/github/switcherapi/client/service/validators/ValueValidator.java b/src/main/java/com/github/switcherapi/client/service/validators/ValueValidator.java deleted file mode 100644 index 0adf6020..00000000 --- a/src/main/java/com/github/switcherapi/client/service/validators/ValueValidator.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; - -import java.util.Arrays; - -public class ValueValidator extends Validator { - - @Override - public StrategyValidator getType() { - return StrategyValidator.VALUE; - } - - @Override - public boolean process(Strategy strategy, Entry switcherInput) { - switch (strategy.getEntryOperation()) { - case EXIST: - return Arrays.stream(strategy.getValues()).anyMatch(val -> val.equals(switcherInput.getInput())); - case NOT_EXIST: - return Arrays.stream(strategy.getValues()).noneMatch(val -> val.equals(switcherInput.getInput())); - case EQUAL: - return strategy.getValues().length == 1 && strategy.getValues()[0].equals(switcherInput.getInput()); - case NOT_EQUAL: - return strategy.getValues().length == 1 && !strategy.getValues()[0].equals(switcherInput.getInput()); - default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); - } - } - -} diff --git a/src/main/java/com/github/switcherapi/client/test/SwitcherTestWhen.java b/src/main/java/com/github/switcherapi/client/test/SwitcherTestWhen.java deleted file mode 100644 index e8e9a730..00000000 --- a/src/main/java/com/github/switcherapi/client/test/SwitcherTestWhen.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.switcherapi.client.test; - -import com.github.switcherapi.client.model.StrategyValidator; - -public @interface SwitcherTestWhen { - - StrategyValidator strategy(); - - String[] input(); - -} diff --git a/src/main/java/com/github/switcherapi/client/ContextBuilder.java b/src/main/java/com/switcherapi/client/ContextBuilder.java similarity index 97% rename from src/main/java/com/github/switcherapi/client/ContextBuilder.java rename to src/main/java/com/switcherapi/client/ContextBuilder.java index 7d3930cd..950c6ee6 100644 --- a/src/main/java/com/github/switcherapi/client/ContextBuilder.java +++ b/src/main/java/com/switcherapi/client/ContextBuilder.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.ContextKey; import org.apache.commons.lang3.StringUtils; import java.util.Optional; -import static com.github.switcherapi.client.remote.Constants.*; +import static com.switcherapi.client.remote.Constants.*; public class ContextBuilder { diff --git a/src/main/java/com/github/switcherapi/client/SnapshotCallback.java b/src/main/java/com/switcherapi/client/SnapshotCallback.java similarity index 87% rename from src/main/java/com/github/switcherapi/client/SnapshotCallback.java rename to src/main/java/com/switcherapi/client/SnapshotCallback.java index f804fc32..0a5095f4 100644 --- a/src/main/java/com/github/switcherapi/client/SnapshotCallback.java +++ b/src/main/java/com/switcherapi/client/SnapshotCallback.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.utils.SwitcherUtils; +import com.switcherapi.client.utils.SwitcherUtils; import org.slf4j.LoggerFactory; public interface SnapshotCallback { diff --git a/src/main/java/com/github/switcherapi/client/SwitcherConfig.java b/src/main/java/com/switcherapi/client/SwitcherConfig.java similarity index 98% rename from src/main/java/com/github/switcherapi/client/SwitcherConfig.java rename to src/main/java/com/switcherapi/client/SwitcherConfig.java index b3dee9ee..6eda3bb8 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherConfig.java +++ b/src/main/java/com/switcherapi/client/SwitcherConfig.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.ContextKey; abstract class SwitcherConfig { diff --git a/src/main/java/com/github/switcherapi/client/SwitcherContext.java b/src/main/java/com/switcherapi/client/SwitcherContext.java similarity index 91% rename from src/main/java/com/github/switcherapi/client/SwitcherContext.java rename to src/main/java/com/switcherapi/client/SwitcherContext.java index 09c0f62d..251b8d2d 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherContext.java +++ b/src/main/java/com/switcherapi/client/SwitcherContext.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.exception.SwitcherKeyNotFoundException; -import com.github.switcherapi.client.exception.SwitchersValidationException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.exception.SwitcherKeyNotFoundException; +import com.switcherapi.client.exception.SwitchersValidationException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.SwitcherRequest; /** * Switcher Context diff --git a/src/main/java/com/github/switcherapi/client/SwitcherContextBase.java b/src/main/java/com/switcherapi/client/SwitcherContextBase.java similarity index 91% rename from src/main/java/com/github/switcherapi/client/SwitcherContextBase.java rename to src/main/java/com/switcherapi/client/SwitcherContextBase.java index b5013ab7..75605557 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherContextBase.java +++ b/src/main/java/com/switcherapi/client/SwitcherContextBase.java @@ -1,25 +1,25 @@ -package com.github.switcherapi.client; - -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.exception.SwitcherKeyNotFoundException; -import com.github.switcherapi.client.exception.SwitchersValidationException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.remote.ClientWS; -import com.github.switcherapi.client.remote.ClientWSImpl; -import com.github.switcherapi.client.service.SwitcherValidator; -import com.github.switcherapi.client.service.ValidatorService; -import com.github.switcherapi.client.service.WorkerName; -import com.github.switcherapi.client.service.local.ClientLocal; -import com.github.switcherapi.client.service.local.ClientLocalService; -import com.github.switcherapi.client.service.local.SwitcherLocalService; -import com.github.switcherapi.client.service.remote.ClientRemote; -import com.github.switcherapi.client.service.remote.ClientRemoteService; -import com.github.switcherapi.client.service.remote.SwitcherRemoteService; -import com.github.switcherapi.client.utils.SnapshotEventHandler; -import com.github.switcherapi.client.utils.SnapshotWatcher; -import com.github.switcherapi.client.utils.SwitcherUtils; +package com.switcherapi.client; + +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherKeyNotFoundException; +import com.switcherapi.client.exception.SwitchersValidationException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.remote.ClientWS; +import com.switcherapi.client.remote.ClientWSImpl; +import com.switcherapi.client.service.SwitcherValidator; +import com.switcherapi.client.service.ValidatorService; +import com.switcherapi.client.service.WorkerName; +import com.switcherapi.client.service.local.ClientLocal; +import com.switcherapi.client.service.local.ClientLocalService; +import com.switcherapi.client.service.local.SwitcherLocalService; +import com.switcherapi.client.service.remote.ClientRemote; +import com.switcherapi.client.service.remote.ClientRemoteService; +import com.switcherapi.client.service.remote.SwitcherRemoteService; +import com.switcherapi.client.utils.SnapshotEventHandler; +import com.switcherapi.client.utils.SnapshotWatcher; +import com.switcherapi.client.utils.SwitcherUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,8 +30,8 @@ import java.util.*; import java.util.concurrent.*; -import static com.github.switcherapi.client.remote.Constants.DEFAULT_POOL_SIZE; -import static com.github.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; +import static com.switcherapi.client.remote.Constants.DEFAULT_POOL_SIZE; +import static com.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; /** * Switcher Context Base diff --git a/src/main/java/com/github/switcherapi/client/SwitcherContextValidator.java b/src/main/java/com/switcherapi/client/SwitcherContextValidator.java similarity index 93% rename from src/main/java/com/github/switcherapi/client/SwitcherContextValidator.java rename to src/main/java/com/switcherapi/client/SwitcherContextValidator.java index 32d23ac6..f87d0100 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherContextValidator.java +++ b/src/main/java/com/switcherapi/client/SwitcherContextValidator.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.model.ContextKey; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/com/github/switcherapi/client/SwitcherExecutor.java b/src/main/java/com/switcherapi/client/SwitcherExecutor.java similarity index 86% rename from src/main/java/com/github/switcherapi/client/SwitcherExecutor.java rename to src/main/java/com/switcherapi/client/SwitcherExecutor.java index ed93ac8c..815d64eb 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherExecutor.java +++ b/src/main/java/com/switcherapi/client/SwitcherExecutor.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.model.criteria.Domain; import java.util.Set; diff --git a/src/main/java/com/github/switcherapi/client/SwitcherExecutorImpl.java b/src/main/java/com/switcherapi/client/SwitcherExecutorImpl.java similarity index 75% rename from src/main/java/com/github/switcherapi/client/SwitcherExecutorImpl.java rename to src/main/java/com/switcherapi/client/SwitcherExecutorImpl.java index 20baf552..594db783 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherExecutorImpl.java +++ b/src/main/java/com/switcherapi/client/SwitcherExecutorImpl.java @@ -1,13 +1,13 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.exception.SwitcherSnapshotWriteException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.criteria.Domain; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.service.remote.ClientRemote; -import com.github.switcherapi.client.utils.SnapshotLoader; -import com.github.switcherapi.client.utils.SwitcherUtils; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.exception.SwitcherSnapshotWriteException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.service.remote.ClientRemote; +import com.switcherapi.client.utils.SnapshotLoader; +import com.switcherapi.client.utils.SwitcherUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/github/switcherapi/client/SwitcherKey.java b/src/main/java/com/switcherapi/client/SwitcherKey.java similarity index 86% rename from src/main/java/com/github/switcherapi/client/SwitcherKey.java rename to src/main/java/com/switcherapi/client/SwitcherKey.java index 2e613597..a48a6312 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherKey.java +++ b/src/main/java/com/switcherapi/client/SwitcherKey.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.test.SwitcherTest; +import com.switcherapi.client.test.SwitcherTest; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/github/switcherapi/client/SwitcherProperties.java b/src/main/java/com/switcherapi/client/SwitcherProperties.java similarity index 91% rename from src/main/java/com/github/switcherapi/client/SwitcherProperties.java rename to src/main/java/com/switcherapi/client/SwitcherProperties.java index 739f9547..3a822d36 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherProperties.java +++ b/src/main/java/com/switcherapi/client/SwitcherProperties.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.ContextKey; import java.util.Properties; diff --git a/src/main/java/com/github/switcherapi/client/SwitcherPropertiesImpl.java b/src/main/java/com/switcherapi/client/SwitcherPropertiesImpl.java similarity index 93% rename from src/main/java/com/github/switcherapi/client/SwitcherPropertiesImpl.java rename to src/main/java/com/switcherapi/client/SwitcherPropertiesImpl.java index 8c832c14..d6d74e73 100644 --- a/src/main/java/com/github/switcherapi/client/SwitcherPropertiesImpl.java +++ b/src/main/java/com/switcherapi/client/SwitcherPropertiesImpl.java @@ -1,15 +1,15 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.model.ContextKey; import org.apache.commons.lang3.StringUtils; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.github.switcherapi.client.remote.Constants.*; -import static com.github.switcherapi.client.utils.SwitcherUtils.*; +import static com.switcherapi.client.remote.Constants.*; +import static com.switcherapi.client.utils.SwitcherUtils.*; public class SwitcherPropertiesImpl implements SwitcherProperties { diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherContextException.java b/src/main/java/com/switcherapi/client/exception/SwitcherContextException.java similarity index 83% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherContextException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherContextException.java index 9eceb228..0e3197a1 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherContextException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherContextException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherException.java b/src/main/java/com/switcherapi/client/exception/SwitcherException.java similarity index 84% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherException.java index 8382e997..7a23a163 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidDateTimeArgumentException.java b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidDateTimeArgumentException.java similarity index 87% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidDateTimeArgumentException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherInvalidDateTimeArgumentException.java index 84b8e469..1b3fa500 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidDateTimeArgumentException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidDateTimeArgumentException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidNumericFormat.java b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidNumericFormat.java similarity index 85% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidNumericFormat.java rename to src/main/java/com/switcherapi/client/exception/SwitcherInvalidNumericFormat.java index 00fdc810..4083d72c 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidNumericFormat.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidNumericFormat.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidOperationException.java b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidOperationException.java similarity index 87% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidOperationException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherInvalidOperationException.java index dfb64057..748fc2af 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidOperationException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidOperationException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidOperationInputException.java b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidOperationInputException.java similarity index 87% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidOperationInputException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherInvalidOperationInputException.java index adfb2c7f..e765077a 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidOperationInputException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidOperationInputException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidStrategyException.java b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidStrategyException.java similarity index 85% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidStrategyException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherInvalidStrategyException.java index 1fb78d4f..49246ddb 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidStrategyException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidStrategyException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidTimeFormat.java b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidTimeFormat.java similarity index 86% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidTimeFormat.java rename to src/main/java/com/switcherapi/client/exception/SwitcherInvalidTimeFormat.java index 780ac55b..7abb3995 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidTimeFormat.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidTimeFormat.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidValidatorException.java b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidValidatorException.java similarity index 85% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidValidatorException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherInvalidValidatorException.java index 13bbe761..2683c2b5 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherInvalidValidatorException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherInvalidValidatorException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherKeyNotFoundException.java b/src/main/java/com/switcherapi/client/exception/SwitcherKeyNotFoundException.java similarity index 84% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherKeyNotFoundException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherKeyNotFoundException.java index 6a9829eb..480cb7c0 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherKeyNotFoundException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherKeyNotFoundException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherRemoteException.java b/src/main/java/com/switcherapi/client/exception/SwitcherRemoteException.java similarity index 93% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherRemoteException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherRemoteException.java index 2b491f0a..2c38c434 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherRemoteException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherRemoteException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherSnapshotLoadException.java b/src/main/java/com/switcherapi/client/exception/SwitcherSnapshotLoadException.java similarity index 86% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherSnapshotLoadException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherSnapshotLoadException.java index cb07a819..9415ed81 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherSnapshotLoadException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherSnapshotLoadException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherSnapshotWriteException.java b/src/main/java/com/switcherapi/client/exception/SwitcherSnapshotWriteException.java similarity index 86% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherSnapshotWriteException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherSnapshotWriteException.java index e3f26f94..53be6e27 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherSnapshotWriteException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherSnapshotWriteException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitcherValidatorException.java b/src/main/java/com/switcherapi/client/exception/SwitcherValidatorException.java similarity index 86% rename from src/main/java/com/github/switcherapi/client/exception/SwitcherValidatorException.java rename to src/main/java/com/switcherapi/client/exception/SwitcherValidatorException.java index 9bc28e6b..28820dd4 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitcherValidatorException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitcherValidatorException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/exception/SwitchersValidationException.java b/src/main/java/com/switcherapi/client/exception/SwitchersValidationException.java similarity index 85% rename from src/main/java/com/github/switcherapi/client/exception/SwitchersValidationException.java rename to src/main/java/com/switcherapi/client/exception/SwitchersValidationException.java index 49efada2..449fc272 100644 --- a/src/main/java/com/github/switcherapi/client/exception/SwitchersValidationException.java +++ b/src/main/java/com/switcherapi/client/exception/SwitchersValidationException.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.exception; +package com.switcherapi.client.exception; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/model/AsyncSwitcher.java b/src/main/java/com/switcherapi/client/model/AsyncSwitcher.java similarity index 87% rename from src/main/java/com/github/switcherapi/client/model/AsyncSwitcher.java rename to src/main/java/com/switcherapi/client/model/AsyncSwitcher.java index 1f5b577e..60ea93eb 100644 --- a/src/main/java/com/github/switcherapi/client/model/AsyncSwitcher.java +++ b/src/main/java/com/switcherapi/client/model/AsyncSwitcher.java @@ -1,14 +1,14 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.utils.SwitcherUtils; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.utils.SwitcherUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static com.github.switcherapi.client.service.WorkerName.SWITCHER_ASYNC_WORKER; +import static com.switcherapi.client.service.WorkerName.SWITCHER_ASYNC_WORKER; /** * Implementation handle asynchronous Criteria execution when using throttle. diff --git a/src/main/java/com/github/switcherapi/client/model/ContextKey.java b/src/main/java/com/switcherapi/client/model/ContextKey.java similarity index 95% rename from src/main/java/com/github/switcherapi/client/model/ContextKey.java rename to src/main/java/com/switcherapi/client/model/ContextKey.java index 1e1cca73..302ef88c 100644 --- a/src/main/java/com/github/switcherapi/client/model/ContextKey.java +++ b/src/main/java/com/switcherapi/client/model/ContextKey.java @@ -1,4 +1,6 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; + +import com.switcherapi.client.SwitcherContext; /** * Contains required and optional properties to build the context @@ -40,7 +42,7 @@ public enum ContextKey { /** * (String) Defines the package and class where a context wrapper is located. - * It is only necessary to use with {@link com.github.switcherapi.client.SwitcherContext} + * It is only necessary to use with {@link SwitcherContext} */ CONTEXT_LOCATION("switcher.context"), diff --git a/src/main/java/com/github/switcherapi/client/model/Entry.java b/src/main/java/com/switcherapi/client/model/Entry.java similarity index 97% rename from src/main/java/com/github/switcherapi/client/model/Entry.java rename to src/main/java/com/switcherapi/client/model/Entry.java index c5f5c986..a75a9358 100644 --- a/src/main/java/com/github/switcherapi/client/model/Entry.java +++ b/src/main/java/com/switcherapi/client/model/Entry.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; /** * Creates the input used after by invoking isItOn(). diff --git a/src/main/java/com/github/switcherapi/client/model/EntryOperation.java b/src/main/java/com/switcherapi/client/model/EntryOperation.java similarity index 74% rename from src/main/java/com/github/switcherapi/client/model/EntryOperation.java rename to src/main/java/com/switcherapi/client/model/EntryOperation.java index 2d3ab6c2..dce70e58 100644 --- a/src/main/java/com/github/switcherapi/client/model/EntryOperation.java +++ b/src/main/java/com/switcherapi/client/model/EntryOperation.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; public enum EntryOperation { EQUAL, diff --git a/src/main/java/com/github/switcherapi/client/model/RelayType.java b/src/main/java/com/switcherapi/client/model/RelayType.java similarity index 72% rename from src/main/java/com/github/switcherapi/client/model/RelayType.java rename to src/main/java/com/switcherapi/client/model/RelayType.java index 83e72e81..312f1e0d 100644 --- a/src/main/java/com/github/switcherapi/client/model/RelayType.java +++ b/src/main/java/com/switcherapi/client/model/RelayType.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/model/StrategyValidator.java b/src/main/java/com/switcherapi/client/model/StrategyValidator.java similarity index 96% rename from src/main/java/com/github/switcherapi/client/model/StrategyValidator.java rename to src/main/java/com/switcherapi/client/model/StrategyValidator.java index 8d1f391d..cf39ea02 100644 --- a/src/main/java/com/github/switcherapi/client/model/StrategyValidator.java +++ b/src/main/java/com/switcherapi/client/model/StrategyValidator.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/model/Switcher.java b/src/main/java/com/switcherapi/client/model/Switcher.java similarity index 94% rename from src/main/java/com/github/switcherapi/client/model/Switcher.java rename to src/main/java/com/switcherapi/client/model/Switcher.java index 3a4e896b..5401c305 100644 --- a/src/main/java/com/github/switcherapi/client/model/Switcher.java +++ b/src/main/java/com/switcherapi/client/model/Switcher.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; -import com.github.switcherapi.client.SwitcherContext; -import com.github.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.SwitcherContext; +import com.switcherapi.client.exception.SwitcherException; import java.util.List; diff --git a/src/main/java/com/github/switcherapi/client/model/SwitcherBuilder.java b/src/main/java/com/switcherapi/client/model/SwitcherBuilder.java similarity index 96% rename from src/main/java/com/github/switcherapi/client/model/SwitcherBuilder.java rename to src/main/java/com/switcherapi/client/model/SwitcherBuilder.java index 478dbed2..7dd36ba1 100644 --- a/src/main/java/com/github/switcherapi/client/model/SwitcherBuilder.java +++ b/src/main/java/com/switcherapi/client/model/SwitcherBuilder.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitcherContextException; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/src/main/java/com/github/switcherapi/client/model/SwitcherRequest.java b/src/main/java/com/switcherapi/client/model/SwitcherRequest.java similarity index 92% rename from src/main/java/com/github/switcherapi/client/model/SwitcherRequest.java rename to src/main/java/com/switcherapi/client/model/SwitcherRequest.java index 2dba2740..c5195a02 100644 --- a/src/main/java/com/github/switcherapi/client/model/SwitcherRequest.java +++ b/src/main/java/com/switcherapi/client/model/SwitcherRequest.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; -import com.github.switcherapi.client.SwitcherContext; -import com.github.switcherapi.client.SwitcherExecutor; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.test.SwitcherBypass; +import com.switcherapi.client.SwitcherContext; +import com.switcherapi.client.SwitcherExecutor; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.test.SwitcherBypass; import java.util.*; diff --git a/src/main/java/com/github/switcherapi/client/model/SwitcherResult.java b/src/main/java/com/switcherapi/client/model/SwitcherResult.java similarity index 98% rename from src/main/java/com/github/switcherapi/client/model/SwitcherResult.java rename to src/main/java/com/switcherapi/client/model/SwitcherResult.java index 6725fa73..4a6f8152 100644 --- a/src/main/java/com/github/switcherapi/client/model/SwitcherResult.java +++ b/src/main/java/com/switcherapi/client/model/SwitcherResult.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; import com.google.gson.Gson; diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/Config.java b/src/main/java/com/switcherapi/client/model/criteria/Config.java similarity index 83% rename from src/main/java/com/github/switcherapi/client/model/criteria/Config.java rename to src/main/java/com/switcherapi/client/model/criteria/Config.java index eb4ae1f9..d4678e9e 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/Config.java +++ b/src/main/java/com/switcherapi/client/model/criteria/Config.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; import java.util.Arrays; import java.util.Objects; @@ -11,14 +11,14 @@ public class Config extends SwitcherElement { private final String key; - private final Strategy[] strategies; + private final StrategyConfig[] strategies; private final String[] components; private final Relay relay; - public Config(String key, String description, boolean activated, Strategy[] strategies, String[] components, - Relay relay) { + public Config(String key, String description, boolean activated, StrategyConfig[] strategies, String[] components, + Relay relay) { super(description, activated); this.key = key; this.strategies = strategies; @@ -42,7 +42,7 @@ public Relay getRelay() { return relay; } - public Strategy[] getStrategies() { + public StrategyConfig[] getStrategies() { return strategies; } diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/Data.java b/src/main/java/com/switcherapi/client/model/criteria/Data.java similarity index 81% rename from src/main/java/com/github/switcherapi/client/model/criteria/Data.java rename to src/main/java/com/switcherapi/client/model/criteria/Data.java index d1f8d47b..3058ac64 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/Data.java +++ b/src/main/java/com/switcherapi/client/model/criteria/Data.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/Domain.java b/src/main/java/com/switcherapi/client/model/criteria/Domain.java similarity index 94% rename from src/main/java/com/github/switcherapi/client/model/criteria/Domain.java rename to src/main/java/com/switcherapi/client/model/criteria/Domain.java index a827b989..b83276ed 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/Domain.java +++ b/src/main/java/com/switcherapi/client/model/criteria/Domain.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; import java.util.Arrays; diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/Group.java b/src/main/java/com/switcherapi/client/model/criteria/Group.java similarity index 92% rename from src/main/java/com/github/switcherapi/client/model/criteria/Group.java rename to src/main/java/com/switcherapi/client/model/criteria/Group.java index 2768ad72..fe2f7ad0 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/Group.java +++ b/src/main/java/com/switcherapi/client/model/criteria/Group.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; import java.util.Arrays; diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/Relay.java b/src/main/java/com/switcherapi/client/model/criteria/Relay.java similarity index 90% rename from src/main/java/com/github/switcherapi/client/model/criteria/Relay.java rename to src/main/java/com/switcherapi/client/model/criteria/Relay.java index 0d00fcb9..697490e3 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/Relay.java +++ b/src/main/java/com/switcherapi/client/model/criteria/Relay.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/Snapshot.java b/src/main/java/com/switcherapi/client/model/criteria/Snapshot.java similarity index 85% rename from src/main/java/com/github/switcherapi/client/model/criteria/Snapshot.java rename to src/main/java/com/switcherapi/client/model/criteria/Snapshot.java index 62dcd3e0..59422708 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/Snapshot.java +++ b/src/main/java/com/switcherapi/client/model/criteria/Snapshot.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; /** * diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/Strategy.java b/src/main/java/com/switcherapi/client/model/criteria/StrategyConfig.java similarity index 76% rename from src/main/java/com/github/switcherapi/client/model/criteria/Strategy.java rename to src/main/java/com/switcherapi/client/model/criteria/StrategyConfig.java index 7bcdb4c3..403cd312 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/Strategy.java +++ b/src/main/java/com/switcherapi/client/model/criteria/StrategyConfig.java @@ -1,15 +1,15 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; import java.util.Arrays; -import com.github.switcherapi.client.model.EntryOperation; -import com.github.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.EntryOperation; +import com.switcherapi.client.model.StrategyValidator; /** * @author Roger Floriano (petruki) * @since 2019-12-24 */ -public class Strategy extends SwitcherElement { +public class StrategyConfig extends SwitcherElement { private final String strategy; @@ -17,14 +17,14 @@ public class Strategy extends SwitcherElement { private final String[] values; - public Strategy(String strategy, String operation, String description, boolean activated, String[] values) { + public StrategyConfig(String strategy, String operation, String description, boolean activated, String[] values) { super(description, activated); this.strategy = strategy; this.operation = operation; this.values = values; } - public Strategy() { + public StrategyConfig() { this(null, null, null, false, null); } diff --git a/src/main/java/com/github/switcherapi/client/model/criteria/SwitcherElement.java b/src/main/java/com/switcherapi/client/model/criteria/SwitcherElement.java similarity index 88% rename from src/main/java/com/github/switcherapi/client/model/criteria/SwitcherElement.java rename to src/main/java/com/switcherapi/client/model/criteria/SwitcherElement.java index f65a024f..a261e823 100644 --- a/src/main/java/com/github/switcherapi/client/model/criteria/SwitcherElement.java +++ b/src/main/java/com/switcherapi/client/model/criteria/SwitcherElement.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.model.criteria; +package com.switcherapi.client.model.criteria; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/remote/ClientWS.java b/src/main/java/com/switcherapi/client/remote/ClientWS.java similarity index 90% rename from src/main/java/com/github/switcherapi/client/remote/ClientWS.java rename to src/main/java/com/switcherapi/client/remote/ClientWS.java index d848a4cc..c2a119fe 100644 --- a/src/main/java/com/github/switcherapi/client/remote/ClientWS.java +++ b/src/main/java/com/switcherapi/client/remote/ClientWS.java @@ -1,8 +1,7 @@ -package com.github.switcherapi.client.remote; +package com.switcherapi.client.remote; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.remote.dto.SwitchersCheck; -import com.github.switcherapi.client.remote.dto.*; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.remote.dto.*; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/com/github/switcherapi/client/remote/ClientWSBuilder.java b/src/main/java/com/switcherapi/client/remote/ClientWSBuilder.java similarity index 89% rename from src/main/java/com/github/switcherapi/client/remote/ClientWSBuilder.java rename to src/main/java/com/switcherapi/client/remote/ClientWSBuilder.java index 944cd3b0..42c932cf 100644 --- a/src/main/java/com/github/switcherapi/client/remote/ClientWSBuilder.java +++ b/src/main/java/com/switcherapi/client/remote/ClientWSBuilder.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client.remote; +package com.switcherapi.client.remote; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.model.ContextKey; import org.apache.commons.lang3.StringUtils; import javax.net.ssl.SSLContext; diff --git a/src/main/java/com/github/switcherapi/client/remote/ClientWSImpl.java b/src/main/java/com/switcherapi/client/remote/ClientWSImpl.java similarity index 91% rename from src/main/java/com/github/switcherapi/client/remote/ClientWSImpl.java rename to src/main/java/com/switcherapi/client/remote/ClientWSImpl.java index f56d8ce7..730f8a67 100644 --- a/src/main/java/com/github/switcherapi/client/remote/ClientWSImpl.java +++ b/src/main/java/com/switcherapi/client/remote/ClientWSImpl.java @@ -1,12 +1,11 @@ -package com.github.switcherapi.client.remote; +package com.switcherapi.client.remote; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.remote.dto.SwitchersCheck; -import com.github.switcherapi.client.remote.dto.*; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.remote.dto.*; import javax.ws.rs.client.Client; import javax.ws.rs.client.Entity; @@ -18,7 +17,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; -import static com.github.switcherapi.client.remote.Constants.*; +import static com.switcherapi.client.remote.Constants.*; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/remote/Constants.java b/src/main/java/com/switcherapi/client/remote/Constants.java similarity index 83% rename from src/main/java/com/github/switcherapi/client/remote/Constants.java rename to src/main/java/com/switcherapi/client/remote/Constants.java index 0ac1e60d..173e8e3e 100644 --- a/src/main/java/com/github/switcherapi/client/remote/Constants.java +++ b/src/main/java/com/switcherapi/client/remote/Constants.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.remote; +package com.switcherapi.client.remote; public final class Constants { @@ -8,8 +8,6 @@ public final class Constants { public static final int DEFAULT_POOL_SIZE = 2; public static final String HEADER_AUTHORIZATION = "Authorization"; public static final String HEADER_APIKEY = "switcher-api-key"; - public static final String HEADER_CONTENT_TYPE = "Content-Type"; - public static final String HEADER_JSON = "application/json"; public static final String TOKEN_TEXT = "Bearer %s"; public static final String QUERY = diff --git a/src/main/java/com/github/switcherapi/client/remote/dto/AuthRequest.java b/src/main/java/com/switcherapi/client/remote/dto/AuthRequest.java similarity index 93% rename from src/main/java/com/github/switcherapi/client/remote/dto/AuthRequest.java rename to src/main/java/com/switcherapi/client/remote/dto/AuthRequest.java index 63f86f75..db294080 100644 --- a/src/main/java/com/github/switcherapi/client/remote/dto/AuthRequest.java +++ b/src/main/java/com/switcherapi/client/remote/dto/AuthRequest.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.remote.dto; +package com.switcherapi.client.remote.dto; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/remote/dto/AuthResponse.java b/src/main/java/com/switcherapi/client/remote/dto/AuthResponse.java similarity index 91% rename from src/main/java/com/github/switcherapi/client/remote/dto/AuthResponse.java rename to src/main/java/com/switcherapi/client/remote/dto/AuthResponse.java index db336a61..1ed8f6eb 100644 --- a/src/main/java/com/github/switcherapi/client/remote/dto/AuthResponse.java +++ b/src/main/java/com/switcherapi/client/remote/dto/AuthResponse.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.remote.dto; +package com.switcherapi.client.remote.dto; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/remote/dto/CriteriaInputRequest.java b/src/main/java/com/switcherapi/client/remote/dto/CriteriaInputRequest.java similarity index 78% rename from src/main/java/com/github/switcherapi/client/remote/dto/CriteriaInputRequest.java rename to src/main/java/com/switcherapi/client/remote/dto/CriteriaInputRequest.java index f3a49973..32569404 100644 --- a/src/main/java/com/github/switcherapi/client/remote/dto/CriteriaInputRequest.java +++ b/src/main/java/com/switcherapi/client/remote/dto/CriteriaInputRequest.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.remote.dto; +package com.switcherapi.client.remote.dto; -import com.github.switcherapi.client.model.Entry; +import com.switcherapi.client.model.Entry; import java.util.Arrays; diff --git a/src/main/java/com/github/switcherapi/client/remote/dto/CriteriaRequest.java b/src/main/java/com/switcherapi/client/remote/dto/CriteriaRequest.java similarity index 90% rename from src/main/java/com/github/switcherapi/client/remote/dto/CriteriaRequest.java rename to src/main/java/com/switcherapi/client/remote/dto/CriteriaRequest.java index 061197c3..25c7a1b5 100644 --- a/src/main/java/com/github/switcherapi/client/remote/dto/CriteriaRequest.java +++ b/src/main/java/com/switcherapi/client/remote/dto/CriteriaRequest.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.remote.dto; +package com.switcherapi.client.remote.dto; -import com.github.switcherapi.client.model.Entry; +import com.switcherapi.client.model.Entry; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/github/switcherapi/client/remote/dto/CriteriaResponse.java b/src/main/java/com/switcherapi/client/remote/dto/CriteriaResponse.java similarity index 93% rename from src/main/java/com/github/switcherapi/client/remote/dto/CriteriaResponse.java rename to src/main/java/com/switcherapi/client/remote/dto/CriteriaResponse.java index b8d4789b..c0dc3a0d 100644 --- a/src/main/java/com/github/switcherapi/client/remote/dto/CriteriaResponse.java +++ b/src/main/java/com/switcherapi/client/remote/dto/CriteriaResponse.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.remote.dto; +package com.switcherapi.client.remote.dto; public class CriteriaResponse { diff --git a/src/main/java/com/github/switcherapi/client/remote/dto/SnapshotVersionResponse.java b/src/main/java/com/switcherapi/client/remote/dto/SnapshotVersionResponse.java similarity index 88% rename from src/main/java/com/github/switcherapi/client/remote/dto/SnapshotVersionResponse.java rename to src/main/java/com/switcherapi/client/remote/dto/SnapshotVersionResponse.java index 530b6e10..2b24e6ef 100644 --- a/src/main/java/com/github/switcherapi/client/remote/dto/SnapshotVersionResponse.java +++ b/src/main/java/com/switcherapi/client/remote/dto/SnapshotVersionResponse.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.remote.dto; +package com.switcherapi.client.remote.dto; /** * @author Roger Floriano (petruki) diff --git a/src/main/java/com/github/switcherapi/client/remote/dto/SwitchersCheck.java b/src/main/java/com/switcherapi/client/remote/dto/SwitchersCheck.java similarity index 90% rename from src/main/java/com/github/switcherapi/client/remote/dto/SwitchersCheck.java rename to src/main/java/com/switcherapi/client/remote/dto/SwitchersCheck.java index 575b00b2..f716f146 100644 --- a/src/main/java/com/github/switcherapi/client/remote/dto/SwitchersCheck.java +++ b/src/main/java/com/switcherapi/client/remote/dto/SwitchersCheck.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.client.remote.dto; +package com.switcherapi.client.remote.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.github.switcherapi.client.remote.ClientWS; +import com.switcherapi.client.remote.ClientWS; import java.util.Arrays; import java.util.Set; diff --git a/src/main/java/com/github/switcherapi/client/service/SwitcherFactory.java b/src/main/java/com/switcherapi/client/service/SwitcherFactory.java similarity index 67% rename from src/main/java/com/github/switcherapi/client/service/SwitcherFactory.java rename to src/main/java/com/switcherapi/client/service/SwitcherFactory.java index affb7b28..d766b6ad 100644 --- a/src/main/java/com/github/switcherapi/client/service/SwitcherFactory.java +++ b/src/main/java/com/switcherapi/client/service/SwitcherFactory.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client.service; +package com.switcherapi.client.service; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; -import static com.github.switcherapi.client.model.SwitcherResult.DEFAULT_REASON; -import static com.github.switcherapi.client.model.SwitcherResult.DEFAULT_SUCCESS; +import static com.switcherapi.client.model.SwitcherResult.DEFAULT_REASON; +import static com.switcherapi.client.model.SwitcherResult.DEFAULT_SUCCESS; public class SwitcherFactory { diff --git a/src/main/java/com/github/switcherapi/client/service/SwitcherValidator.java b/src/main/java/com/switcherapi/client/service/SwitcherValidator.java similarity index 60% rename from src/main/java/com/github/switcherapi/client/service/SwitcherValidator.java rename to src/main/java/com/switcherapi/client/service/SwitcherValidator.java index 81302283..828b3e9b 100644 --- a/src/main/java/com/github/switcherapi/client/service/SwitcherValidator.java +++ b/src/main/java/com/switcherapi/client/service/SwitcherValidator.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client.service; +package com.switcherapi.client.service; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.service.validators.Validator; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.service.validators.Validator; /** * @author Roger Floriano (petruki) @@ -22,10 +22,10 @@ public interface SwitcherValidator { * validating from the top of the node (Domain) ascending to the lower level * (Strategy) * - * @param strategy Configuration switcher to be validated + * @param strategyConfig Configuration switcher to be validated * @param switcherInput Input to be validated * @return The criteria result */ - boolean execute(final Strategy strategy, final Entry switcherInput); + boolean execute(final StrategyConfig strategyConfig, final Entry switcherInput); } diff --git a/src/main/java/com/github/switcherapi/client/service/ValidatorService.java b/src/main/java/com/switcherapi/client/service/ValidatorService.java similarity index 55% rename from src/main/java/com/github/switcherapi/client/service/ValidatorService.java rename to src/main/java/com/switcherapi/client/service/ValidatorService.java index a9f21867..c2b0b303 100644 --- a/src/main/java/com/github/switcherapi/client/service/ValidatorService.java +++ b/src/main/java/com/switcherapi/client/service/ValidatorService.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client.service; +package com.switcherapi.client.service; -import com.github.switcherapi.client.exception.SwitcherInvalidStrategyException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.service.validators.*; +import com.switcherapi.client.exception.SwitcherInvalidStrategyException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.service.validators.*; import java.util.EnumMap; @@ -33,13 +33,13 @@ public void registerValidator(Validator validator) { } @Override - public boolean execute(final Strategy strategy, final Entry switcherInput) + public boolean execute(final StrategyConfig strategyConfig, final Entry switcherInput) throws SwitcherInvalidStrategyException { - if (!validators.containsKey(strategy.getStrategyValidator())) { - throw new SwitcherInvalidStrategyException(strategy.getStrategy()); + if (!validators.containsKey(strategyConfig.getStrategyValidator())) { + throw new SwitcherInvalidStrategyException(strategyConfig.getStrategy()); } - return validators.get(strategy.getStrategyValidator()).execute(strategy, switcherInput); + return validators.get(strategyConfig.getStrategyValidator()).execute(strategyConfig, switcherInput); } } diff --git a/src/main/java/com/github/switcherapi/client/service/WorkerName.java b/src/main/java/com/switcherapi/client/service/WorkerName.java similarity index 91% rename from src/main/java/com/github/switcherapi/client/service/WorkerName.java rename to src/main/java/com/switcherapi/client/service/WorkerName.java index 4d635c16..a9b54ef9 100644 --- a/src/main/java/com/github/switcherapi/client/service/WorkerName.java +++ b/src/main/java/com/switcherapi/client/service/WorkerName.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.service; +package com.switcherapi.client.service; public enum WorkerName { diff --git a/src/main/java/com/github/switcherapi/client/service/local/ClientLocal.java b/src/main/java/com/switcherapi/client/service/local/ClientLocal.java similarity index 76% rename from src/main/java/com/github/switcherapi/client/service/local/ClientLocal.java rename to src/main/java/com/switcherapi/client/service/local/ClientLocal.java index 3c43eb44..4181ab95 100644 --- a/src/main/java/com/github/switcherapi/client/service/local/ClientLocal.java +++ b/src/main/java/com/switcherapi/client/service/local/ClientLocal.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client.service.local; +package com.switcherapi.client.service.local; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.criteria.Domain; -import com.github.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.SwitcherResult; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/github/switcherapi/client/service/local/ClientLocalService.java b/src/main/java/com/switcherapi/client/service/local/ClientLocalService.java similarity index 74% rename from src/main/java/com/github/switcherapi/client/service/local/ClientLocalService.java rename to src/main/java/com/switcherapi/client/service/local/ClientLocalService.java index f5419efd..8f231496 100644 --- a/src/main/java/com/github/switcherapi/client/service/local/ClientLocalService.java +++ b/src/main/java/com/switcherapi/client/service/local/ClientLocalService.java @@ -1,17 +1,17 @@ -package com.github.switcherapi.client.service.local; - -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.exception.SwitcherKeyNotFoundException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.criteria.Config; -import com.github.switcherapi.client.model.criteria.Domain; -import com.github.switcherapi.client.model.criteria.Group; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.client.service.SwitcherFactory; -import com.github.switcherapi.client.service.SwitcherValidator; -import com.github.switcherapi.client.utils.SwitcherUtils; +package com.switcherapi.client.service.local; + +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherKeyNotFoundException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.criteria.Config; +import com.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.criteria.Group; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.service.SwitcherFactory; +import com.switcherapi.client.service.SwitcherValidator; +import com.switcherapi.client.utils.SwitcherUtils; import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -115,40 +115,40 @@ private Config findConfigInGroup(final Group group, final String switcherKey) { * @return SwitcherResult containing the result of the execution * @throws SwitcherException If encountered either invalid input or misconfiguration */ - private SwitcherResult processOperation(final Strategy[] configStrategies, final List input, + private SwitcherResult processOperation(final StrategyConfig[] configStrategies, final List input, final SwitcherRequest switcher) { SwitcherUtils.debug(logger, LOG_PROCESS_OP_TEMPLATE, Arrays.toString(configStrategies)); - for (final Strategy strategy : configStrategies) { - if (!strategy.isActivated()) { + for (final StrategyConfig strategyConfig : configStrategies) { + if (!strategyConfig.isActivated()) { continue; } - final Entry switcherInput = tryGetSwitcherInput(input, strategy); + final Entry switcherInput = tryGetSwitcherInput(input, strategyConfig); if (switcherInput == null) { - return strategyFailed(switcher, strategy, STRATEGY_FAIL_NO_INPUT_PATTERN); + return strategyFailed(switcher, strategyConfig, STRATEGY_FAIL_NO_INPUT_PATTERN); } - if (!validatorService.execute(strategy, switcherInput)) { - return strategyFailed(switcher, strategy, STRATEGY_FAIL_PATTERN); + if (!validatorService.execute(strategyConfig, switcherInput)) { + return strategyFailed(switcher, strategyConfig, STRATEGY_FAIL_PATTERN); } } return SwitcherFactory.buildResultEnabled(switcher); } - private SwitcherResult strategyFailed(SwitcherRequest switcher, Strategy strategy, String pattern) { - return SwitcherFactory.buildResultDisabled(String.format(pattern, strategy.getStrategy()), switcher); + private SwitcherResult strategyFailed(SwitcherRequest switcher, StrategyConfig strategyConfig, String pattern) { + return SwitcherFactory.buildResultDisabled(String.format(pattern, strategyConfig.getStrategy()), switcher); } - private Entry tryGetSwitcherInput(final List input, Strategy strategy) { + private Entry tryGetSwitcherInput(final List input, StrategyConfig strategyConfig) { if (input == null) { return null; } return input.stream() - .filter(i -> i.getStrategy().equals(strategy.getStrategy())) + .filter(i -> i.getStrategy().equals(strategyConfig.getStrategy())) .findFirst() .orElse(null); } diff --git a/src/main/java/com/github/switcherapi/client/service/local/SwitcherLocalService.java b/src/main/java/com/switcherapi/client/service/local/SwitcherLocalService.java similarity index 80% rename from src/main/java/com/github/switcherapi/client/service/local/SwitcherLocalService.java rename to src/main/java/com/switcherapi/client/service/local/SwitcherLocalService.java index fd9d22a6..2caf71c7 100644 --- a/src/main/java/com/github/switcherapi/client/service/local/SwitcherLocalService.java +++ b/src/main/java/com/switcherapi/client/service/local/SwitcherLocalService.java @@ -1,20 +1,20 @@ -package com.github.switcherapi.client.service.local; +package com.switcherapi.client.service.local; -import com.github.switcherapi.client.SwitcherExecutorImpl; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.exception.SwitcherKeyNotFoundException; -import com.github.switcherapi.client.exception.SwitcherSnapshotLoadException; -import com.github.switcherapi.client.exception.SwitchersValidationException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.client.service.SwitcherFactory; -import com.github.switcherapi.client.service.remote.ClientRemote; -import com.github.switcherapi.client.utils.Mapper; -import com.github.switcherapi.client.utils.SnapshotEventHandler; -import com.github.switcherapi.client.utils.SnapshotLoader; -import com.github.switcherapi.client.utils.SwitcherUtils; +import com.switcherapi.client.SwitcherExecutorImpl; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherKeyNotFoundException; +import com.switcherapi.client.exception.SwitcherSnapshotLoadException; +import com.switcherapi.client.exception.SwitchersValidationException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.service.SwitcherFactory; +import com.switcherapi.client.service.remote.ClientRemote; +import com.switcherapi.client.utils.Mapper; +import com.switcherapi.client.utils.SnapshotEventHandler; +import com.switcherapi.client.utils.SnapshotLoader; +import com.switcherapi.client.utils.SwitcherUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/github/switcherapi/client/service/remote/ClientRemote.java b/src/main/java/com/switcherapi/client/service/remote/ClientRemote.java similarity index 78% rename from src/main/java/com/github/switcherapi/client/service/remote/ClientRemote.java rename to src/main/java/com/switcherapi/client/service/remote/ClientRemote.java index 82707c6c..bf4a9c63 100644 --- a/src/main/java/com/github/switcherapi/client/service/remote/ClientRemote.java +++ b/src/main/java/com/switcherapi/client/service/remote/ClientRemote.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client.service.remote; +package com.switcherapi.client.service.remote; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.remote.dto.SwitchersCheck; -import com.github.switcherapi.client.remote.dto.CriteriaRequest; -import com.github.switcherapi.client.remote.dto.CriteriaResponse; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.remote.dto.SwitchersCheck; +import com.switcherapi.client.remote.dto.CriteriaRequest; +import com.switcherapi.client.remote.dto.CriteriaResponse; import java.util.Set; diff --git a/src/main/java/com/github/switcherapi/client/service/remote/ClientRemoteService.java b/src/main/java/com/switcherapi/client/service/remote/ClientRemoteService.java similarity index 83% rename from src/main/java/com/github/switcherapi/client/service/remote/ClientRemoteService.java rename to src/main/java/com/switcherapi/client/service/remote/ClientRemoteService.java index 75fe6b58..21be836f 100644 --- a/src/main/java/com/github/switcherapi/client/service/remote/ClientRemoteService.java +++ b/src/main/java/com/switcherapi/client/service/remote/ClientRemoteService.java @@ -1,15 +1,14 @@ -package com.github.switcherapi.client.service.remote; - -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.exception.SwitcherInvalidDateTimeArgumentException; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.remote.dto.SwitchersCheck; -import com.github.switcherapi.client.remote.dto.*; -import com.github.switcherapi.client.remote.ClientWS; -import com.github.switcherapi.client.utils.SwitcherUtils; +package com.switcherapi.client.service.remote; + +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherInvalidDateTimeArgumentException; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.remote.dto.*; +import com.switcherapi.client.remote.ClientWS; +import com.switcherapi.client.utils.SwitcherUtils; import org.apache.commons.lang3.StringUtils; import java.util.Date; diff --git a/src/main/java/com/github/switcherapi/client/service/remote/SwitcherRemoteService.java b/src/main/java/com/switcherapi/client/service/remote/SwitcherRemoteService.java similarity index 78% rename from src/main/java/com/github/switcherapi/client/service/remote/SwitcherRemoteService.java rename to src/main/java/com/switcherapi/client/service/remote/SwitcherRemoteService.java index d4d63ab0..411e8c96 100644 --- a/src/main/java/com/github/switcherapi/client/service/remote/SwitcherRemoteService.java +++ b/src/main/java/com/switcherapi/client/service/remote/SwitcherRemoteService.java @@ -1,17 +1,17 @@ -package com.github.switcherapi.client.service.remote; +package com.switcherapi.client.service.remote; -import com.github.switcherapi.client.SwitcherExecutor; -import com.github.switcherapi.client.SwitcherExecutorImpl; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.exception.SwitchersValidationException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.client.remote.dto.CriteriaResponse; -import com.github.switcherapi.client.remote.dto.SwitchersCheck; -import com.github.switcherapi.client.service.SwitcherFactory; -import com.github.switcherapi.client.utils.Mapper; -import com.github.switcherapi.client.utils.SwitcherUtils; +import com.switcherapi.client.SwitcherExecutor; +import com.switcherapi.client.SwitcherExecutorImpl; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.exception.SwitchersValidationException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.remote.dto.CriteriaResponse; +import com.switcherapi.client.remote.dto.SwitchersCheck; +import com.switcherapi.client.service.SwitcherFactory; +import com.switcherapi.client.utils.Mapper; +import com.switcherapi.client.utils.SwitcherUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/github/switcherapi/client/service/validators/DateTimeValidator.java b/src/main/java/com/switcherapi/client/service/validators/DateTimeValidator.java similarity index 92% rename from src/main/java/com/github/switcherapi/client/service/validators/DateTimeValidator.java rename to src/main/java/com/switcherapi/client/service/validators/DateTimeValidator.java index 4c9af227..e61b2b42 100644 --- a/src/main/java/com/github/switcherapi/client/service/validators/DateTimeValidator.java +++ b/src/main/java/com/switcherapi/client/service/validators/DateTimeValidator.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.service.validators; +package com.switcherapi.client.service.validators; -import com.github.switcherapi.client.utils.SwitcherUtils; +import com.switcherapi.client.utils.SwitcherUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/switcherapi/client/service/validators/DateValidator.java b/src/main/java/com/switcherapi/client/service/validators/DateValidator.java new file mode 100644 index 00000000..f31161f6 --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/DateValidator.java @@ -0,0 +1,66 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.exception.SwitcherInvalidOperationInputException; +import com.switcherapi.client.exception.SwitcherInvalidTimeFormat; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.EntryOperation; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import org.apache.commons.lang3.time.DateUtils; + +import java.text.ParseException; +import java.util.Date; + +public class DateValidator extends DateTimeValidator { + + public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + + @Override + public StrategyValidator getType() { + return StrategyValidator.DATE; + } + + @Override + public boolean process(final StrategyConfig strategyConfig, final Entry switcherInput) throws SwitcherInvalidOperationException, + SwitcherInvalidTimeFormat, SwitcherInvalidOperationInputException { + + try { + return selectDateOperationCase(strategyConfig, switcherInput); + } catch (ParseException e) { + throw new SwitcherInvalidTimeFormat(strategyConfig.getStrategy(), e); + } + } + + private boolean selectDateOperationCase(final StrategyConfig strategyConfig, final Entry switcherInput) throws ParseException { + Date stgDate; + Date stgDate2; + Date inputDate; + + switch (strategyConfig.getEntryOperation()) { + case LOWER: + stgDate = DateUtils.parseDate(getFullDate(strategyConfig.getValues()[0]), DATE_FORMAT); + inputDate = DateUtils.parseDate(getFullDate(switcherInput.getInput()), DATE_FORMAT); + + return inputDate.before(stgDate); + case GREATER: + stgDate = DateUtils.parseDate(getFullDate(strategyConfig.getValues()[0]), DATE_FORMAT); + inputDate = DateUtils.parseDate(getFullDate(switcherInput.getInput()), DATE_FORMAT); + + return inputDate.after(stgDate); + case BETWEEN: + if (strategyConfig.getValues().length == 2) { + stgDate = DateUtils.parseDate(getFullDate(strategyConfig.getValues()[0]), DATE_FORMAT); + stgDate2 = DateUtils.parseDate(getFullDate(strategyConfig.getValues()[1]), DATE_FORMAT); + inputDate = DateUtils.parseDate(getFullDate(switcherInput.getInput()), DATE_FORMAT); + + return inputDate.after(stgDate) && inputDate.before(stgDate2); + } + + throw new SwitcherInvalidOperationInputException(EntryOperation.BETWEEN.name()); + default: + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + } + +} diff --git a/src/main/java/com/switcherapi/client/service/validators/NetworkValidator.java b/src/main/java/com/switcherapi/client/service/validators/NetworkValidator.java new file mode 100644 index 00000000..b6f85dfb --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/NetworkValidator.java @@ -0,0 +1,50 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import org.apache.commons.net.util.SubnetUtils; +import org.apache.commons.net.util.SubnetUtils.SubnetInfo; + +public class NetworkValidator extends Validator { + + public static final String CIDR_REGEX = "^(\\d{1,3}\\.){3}\\d{1,3}(/(\\d|[1-2]\\d|3[0-2]))"; + + @Override + public StrategyValidator getType() { + return StrategyValidator.NETWORK; + } + + @Override + public boolean process(final StrategyConfig strategyConfig, final Entry switcherInput) { + switch (strategyConfig.getEntryOperation()) { + case EXIST: + return verifyIfAddressExistInNetwork(strategyConfig, switcherInput); + case NOT_EXIST: + return !verifyIfAddressExistInNetwork(strategyConfig, switcherInput); + default: + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + } + + private boolean verifyIfAddressExistInNetwork(final StrategyConfig strategyConfig, final Entry switcherInput) { + SubnetInfo subnetInfo; + for (final String value : strategyConfig.getValues()) { + if (value.matches(CIDR_REGEX)) { + subnetInfo = new SubnetUtils(value).getInfo(); + + if (subnetInfo.isInRange(switcherInput.getInput())) { + return true; + } + } else { + if (value.equals(switcherInput.getInput())) { + return true; + } + } + } + + return false; + } + +} diff --git a/src/main/java/com/switcherapi/client/service/validators/NumericValidator.java b/src/main/java/com/switcherapi/client/service/validators/NumericValidator.java new file mode 100644 index 00000000..f943f22e --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/NumericValidator.java @@ -0,0 +1,62 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.exception.SwitcherInvalidNumericFormat; +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import org.apache.commons.lang3.math.NumberUtils; + +import java.util.Arrays; + +public class NumericValidator extends Validator { + + @Override + public StrategyValidator getType() { + return StrategyValidator.NUMERIC; + } + + @Override + public boolean process(final StrategyConfig strategyConfig, final Entry switcherInput) { + if (!NumberUtils.isCreatable(switcherInput.getInput())) + throw new SwitcherInvalidNumericFormat(switcherInput.getInput()); + + switch (strategyConfig.getEntryOperation()) { + case EXIST: + return Arrays.stream(strategyConfig.getValues()).anyMatch(val -> val.equals(switcherInput.getInput())); + case NOT_EXIST: + return Arrays.stream(strategyConfig.getValues()).noneMatch(val -> val.equals(switcherInput.getInput())); + case EQUAL: + return strategyConfig.getValues().length == 1 && strategyConfig.getValues()[0].equals(switcherInput.getInput()); + case NOT_EQUAL: + return strategyConfig.getValues().length == 1 && !strategyConfig.getValues()[0].equals(switcherInput.getInput()); + case LOWER: + if (strategyConfig.getValues().length == 1) { + final double numericInput = NumberUtils.createNumber(switcherInput.getInput()).doubleValue(); + final double numericValue = NumberUtils.createNumber(strategyConfig.getValues()[0]).doubleValue(); + return numericInput < numericValue; + } + break; + case GREATER: + if (strategyConfig.getValues().length == 1) { + final double numericInput = NumberUtils.createNumber(switcherInput.getInput()).doubleValue(); + final double numericValue = NumberUtils.createNumber(strategyConfig.getValues()[0]).doubleValue(); + return numericInput > numericValue; + } + break; + case BETWEEN: + if (strategyConfig.getValues().length == 2) { + final double numericInput = NumberUtils.createNumber(switcherInput.getInput()).doubleValue(); + final double numericFirstValue = NumberUtils.createNumber(strategyConfig.getValues()[0]).doubleValue(); + final double numericSecondValue = NumberUtils.createNumber(strategyConfig.getValues()[1]).doubleValue(); + return numericInput >= numericFirstValue && numericFirstValue <= numericSecondValue; + } + break; + default: + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + +} diff --git a/src/main/java/com/switcherapi/client/service/validators/PayloadValidator.java b/src/main/java/com/switcherapi/client/service/validators/PayloadValidator.java new file mode 100644 index 00000000..a512f07b --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/PayloadValidator.java @@ -0,0 +1,51 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.utils.SwitcherUtils; + +import java.util.Arrays; +import java.util.Set; + +public class PayloadValidator extends Validator { + + @Override + public StrategyValidator getType() { + return StrategyValidator.PAYLOAD; + } + + @Override + public boolean process(StrategyConfig strategyConfig, Entry switcherInput) { + switch (strategyConfig.getEntryOperation()) { + case HAS_ONE: + return hasOne(strategyConfig, switcherInput); + case HAS_ALL: + return hasAll(strategyConfig, switcherInput); + default: + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + } + + private boolean hasOne(StrategyConfig strategyConfig, Entry switcherInput) { + try { + final Set keySet = SwitcherUtils.payloadReader(switcherInput.getInput(), null); + return Arrays.stream(strategyConfig.getValues()) + .anyMatch(keySet::contains); + } catch (Exception e) { + return false; + } + } + + private boolean hasAll(StrategyConfig strategyConfig, Entry switcherInput) { + try { + final Set keySet = SwitcherUtils.payloadReader(switcherInput.getInput(), null); + return Arrays.stream(strategyConfig.getValues()) + .allMatch(keySet::contains); + } catch (Exception e) { + return false; + } + } + +} diff --git a/src/main/java/com/switcherapi/client/service/validators/RegexValidator.java b/src/main/java/com/switcherapi/client/service/validators/RegexValidator.java new file mode 100644 index 00000000..1dd5c8a8 --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/RegexValidator.java @@ -0,0 +1,37 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; + +import java.util.Arrays; + +public class RegexValidator extends Validator { + + private static final String DELIMITER_REGEX = "\\b%s\\b"; + + @Override + public StrategyValidator getType() { + return StrategyValidator.REGEX; + } + + @Override + public boolean process(StrategyConfig strategyConfig, Entry switcherInput) throws SwitcherInvalidOperationException { + switch (strategyConfig.getEntryOperation()) { + case EXIST: + return Arrays.stream(strategyConfig.getValues()).anyMatch(val -> switcherInput.getInput().matches(val)); + case NOT_EXIST: + return Arrays.stream(strategyConfig.getValues()).noneMatch(val -> switcherInput.getInput().matches(val)); + case EQUAL: + return strategyConfig.getValues().length == 1 + && switcherInput.getInput().matches(String.format(DELIMITER_REGEX, strategyConfig.getValues()[0])); + case NOT_EQUAL: + return strategyConfig.getValues().length == 1 + && !switcherInput.getInput().matches(String.format(DELIMITER_REGEX, strategyConfig.getValues()[0])); + default: + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/github/switcherapi/client/service/validators/RegexValidatorV8.java b/src/main/java/com/switcherapi/client/service/validators/RegexValidatorV8.java similarity index 80% rename from src/main/java/com/github/switcherapi/client/service/validators/RegexValidatorV8.java rename to src/main/java/com/switcherapi/client/service/validators/RegexValidatorV8.java index 6d4f69fd..3b6b685d 100644 --- a/src/main/java/com/github/switcherapi/client/service/validators/RegexValidatorV8.java +++ b/src/main/java/com/switcherapi/client/service/validators/RegexValidatorV8.java @@ -1,14 +1,14 @@ -package com.github.switcherapi.client.service.validators; - -import com.github.switcherapi.client.SwitcherContextBase; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.exception.SwitcherValidatorException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.service.WorkerName; +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.SwitcherContextBase; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.exception.SwitcherValidatorException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.service.WorkerName; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,11 +61,11 @@ public StrategyValidator getType() { } @Override - public boolean process(Strategy strategy, Entry switcherInput) throws SwitcherInvalidOperationException { + public boolean process(StrategyConfig strategyConfig, Entry switcherInput) throws SwitcherInvalidOperationException { try { - switch (strategy.getEntryOperation()) { + switch (strategyConfig.getEntryOperation()) { case EXIST: - return Arrays.stream(strategy.getValues()).anyMatch(val -> { + return Arrays.stream(strategyConfig.getValues()).anyMatch(val -> { try { return timedMatch(switcherInput.getInput(), val); } catch (TimeoutException | SwitcherValidatorException e) { @@ -74,7 +74,7 @@ public boolean process(Strategy strategy, Entry switcherInput) throws SwitcherIn } }); case NOT_EXIST: - return Arrays.stream(strategy.getValues()).noneMatch(val -> { + return Arrays.stream(strategyConfig.getValues()).noneMatch(val -> { try { return timedMatch(switcherInput.getInput(), val); } catch (TimeoutException | SwitcherValidatorException e) { @@ -83,13 +83,13 @@ public boolean process(Strategy strategy, Entry switcherInput) throws SwitcherIn } }); case EQUAL: - return strategy.getValues().length == 1 - && timedMatch(switcherInput.getInput(), String.format(DELIMITER_REGEX, strategy.getValues()[0])); + return strategyConfig.getValues().length == 1 + && timedMatch(switcherInput.getInput(), String.format(DELIMITER_REGEX, strategyConfig.getValues()[0])); case NOT_EQUAL: - return strategy.getValues().length == 1 - && !timedMatch(switcherInput.getInput(), String.format(DELIMITER_REGEX, strategy.getValues()[0])); + return strategyConfig.getValues().length == 1 + && !timedMatch(switcherInput.getInput(), String.format(DELIMITER_REGEX, strategyConfig.getValues()[0])); default: - throw new SwitcherInvalidOperationException(strategy.getOperation(), strategy.getStrategy()); + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); } } catch (TimeoutException | SwitcherValidatorException e) { logger.error(e.getMessage(), e); diff --git a/src/main/java/com/switcherapi/client/service/validators/TimeValidator.java b/src/main/java/com/switcherapi/client/service/validators/TimeValidator.java new file mode 100644 index 00000000..10da8841 --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/TimeValidator.java @@ -0,0 +1,72 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.exception.SwitcherInvalidOperationInputException; +import com.switcherapi.client.exception.SwitcherInvalidTimeFormat; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.EntryOperation; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import org.apache.commons.lang3.time.DateUtils; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class TimeValidator extends DateTimeValidator { + + public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + + @Override + public StrategyValidator getType() { + return StrategyValidator.TIME; + } + + @Override + public boolean process(StrategyConfig strategyConfig, Entry switcherInput) throws SwitcherInvalidOperationException, + SwitcherInvalidTimeFormat, SwitcherInvalidOperationInputException { + + try { + final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + final String today = format.format(new Date()); + return selectTimeOperationCase(strategyConfig, switcherInput, today); + } catch (ParseException e) { + throw new SwitcherInvalidTimeFormat(strategyConfig.getStrategy(), e); + } + + } + + private boolean selectTimeOperationCase(final StrategyConfig strategyConfig, final Entry switcherInput, final String today) + throws ParseException { + Date stgDate; + Date stgDate2; + Date inputDate; + + switch (strategyConfig.getEntryOperation()) { + case LOWER: + stgDate = DateUtils.parseDate(getFullTime(today, strategyConfig.getValues()[0]), DATE_FORMAT); + inputDate = DateUtils.parseDate(getFullTime(today, switcherInput.getInput()), DATE_FORMAT); + + return inputDate.before(stgDate); + case GREATER: + stgDate = DateUtils.parseDate(getFullTime(today, strategyConfig.getValues()[0]), DATE_FORMAT); + inputDate = DateUtils.parseDate(getFullTime(today, switcherInput.getInput()), DATE_FORMAT); + + return inputDate.after(stgDate); + case BETWEEN: + if (strategyConfig.getValues().length == 2) { + stgDate = DateUtils.parseDate(getFullTime(today, strategyConfig.getValues()[0]), DATE_FORMAT); + stgDate2 = DateUtils.parseDate(getFullTime(today, strategyConfig.getValues()[1]), DATE_FORMAT); + inputDate = DateUtils.parseDate(getFullTime(today, switcherInput.getInput()), + DATE_FORMAT); + + return inputDate.after(stgDate) && inputDate.before(stgDate2); + } + + throw new SwitcherInvalidOperationInputException(EntryOperation.BETWEEN.name()); + default: + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + } + +} diff --git a/src/main/java/com/switcherapi/client/service/validators/Validator.java b/src/main/java/com/switcherapi/client/service/validators/Validator.java new file mode 100644 index 00000000..b3825d74 --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/Validator.java @@ -0,0 +1,30 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.utils.SwitcherUtils; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.criteria.StrategyConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class Validator { + + protected static final Logger logger = LoggerFactory.getLogger(Validator.class); + + public static final String DEBUG_SWITCHER_INPUT = "switcherInput: {}"; + public static final String DEBUG_STRATEGY = "strategy: {}"; + + public boolean execute(final StrategyConfig strategyConfig, final Entry switcherInput) + throws SwitcherException { + SwitcherUtils.debug(logger, DEBUG_STRATEGY, strategyConfig); + SwitcherUtils.debug(logger, DEBUG_SWITCHER_INPUT, switcherInput); + return process(strategyConfig, switcherInput); + } + + public abstract boolean process(final StrategyConfig strategyConfig, final Entry switcherInput) + throws SwitcherException; + + public abstract StrategyValidator getType(); + +} diff --git a/src/main/java/com/switcherapi/client/service/validators/ValueValidator.java b/src/main/java/com/switcherapi/client/service/validators/ValueValidator.java new file mode 100644 index 00000000..c24b8f9f --- /dev/null +++ b/src/main/java/com/switcherapi/client/service/validators/ValueValidator.java @@ -0,0 +1,33 @@ +package com.switcherapi.client.service.validators; + +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; + +import java.util.Arrays; + +public class ValueValidator extends Validator { + + @Override + public StrategyValidator getType() { + return StrategyValidator.VALUE; + } + + @Override + public boolean process(StrategyConfig strategyConfig, Entry switcherInput) { + switch (strategyConfig.getEntryOperation()) { + case EXIST: + return Arrays.stream(strategyConfig.getValues()).anyMatch(val -> val.equals(switcherInput.getInput())); + case NOT_EXIST: + return Arrays.stream(strategyConfig.getValues()).noneMatch(val -> val.equals(switcherInput.getInput())); + case EQUAL: + return strategyConfig.getValues().length == 1 && strategyConfig.getValues()[0].equals(switcherInput.getInput()); + case NOT_EQUAL: + return strategyConfig.getValues().length == 1 && !strategyConfig.getValues()[0].equals(switcherInput.getInput()); + default: + throw new SwitcherInvalidOperationException(strategyConfig.getOperation(), strategyConfig.getStrategy()); + } + } + +} diff --git a/src/main/java/com/github/switcherapi/client/test/SwitcherBypass.java b/src/main/java/com/switcherapi/client/test/SwitcherBypass.java similarity index 94% rename from src/main/java/com/github/switcherapi/client/test/SwitcherBypass.java rename to src/main/java/com/switcherapi/client/test/SwitcherBypass.java index 1278ae6b..3a820123 100644 --- a/src/main/java/com/github/switcherapi/client/test/SwitcherBypass.java +++ b/src/main/java/com/switcherapi/client/test/SwitcherBypass.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.test; +package com.switcherapi.client.test; -import com.github.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.model.SwitcherResult; import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/github/switcherapi/client/test/SwitcherTest.java b/src/main/java/com/switcherapi/client/test/SwitcherTest.java similarity index 95% rename from src/main/java/com/github/switcherapi/client/test/SwitcherTest.java rename to src/main/java/com/switcherapi/client/test/SwitcherTest.java index cdf81b0d..65c3e025 100644 --- a/src/main/java/com/github/switcherapi/client/test/SwitcherTest.java +++ b/src/main/java/com/switcherapi/client/test/SwitcherTest.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.test; +package com.switcherapi.client.test; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/main/java/com/github/switcherapi/client/test/SwitcherTestExtension.java b/src/main/java/com/switcherapi/client/test/SwitcherTestExtension.java similarity index 97% rename from src/main/java/com/github/switcherapi/client/test/SwitcherTestExtension.java rename to src/main/java/com/switcherapi/client/test/SwitcherTestExtension.java index 4a69721c..bcfc83da 100644 --- a/src/main/java/com/github/switcherapi/client/test/SwitcherTestExtension.java +++ b/src/main/java/com/switcherapi/client/test/SwitcherTestExtension.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.test; +package com.switcherapi.client.test; -import com.github.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.model.SwitcherResult; import org.apache.commons.lang3.ArrayUtils; import org.junit.jupiter.api.extension.*; import org.junit.jupiter.api.extension.ExtensionContext.Namespace; diff --git a/src/main/java/com/github/switcherapi/client/test/SwitcherTestTemplate.java b/src/main/java/com/switcherapi/client/test/SwitcherTestTemplate.java similarity index 97% rename from src/main/java/com/github/switcherapi/client/test/SwitcherTestTemplate.java rename to src/main/java/com/switcherapi/client/test/SwitcherTestTemplate.java index ab9d695d..22aae0be 100644 --- a/src/main/java/com/github/switcherapi/client/test/SwitcherTestTemplate.java +++ b/src/main/java/com/switcherapi/client/test/SwitcherTestTemplate.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.test; +package com.switcherapi.client.test; import org.apache.commons.lang3.ArrayUtils; import org.junit.jupiter.api.extension.TestTemplateInvocationContext; diff --git a/src/main/java/com/github/switcherapi/client/test/SwitcherTestValue.java b/src/main/java/com/switcherapi/client/test/SwitcherTestValue.java similarity index 79% rename from src/main/java/com/github/switcherapi/client/test/SwitcherTestValue.java rename to src/main/java/com/switcherapi/client/test/SwitcherTestValue.java index 4727424c..4843c1c6 100644 --- a/src/main/java/com/github/switcherapi/client/test/SwitcherTestValue.java +++ b/src/main/java/com/switcherapi/client/test/SwitcherTestValue.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.test; +package com.switcherapi.client.test; public @interface SwitcherTestValue { diff --git a/src/main/java/com/switcherapi/client/test/SwitcherTestWhen.java b/src/main/java/com/switcherapi/client/test/SwitcherTestWhen.java new file mode 100644 index 00000000..27b638f9 --- /dev/null +++ b/src/main/java/com/switcherapi/client/test/SwitcherTestWhen.java @@ -0,0 +1,11 @@ +package com.switcherapi.client.test; + +import com.switcherapi.client.model.StrategyValidator; + +public @interface SwitcherTestWhen { + + StrategyValidator strategy(); + + String[] input(); + +} diff --git a/src/main/java/com/github/switcherapi/client/utils/Mapper.java b/src/main/java/com/switcherapi/client/utils/Mapper.java similarity index 71% rename from src/main/java/com/github/switcherapi/client/utils/Mapper.java rename to src/main/java/com/switcherapi/client/utils/Mapper.java index 2c5b6706..7b71b12f 100644 --- a/src/main/java/com/github/switcherapi/client/utils/Mapper.java +++ b/src/main/java/com/switcherapi/client/utils/Mapper.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.client.remote.dto.CriteriaRequest; -import com.github.switcherapi.client.remote.dto.CriteriaResponse; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.remote.dto.CriteriaRequest; +import com.switcherapi.client.remote.dto.CriteriaResponse; public class Mapper { diff --git a/src/main/java/com/github/switcherapi/client/utils/SnapshotEventHandler.java b/src/main/java/com/switcherapi/client/utils/SnapshotEventHandler.java similarity index 87% rename from src/main/java/com/github/switcherapi/client/utils/SnapshotEventHandler.java rename to src/main/java/com/switcherapi/client/utils/SnapshotEventHandler.java index 054d0e5f..c27b56e6 100644 --- a/src/main/java/com/github/switcherapi/client/utils/SnapshotEventHandler.java +++ b/src/main/java/com/switcherapi/client/utils/SnapshotEventHandler.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherException; import org.slf4j.LoggerFactory; /** diff --git a/src/main/java/com/github/switcherapi/client/utils/SnapshotLoader.java b/src/main/java/com/switcherapi/client/utils/SnapshotLoader.java similarity index 93% rename from src/main/java/com/github/switcherapi/client/utils/SnapshotLoader.java rename to src/main/java/com/switcherapi/client/utils/SnapshotLoader.java index 428ab9fa..284dfe25 100644 --- a/src/main/java/com/github/switcherapi/client/utils/SnapshotLoader.java +++ b/src/main/java/com/switcherapi/client/utils/SnapshotLoader.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.client.exception.SwitcherSnapshotLoadException; -import com.github.switcherapi.client.exception.SwitcherSnapshotWriteException; -import com.github.switcherapi.client.model.criteria.Domain; -import com.github.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.exception.SwitcherSnapshotLoadException; +import com.switcherapi.client.exception.SwitcherSnapshotWriteException; +import com.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.criteria.Snapshot; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonIOException; diff --git a/src/main/java/com/github/switcherapi/client/utils/SnapshotSerializer.java b/src/main/java/com/switcherapi/client/utils/SnapshotSerializer.java similarity index 87% rename from src/main/java/com/github/switcherapi/client/utils/SnapshotSerializer.java rename to src/main/java/com/switcherapi/client/utils/SnapshotSerializer.java index 6b7289c8..6dddfed3 100644 --- a/src/main/java/com/github/switcherapi/client/utils/SnapshotSerializer.java +++ b/src/main/java/com/switcherapi/client/utils/SnapshotSerializer.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.client.model.criteria.Config; -import com.github.switcherapi.client.model.criteria.Domain; -import com.github.switcherapi.client.model.criteria.Group; -import com.github.switcherapi.client.model.criteria.Strategy; +import com.switcherapi.client.model.criteria.Config; +import com.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.criteria.Group; +import com.switcherapi.client.model.criteria.StrategyConfig; import com.google.gson.*; import java.lang.reflect.Type; @@ -65,13 +65,13 @@ private JsonArray serializeStrategies(Config config, JsonSerializationContext co JsonArray strategiesArray = new JsonArray(); if (Objects.nonNull(config.getStrategies())) { - for (Strategy strategy : config.getStrategies()) { + for (StrategyConfig strategyConfig : config.getStrategies()) { JsonObject strategyObject = new JsonObject(); - strategyObject.add(Field.STRATEGY.value(), context.serialize(strategy.getStrategy())); - strategyObject.add(Field.OPERATION.value(), context.serialize(strategy.getOperation())); - strategyObject.add(Field.DESCRIPTION.value(), context.serialize(strategy.getDescription())); - strategyObject.add(Field.ACTIVATED.value(), context.serialize(strategy.isActivated())); - strategyObject.add(Field.VALUES.value(), context.serialize(strategy.getValues())); + strategyObject.add(Field.STRATEGY.value(), context.serialize(strategyConfig.getStrategy())); + strategyObject.add(Field.OPERATION.value(), context.serialize(strategyConfig.getOperation())); + strategyObject.add(Field.DESCRIPTION.value(), context.serialize(strategyConfig.getDescription())); + strategyObject.add(Field.ACTIVATED.value(), context.serialize(strategyConfig.isActivated())); + strategyObject.add(Field.VALUES.value(), context.serialize(strategyConfig.getValues())); strategiesArray.add(strategyObject); } } diff --git a/src/main/java/com/github/switcherapi/client/utils/SnapshotWatcher.java b/src/main/java/com/switcherapi/client/utils/SnapshotWatcher.java similarity index 94% rename from src/main/java/com/github/switcherapi/client/utils/SnapshotWatcher.java rename to src/main/java/com/switcherapi/client/utils/SnapshotWatcher.java index 894fa2cd..f9f448de 100644 --- a/src/main/java/com/github/switcherapi/client/utils/SnapshotWatcher.java +++ b/src/main/java/com/switcherapi/client/utils/SnapshotWatcher.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.client.service.local.SwitcherLocalService; +import com.switcherapi.client.service.local.SwitcherLocalService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/github/switcherapi/client/utils/SwitcherUtils.java b/src/main/java/com/switcherapi/client/utils/SwitcherUtils.java similarity index 95% rename from src/main/java/com/github/switcherapi/client/utils/SwitcherUtils.java rename to src/main/java/com/switcherapi/client/utils/SwitcherUtils.java index 74ec7dbe..89b63668 100644 --- a/src/main/java/com/github/switcherapi/client/utils/SwitcherUtils.java +++ b/src/main/java/com/switcherapi/client/utils/SwitcherUtils.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.exception.SwitcherInvalidDateTimeArgumentException; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.exception.SwitcherInvalidDateTimeArgumentException; +import com.switcherapi.client.model.ContextKey; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/reflect-config.json b/src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/reflect-config.json similarity index 52% rename from src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/reflect-config.json rename to src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/reflect-config.json index 04a78091..700b3561 100644 --- a/src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/reflect-config.json +++ b/src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/reflect-config.json @@ -1,8 +1,8 @@ [ { - "name": "com.github.switcherapi.client.model.Entry", + "name": "com.switcherapi.client.model.Entry", "condition": { - "typeReachable": "com.github.switcherapi.client.remote.dto.CriteriaInputRequest" + "typeReachable": "com.switcherapi.client.remote.dto.CriteriaInputRequest" }, "allDeclaredFields": true, "methods": [ @@ -13,9 +13,9 @@ ] }, { - "name": "com.github.switcherapi.client.remote.dto.CriteriaInputRequest", + "name": "com.switcherapi.client.remote.dto.CriteriaInputRequest", "condition": { - "typeReachable": "com.github.switcherapi.client.model.Switcher" + "typeReachable": "com.switcherapi.client.model.Switcher" }, "allDeclaredFields": true, "methods": [ @@ -26,9 +26,9 @@ ] }, { - "name": "com.github.switcherapi.client.model.criteria.Config", + "name": "com.switcherapi.client.model.criteria.Config", "condition": { - "typeReachable": "com.github.switcherapi.client.model.criteria.Snapshot" + "typeReachable": "com.switcherapi.client.model.criteria.Snapshot" }, "allDeclaredFields": true, "methods": [ @@ -39,9 +39,9 @@ ] }, { - "name": "com.github.switcherapi.client.model.criteria.Data", + "name": "com.switcherapi.client.model.criteria.Data", "condition": { - "typeReachable": "com.github.switcherapi.client.model.criteria.Snapshot" + "typeReachable": "com.switcherapi.client.model.criteria.Snapshot" }, "allDeclaredFields": true, "methods": [ @@ -52,9 +52,9 @@ ] }, { - "name": "com.github.switcherapi.client.model.criteria.Domain", + "name": "com.switcherapi.client.model.criteria.Domain", "condition": { - "typeReachable": "com.github.switcherapi.client.model.criteria.Snapshot" + "typeReachable": "com.switcherapi.client.model.criteria.Snapshot" }, "allDeclaredFields": true, "methods": [ @@ -65,9 +65,9 @@ ] }, { - "name": "com.github.switcherapi.client.model.criteria.Group", + "name": "com.switcherapi.client.model.criteria.Group", "condition": { - "typeReachable": "com.github.switcherapi.client.model.criteria.Snapshot" + "typeReachable": "com.switcherapi.client.model.criteria.Snapshot" }, "allDeclaredFields": true, "methods": [ @@ -78,9 +78,9 @@ ] }, { - "name": "com.github.switcherapi.client.model.criteria.Snapshot", + "name": "com.switcherapi.client.model.criteria.Snapshot", "condition": { - "typeReachable": "com.github.switcherapi.client.SwitcherExecutor" + "typeReachable": "com.switcherapi.client.SwitcherExecutor" }, "allDeclaredFields": true, "methods": [ @@ -91,9 +91,9 @@ ] }, { - "name": "com.github.switcherapi.client.model.criteria.Strategy", + "name": "com.switcherapi.client.model.criteria.StrategyConfig", "condition": { - "typeReachable": "com.github.switcherapi.client.model.criteria.Snapshot" + "typeReachable": "com.switcherapi.client.model.criteria.Snapshot" }, "allDeclaredFields": true, "methods": [ @@ -104,13 +104,13 @@ ] }, { - "name": "com.github.switcherapi.client.model.criteria.SwitcherElement", + "name": "com.switcherapi.client.model.criteria.SwitcherElement", "allDeclaredFields": true }, { - "name": "com.github.switcherapi.client.remote.dto.SwitchersCheck", + "name": "com.switcherapi.client.remote.dto.SwitchersCheck", "condition": { - "typeReachable": "com.github.switcherapi.client.remote.ClientWSImpl" + "typeReachable": "com.switcherapi.client.remote.ClientWSImpl" }, "allDeclaredFields": true, "methods": [ @@ -121,9 +121,9 @@ ] }, { - "name": "com.github.switcherapi.client.remote.dto.AuthRequest", + "name": "com.switcherapi.client.remote.dto.AuthRequest", "condition": { - "typeReachable": "com.github.switcherapi.client.remote.ClientWSImpl" + "typeReachable": "com.switcherapi.client.remote.ClientWSImpl" }, "allDeclaredFields": true, "methods": [ @@ -134,9 +134,9 @@ ] }, { - "name": "com.github.switcherapi.client.remote.dto.AuthResponse", + "name": "com.switcherapi.client.remote.dto.AuthResponse", "condition": { - "typeReachable": "com.github.switcherapi.client.remote.ClientWSImpl" + "typeReachable": "com.switcherapi.client.remote.ClientWSImpl" }, "allDeclaredFields": true, "methods": [ @@ -147,9 +147,9 @@ ] }, { - "name": "com.github.switcherapi.client.remote.dto.SnapshotVersionResponse", + "name": "com.switcherapi.client.remote.dto.SnapshotVersionResponse", "condition": { - "typeReachable": "com.github.switcherapi.client.remote.ClientWSImpl" + "typeReachable": "com.switcherapi.client.remote.ClientWSImpl" }, "allDeclaredFields": true, "methods": [ @@ -160,9 +160,9 @@ ] }, { - "name": "com.github.switcherapi.client.remote.dto.CriteriaResponse", + "name": "com.switcherapi.client.remote.dto.CriteriaResponse", "condition": { - "typeReachable": "com.github.switcherapi.client.remote.ClientWSImpl" + "typeReachable": "com.switcherapi.client.remote.ClientWSImpl" }, "allDeclaredFields": true, "methods": [ diff --git a/src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/resource-config.json b/src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/resource-config.json similarity index 60% rename from src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/resource-config.json rename to src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/resource-config.json index d47e6561..7a511658 100644 --- a/src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/resource-config.json +++ b/src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/resource-config.json @@ -4,13 +4,13 @@ { "pattern": "switcherapi.*\\.properties$", "condition": { - "typeReachable": "com.github.switcherapi.client.SwitcherContextBase" + "typeReachable": "com.switcherapi.client.SwitcherContextBase" } }, { "pattern": "snapshots/.*\\.json$", "condition": { - "typeReachable": "com.github.switcherapi.client.SwitcherContextBase" + "typeReachable": "com.switcherapi.client.SwitcherContextBase" } } ] diff --git a/src/test/java/com/github/switcherapi/SwitchersBase.java b/src/test/java/com/github/switcherapi/SwitchersBase.java deleted file mode 100644 index cf111f96..00000000 --- a/src/test/java/com/github/switcherapi/SwitchersBase.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.switcherapi; - -import com.github.switcherapi.client.SwitcherContextBase; -import com.github.switcherapi.client.SwitcherKey; - -public class SwitchersBase extends SwitcherContextBase { - - @SwitcherKey - public static final String USECASE11 = "USECASE11"; - -} diff --git a/src/test/java/com/github/switcherapi/client/validator/CustomValidator.java b/src/test/java/com/github/switcherapi/client/validator/CustomValidator.java deleted file mode 100644 index 16bfe02d..00000000 --- a/src/test/java/com/github/switcherapi/client/validator/CustomValidator.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.github.switcherapi.client.validator; - -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.service.validators.Validator; - -public class CustomValidator extends Validator { - - @Override - public StrategyValidator getType() { - return StrategyValidator.INVALID; - } - - @Override - public boolean process(Strategy strategy, Entry switcherInput) - throws SwitcherException { - return true; - } - -} \ No newline at end of file diff --git a/src/test/java/com/github/switcherapi/Switchers.java b/src/test/java/com/switcherapi/Switchers.java similarity index 95% rename from src/test/java/com/github/switcherapi/Switchers.java rename to src/test/java/com/switcherapi/Switchers.java index 9b98a10e..4109c69e 100644 --- a/src/test/java/com/github/switcherapi/Switchers.java +++ b/src/test/java/com/switcherapi/Switchers.java @@ -1,7 +1,7 @@ -package com.github.switcherapi; +package com.switcherapi; -import com.github.switcherapi.client.SwitcherContext; -import com.github.switcherapi.client.SwitcherKey; +import com.switcherapi.client.SwitcherContext; +import com.switcherapi.client.SwitcherKey; public class Switchers extends SwitcherContext { diff --git a/src/test/java/com/switcherapi/SwitchersBase.java b/src/test/java/com/switcherapi/SwitchersBase.java new file mode 100644 index 00000000..bccc2c98 --- /dev/null +++ b/src/test/java/com/switcherapi/SwitchersBase.java @@ -0,0 +1,11 @@ +package com.switcherapi; + +import com.switcherapi.client.SwitcherContextBase; +import com.switcherapi.client.SwitcherKey; + +public class SwitchersBase extends SwitcherContextBase { + + @SwitcherKey + public static final String USECASE11 = "USECASE11"; + +} diff --git a/src/test/java/com/github/switcherapi/SwitchersBaseNative.java b/src/test/java/com/switcherapi/SwitchersBaseNative.java similarity index 85% rename from src/test/java/com/github/switcherapi/SwitchersBaseNative.java rename to src/test/java/com/switcherapi/SwitchersBaseNative.java index c40418e5..4f747d92 100644 --- a/src/test/java/com/github/switcherapi/SwitchersBaseNative.java +++ b/src/test/java/com/switcherapi/SwitchersBaseNative.java @@ -1,6 +1,6 @@ -package com.github.switcherapi; +package com.switcherapi; -import com.github.switcherapi.client.SwitcherContextBase; +import com.switcherapi.client.SwitcherContextBase; public class SwitchersBaseNative extends SwitcherContextBase { diff --git a/src/test/java/com/github/switcherapi/client/SwitcherBasicCriteriaResponseTest.java b/src/test/java/com/switcherapi/client/SwitcherBasicCriteriaResponseTest.java similarity index 89% rename from src/test/java/com/github/switcherapi/client/SwitcherBasicCriteriaResponseTest.java rename to src/test/java/com/switcherapi/client/SwitcherBasicCriteriaResponseTest.java index 3b0dd791..4926c0f2 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherBasicCriteriaResponseTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherBasicCriteriaResponseTest.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.client; - -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.fixture.MetadataErrorSample; -import com.github.switcherapi.fixture.MetadataSample; -import com.github.switcherapi.fixture.MockWebServerHelper; +package com.switcherapi.client; + +import com.switcherapi.Switchers; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.fixture.MetadataErrorSample; +import com.switcherapi.fixture.MetadataSample; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherBasicTest.java b/src/test/java/com/switcherapi/client/SwitcherBasicTest.java similarity index 90% rename from src/test/java/com/github/switcherapi/client/SwitcherBasicTest.java rename to src/test/java/com/switcherapi/client/SwitcherBasicTest.java index e17fe72b..e73db940 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherBasicTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherBasicTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherBypassTest.java b/src/test/java/com/switcherapi/client/SwitcherBypassTest.java similarity index 91% rename from src/test/java/com/github/switcherapi/client/SwitcherBypassTest.java rename to src/test/java/com/switcherapi/client/SwitcherBypassTest.java index bef955d4..13dd69e6 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherBypassTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherBypassTest.java @@ -1,15 +1,15 @@ -package com.github.switcherapi.client; - -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.Switcher; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.client.test.SwitcherBypass; -import com.github.switcherapi.client.test.SwitcherTest; -import com.github.switcherapi.client.test.SwitcherTestValue; -import com.github.switcherapi.client.test.SwitcherTestWhen; -import com.github.switcherapi.fixture.MetadataErrorSample; -import com.github.switcherapi.fixture.MetadataSample; +package com.switcherapi.client; + +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.Switcher; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.test.SwitcherBypass; +import com.switcherapi.client.test.SwitcherTest; +import com.switcherapi.client.test.SwitcherTestValue; +import com.switcherapi.client.test.SwitcherTestWhen; +import com.switcherapi.fixture.MetadataErrorSample; +import com.switcherapi.fixture.MetadataSample; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -17,8 +17,8 @@ import java.nio.file.Paths; -import static com.github.switcherapi.Switchers.*; -import static com.github.switcherapi.client.SwitcherContext.getSwitcher; +import static com.switcherapi.Switchers.*; +import static com.switcherapi.client.SwitcherContext.getSwitcher; import static org.junit.jupiter.api.Assertions.*; class SwitcherBypassTest { @@ -141,7 +141,7 @@ void shouldReturnTrue_usingAnnotationAsTrueWhenValueSetMatches() { @SwitcherTest(key = USECASE41, switchers = @SwitcherTestValue(key = USECASE41, when = { - @SwitcherTestWhen(strategy = StrategyValidator.VALUE, input = "Value1") + @SwitcherTestWhen(strategy = StrategyValidator.VALUE, input = "Value2") }) ) void shouldReturnTrue_usingMultipleSwitchersAnnotationWhenValueMatches() { @@ -150,7 +150,7 @@ void shouldReturnTrue_usingMultipleSwitchersAnnotationWhenValueMatches() { SwitcherContext.initializeClient(); //test - Switcher switcher = getSwitcher(USECASE41).checkValue("Value1"); + Switcher switcher = getSwitcher(USECASE41).checkValue("Value2"); assertTrue(switcher.isItOn()); } diff --git a/src/test/java/com/github/switcherapi/client/SwitcherConfigNativeTest.java b/src/test/java/com/switcherapi/client/SwitcherConfigNativeTest.java similarity index 92% rename from src/test/java/com/github/switcherapi/client/SwitcherConfigNativeTest.java rename to src/test/java/com/switcherapi/client/SwitcherConfigNativeTest.java index 3d80e6ba..1b696fa8 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherConfigNativeTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherConfigNativeTest.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.SwitchersBaseNative; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.SwitchersBaseNative; +import com.switcherapi.fixture.MockWebServerHelper; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherConfigTest.java b/src/test/java/com/switcherapi/client/SwitcherConfigTest.java similarity index 92% rename from src/test/java/com/github/switcherapi/client/SwitcherConfigTest.java rename to src/test/java/com/switcherapi/client/SwitcherConfigTest.java index 76193205..ee1cd1e9 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherConfigTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherConfigTest.java @@ -1,13 +1,13 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.model.ContextKey; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; import java.nio.file.Paths; -import static com.github.switcherapi.SwitchersBase.USECASE11; +import static com.switcherapi.SwitchersBase.USECASE11; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherContextBuilderDefaultsTest.java b/src/test/java/com/switcherapi/client/SwitcherContextBuilderDefaultsTest.java similarity index 80% rename from src/test/java/com/github/switcherapi/client/SwitcherContextBuilderDefaultsTest.java rename to src/test/java/com/switcherapi/client/SwitcherContextBuilderDefaultsTest.java index c499aae5..87f66d59 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherContextBuilderDefaultsTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherContextBuilderDefaultsTest.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.model.ContextKey; import org.junit.jupiter.api.Test; -import static com.github.switcherapi.client.remote.Constants.*; +import static com.switcherapi.client.remote.Constants.*; import static org.junit.jupiter.api.Assertions.assertEquals; class SwitcherContextBuilderDefaultsTest { diff --git a/src/test/java/com/github/switcherapi/client/SwitcherContextBuilderTest.java b/src/test/java/com/switcherapi/client/SwitcherContextBuilderTest.java similarity index 81% rename from src/test/java/com/github/switcherapi/client/SwitcherContextBuilderTest.java rename to src/test/java/com/switcherapi/client/SwitcherContextBuilderTest.java index 259e191b..6b799a3f 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherContextBuilderTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherContextBuilderTest.java @@ -1,16 +1,16 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.SwitcherRequest; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; import java.nio.file.Paths; -import static com.github.switcherapi.SwitchersBase.*; -import static com.github.switcherapi.client.SwitcherContextValidator.ERR_LOCAL; +import static com.switcherapi.SwitchersBase.*; +import static com.switcherapi.client.SwitcherContextValidator.ERR_LOCAL; import static org.junit.jupiter.api.Assertions.*; class SwitcherContextBuilderTest { diff --git a/src/test/java/com/github/switcherapi/client/SwitcherContextOptionalsTest.java b/src/test/java/com/switcherapi/client/SwitcherContextOptionalsTest.java similarity index 81% rename from src/test/java/com/github/switcherapi/client/SwitcherContextOptionalsTest.java rename to src/test/java/com/switcherapi/client/SwitcherContextOptionalsTest.java index 3c20871f..bca46846 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherContextOptionalsTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherContextOptionalsTest.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.model.ContextKey; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherContextRemoteExecutorTest.java b/src/test/java/com/switcherapi/client/SwitcherContextRemoteExecutorTest.java similarity index 86% rename from src/test/java/com/github/switcherapi/client/SwitcherContextRemoteExecutorTest.java rename to src/test/java/com/switcherapi/client/SwitcherContextRemoteExecutorTest.java index 5a96a790..8a508817 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherContextRemoteExecutorTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherContextRemoteExecutorTest.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.MockWebServerHelper; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherContextTest.java b/src/test/java/com/switcherapi/client/SwitcherContextTest.java similarity index 90% rename from src/test/java/com/github/switcherapi/client/SwitcherContextTest.java rename to src/test/java/com/switcherapi/client/SwitcherContextTest.java index 922b2e01..d2d3e809 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherContextTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherContextTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.exception.SwitcherKeyNotFoundException; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.exception.SwitcherKeyNotFoundException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherFail1Test.java b/src/test/java/com/switcherapi/client/SwitcherFail1Test.java similarity index 88% rename from src/test/java/com/github/switcherapi/client/SwitcherFail1Test.java rename to src/test/java/com/switcherapi/client/SwitcherFail1Test.java index ac20d9b8..639b9a2b 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherFail1Test.java +++ b/src/test/java/com/switcherapi/client/SwitcherFail1Test.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.CountDownHelper; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.CountDownHelper; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherFail2Test.java b/src/test/java/com/switcherapi/client/SwitcherFail2Test.java similarity index 84% rename from src/test/java/com/github/switcherapi/client/SwitcherFail2Test.java rename to src/test/java/com/switcherapi/client/SwitcherFail2Test.java index 1c10e56c..e85123ab 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherFail2Test.java +++ b/src/test/java/com/switcherapi/client/SwitcherFail2Test.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherForceResolveTest.java b/src/test/java/com/switcherapi/client/SwitcherForceResolveTest.java similarity index 89% rename from src/test/java/com/github/switcherapi/client/SwitcherForceResolveTest.java rename to src/test/java/com/switcherapi/client/SwitcherForceResolveTest.java index ca5907bf..d3629cfa 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherForceResolveTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherForceResolveTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherLocal1Test.java b/src/test/java/com/switcherapi/client/SwitcherLocal1Test.java similarity index 96% rename from src/test/java/com/github/switcherapi/client/SwitcherLocal1Test.java rename to src/test/java/com/switcherapi/client/SwitcherLocal1Test.java index 6cd43926..a9b5d8e3 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherLocal1Test.java +++ b/src/test/java/com/switcherapi/client/SwitcherLocal1Test.java @@ -1,14 +1,14 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherInvalidNumericFormat; -import com.github.switcherapi.client.exception.SwitcherInvalidTimeFormat; -import com.github.switcherapi.client.exception.SwitcherKeyNotFoundException; -import com.github.switcherapi.client.model.ContextKey; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.Product; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherInvalidNumericFormat; +import com.switcherapi.client.exception.SwitcherInvalidTimeFormat; +import com.switcherapi.client.exception.SwitcherKeyNotFoundException; +import com.switcherapi.client.model.ContextKey; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.Product; import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherLocal2Test.java b/src/test/java/com/switcherapi/client/SwitcherLocal2Test.java similarity index 85% rename from src/test/java/com/github/switcherapi/client/SwitcherLocal2Test.java rename to src/test/java/com/switcherapi/client/SwitcherLocal2Test.java index 8a8b0305..d3db699d 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherLocal2Test.java +++ b/src/test/java/com/switcherapi/client/SwitcherLocal2Test.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.Switchers; +import com.switcherapi.client.model.SwitcherRequest; class SwitcherLocal2Test { diff --git a/src/test/java/com/github/switcherapi/client/SwitcherLocal3Test.java b/src/test/java/com/switcherapi/client/SwitcherLocal3Test.java similarity index 80% rename from src/test/java/com/github/switcherapi/client/SwitcherLocal3Test.java rename to src/test/java/com/switcherapi/client/SwitcherLocal3Test.java index 45bbfa48..b380c347 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherLocal3Test.java +++ b/src/test/java/com/switcherapi/client/SwitcherLocal3Test.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; import java.nio.file.Paths; import java.util.HashSet; @@ -7,12 +7,12 @@ import java.util.concurrent.Executors; import java.util.stream.Stream; -import com.github.switcherapi.client.remote.ClientWS; -import com.github.switcherapi.client.remote.ClientWSImpl; -import com.github.switcherapi.client.service.SwitcherValidator; -import com.github.switcherapi.client.service.ValidatorService; -import com.github.switcherapi.client.service.local.ClientLocalService; -import com.github.switcherapi.client.service.remote.ClientRemoteService; +import com.switcherapi.client.remote.ClientWS; +import com.switcherapi.client.remote.ClientWSImpl; +import com.switcherapi.client.service.SwitcherValidator; +import com.switcherapi.client.service.ValidatorService; +import com.switcherapi.client.service.local.ClientLocalService; +import com.switcherapi.client.service.remote.ClientRemoteService; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -21,18 +21,18 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.exception.SwitcherInvalidOperationException; -import com.github.switcherapi.client.exception.SwitcherInvalidOperationInputException; -import com.github.switcherapi.client.exception.SwitcherInvalidStrategyException; -import com.github.switcherapi.client.exception.SwitchersValidationException; -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.service.local.SwitcherLocalService; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.exception.SwitcherInvalidOperationException; +import com.switcherapi.client.exception.SwitcherInvalidOperationInputException; +import com.switcherapi.client.exception.SwitcherInvalidStrategyException; +import com.switcherapi.client.exception.SwitchersValidationException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.service.local.SwitcherLocalService; -import static com.github.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; +import static com.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; import static org.junit.jupiter.api.Assertions.*; class SwitcherLocal3Test { diff --git a/src/test/java/com/github/switcherapi/client/SwitcherRemoteUnavailableTest.java b/src/test/java/com/switcherapi/client/SwitcherRemoteUnavailableTest.java similarity index 73% rename from src/test/java/com/github/switcherapi/client/SwitcherRemoteUnavailableTest.java rename to src/test/java/com/switcherapi/client/SwitcherRemoteUnavailableTest.java index 6af80a20..afed02af 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherRemoteUnavailableTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherRemoteUnavailableTest.java @@ -1,13 +1,13 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.client.model.SwitcherRequest; class SwitcherRemoteUnavailableTest { diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSilentModeTest.java b/src/test/java/com/switcherapi/client/SwitcherSilentModeTest.java similarity index 88% rename from src/test/java/com/github/switcherapi/client/SwitcherSilentModeTest.java rename to src/test/java/com/switcherapi/client/SwitcherSilentModeTest.java index 930956fb..e1bd267a 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherSilentModeTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherSilentModeTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.CountDownHelper; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.CountDownHelper; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotAutoUpdateTest.java b/src/test/java/com/switcherapi/client/SwitcherSnapshotAutoUpdateTest.java similarity index 94% rename from src/test/java/com/github/switcherapi/client/SwitcherSnapshotAutoUpdateTest.java rename to src/test/java/com/switcherapi/client/SwitcherSnapshotAutoUpdateTest.java index cf7a4e60..af23c060 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotAutoUpdateTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherSnapshotAutoUpdateTest.java @@ -1,12 +1,12 @@ -package com.github.switcherapi.client; - -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.model.criteria.Data; -import com.github.switcherapi.client.model.criteria.Domain; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.utils.SnapshotLoader; -import com.github.switcherapi.fixture.CountDownHelper; -import com.github.switcherapi.fixture.MockWebServerHelper; +package com.switcherapi.client; + +import com.switcherapi.Switchers; +import com.switcherapi.client.model.criteria.Data; +import com.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.utils.SnapshotLoader; +import com.switcherapi.fixture.CountDownHelper; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotLookupTest.java b/src/test/java/com/switcherapi/client/SwitcherSnapshotLookupTest.java similarity index 93% rename from src/test/java/com/github/switcherapi/client/SwitcherSnapshotLookupTest.java rename to src/test/java/com/switcherapi/client/SwitcherSnapshotLookupTest.java index 3c6f0cfd..45aa5aa3 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotLookupTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherSnapshotLookupTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationFailTest.java b/src/test/java/com/switcherapi/client/SwitcherSnapshotValidationFailTest.java similarity index 93% rename from src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationFailTest.java rename to src/test/java/com/switcherapi/client/SwitcherSnapshotValidationFailTest.java index eeb6a45f..6fdd4071 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationFailTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherSnapshotValidationFailTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherSnapshotWriteException; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherSnapshotWriteException; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationTest.java b/src/test/java/com/switcherapi/client/SwitcherSnapshotValidationTest.java similarity index 94% rename from src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationTest.java rename to src/test/java/com/switcherapi/client/SwitcherSnapshotValidationTest.java index e86a6bdc..10c9fd71 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherSnapshotValidationTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherSnapshotValidationTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitcherRemoteException; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitcherRemoteException; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherThrottleTest.java b/src/test/java/com/switcherapi/client/SwitcherThrottleTest.java similarity index 87% rename from src/test/java/com/github/switcherapi/client/SwitcherThrottleTest.java rename to src/test/java/com/switcherapi/client/SwitcherThrottleTest.java index 04da78cc..94c85397 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherThrottleTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherThrottleTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.model.Switcher; -import com.github.switcherapi.fixture.CountDownHelper; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.model.Switcher; +import com.switcherapi.fixture.CountDownHelper; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/client/SwitcherValidateTest.java b/src/test/java/com/switcherapi/client/SwitcherValidateTest.java similarity index 90% rename from src/test/java/com/github/switcherapi/client/SwitcherValidateTest.java rename to src/test/java/com/switcherapi/client/SwitcherValidateTest.java index 9e1d648b..f2276087 100644 --- a/src/test/java/com/github/switcherapi/client/SwitcherValidateTest.java +++ b/src/test/java/com/switcherapi/client/SwitcherValidateTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client; +package com.switcherapi.client; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.exception.SwitchersValidationException; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.exception.SwitchersValidationException; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/github/switcherapi/client/model/ModelTest.java b/src/test/java/com/switcherapi/client/model/ModelTest.java similarity index 80% rename from src/test/java/com/github/switcherapi/client/model/ModelTest.java rename to src/test/java/com/switcherapi/client/model/ModelTest.java index 6b726f17..923a0e3c 100644 --- a/src/test/java/com/github/switcherapi/client/model/ModelTest.java +++ b/src/test/java/com/switcherapi/client/model/ModelTest.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.model; +package com.switcherapi.client.model; -import com.github.switcherapi.client.model.criteria.*; +import com.switcherapi.client.model.criteria.*; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; @@ -20,7 +20,7 @@ void testModelEntry() { @Test void testCriteriaPackage() { String[] strategyValues = new String[] { "Value" }; - final Strategy strategy = new Strategy( + final StrategyConfig strategyConfig = new StrategyConfig( "Strategy", "Operation", "Description", @@ -28,12 +28,12 @@ void testCriteriaPackage() { strategyValues ); - assertSame("Description", strategy.getDescription()); - assertSame("Operation", strategy.getOperation()); - assertSame("Strategy", strategy.getStrategy()); - assertSame(strategyValues, strategy.getValues()); + assertSame("Description", strategyConfig.getDescription()); + assertSame("Operation", strategyConfig.getOperation()); + assertSame("Strategy", strategyConfig.getStrategy()); + assertSame(strategyValues, strategyConfig.getValues()); - Strategy[] strategies = new Strategy[] { strategy }; + StrategyConfig[] strategies = new StrategyConfig[] {strategyConfig}; String[] configComponents = new String[] { "Component" }; Relay relay = new Relay(RelayType.NOTIFICATION.name(), false); final Config config = new Config( diff --git a/src/test/java/com/github/switcherapi/client/remote/ClientRemoteTest.java b/src/test/java/com/switcherapi/client/remote/ClientRemoteTest.java similarity index 75% rename from src/test/java/com/github/switcherapi/client/remote/ClientRemoteTest.java rename to src/test/java/com/switcherapi/client/remote/ClientRemoteTest.java index f7e15df0..ac1d4f9c 100644 --- a/src/test/java/com/github/switcherapi/client/remote/ClientRemoteTest.java +++ b/src/test/java/com/switcherapi/client/remote/ClientRemoteTest.java @@ -1,23 +1,23 @@ -package com.github.switcherapi.client.remote; - -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.SwitcherContext; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitchersValidationException; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.client.model.SwitcherResult; -import com.github.switcherapi.client.remote.dto.SwitchersCheck; -import com.github.switcherapi.client.service.SwitcherValidator; -import com.github.switcherapi.client.service.ValidatorService; -import com.github.switcherapi.client.service.local.ClientLocal; -import com.github.switcherapi.client.service.local.ClientLocalService; -import com.github.switcherapi.client.service.local.SwitcherLocalService; -import com.github.switcherapi.client.service.remote.ClientRemote; -import com.github.switcherapi.client.service.remote.ClientRemoteService; -import com.github.switcherapi.client.service.remote.SwitcherRemoteService; -import com.github.switcherapi.client.utils.Mapper; -import com.github.switcherapi.fixture.MockWebServerHelper; +package com.switcherapi.client.remote; + +import com.switcherapi.Switchers; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.SwitcherContext; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitchersValidationException; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.client.model.SwitcherResult; +import com.switcherapi.client.remote.dto.SwitchersCheck; +import com.switcherapi.client.service.SwitcherValidator; +import com.switcherapi.client.service.ValidatorService; +import com.switcherapi.client.service.local.ClientLocal; +import com.switcherapi.client.service.local.ClientLocalService; +import com.switcherapi.client.service.local.SwitcherLocalService; +import com.switcherapi.client.service.remote.ClientRemote; +import com.switcherapi.client.service.remote.ClientRemoteService; +import com.switcherapi.client.service.remote.SwitcherRemoteService; +import com.switcherapi.client.utils.Mapper; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -30,7 +30,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static com.github.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; +import static com.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; import static org.junit.jupiter.api.Assertions.*; class ClientRemoteTest extends MockWebServerHelper { diff --git a/src/test/java/com/github/switcherapi/client/remote/ClientWSBuilderTest.java b/src/test/java/com/switcherapi/client/remote/ClientWSBuilderTest.java similarity index 91% rename from src/test/java/com/github/switcherapi/client/remote/ClientWSBuilderTest.java rename to src/test/java/com/switcherapi/client/remote/ClientWSBuilderTest.java index 04446e01..00f778d3 100644 --- a/src/test/java/com/github/switcherapi/client/remote/ClientWSBuilderTest.java +++ b/src/test/java/com/switcherapi/client/remote/ClientWSBuilderTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client.remote; +package com.switcherapi.client.remote; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.SwitcherContextBase; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.SwitcherContextBase; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.exception.SwitcherException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/client/remote/ClientWSTest.java b/src/test/java/com/switcherapi/client/remote/ClientWSTest.java similarity index 88% rename from src/test/java/com/github/switcherapi/client/remote/ClientWSTest.java rename to src/test/java/com/switcherapi/client/remote/ClientWSTest.java index 58707f9f..f0fdc9f1 100644 --- a/src/test/java/com/github/switcherapi/client/remote/ClientWSTest.java +++ b/src/test/java/com/switcherapi/client/remote/ClientWSTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client.remote; +package com.switcherapi.client.remote; -import com.github.switcherapi.Switchers; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.fixture.MockWebServerHelper; +import com.switcherapi.Switchers; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.fixture.MockWebServerHelper; import mockwebserver3.QueueDispatcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -13,7 +13,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static com.github.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; +import static com.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/github/switcherapi/client/service/local/SwitcherLocalServiceTest.java b/src/test/java/com/switcherapi/client/service/local/SwitcherLocalServiceTest.java similarity index 79% rename from src/test/java/com/github/switcherapi/client/service/local/SwitcherLocalServiceTest.java rename to src/test/java/com/switcherapi/client/service/local/SwitcherLocalServiceTest.java index e0c4953f..fbe07c31 100644 --- a/src/test/java/com/github/switcherapi/client/service/local/SwitcherLocalServiceTest.java +++ b/src/test/java/com/switcherapi/client/service/local/SwitcherLocalServiceTest.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.client.service.local; +package com.switcherapi.client.service.local; -import static com.github.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; +import static com.switcherapi.client.remote.Constants.DEFAULT_TIMEOUT; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -9,21 +9,21 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; -import com.github.switcherapi.client.SwitcherProperties; -import com.github.switcherapi.client.remote.ClientWS; -import com.github.switcherapi.client.remote.ClientWSImpl; -import com.github.switcherapi.client.service.SwitcherValidator; -import com.github.switcherapi.client.service.ValidatorService; -import com.github.switcherapi.client.service.remote.ClientRemoteService; +import com.switcherapi.client.SwitcherProperties; +import com.switcherapi.client.remote.ClientWS; +import com.switcherapi.client.remote.ClientWSImpl; +import com.switcherapi.client.service.SwitcherValidator; +import com.switcherapi.client.service.ValidatorService; +import com.switcherapi.client.service.remote.ClientRemoteService; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.exception.SwitcherException; -import com.github.switcherapi.client.utils.SnapshotEventHandler; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.utils.SnapshotEventHandler; class SwitcherLocalServiceTest { @@ -37,7 +37,7 @@ class SwitcherLocalServiceTest { static void init() { executorService = Executors.newSingleThreadExecutor(); SwitchersBase.configure(ContextBuilder.builder() - .context("com.github.switcherapi.SwitchersBase") + .context("com.switcherapi.SwitchersBase") .snapshotLocation(SNAPSHOTS_LOCAL) .environment("default") .local(true)); diff --git a/src/test/java/com/github/switcherapi/client/utils/SnapshotTest.java b/src/test/java/com/switcherapi/client/utils/SnapshotTest.java similarity index 87% rename from src/test/java/com/github/switcherapi/client/utils/SnapshotTest.java rename to src/test/java/com/switcherapi/client/utils/SnapshotTest.java index 419d5029..8ef99d0b 100644 --- a/src/test/java/com/github/switcherapi/client/utils/SnapshotTest.java +++ b/src/test/java/com/switcherapi/client/utils/SnapshotTest.java @@ -1,10 +1,10 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.model.criteria.Data; -import com.github.switcherapi.client.model.criteria.Domain; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.service.WorkerName; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.model.criteria.Data; +import com.switcherapi.client.model.criteria.Domain; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.service.WorkerName; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.commons.lang3.StringUtils; diff --git a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherContextTest.java b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherContextTest.java similarity index 83% rename from src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherContextTest.java rename to src/test/java/com/switcherapi/client/utils/SnapshotWatcherContextTest.java index b44c7ba7..10f57d06 100644 --- a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherContextTest.java +++ b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherContextTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.CountDownHelper; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.CountDownHelper; import org.junit.jupiter.api.*; import java.io.IOException; diff --git a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherErrorTest.java b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherErrorTest.java similarity index 78% rename from src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherErrorTest.java rename to src/test/java/com/switcherapi/client/utils/SnapshotWatcherErrorTest.java index cf052289..286fb4f8 100644 --- a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherErrorTest.java +++ b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherErrorTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.exception.SwitcherException; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.exception.SwitcherException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherTest.java b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherTest.java similarity index 86% rename from src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherTest.java rename to src/test/java/com/switcherapi/client/utils/SnapshotWatcherTest.java index ae82a9bd..7a04c6a3 100644 --- a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherTest.java +++ b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherTest.java @@ -1,9 +1,9 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.model.SwitcherRequest; -import com.github.switcherapi.fixture.CountDownHelper; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.model.SwitcherRequest; +import com.switcherapi.fixture.CountDownHelper; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherWorkerTest.java b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherWorkerTest.java similarity index 75% rename from src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherWorkerTest.java rename to src/test/java/com/switcherapi/client/utils/SnapshotWatcherWorkerTest.java index 102f23cf..011afb3e 100644 --- a/src/test/java/com/github/switcherapi/client/utils/SnapshotWatcherWorkerTest.java +++ b/src/test/java/com/switcherapi/client/utils/SnapshotWatcherWorkerTest.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; -import com.github.switcherapi.SwitchersBase; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.fixture.CountDownHelper; +import com.switcherapi.SwitchersBase; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.fixture.CountDownHelper; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/switcherapi/client/utils/SwitcherUtilsTest.java b/src/test/java/com/switcherapi/client/utils/SwitcherUtilsTest.java similarity index 93% rename from src/test/java/com/github/switcherapi/client/utils/SwitcherUtilsTest.java rename to src/test/java/com/switcherapi/client/utils/SwitcherUtilsTest.java index 8ba979e7..7dfa42ff 100644 --- a/src/test/java/com/github/switcherapi/client/utils/SwitcherUtilsTest.java +++ b/src/test/java/com/switcherapi/client/utils/SwitcherUtilsTest.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.client.utils; +package com.switcherapi.client.utils; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,11 +23,11 @@ import org.junitpioneer.jupiter.ClearEnvironmentVariable; import org.junitpioneer.jupiter.SetEnvironmentVariable; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.SwitcherContext; -import com.github.switcherapi.client.exception.SwitcherContextException; -import com.github.switcherapi.client.exception.SwitcherSnapshotLoadException; -import com.github.switcherapi.client.model.ContextKey; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.SwitcherContext; +import com.switcherapi.client.exception.SwitcherContextException; +import com.switcherapi.client.exception.SwitcherSnapshotLoadException; +import com.switcherapi.client.model.ContextKey; class SwitcherUtilsTest { diff --git a/src/test/java/com/switcherapi/client/validator/CustomValidator.java b/src/test/java/com/switcherapi/client/validator/CustomValidator.java new file mode 100644 index 00000000..eebc09bf --- /dev/null +++ b/src/test/java/com/switcherapi/client/validator/CustomValidator.java @@ -0,0 +1,22 @@ +package com.switcherapi.client.validator; + +import com.switcherapi.client.exception.SwitcherException; +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.service.validators.Validator; + +public class CustomValidator extends Validator { + + @Override + public StrategyValidator getType() { + return StrategyValidator.INVALID; + } + + @Override + public boolean process(StrategyConfig strategyConfig, Entry switcherInput) + throws SwitcherException { + return true; + } + +} \ No newline at end of file diff --git a/src/test/java/com/github/switcherapi/client/validator/RegexValidatorV8Test.java b/src/test/java/com/switcherapi/client/validator/RegexValidatorV8Test.java similarity index 68% rename from src/test/java/com/github/switcherapi/client/validator/RegexValidatorV8Test.java rename to src/test/java/com/switcherapi/client/validator/RegexValidatorV8Test.java index e623aa90..afd6224e 100644 --- a/src/test/java/com/github/switcherapi/client/validator/RegexValidatorV8Test.java +++ b/src/test/java/com/switcherapi/client/validator/RegexValidatorV8Test.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.client.validator; - -import com.github.switcherapi.client.model.Entry; -import com.github.switcherapi.client.model.EntryOperation; -import com.github.switcherapi.client.model.StrategyValidator; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.service.WorkerName; -import com.github.switcherapi.client.service.validators.RegexValidatorV8; +package com.switcherapi.client.validator; + +import com.switcherapi.client.model.Entry; +import com.switcherapi.client.model.EntryOperation; +import com.switcherapi.client.model.StrategyValidator; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.service.WorkerName; +import com.switcherapi.client.service.validators.RegexValidatorV8; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnJre; import org.junit.jupiter.api.condition.JRE; @@ -40,11 +40,11 @@ static Stream evilRegexTestArguments() { void shouldFailEvilRegexInput(EntryOperation operation, boolean expected) { //given RegexValidatorV8 regexValidator = new RegexValidatorV8(); - Strategy strategy = givenStrategy(operation, Collections.singletonList(EVIL_REGEX)); + StrategyConfig strategyConfig = givenStrategy(operation, Collections.singletonList(EVIL_REGEX)); Entry entry = Entry.build(StrategyValidator.REGEX, EVIL_INPUT); //test - boolean actual = assertTimeoutPreemptively(Duration.ofMillis(5000), () -> regexValidator.process(strategy, entry)); + boolean actual = assertTimeoutPreemptively(Duration.ofMillis(5000), () -> regexValidator.process(strategyConfig, entry)); assertEquals(expected, actual); } @@ -52,14 +52,14 @@ void shouldFailEvilRegexInput(EntryOperation operation, boolean expected) { void shouldBlackListEvilInput_immediateReturnNextCall() { //given RegexValidatorV8 regexValidator = new RegexValidatorV8(); - Strategy strategy = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); + StrategyConfig strategyConfig = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); Entry entry = Entry.build(StrategyValidator.REGEX, EVIL_INPUT); //test - boolean result = assertTimeoutPreemptively(Duration.ofMillis(4000), () -> regexValidator.process(strategy, entry)); + boolean result = assertTimeoutPreemptively(Duration.ofMillis(4000), () -> regexValidator.process(strategyConfig, entry)); assertFalse(result); - result = assertTimeoutPreemptively(Duration.ofMillis(100), () -> regexValidator.process(strategy, entry)); + result = assertTimeoutPreemptively(Duration.ofMillis(100), () -> regexValidator.process(strategyConfig, entry)); assertFalse(result); } @@ -67,15 +67,15 @@ void shouldBlackListEvilInput_immediateReturnNextCall() { void shouldBlackListEvilInput_immediateReturnNextCall_similarInput() { //given RegexValidatorV8 regexValidator = new RegexValidatorV8(); - Strategy strategy = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); + StrategyConfig strategyConfig = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); //test Entry entry1 = Entry.build(StrategyValidator.REGEX, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); - boolean result = assertTimeoutPreemptively(Duration.ofMillis(4000), () -> regexValidator.process(strategy, entry1)); + boolean result = assertTimeoutPreemptively(Duration.ofMillis(4000), () -> regexValidator.process(strategyConfig, entry1)); assertFalse(result); Entry entry2 = Entry.build(StrategyValidator.REGEX, "bbbbaaaaaaaaaaaaaaa"); - result = assertTimeoutPreemptively(Duration.ofMillis(100), () -> regexValidator.process(strategy, entry2)); + result = assertTimeoutPreemptively(Duration.ofMillis(100), () -> regexValidator.process(strategyConfig, entry2)); assertFalse(result); } @@ -83,11 +83,11 @@ void shouldBlackListEvilInput_immediateReturnNextCall_similarInput() { void shouldFail_nullInput() { //given RegexValidatorV8 regexValidator = new RegexValidatorV8(); - Strategy strategy = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); + StrategyConfig strategyConfig = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); Entry entry = Entry.build(StrategyValidator.REGEX, null); //test - boolean result = regexValidator.process(strategy, entry); + boolean result = regexValidator.process(strategyConfig, entry); assertFalse(result); } @@ -95,17 +95,17 @@ void shouldFail_nullInput() { void shouldCompleteWorkerThreadsAfterTimeout() { //given RegexValidatorV8 regexValidator = new RegexValidatorV8(); - Strategy strategy = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); + StrategyConfig strategyConfig = givenStrategy(EntryOperation.EXIST, Collections.singletonList(EVIL_REGEX)); Entry entry = Entry.build(StrategyValidator.REGEX, EVIL_INPUT); //test - boolean result = regexValidator.process(strategy, entry); + boolean result = regexValidator.process(strategyConfig, entry); assertFalse(result); assertWorkerNotExists(); } - private Strategy givenStrategy(EntryOperation operation, List values) { - return new Strategy( + private StrategyConfig givenStrategy(EntryOperation operation, List values) { + return new StrategyConfig( StrategyValidator.REGEX.toString(), operation.toString(), "Regex validator strategy for test", diff --git a/src/test/java/com/github/switcherapi/client/validator/ValidatorsTest.java b/src/test/java/com/switcherapi/client/validator/ValidatorsTest.java similarity index 65% rename from src/test/java/com/github/switcherapi/client/validator/ValidatorsTest.java rename to src/test/java/com/switcherapi/client/validator/ValidatorsTest.java index e6d6f88d..bbe7d967 100644 --- a/src/test/java/com/github/switcherapi/client/validator/ValidatorsTest.java +++ b/src/test/java/com/switcherapi/client/validator/ValidatorsTest.java @@ -1,7 +1,7 @@ -package com.github.switcherapi.client.validator; +package com.switcherapi.client.validator; -import com.github.switcherapi.client.model.criteria.Strategy; -import com.github.switcherapi.client.service.ValidatorService; +import com.switcherapi.client.model.criteria.StrategyConfig; +import com.switcherapi.client.service.ValidatorService; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -14,7 +14,7 @@ class ValidatorsTest { @Test void shouldRegisterCustomValidator() { assertDoesNotThrow(() -> service.registerValidator(new CustomValidator())); - Strategy strategy = new Strategy( + StrategyConfig strategyConfig = new StrategyConfig( "CUSTOM", "INVALID", "Custom Validator Test", @@ -22,7 +22,7 @@ void shouldRegisterCustomValidator() { new String[] { "Value1", "Value2" } ); - assertTrue(service.execute(strategy, null)); + assertTrue(service.execute(strategyConfig, null)); } } diff --git a/src/test/java/com/github/switcherapi/fixture/CountDownHelper.java b/src/test/java/com/switcherapi/fixture/CountDownHelper.java similarity index 94% rename from src/test/java/com/github/switcherapi/fixture/CountDownHelper.java rename to src/test/java/com/switcherapi/fixture/CountDownHelper.java index b6f19e72..416f8864 100644 --- a/src/test/java/com/github/switcherapi/fixture/CountDownHelper.java +++ b/src/test/java/com/switcherapi/fixture/CountDownHelper.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.fixture; +package com.switcherapi.fixture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/github/switcherapi/fixture/MetadataErrorSample.java b/src/test/java/com/switcherapi/fixture/MetadataErrorSample.java similarity index 88% rename from src/test/java/com/github/switcherapi/fixture/MetadataErrorSample.java rename to src/test/java/com/switcherapi/fixture/MetadataErrorSample.java index 881bfe51..667ce724 100644 --- a/src/test/java/com/github/switcherapi/fixture/MetadataErrorSample.java +++ b/src/test/java/com/switcherapi/fixture/MetadataErrorSample.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.fixture; +package com.switcherapi.fixture; public class MetadataErrorSample { diff --git a/src/test/java/com/github/switcherapi/fixture/MetadataSample.java b/src/test/java/com/switcherapi/fixture/MetadataSample.java similarity index 89% rename from src/test/java/com/github/switcherapi/fixture/MetadataSample.java rename to src/test/java/com/switcherapi/fixture/MetadataSample.java index f8578e11..800419f8 100644 --- a/src/test/java/com/github/switcherapi/fixture/MetadataSample.java +++ b/src/test/java/com/switcherapi/fixture/MetadataSample.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.fixture; +package com.switcherapi.fixture; public class MetadataSample { diff --git a/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java b/src/test/java/com/switcherapi/fixture/MockWebServerHelper.java similarity index 94% rename from src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java rename to src/test/java/com/switcherapi/fixture/MockWebServerHelper.java index 2420a39d..745696d1 100644 --- a/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java +++ b/src/test/java/com/switcherapi/fixture/MockWebServerHelper.java @@ -1,11 +1,11 @@ -package com.github.switcherapi.fixture; - -import com.github.switcherapi.client.model.criteria.Data; -import com.github.switcherapi.client.model.criteria.Snapshot; -import com.github.switcherapi.client.remote.ClientWSImpl; -import com.github.switcherapi.client.remote.dto.CriteriaRequest; -import com.github.switcherapi.client.utils.SnapshotLoader; -import com.github.switcherapi.client.utils.SwitcherUtils; +package com.switcherapi.fixture; + +import com.switcherapi.client.model.criteria.Data; +import com.switcherapi.client.model.criteria.Snapshot; +import com.switcherapi.client.remote.ClientWSImpl; +import com.switcherapi.client.remote.dto.CriteriaRequest; +import com.switcherapi.client.utils.SnapshotLoader; +import com.switcherapi.client.utils.SwitcherUtils; import com.google.gson.Gson; import mockwebserver3.MockResponse; import mockwebserver3.MockWebServer; diff --git a/src/test/java/com/github/switcherapi/fixture/Product.java b/src/test/java/com/switcherapi/fixture/Product.java similarity index 96% rename from src/test/java/com/github/switcherapi/fixture/Product.java rename to src/test/java/com/switcherapi/fixture/Product.java index 8feafea5..1f47469d 100644 --- a/src/test/java/com/github/switcherapi/fixture/Product.java +++ b/src/test/java/com/switcherapi/fixture/Product.java @@ -1,4 +1,4 @@ -package com.github.switcherapi.fixture; +package com.switcherapi.fixture; /** * Blueprint class to generate JSON to validate Payload algorithms diff --git a/src/test/java/com/github/switcherapi/playground/ClientPlayground.java b/src/test/java/com/switcherapi/playground/ClientPlayground.java similarity index 79% rename from src/test/java/com/github/switcherapi/playground/ClientPlayground.java rename to src/test/java/com/switcherapi/playground/ClientPlayground.java index 8c2531ec..0277ddd8 100644 --- a/src/test/java/com/github/switcherapi/playground/ClientPlayground.java +++ b/src/test/java/com/switcherapi/playground/ClientPlayground.java @@ -1,6 +1,6 @@ -package com.github.switcherapi.playground; +package com.switcherapi.playground; -import com.github.switcherapi.client.model.Switcher; +import com.switcherapi.client.model.Switcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,8 +8,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import static com.github.switcherapi.playground.Features.CLIENT_JAVA_FEATURE; -import static com.github.switcherapi.playground.Features.getSwitcher; +import static com.switcherapi.playground.Features.CLIENT_JAVA_FEATURE; +import static com.switcherapi.playground.Features.getSwitcher; public class ClientPlayground { diff --git a/src/test/java/com/github/switcherapi/playground/Features.java b/src/test/java/com/switcherapi/playground/Features.java similarity index 73% rename from src/test/java/com/github/switcherapi/playground/Features.java rename to src/test/java/com/switcherapi/playground/Features.java index 05c38a63..2fe36cab 100644 --- a/src/test/java/com/github/switcherapi/playground/Features.java +++ b/src/test/java/com/switcherapi/playground/Features.java @@ -1,8 +1,8 @@ -package com.github.switcherapi.playground; +package com.switcherapi.playground; -import com.github.switcherapi.client.ContextBuilder; -import com.github.switcherapi.client.SwitcherContextBase; -import com.github.switcherapi.client.SwitcherKey; +import com.switcherapi.client.ContextBuilder; +import com.switcherapi.client.SwitcherContextBase; +import com.switcherapi.client.SwitcherKey; public class Features extends SwitcherContextBase { diff --git a/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java b/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java index 00cb6f11..f3cbf8c0 100644 --- a/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java +++ b/src/test/java/metainf/nativeimage/NativeReflectConfigTest.java @@ -14,7 +14,7 @@ class NativeReflectConfigTest { - private static final Path reflectPath = Paths.get("src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/reflect-config.json"); + private static final Path reflectPath = Paths.get("src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/reflect-config.json"); private static String reflectContent; @@ -25,7 +25,7 @@ static void readReflectConfig() throws Exception { @Test void shouldReadReflectConfig() { - assertTrue(reflectContent.contains("com.github.switcherapi.client")); + assertTrue(reflectContent.contains("com.switcherapi.client")); } @Test diff --git a/src/test/java/metainf/nativeimage/NativeResourceConfigTest.java b/src/test/java/metainf/nativeimage/NativeResourceConfigTest.java index 25bc00b9..6799e394 100644 --- a/src/test/java/metainf/nativeimage/NativeResourceConfigTest.java +++ b/src/test/java/metainf/nativeimage/NativeResourceConfigTest.java @@ -13,7 +13,7 @@ class NativeResourceConfigTest { - private static final Path resourcePath = Paths.get("src/main/resources/META-INF/native-image/com.github.switcherapi/switcher-client/resource-config.json"); + private static final Path resourcePath = Paths.get("src/main/resources/META-INF/native-image/com.switcherapi/switcher-client/resource-config.json"); private static String resourceContent; diff --git a/src/test/resources/switcherapi-optionals.properties b/src/test/resources/switcherapi-optionals.properties index b46cbb96..a17ad004 100644 --- a/src/test/resources/switcherapi-optionals.properties +++ b/src/test/resources/switcherapi-optionals.properties @@ -1,4 +1,4 @@ -switcher.context=com.github.switcherapi.SwitchersBase +switcher.context=com.switcherapi.SwitchersBase switcher.url=http://localhost:3000 switcher.apikey=[API_KEY] switcher.component=switcher-client diff --git a/src/test/resources/switcherapi.properties b/src/test/resources/switcherapi.properties index 61028de3..e2bf2f12 100644 --- a/src/test/resources/switcherapi.properties +++ b/src/test/resources/switcherapi.properties @@ -1,4 +1,4 @@ -switcher.context=com.github.switcherapi.Switchers +switcher.context=com.switcherapi.Switchers switcher.url=http://localhost:3000 switcher.apikey=[API_KEY] switcher.component=switcher-client