Merge pull request #17 from petruki/master

fix: Fixed code smells - updated commons-net

Author: petruki

pom.xml

@@ -52,7 +52,7 @@
 
    		<!-- utils -->
    		<commons-lang3.version>3.11</commons-lang3.version>
-   		<commons-net.version>3.6</commons-net.version>
+   		<commons-net.version>3.7</commons-net.version>
 
    		<!-- test -->
    		<log4j.version>2.13.3</log4j.version>

readme.md

@@ -153,14 +153,15 @@ switcher.isItOn(); // Now, it's going to return the result retrieved from the AP
 	- Fixed error when using only access to online API
 	- Improved validation when verifying whether API is accessible
 	- Added validations when preparing the Switcher Context
+	- Updated dependency commons-net.version from 3.6 to 3.7
 - 1.0.7: Added Regex Validation
 - 1.0.6: Updated depencencies & new features
 	- Updated dependency jersey-hk2 from 2.28 to 2.31
-	- Updated dependency commons-net from 3.3 to 3.6.
-	- Updated dependency commons-lang3 from 3.8.1 to 3.10.
-	- Updated dependency gson from 2.8.5 to 2.8.6.
-	- Added execution log to Switcher.
-	- Added bypass metrics and show detailed criteria evaluation options to Switcher objects.
+	- Updated dependency commons-net from 3.3 to 3.6
+	- Updated dependency commons-lang3 from 3.8.1 to 3.10
+	- Updated dependency gson from 2.8.5 to 2.8.6
+	- Added execution log to Switcher
+	- Added bypass metrics and show detailed criteria evaluation options to Switcher objects
 - 1.0.5: Security patch - Jersey has been updated - 2.28 to 2.31
 - 1.0.4: Added Numeric Validation
 - 1.0.3: Security patch - Log4J has been updated - 2.13.1 to 2.13.3

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

@@ -161,17 +161,15 @@ public static void validateContext(final Map<String, Object> properties, boolean
 		}
 
 		if (properties.containsKey(SwitcherContextParam.SNAPSHOT_AUTO_LOAD) &&
-				Boolean.parseBoolean(properties.get(SwitcherContextParam.SNAPSHOT_AUTO_LOAD).toString())) {
-			if (!properties.containsKey(SwitcherContextParam.SNAPSHOT_LOCATION)) {
+				Boolean.parseBoolean(properties.get(SwitcherContextParam.SNAPSHOT_AUTO_LOAD).toString()) &&
+				!properties.containsKey(SwitcherContextParam.SNAPSHOT_LOCATION)) {
 				throw new SwitcherFactoryContextException("SwitcherContextParam.SNAPSHOT_LOCATION not found");
-			}
 		}
 
 		if (properties.containsKey(SwitcherContextParam.SILENT_MODE) &&
-				Boolean.parseBoolean(properties.get(SwitcherContextParam.SILENT_MODE).toString())) {
-			if (!properties.containsKey(SwitcherContextParam.RETRY_AFTER)) {
+				Boolean.parseBoolean(properties.get(SwitcherContextParam.SILENT_MODE).toString()) && 
+				!properties.containsKey(SwitcherContextParam.RETRY_AFTER)) {
 				throw new SwitcherFactoryContextException("SwitcherContextParam.RETRY_AFTER not found");
-			}
 		}
 	}
 

src/main/java/com/github/switcherapi/client/facade/ClientServiceFacade.java

@@ -47,29 +47,23 @@ public static ClientServiceFacade getInstance() {
 
 	public CriteriaResponse executeCriteria(final Map<String, Object> properties, final Switcher switcher) 
 			throws SwitcherException {
+		if (!this.isTokenValid(properties)) {
+			this.auth(properties);
+		}
+				
+		final Response response = this.clientService.executeCriteriaService(properties, switcher);
 
-		try {
-			if (!this.isTokenValid(properties)) {
-				this.auth(properties);
-			}
-					
-			final Response response = this.clientService.executeCriteriaService(properties, switcher);
-			
-			if (response.getStatus() == 401) {
-				throw new SwitcherKeyNotAvailableForComponentException(
-						properties.get(SwitcherContextParam.COMPONENT).toString(), switcher.getSwitcherKey());
-			} else if (response.getStatus() != 200) {
-				throw new SwitcherKeyNotFoundException(switcher.getSwitcherKey());
-			}
-			
-			final CriteriaResponse criteriaReponse = response.readEntity(CriteriaResponse.class);
-			criteriaReponse.setSwitcherKey(switcher.getSwitcherKey());
-			response.close();
-			return criteriaReponse;
-		} catch (final SwitcherException e) {
-			throw e;
+		if (response.getStatus() == 401) {
+			throw new SwitcherKeyNotAvailableForComponentException(
+					properties.get(SwitcherContextParam.COMPONENT).toString(), switcher.getSwitcherKey());
+		} else if (response.getStatus() != 200) {
+			throw new SwitcherKeyNotFoundException(switcher.getSwitcherKey());
 		}
 
+		final CriteriaResponse criteriaReponse = response.readEntity(CriteriaResponse.class);
+		criteriaReponse.setSwitcherKey(switcher.getSwitcherKey());
+		response.close();
+		return criteriaReponse;
 	}
 
 	public Snapshot resolveSnapshot(final Map<String, Object> properties) 
@@ -88,8 +82,7 @@ public Snapshot resolveSnapshot(final Map<String, Object> properties)
 		} catch (final SwitcherException e) {
 			throw e;
 		} catch (final Exception e) {
-			throw new SwitcherAPIConnectionException(properties.containsKey(SwitcherContextParam.URL) ? 
-					(String) properties.get(SwitcherContextParam.URL) : StringUtils.EMPTY, e);
+			throw new SwitcherAPIConnectionException(getAPIConnectionException(properties), e);
 		}
 
 	}
