You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by ry...@apache.org on 2008/09/13 21:27:34 UTC
svn commit: r695012 - in
/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories:
DroidFactory.java GenericFactory.java HandlerFactory.java
ParserFactory.java ProtocolFactory.java URLFiltersFactory.java
Author: ryan
Date: Sat Sep 13 12:27:34 2008
New Revision: 695012
URL: http://svn.apache.org/viewvc?rev=695012&view=rev
Log:
LABS-145 make filter factory generic
Modified:
labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/DroidFactory.java
labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java
labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/HandlerFactory.java
labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ParserFactory.java
labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ProtocolFactory.java
labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/URLFiltersFactory.java
Modified: labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/DroidFactory.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/DroidFactory.java?rev=695012&r1=695011&r2=695012&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/DroidFactory.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/DroidFactory.java Sat Sep 13 12:27:34 2008
@@ -25,7 +25,7 @@
* @version 1.0
*
*/
-public class DroidFactory extends GenericFactory {
+public class DroidFactory extends GenericFactory<Droid> {
/**
* Lookup a droid by its name and return it.
@@ -35,8 +35,7 @@
* @return the droid registered for the given name
*/
public Droid getDroid(String name) {
- Droid droid = (Droid) getMap().get(name);
- return droid;
+ return getMap().get(name);
}
}
Modified: labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java?rev=695012&r1=695011&r2=695012&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/GenericFactory.java Sat Sep 13 12:27:34 2008
@@ -29,18 +29,18 @@
* @version 1.0
*
*/
-public class GenericFactory {
+public class GenericFactory<T> {
protected final Log log = LogFactory.getLog(this.getClass().getCanonicalName());
- private Map map = null;
+ private Map<String,T> map = null;
/**
* Get the register which contains all components.
*
* @return the register which contains all components
*/
- public Map getMap() {
+ public Map<String,T> getMap() {
return map;
}
@@ -50,8 +50,9 @@
* @param map
* the register which contains all components.
*/
+ @SuppressWarnings("unchecked")
public void setMap(Map map) {
- this.map = map;
+ this.map = (Map<String,T>)map;
}
/**
@@ -61,9 +62,8 @@
* -the name of the component you need.
* @return plugin to process the job.
*/
- public Object resolve(String name) {
- Object plugin = map.get(name);
- return plugin;
+ public T resolve(String name) {
+ return map.get(name);
}
}
Modified: labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/HandlerFactory.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/HandlerFactory.java?rev=695012&r1=695011&r2=695012&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/HandlerFactory.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/HandlerFactory.java Sat Sep 13 12:27:34 2008
@@ -33,7 +33,7 @@
* @version 1.0
*
*/
-public class HandlerFactory extends GenericFactory {
+public class HandlerFactory extends GenericFactory<Handler> {
/**
* Will traverse all registered handler and execute them. If we encounter a
@@ -62,7 +62,7 @@
if (streamCopy == null) {
return false;
}
- Handler handler = (Handler) getMap().get(handlerName);
+ Handler handler = getMap().get(handlerName);
try {
handler.handle(new ByteArrayInputStream(streamCopy), url, parse);
} catch (Exception e) {
Modified: labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ParserFactory.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ParserFactory.java?rev=695012&r1=695011&r2=695012&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ParserFactory.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ParserFactory.java Sat Sep 13 12:27:34 2008
@@ -27,7 +27,7 @@
* @version 1.0
*
*/
-public class ParserFactory extends GenericFactory {
+public class ParserFactory extends GenericFactory<Parser> {
/**
* Lookup a parser by its identifier (content type) and return it.
@@ -41,9 +41,7 @@
if (contentType == null) {
throw new ParserNotFoundException(contentType);
}
- Parser parser = null;
- parser = (Parser) getMap().get(contentType);
- return parser;
+ return getMap().get(contentType);
}
}
Modified: labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ProtocolFactory.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ProtocolFactory.java?rev=695012&r1=695011&r2=695012&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ProtocolFactory.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/ProtocolFactory.java Sat Sep 13 12:27:34 2008
@@ -29,7 +29,7 @@
* @version 1.0
*
*/
-public class ProtocolFactory extends GenericFactory {
+public class ProtocolFactory extends GenericFactory<Protocol> {
/**
* Will lookup a protocol based on the underlying uri
@@ -48,7 +48,7 @@
if (protocolName == null) {
throw new ProtocolNotFoundException(uri);
}
- protocol = (Protocol) getMap().get(protocolName);
+ protocol = getMap().get(protocolName);
} catch (MalformedURLException e) {
throw new ProtocolNotFoundException(uri, e.toString());
} catch (ProtocolNotFoundException e) {
Modified: labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/URLFiltersFactory.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/URLFiltersFactory.java?rev=695012&r1=695011&r2=695012&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/URLFiltersFactory.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/helper/factories/URLFiltersFactory.java Sat Sep 13 12:27:34 2008
@@ -16,8 +16,6 @@
*/
package org.apache.droids.helper.factories;
-import java.util.Iterator;
-
import org.apache.droids.api.URLFilter;
/**
@@ -27,7 +25,7 @@
* @version 1.0
*
*/
-public class URLFiltersFactory extends GenericFactory {
+public class URLFiltersFactory extends GenericFactory<URLFilter> {
/**
* Run all defined filters. Assume logical AND.
@@ -37,12 +35,11 @@
* @return true if filter plugin accept the url, false if excluded.
*/
public boolean accept(String urlString) {
- for (Iterator<String> iterator = getMap().keySet().iterator(); iterator.hasNext();) {
- String key = iterator.next();
+ for (String key : getMap().keySet()) {
if (urlString == null) {
return false;
}
- URLFilter filter = (URLFilter) getMap().get(key);
+ URLFilter filter = getMap().get(key);
urlString = filter.filter(urlString);
if (urlString == null) {
return false;
@@ -64,7 +61,7 @@
if (urlString == null) {
return false;
}
- URLFilter filter = (URLFilter) getMap().get(filterName);
+ URLFilter filter = getMap().get(filterName);
urlString = filter.filter(urlString);
if (urlString == null) {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org