Menu
▾
▴
[EsiGate-commits] SF.net SVN: webassembletool:[1588] trunk
|
From: <ath...@us...> - 2014-03-27 13:25:15
|
Revision: 1588
http://sourceforge.net/p/webassembletool/code/1588
Author: athaveau
Date: 2014-03-27 13:25:10 +0000 (Thu, 27 Mar 2014)
Log Message:
-----------
Checkstyle issues
Modified Paths:
--------------
trunk/esigate-cas/src/main/java/org/esigate/cas/CasAuthenticationHandler.java
trunk/esigate-core/src/main/java/org/esigate/Driver.java
trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java
trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java
trunk/esigate-core/src/main/java/org/esigate/Parameters.java
trunk/esigate-core/src/main/java/org/esigate/api/Session.java
trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java
trunk/esigate-core/src/main/java/org/esigate/events/EventManager.java
trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java
trunk/esigate-core/src/main/java/org/esigate/extension/FragmentLogging.java
trunk/esigate-core/src/main/java/org/esigate/extension/monitoring/Metric.java
trunk/esigate-core/src/main/java/org/esigate/util/Parameter.java
trunk/esigate-core/src/main/java/org/esigate/util/ParameterArray.java
trunk/esigate-core/src/main/java/org/esigate/util/ParameterBoolean.java
trunk/esigate-core/src/main/java/org/esigate/util/ParameterCollection.java
trunk/esigate-core/src/main/java/org/esigate/util/ParameterFloat.java
trunk/esigate-core/src/main/java/org/esigate/util/ParameterInteger.java
trunk/esigate-core/src/main/java/org/esigate/util/ParameterLong.java
trunk/esigate-core/src/main/java/org/esigate/util/ParameterString.java
trunk/esigate-core/src/main/java/org/esigate/vars/Operations.java
trunk/esigate-core/src/test/java/org/esigate/extension/surrogate/SurrogateTest.java
trunk/esigate-core/src/test/java/org/esigate/util/ParameterTest.java
Modified: trunk/esigate-cas/src/main/java/org/esigate/cas/CasAuthenticationHandler.java
===================================================================
--- trunk/esigate-cas/src/main/java/org/esigate/cas/CasAuthenticationHandler.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-cas/src/main/java/org/esigate/cas/CasAuthenticationHandler.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -31,14 +31,14 @@
public class CasAuthenticationHandler extends GenericAuthentificationHandler {
public static final String DEFAULT_LOGIN_URL = "/login";
- private final static Logger LOG = LoggerFactory.getLogger(GenericAuthentificationHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GenericAuthentificationHandler.class);
// Configuration properties names
- private final static String LOGIN_URL_PROPERTY = "casLoginUrl";
- private final static String SECOND_REQUEST = "SECOND_REQUEST";
- private final static String SPRING_SECURITY_PROPERTY = "isSpringSecurity";
+ private static final String LOGIN_URL_PROPERTY = "casLoginUrl";
+ private static final String SECOND_REQUEST = "SECOND_REQUEST";
+ private static final String SPRING_SECURITY_PROPERTY = "isSpringSecurity";
- private final static String SPRING_SECURITY_URL_PATTERN_PROPERTY = "springSecurityUrl";
+ private static final String SPRING_SECURITY_URL_PATTERN_PROPERTY = "springSecurityUrl";
private String loginUrl;
private boolean springSecurity;
Modified: trunk/esigate-core/src/main/java/org/esigate/Driver.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/Driver.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/Driver.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -190,11 +190,10 @@
*
* <pre>
* if (LOG.isInfoEnabled()) {
- * logRendering(pageUrl, renderers);
+ * logAction(pageUrl, renderers);
* }
* </pre>
- *
- * @see Driver#logRendering(String, Renderer[]) logRendering for renderer <b>list</b>.
+ *
* @param action
* Action name (eg. "proxy" or "render")
* @param onUrl
Modified: trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/DriverConfiguration.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -53,7 +53,7 @@
this.preserveHost = Parameters.PRESERVE_HOST.getValue(props);
this.visibleBaseURL = Parameters.VISIBLE_URL_BASE.getValue(props);
this.isVisibleBaseURLEmpty = StringUtils.isEmpty(visibleBaseURL);
- this.stripMappingPath= Parameters.STRIP_MAPPING_PATH.getValue(props);
+ this.stripMappingPath = Parameters.STRIP_MAPPING_PATH.getValue(props);
this.uriMappings = parseMappings(props);
properties = props;
}
Modified: trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -167,7 +167,7 @@
newInstances.put(name, createDriver(name, properties));
}
if (newInstances.get(DEFAULT_INSTANCE_NAME) == null
- && Parameters.REMOTE_URL_BASE.getValue(defaultProperties)!=null) {
+ && Parameters.REMOTE_URL_BASE.getValue(defaultProperties) != null) {
newInstances.put(DEFAULT_INSTANCE_NAME, createDriver(DEFAULT_INSTANCE_NAME, defaultProperties));
}
Modified: trunk/esigate-core/src/main/java/org/esigate/Parameters.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/Parameters.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/Parameters.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -33,7 +33,6 @@
import org.esigate.util.ParameterInteger;
import org.esigate.util.ParameterString;
-import java.util.Arrays;
import java.util.Collection;
/**
@@ -44,53 +43,43 @@
*/
public final class Parameters {
- private Parameters() {
-
- }
-
// Core parameters
- public static final Parameter<String[]> REMOTE_URL_BASE = new ParameterArray("remoteUrlBase", null);
- public static final Parameter<Collection<String>> MAPPINGS = new ParameterCollection("mappings",null);
+ public static final Parameter<String[]> REMOTE_URL_BASE = new ParameterArray("remoteUrlBase");
+ public static final Parameter<Collection<String>> MAPPINGS = new ParameterCollection("mappings");
public static final Parameter<Boolean> STRIP_MAPPING_PATH = new ParameterBoolean("stripMappingPath", false);
public static final Parameter<String> URI_ENCODING = new ParameterString("uriEncoding", "ISO-8859-1");
- public static final Parameter<Collection<String>> PARSABLE_CONTENT_TYPES = new ParameterCollection("parsableContentTypes", Arrays.asList("text/html", "application/xhtml+xml"));
-
+ public static final Parameter<Collection<String>> PARSABLE_CONTENT_TYPES =
+ new ParameterCollection("parsableContentTypes", "text/html", "application/xhtml+xml");
// Network settings
public static final Parameter<Integer> MAX_CONNECTIONS_PER_HOST = new ParameterInteger("maxConnectionsPerHost", 20);
public static final Parameter<Integer> CONNECT_TIMEOUT = new ParameterInteger("connectTimeout", 1000);
public static final Parameter<Integer> SOCKET_TIMEOUT = new ParameterInteger("socketTimeout", 10000);
-
// Proxy settings
- public static final Parameter<String> PROXY_HOST = new ParameterString("proxyHost", null);
- public static final Parameter<Integer> PROXY_PORT = new ParameterInteger("proxyPort", 0 );
- public static final Parameter<String> PROXY_USER = new ParameterString("proxyUser", null);
- public static final Parameter<String> PROXY_PASSWORD = new ParameterString("proxyPassword", null);
-
+ public static final Parameter<String> PROXY_HOST = new ParameterString("proxyHost");
+ public static final Parameter<Integer> PROXY_PORT = new ParameterInteger("proxyPort", 0);
+ public static final Parameter<String> PROXY_USER = new ParameterString("proxyUser");
+ public static final Parameter<String> PROXY_PASSWORD = new ParameterString("proxyPassword");
// Http headers
public static final Parameter<Boolean> PRESERVE_HOST = new ParameterBoolean("preserveHost", true);
-
// Cookies
- public static final Parameter<String> COOKIE_MANAGER = new ParameterString("cookieManager", DefaultCookieManager.class.getName());
- public static final Parameter<Collection<String>> DISCARD_COOKIES = new ParameterCollection("discardCookies",null);
- public static final Parameter<Collection<String>> STORE_COOKIES_IN_SESSION = new ParameterCollection("storeCookiesInSession",null);
-
+ public static final Parameter<String> COOKIE_MANAGER = new ParameterString("cookieManager",
+ DefaultCookieManager.class.getName());
+ public static final Parameter<Collection<String>> DISCARD_COOKIES = new ParameterCollection("discardCookies");
+ public static final Parameter<Collection<String>> STORE_COOKIES_IN_SESSION = new ParameterCollection("storeCookiesInSession");
public static final Parameter<String> FIX_MODE = new ParameterString("fixMode", "relative");
- public static final Parameter<String> VISIBLE_URL_BASE = new ParameterString("visibleUrlBase", null);
-
- // Load-balancing
- public static final Parameter<String> REMOTE_URL_BASE_STRATEGY = new ParameterString("remoteUrlBaseStrategy",
- Parameters.ROUNDROBIN);
+ public static final Parameter<String> VISIBLE_URL_BASE = new ParameterString("visibleUrlBase");
// Possible values for remoteUrlBaseStrategy
public static final String STICKYSESSION = "stickysession";
public static final String IPHASH = "iphash";
public static final String ROUNDROBIN = "roundrobin";
-
+ // Load-balancing
+ public static final Parameter<String> REMOTE_URL_BASE_STRATEGY = new ParameterString("remoteUrlBaseStrategy",
+ Parameters.ROUNDROBIN);
// Extensions
- public static final Parameter<Collection<String>> EXTENSIONS = new ParameterCollection("extensions", Arrays.asList(FragmentLogging.class.getName(),
- FetchLogging.class.getName() , RemoteUserAuthenticationHandler.class.getName() ,
- Esi.class.getName() , ResourceFixup.class.getName() , XPoweredBy.class.getName() ,
- Surrogate.class.getName() , ConfigReloadOnChange.class.getName()));
-
+ public static final Parameter<Collection<String>> EXTENSIONS = new ParameterCollection("extensions",
+ FragmentLogging.class.getName(), FetchLogging.class.getName(), RemoteUserAuthenticationHandler.class
+ .getName(), Esi.class.getName(), ResourceFixup.class.getName(), XPoweredBy.class.getName(),
+ Surrogate.class.getName(), ConfigReloadOnChange.class.getName());
// Cache settings
public static final Parameter<Boolean> USE_CACHE = new ParameterBoolean("useCache", true);
public static final Parameter<Integer> MAX_CACHE_ENTRIES = new ParameterInteger("maxCacheEntries", 1000);
@@ -98,10 +87,8 @@
public static final Parameter<String> CACHE_STORAGE = new ParameterString("cacheStorage", BasicCacheStorage.class.getName());
public static final Parameter<Boolean> X_CACHE_HEADER = new ParameterBoolean("xCacheHeader", false);
public static final Parameter<Boolean> VIA_HEADER = new ParameterBoolean("viaHeader", true);
-
// Forced caching
public static final Parameter<Integer> TTL = new ParameterInteger("ttl", 0);
-
// Heuristic caching
public static final Parameter<Boolean> HEURISTIC_CACHING_ENABLED = new ParameterBoolean("heuristicCachingEnabled", true);
// default value defined in
@@ -109,26 +96,26 @@
public static final Parameter<Float> HEURISTIC_COEFFICIENT = new ParameterFloat("heuristicCoefficient", 0.1f);
// when no cache directive at all, nothing is cached by default
public static final Parameter<Integer> HEURISTIC_DEFAULT_LIFETIME_SECS = new ParameterInteger("heuristicDefaultLifetimeSecs", 0);
-
// Background revalidation
public static final Parameter<Integer> STALE_WHILE_REVALIDATE = new ParameterInteger("staleWhileRevalidate", 0);
public static final Parameter<Integer> STALE_IF_ERROR = new ParameterInteger("staleIfError", 0);
public static final Parameter<Integer> MIN_ASYNCHRONOUS_WORKERS = new ParameterInteger("minAsynchronousWorkers", 0);
public static final Parameter<Integer> MAX_ASYNCHRONOUS_WORKERS = new ParameterInteger("maxAsynchronousWorkers", 0);
- public static final Parameter<Integer> ASYNCHRONOUS_WORKER_IDLE_LIFETIME_SECS = new ParameterInteger("asynchronousWorkerIdleLifetimeSecs", 60);
+ public static final Parameter<Integer> ASYNCHRONOUS_WORKER_IDLE_LIFETIME_SECS
+ = new ParameterInteger("asynchronousWorkerIdleLifetimeSecs", 60);
public static final Parameter<Integer> MAX_UPDATE_RETRIES = new ParameterInteger("maxUpdateRetries", 1);
public static final Parameter<Integer> REVALIDATION_QUEUE_SIZE = new ParameterInteger("revalidationQueueSize", 100);
-
// EhCache
public static final Parameter<String> EHCACHE_CACHE_NAME_PROPERTY = new ParameterString("ehcache.cacheName", "esigate");
- public static final Parameter<String> EHCACHE_CONFIGURATION_FILE_PROPERTY = new ParameterString("ehcache.configurationFile", null);
-
+ public static final Parameter<String> EHCACHE_CONFIGURATION_FILE_PROPERTY = new ParameterString("ehcache.configurationFile");
// MemCached
- public static final Parameter<Collection<String>> MEMCACHED_SERVERS_PROPERTY = new ParameterCollection("memcached.servers", null);
-
+ public static final Parameter<Collection<String>> MEMCACHED_SERVERS_PROPERTY = new ParameterCollection("memcached.servers");
// Default size for String or byte buffers used to manipulate html page contents
public static final int DEFAULT_BUFFER_SIZE = 1024;
-
// Default size for String or byte buffers used to manipulate small things like tags, cookie, log lines
public static final int SMALL_BUFFER_SIZE = 256;
+
+ private Parameters() {
+
+ }
}
Modified: trunk/esigate-core/src/main/java/org/esigate/api/Session.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/api/Session.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/api/Session.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -30,8 +30,8 @@
* decide to store the objects serialized in a cookie on the client side or server side with some session tracking
* mechanism.
*
- * @param key
- * @param value
+ * @param key the key
+ * @param value obejct to store
*/
void setAttribute(String key, Serializable value);
@@ -39,7 +39,7 @@
* Retrieves an Object previously stored with method @see #setSessionAttribute(String, Serializable) or
* <code>null</code>.
*
- * @param key
+ * @param key the key
* @return the previously stored object or <code>null</code>
*/
Serializable getAttribute(String key);
Modified: trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/cache/CacheAdapter.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -15,6 +15,7 @@
package org.esigate.cache;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Date;
import java.util.Properties;
@@ -60,7 +61,7 @@
ttl = Parameters.TTL.getValue(properties);
xCacheHeader = Parameters.X_CACHE_HEADER.getValue(properties);
viaHeader = Parameters.VIA_HEADER.getValue(properties);
- LOG.info("Initializing cache for provider " + Parameters.REMOTE_URL_BASE.getValue(properties)
+ LOG.info("Initializing cache for provider " + Arrays.toString(Parameters.REMOTE_URL_BASE.getValue(properties))
+ " staleIfError=" + staleIfError + " staleWhileRevalidate=" + staleWhileRevalidate + " ttl=" + ttl
+ " xCacheHeader=" + xCacheHeader + " viaHeader=" + viaHeader);
}
Modified: trunk/esigate-core/src/main/java/org/esigate/events/EventManager.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/events/EventManager.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/events/EventManager.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -111,8 +111,7 @@
}
if (LOG.isInfoEnabled()) {
- LOG.info("Registered {} on event {}/{}", new Object[]{listener.getClass().getName(), driverId,
- eventDefinition});
+ LOG.info("Registered {} on event {}/{}", listener.getClass().getName(), driverId, eventDefinition);
}
}
}
@@ -157,7 +156,7 @@
// Loop on listeners
for (IEventListener el : eventListeners) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Running {} on event {}/{}", new Object[] {el, driverId, eventDefinition});
+ LOG.debug("Running {} on event {}/{}", el, driverId, eventDefinition);
}
if (!el.event(eventDefinition, eventDetails)) {
@@ -194,8 +193,7 @@
boolean removed = eventListeners.remove(listener);
if (LOG.isInfoEnabled() && removed) {
- LOG.info("Unregistered {} on event {}/{}", new Object[] {listener.getClass().getName(), driverId,
- eventDefinition});
+ LOG.info("Unregistered {} on event {}/{}", listener.getClass().getName(), driverId, eventDefinition);
}
}
}
Modified: trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -109,7 +109,7 @@
delay = SPEED_LIMIT;
}
} catch (NumberFormatException e) {
- LOG.warn("Unable to convert {}={} as number", CONFIG_RELOAD_DELAY.getName(),e);
+ LOG.warn("Unable to convert {}={} as number", CONFIG_RELOAD_DELAY.getName(), e);
}
LOG.info("Will reload configuration every {}ms if {} is modified", Long.valueOf(delay),
Modified: trunk/esigate-core/src/main/java/org/esigate/extension/FragmentLogging.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/extension/FragmentLogging.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/extension/FragmentLogging.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -128,8 +128,8 @@
logMessage.append(" - ");
}
- logMessage.append(requestLine + " " + reqHeaders + " -> " + statusLine + " (" + time + " ms) " + cache
- + " " + respHeaders);
+ logMessage.append(requestLine).append(" ").append(reqHeaders).append(" -> ").append(statusLine)
+ .append(" (").append(time).append(" ms) ").append(cache).append(" ").append(respHeaders);
// Log level according to status code.
if (statusCode >= HttpStatus.SC_BAD_REQUEST) {
Modified: trunk/esigate-core/src/main/java/org/esigate/extension/monitoring/Metric.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/extension/monitoring/Metric.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/extension/monitoring/Metric.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -15,7 +15,9 @@
package org.esigate.extension.monitoring;
-import com.codahale.metrics.*;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.ScheduledReporter;
+import com.codahale.metrics.Slf4jReporter;
import org.apache.http.HttpStatus;
import org.apache.http.client.cache.CacheResponseStatus;
import org.apache.http.client.cache.HttpCacheContext;
@@ -76,7 +78,8 @@
public boolean event(EventDefinition id, Event event) {
- String timerName = MetricRegistry.name(this.getClass().getSimpleName(), driver.getConfiguration().getInstanceName(), id.getId());
+ String timerName = MetricRegistry.name(this.getClass().getSimpleName(),
+ driver.getConfiguration().getInstanceName(), id.getId());
if (EventManager.EVENT_PROXY_POST.equals(id)) {
@@ -100,7 +103,7 @@
}
}
- metric.meter(timerName.toString()).mark();
+ metric.meter(timerName).mark();
return true;
}
Modified: trunk/esigate-core/src/main/java/org/esigate/util/Parameter.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/Parameter.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/Parameter.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -17,13 +17,25 @@
import java.util.Properties;
-public class Parameter<T> {
+/**
+ * A parameter with a T value.
+ * @param <T> type
+ */
+public abstract class Parameter<T> {
private final String name;
private final T defaultValue;
@Override
public boolean equals(Object obj) {
- return this.name.equals(obj);
+ boolean equals = false;
+ if (obj != null) {
+ if (obj instanceof Parameter) {
+ equals = this.name.equals(((Parameter) obj).getName());
+ } else if (obj != null && obj instanceof String) {
+ equals = this.name.equals(obj);
+ }
+ }
+ return equals;
}
@Override
@@ -36,6 +48,9 @@
return this.name.hashCode();
}
+ public Parameter(String name) {
+ this(name, null);
+ }
Parameter(String name, T defaultValue) {
this.name = name;
Modified: trunk/esigate-core/src/main/java/org/esigate/util/ParameterArray.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/ParameterArray.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/ParameterArray.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -14,9 +14,12 @@
*/
package org.esigate.util;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Properties;
/**
+ * Array parameter.
* @author Alexis Thaveau
*/
public class ParameterArray extends Parameter<String[]> {
@@ -25,7 +28,11 @@
super(name, defaultValue);
}
+ public ParameterArray(String name) {
+ super(name);
+ }
+
@Override
public String[] getValue(Properties properties) {
String[] value;
Modified: trunk/esigate-core/src/main/java/org/esigate/util/ParameterBoolean.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/ParameterBoolean.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/ParameterBoolean.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -17,7 +17,8 @@
import java.util.Properties;
/**
- * @author Alexis Thaveau
+ * Boolean parameter.
+ * @author Alexis Thaveau
*/
public class ParameterBoolean extends Parameter<Boolean> {
Modified: trunk/esigate-core/src/main/java/org/esigate/util/ParameterCollection.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/ParameterCollection.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/ParameterCollection.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -14,17 +14,24 @@
*/
package org.esigate.util;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Properties;
/**
- * @author Alexis Thaveau
+ * Collection parameter.
+ * @author Alexis Thaveau
*/
public class ParameterCollection extends Parameter<Collection<String>> {
- public ParameterCollection(String name, Collection<String> defaultValue) {
- super(name, defaultValue);
+ public ParameterCollection(String name) {
+ super(name);
}
+ public ParameterCollection(String name, String... defaultValue) {
+ super(name, Arrays.asList(defaultValue));
+ }
@Override
public Collection<String> getValue(Properties properties) {
Modified: trunk/esigate-core/src/main/java/org/esigate/util/ParameterFloat.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/ParameterFloat.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/ParameterFloat.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -17,6 +17,7 @@
import java.util.Properties;
/**
+ * Float parameter.
* @author Alexis Thaveau
*/
public class ParameterFloat extends Parameter<Float> {
Modified: trunk/esigate-core/src/main/java/org/esigate/util/ParameterInteger.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/ParameterInteger.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/ParameterInteger.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -17,7 +17,8 @@
import java.util.Properties;
/**
- * @author Alexis Thaveau
+ * Integer parameter.
+ * @author Alexis Thaveau
*/
public class ParameterInteger extends Parameter<Integer> {
@@ -28,12 +29,12 @@
@Override
public Integer getValue(Properties properties) {
Integer defaultValue = 0;
- if(getDefaultValue()!=null){
+ if (getDefaultValue() != null) {
defaultValue = getDefaultValue();
}
- Integer value = PropertiesUtil.getPropertyValue(properties,getName(),defaultValue);
+ Integer value = PropertiesUtil.getPropertyValue(properties, getName(), defaultValue);
return value;
-
-
+
+
}
}
Modified: trunk/esigate-core/src/main/java/org/esigate/util/ParameterLong.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/ParameterLong.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/ParameterLong.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -17,6 +17,7 @@
import java.util.Properties;
/**
+ * Long parameter.
* @author Alexis Thaveau
*/
public class ParameterLong extends Parameter<Long> {
@@ -25,10 +26,14 @@
super(name, defaultValue);
}
+ public ParameterLong(String name) {
+ super(name);
+ }
+
@Override
public Long getValue(Properties properties) {
- Long defaultValue = 0l;
- if(getDefaultValue()!=null){
+ Long defaultValue = 0L;
+ if (getDefaultValue() != null) {
defaultValue = getDefaultValue();
}
Long value = PropertiesUtil.getPropertyValue(properties, getName(), defaultValue);
Modified: trunk/esigate-core/src/main/java/org/esigate/util/ParameterString.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/util/ParameterString.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/util/ParameterString.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -2,10 +2,24 @@
/**
+ * String parameter.
* @author Alexis Thaveau
*/
public class ParameterString extends Parameter<String> {
+ /***
+ *Constructor
+ * @param name name
+ * @param defaultValue defaultValue
+ */
public ParameterString(String name, String defaultValue) {
super(name, defaultValue);
}
+
+ /***
+ *Constructor
+ * @param name name
+ */
+ public ParameterString(String name) {
+ super(name);
+ }
}
Modified: trunk/esigate-core/src/main/java/org/esigate/vars/Operations.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/vars/Operations.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/main/java/org/esigate/vars/Operations.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -124,7 +124,7 @@
}
private static boolean executeOperations(ArrayList<String> operands, ArrayList<String> operations) {
- boolean res = false;
+ boolean res;
ArrayList<Boolean> results = new ArrayList<Boolean>();
try {
Modified: trunk/esigate-core/src/test/java/org/esigate/extension/surrogate/SurrogateTest.java
===================================================================
--- trunk/esigate-core/src/test/java/org/esigate/extension/surrogate/SurrogateTest.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/test/java/org/esigate/extension/surrogate/SurrogateTest.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -387,7 +387,7 @@
// Cache expired, this request fails.
requestWithSurrogate = createRequest("http://test.mydomain.fr/foobar/").build();
try {
- response = driverProxy(driver, requestWithSurrogate);
+ driverProxy(driver, requestWithSurrogate);
fail("Should return 500");
} catch (HttpErrorPage e) {
assertEquals("3", EntityUtils.toString(e.getHttpResponse().getEntity()));
Modified: trunk/esigate-core/src/test/java/org/esigate/util/ParameterTest.java
===================================================================
--- trunk/esigate-core/src/test/java/org/esigate/util/ParameterTest.java 2014-03-26 15:58:02 UTC (rev 1587)
+++ trunk/esigate-core/src/test/java/org/esigate/util/ParameterTest.java 2014-03-27 13:25:10 UTC (rev 1588)
@@ -71,8 +71,8 @@
}
public void testGetValueCollection() throws Exception {
- Parameter<Collection<String>> parameter1 = new ParameterCollection("test1", null);
- Parameter<Collection<String>> parameter2 = new ParameterCollection("test2", Arrays.asList("v1", "v2"));
+ Parameter<Collection<String>> parameter1 = new ParameterCollection("test1");
+ Parameter<Collection<String>> parameter2 = new ParameterCollection("test2", "v1", "v2");
Properties properties = new Properties();
assertNotNull(parameter1.getValue(properties));
assertTrue(parameter1.getValue(properties).isEmpty());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