@@ -111,8 +104,7 @@ public boolean checkSnapshotVersion(final Map<String, Object> properties, final
 		} catch (final SwitcherException e) {
 			throw e;
 		} catch (final Exception e) {
-			throw new SwitcherAPIConnectionException(properties.containsKey(SwitcherContextParam.URL) ? 
-					(String) properties.get(SwitcherContextParam.URL) : StringUtils.EMPTY, e);
+			throw new SwitcherAPIConnectionException(getAPIConnectionException(properties), e);
 		}
 
 	}
@@ -132,8 +124,7 @@ private void auth(final Map<String, Object> properties) throws SwitcherException
 			throw e;
 		} catch (final Exception e) {
 			this.setSilentModeExpiration(properties);
-			throw new SwitcherAPIConnectionException(properties.containsKey(SwitcherContextParam.URL) ? 
-					(String) properties.get(SwitcherContextParam.URL) : StringUtils.EMPTY, e);
+			throw new SwitcherAPIConnectionException(getAPIConnectionException(properties), e);
 		}
 	}
 
@@ -143,16 +134,12 @@ private boolean isTokenValid(final Map<String, Object> properties)
 		if (properties.containsKey(ClientService.AUTH_RESPONSE)) {
 			final AuthResponse authResponse = (AuthResponse) properties.get(ClientService.AUTH_RESPONSE);
 
-			if (authResponse.getToken().equals(SwitcherContextParam.SILENT_MODE)) {
-				if (!authResponse.isExpired()) {
-					throw new SwitcherAPIConnectionException(properties.containsKey(SwitcherContextParam.URL) ? 
-							(String) properties.get(SwitcherContextParam.URL) : StringUtils.EMPTY);
-				}
+			if (authResponse.getToken().equals(SwitcherContextParam.SILENT_MODE) && !authResponse.isExpired()) {
+				throw new SwitcherAPIConnectionException(getAPIConnectionException(properties));
 			} else {
 				if (!this.clientService.isAlive(properties)) {
 					this.setSilentModeExpiration(properties);
-					throw new SwitcherAPIConnectionException(properties.containsKey(SwitcherContextParam.URL) ? 
-							(String) properties.get(SwitcherContextParam.URL) : StringUtils.EMPTY);
+					throw new SwitcherAPIConnectionException(getAPIConnectionException(properties));
 				}
 
 				return !authResponse.isExpired();
@@ -161,6 +148,11 @@ private boolean isTokenValid(final Map<String, Object> properties)
 
 		return false;
 	}
+
+	private String getAPIConnectionException(final Map<String, Object> properties) {
+		return properties.containsKey(SwitcherContextParam.URL) ? 
+				(String) properties.get(SwitcherContextParam.URL) : StringUtils.EMPTY;
+	}
 
 	private void setSilentModeExpiration(final Map<String, Object> properties) 
 			throws SwitcherInvalidDateTimeArgumentException {

src/test/java/com/github/switcherapi/client/SwitcherOnlineTest.java

@@ -309,7 +309,7 @@ public void shouldInvokeClientCheckWithNoErrors() throws Exception {
 		clientService.setClient(clientMock);
 
 		//test
-		clientService.isAlive(properties);
+		assertTrue(clientService.isAlive(properties));
 	}
 
 

src/test/resources/generated_watcher_default.json

@@ -341,7 +341,7 @@
         }
       ],
       "description": "Fixture #1",
-      "activated": true
+      "activated": false
     }
   }
 }