Fixed project dependencies (#321)

* Closes #319 - removed jersey dependencies (#320)

* Closes #319 - removed jersey dependencies

* Moved HttpClient from constructor to ClientWS dependency

* fixes code smell

* Reverted jersey dependency for the v1

Author: petruki

README.md

@@ -78,6 +78,7 @@ switcher.silent -> Enable contigency given the time for the client to retry - e.
 switcher.truststore.path -> Path to the truststore file
 switcher.truststore.password -> Truststore password
 switcher.timeout -> Time in ms given to the API to respond - 3000 default value
+switcher.poolsize -> Number of threads used to execute the API - 10 default value
 
 (Java 8 applications only)
 switcher.regextimeout -> Time in ms given to Timed Match Worker used for local Regex (ReDoS safety mechanism) - 3000 default value

pom.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.github.switcherapi</groupId>

src/main/java/com/github/switcherapi/client/ContextBuilder.java

@@ -154,7 +154,7 @@ public ContextBuilder snapshotSkipValidation(boolean snapshotSkipValidation) {
 	}
 
 	/**
-	 * @param retryAfter Enable contigency given the time for the client to retry - e.g. 5s (s: seconds - m: minutes - h: hours)
+	 * @param retryAfter Enable contingency given the time for the client to retry - e.g. 5s (s: seconds - m: minutes - h: hours)
 	 * @return ContextBuilder
 	 */
 	public ContextBuilder silentMode(String retryAfter) {
@@ -202,4 +202,13 @@ public ContextBuilder timeoutMs(String timeoutMs) {
 		properties.setValue(ContextKey.TIMEOUT_MS, properties.getTimeoutMsOrDefault(timeoutMs));
 		return this;
 	}
+
+	/**
+	 * @param poolSize Number of threads for the pool connection - 10 default value
+	 * @return ContextBuilder
+	 */
+	public ContextBuilder poolConnectionSize(String poolSize) {
+		properties.setValue(ContextKey.POOL_CONNECTION_SIZE, poolSize);
+		return this;
+	}
 }

src/main/java/com/github/switcherapi/client/SwitcherContextBase.java

@@ -6,8 +6,14 @@
 import com.github.switcherapi.client.exception.SwitchersValidationException;
 import com.github.switcherapi.client.model.ContextKey;
 import com.github.switcherapi.client.model.Switcher;
+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.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;
@@ -70,7 +76,7 @@ public abstract class SwitcherContextBase {
 	protected static SwitcherExecutor instance;
 	private static ScheduledExecutorService scheduledExecutorService;
 	private static ExecutorService watcherExecutorService;
-	private static SnapshotWatcher watcher;
+	private static SnapshotWatcher watcherSnapshot;
 
 	protected SwitcherContextBase() {
 		throw new IllegalStateException("Context class cannot be instantiated");
@@ -112,11 +118,15 @@ public static void loadProperties(String contextFilename) {
 	public static void initializeClient() {
 		validateContext();
 		validateSwitcherKeys();
-		
+
+		final SwitcherValidator validatorService = new ValidatorService();
+		final ClientRemote clientRemote = new ClientRemoteService(ClientWSImpl.build());
+		final ClientLocalService clientLocal = new ClientLocalService(validatorService);
+
 		if (contextBol(ContextKey.LOCAL_MODE)) {
-			instance = new SwitcherLocalService();
+			instance = new SwitcherLocalService(clientRemote, clientLocal);
 		} else {
-			instance = new SwitcherRemoteService();
+			instance = new SwitcherRemoteService(clientRemote, new SwitcherLocalService(clientRemote, clientLocal));
 		}
 
 		loadSwitchers();
@@ -309,13 +319,13 @@ public static void watchSnapshot(SnapshotEventHandler handler) {
 			throw new SwitcherException("Cannot watch snapshot when using remote", new UnsupportedOperationException());
 		}
 
-		if (watcher == null) {
-			watcher = new SnapshotWatcher((SwitcherLocalService) instance, handler,
+		if (watcherSnapshot == null) {
+			watcherSnapshot = new SnapshotWatcher((SwitcherLocalService) instance, handler,
 					contextStr(ContextKey.SNAPSHOT_LOCATION));
 		}
 
 		initWatcherExecutorService();
-		watcherExecutorService.submit(watcher);
+		watcherExecutorService.submit(watcherSnapshot);
 	}
 
 	/**
@@ -324,10 +334,10 @@ public static void watchSnapshot(SnapshotEventHandler handler) {
 	 * @throws SwitcherException if watch thread never started
 	 */
 	public static void stopWatchingSnapshot() {
-		if (watcher != null) {
+		if (watcherSnapshot != null) {
 			watcherExecutorService.shutdownNow();
-			watcher.terminate();
-			watcher = null;
+			watcherSnapshot.terminate();
+			watcherSnapshot = null;
 		}
 	}
 

src/main/java/com/github/switcherapi/client/SwitcherContextValidator.java

@@ -18,6 +18,8 @@ class SwitcherContextValidator {
 	public static final String ERR_DOMAIN = "Domain not defined [add: switcher.domain]";
 	public static final String ERR_COMPONENT = "Component not defined [add: switcher.component]";
 	public static final String ERR_CONTEXT = "Context class location not defined [add: switcher.context]";
+	public static final String ERR_LOCAL = "Snapshot location not defined [add: switcher.snapshot.location] " +
+			"or enable auto-load [add: switcher.snapshot.auto]";
 
 	private SwitcherContextValidator() {}
 
@@ -34,6 +36,8 @@ public static void validate(final SwitcherProperties prop) {
 
 		if (!prop.getBoolean(ContextKey.LOCAL_MODE)) {
 			validateRemote(prop);
+		} else {
+			validateLocal(prop);
 		}
 
 		validateOptionals(prop);
@@ -75,4 +79,16 @@ public static void validateRemote(final SwitcherProperties prop) {
 			throw new SwitcherContextException(ERR_COMPONENT);
 		}
 	}
+
+	/**
+	 * Validate context properties required to run local
+	 *
+	 * @param prop Configured properties
+	 */
+	public static void validateLocal(final SwitcherProperties prop) {
+		if (StringUtils.isBlank(prop.getValue(ContextKey.SNAPSHOT_LOCATION)) &&
+				!prop.getBoolean(ContextKey.SNAPSHOT_AUTO_LOAD)) {
+			throw new SwitcherContextException(ERR_LOCAL);
+		}
+	}
 }

src/main/java/com/github/switcherapi/client/SwitcherExecutor.java

@@ -31,6 +31,8 @@ public abstract class SwitcherExecutor {
 	private static final Logger logger = LoggerFactory.getLogger(SwitcherExecutor.class);
 
 	private static final Map<String, CriteriaResponse> bypass = new HashMap<>();
+
+	protected Domain domain;
 
 	/**
 	 * Execute criteria based on the Switcher configuration
@@ -137,4 +139,12 @@ public static void forget(final String key) {
 	public static Map<String, CriteriaResponse> getBypass() {
 		return bypass;
 	}
+
+	public Domain getDomain() {
+		return domain;
+	}
+
+	public void setDomain(Domain domain) {
+		this.domain = domain;
+	}
 }

src/main/java/com/github/switcherapi/client/SwitcherProperties.java

@@ -55,6 +55,7 @@ public void loadFromProperties(Properties prop) {
 		setValue(ContextKey.TRUSTSTORE_PATH, SwitcherUtils.resolveProperties(ContextKey.TRUSTSTORE_PATH.getParam(), prop));
 		setValue(ContextKey.TRUSTSTORE_PASSWORD, SwitcherUtils.resolveProperties(ContextKey.TRUSTSTORE_PASSWORD.getParam(), prop));
 		setValue(ContextKey.TIMEOUT_MS, getTimeoutMsOrDefault(SwitcherUtils.resolveProperties(ContextKey.TIMEOUT_MS.getParam(), prop)));
+		setValue(ContextKey.POOL_CONNECTION_SIZE, SwitcherUtils.resolveProperties(ContextKey.POOL_CONNECTION_SIZE.getParam(), prop));
 	}
 
 	public String getValue(ContextKey contextKey) {

src/main/java/com/github/switcherapi/client/model/AsyncSwitcher.java

@@ -1,9 +1,8 @@
 package com.github.switcherapi.client.model;
 
-import com.github.switcherapi.client.utils.SwitcherUtils;
-
 import com.github.switcherapi.client.exception.SwitcherException;
 import com.github.switcherapi.client.model.response.CriteriaResponse;
+import com.github.switcherapi.client.utils.SwitcherUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/github/switcherapi/client/model/ContextKey.java

@@ -11,98 +11,97 @@ public enum ContextKey {
 	/**
 	 *  (String) Switcher API URL.
 	 */
-	URL("switcher.url", "url"),
+	URL("switcher.url"),
 
 	/**
 	 * (String) API Key generated by your domain.
 	 */
-	APIKEY("switcher.apikey", "apiKey"),
+	APIKEY("switcher.apikey"),
 
 	/**
 	 * (String) Registered domain name.
 	 */
-	DOMAIN("switcher.domain", "domain"),
+	DOMAIN("switcher.domain"),
 
 	/**
 	 * (String) Name of this application. This value is used to track which applications are using switchers.
 	 */
-	COMPONENT("switcher.component", "component"),
+	COMPONENT("switcher.component"),
 
 	/**
 	 * (String) Name of the environment where this application is running ('default' is a production environment).
 	 */
-	ENVIRONMENT("switcher.environment", "environment"),
+	ENVIRONMENT("switcher.environment"),
 
 	/**
 	 * (String) Folder path where all snapshot files are located.
 	 */
-	SNAPSHOT_LOCATION("switcher.snapshot.location", "snapshotLocation"),
+	SNAPSHOT_LOCATION("switcher.snapshot.location"),
 
 	/**
 	 * (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}
 	 */
-	CONTEXT_LOCATION("switcher.context", "context"),
+	CONTEXT_LOCATION("switcher.context"),
 
 	/**
 	 * (boolean) Activate snapshot autoload which will try to retrieve the snapshot from the API if the file does not exist.
 	 */
-	SNAPSHOT_AUTO_LOAD("switcher.snapshot.auto", "snapshotAutoLoad"),
+	SNAPSHOT_AUTO_LOAD("switcher.snapshot.auto"),
 
 	/**
 	 * (boolean) When true it will skip validateSnapshot() (default is false)
 	 */
-	SNAPSHOT_SKIP_VALIDATION("switcher.snapshot.skipvalidation", "snapshotSkipValidation"),
+	SNAPSHOT_SKIP_VALIDATION("switcher.snapshot.skipvalidation"),
 
 	/**
 	 * (String) Interval given to the library to update the snapshot
 	 */
-	SNAPSHOT_AUTO_UPDATE_INTERVAL("switcher.snapshot.updateinterval", "snapshotAutoUpdateInterval"),
+	SNAPSHOT_AUTO_UPDATE_INTERVAL("switcher.snapshot.updateinterval"),
 
 	/**
 	 * (String) Defines if client will work in silent mode by specifying the time interval to retry
 	 */
-	SILENT_MODE("switcher.silent", "silentMode"),
+	SILENT_MODE("switcher.silent"),
 
 	/**
 	 * (boolean) Defines if client will work locally.
 	 */
-	LOCAL_MODE("switcher.local", "local"),
+	LOCAL_MODE("switcher.local"),
 
 	/**
 	 * (Number) Defines the Timed Match regex time out.
 	 */
-	REGEX_TIMEOUT("switcher.regextimeout", "regexTimeout"),
+	REGEX_TIMEOUT("switcher.regextimeout"),
 
 	/**
-	 * (Path) Defines the path for the trustsore file.
+	 * (Path) Defines the path for the truststore file.
 	 */
-	TRUSTSTORE_PATH("switcher.truststore.path", "truststorePath"),
+	TRUSTSTORE_PATH("switcher.truststore.path"),
 
 	/**
 	 * (String) Defines the password for the truststore file.
 	 */
-	TRUSTSTORE_PASSWORD("switcher.truststore.password", "truststorePassword"),
+	TRUSTSTORE_PASSWORD("switcher.truststore.password"),
 
 	/**
 	 * (Number) Defines the timeout in ms for the Remote client.
 	 */
-	TIMEOUT_MS("switcher.timeout", "timeoutMs");
+	TIMEOUT_MS("switcher.timeout"),
+
+	/**
+	 * (Number) Defines a fixed number of threads for the pool connection (default is 10).
+	 */
+	POOL_CONNECTION_SIZE("switcher.poolsize");
 
 	private final String param;
-	private final String propField;
 
-	ContextKey(String param, String propField) {
+	ContextKey(String param) {
 		this.param = param;
-		this.propField = propField;
 	}
 
 	public String getParam() {
 		return param;
 	}
-
-	public String getPropField() {
-		return propField;
-	}
 
 }

src/main/java/com/github/switcherapi/client/model/Switcher.java

@@ -136,10 +136,6 @@ public GsonInputRequest getInputRequest() {
 						this.entry.toArray(new Entry[0]) : null);
 	}
 
-	public long getDelay() {
-		return super.delay;
-	}
-
 	public boolean isBypassMetrics() {
 		return bypassMetrics;
 	}