Author: tv
Date: Thu Aug 9 20:43:49 2012
New Revision: 1371471
URL: http://svn.apache.org/viewvc?rev=1371471&view=rev
Log:
Use enum instead of integer/string constants
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParserService.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParserService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParserService.java?rev=1371471&r1=1371470&r2=1371471&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParserService.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParserService.java
Thu Aug 9 20:43:49 2012
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.avalon.framework.service.ServiceException;
import org.apache.commons.fileupload.FileItem;
+import org.apache.fulcrum.parser.ValueParser.URLCaseFolding;
/**
@@ -50,27 +51,6 @@ public interface ParserService
/** Property for setting the URL folding value */
String URL_CASE_FOLDING_KEY = "urlCaseFolding";
- /** No folding */
- String URL_CASE_FOLDING_NONE_VALUE = "none";
-
- /** Fold to lower case */
- String URL_CASE_FOLDING_LOWER_VALUE = "lower";
-
- /** Fold to upper case */
- String URL_CASE_FOLDING_UPPER_VALUE = "upper";
-
- /** No folding set */
- int URL_CASE_FOLDING_UNSET = 0;
-
- /** Folding set to "no folding" */
- int URL_CASE_FOLDING_NONE = 1;
-
- /** Folding set to "lowercase" */
- int URL_CASE_FOLDING_LOWER = 2;
-
- /** Folding set to "uppercase" */
- int URL_CASE_FOLDING_UPPER = 3;
-
/** Parse file upload items automatically */
String AUTOMATIC_KEY = "automaticUpload";
@@ -121,14 +101,14 @@ public interface ParserService
* (see {@link ParserService})
* @return A new String converted to the correct case and trimmed.
*/
- String convertAndTrim(String value, int fold);
+ String convertAndTrim(String value, URLCaseFolding fold);
/**
* Gets the folding value from the configuration
*
* @return The current Folding Value
*/
- int getUrlFolding();
+ URLCaseFolding getUrlFolding();
/**
* Gets the automaticUpload value from the configuration
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java?rev=1371471&r1=1371470&r2=1371471&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java
Thu Aug 9 20:43:49 2012
@@ -47,13 +47,28 @@ import java.util.Set;
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id$
*/
-public interface ValueParser
+public interface ValueParser extends Iterable<String>
{
/**
* The default character encoding to use when converting to byte arrays
*/
String DEFAULT_CHARACTER_ENCODING = "US-ASCII";
+ /** Possible values for the URL folding setting */
+ enum URLCaseFolding {
+ /** No folding set */
+ UNSET,
+
+ /** No folding */
+ NONE,
+
+ /** Fold to lower case */
+ LOWER,
+
+ /** Fold to upper case */
+ UPPER
+ }
+
/**
* Clear all name/value pairs out of this object.
*/
@@ -234,7 +249,7 @@ public interface ValueParser
* Valid values for true: true, on, 1, yes<br>
* Valid values for false: false, off, 0, no<br>
* <p>
- * The string is compared without reguard to case.
+ * The string is compared without regard to case.
*
* @param name A String with the name.
* @return A Boolean.
@@ -720,13 +735,13 @@ public interface ValueParser
* @param value A String to be processed.
* @return A new String converted and trimmed.
*/
- String convertAndTrim(String value, int folding);
+ String convertAndTrim(String value, URLCaseFolding folding);
/**
* Gets the folding value from the ParserService configuration
*
* @return The current Folding Value
*/
- int getUrlFolding();
+ URLCaseFolding getUrlFolding();
}
Modified:
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java?rev=1371471&r1=1371470&r2=1371471&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
(original)
+++
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
Thu Aug 9 20:43:49 2012
@@ -26,6 +26,7 @@ import org.apache.avalon.framework.compo
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.fulcrum.parser.ValueParser.URLCaseFolding;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
* Basic test that ParameterParser instantiates.
@@ -66,13 +67,13 @@ public class ParameterParserTest extends
public void testConfiguredUrlCaseFolding() throws Exception
{
- assertTrue(parameterParser.getUrlFolding() ==
ParserService.URL_CASE_FOLDING_NONE);
+ assertTrue(parameterParser.getUrlFolding() == URLCaseFolding.NONE);
}
-
+
public void testConfiguredAutomaticUpload() throws Exception {
assertTrue(parserService.getAutomaticUpload());
}
-
+
public void testConfiguredParameterEncoding() throws Exception {
assertEquals("utf-8", parserService.getParameterEncoding());
}
@@ -84,9 +85,9 @@ public class ParameterParserTest extends
*/
public void testRepositoryExists() throws Exception
{
-
assertEquals("TRIMMED_and_Not_Modified",parameterParser.convertAndTrim("
TRIMMED_and_Not_Modified ", ParserService.URL_CASE_FOLDING_NONE));
- assertEquals("trimmed_and_lower_case",parameterParser.convertAndTrim("
TRIMMED_and_Lower_Case ", ParserService.URL_CASE_FOLDING_LOWER));
- assertEquals("TRIMMED_AND_UPPER_CASE",parameterParser.convertAndTrim("
TRIMMED_and_Upper_Case ", ParserService.URL_CASE_FOLDING_UPPER));
+
assertEquals("TRIMMED_and_Not_Modified",parameterParser.convertAndTrim("
TRIMMED_and_Not_Modified ", URLCaseFolding.NONE));
+ assertEquals("trimmed_and_lower_case",parameterParser.convertAndTrim("
TRIMMED_and_Lower_Case ", URLCaseFolding.LOWER));
+ assertEquals("TRIMMED_AND_UPPER_CASE",parameterParser.convertAndTrim("
TRIMMED_and_Upper_Case ", URLCaseFolding.UPPER));
}
/**
@@ -108,10 +109,10 @@ public class ParameterParserTest extends
assertEquals("FileItem not found in keySet()!", 1,
parameterParser.keySet().size());
- Iterator it = parameterParser.keySet().iterator();
+ Iterator<String> it = parameterParser.keySet().iterator();
assertTrue(it.hasNext());
- String name = (String) it.next();
+ String name = it.next();
assertEquals("Wrong name found", "upload-field", name);
assertFalse(it.hasNext());
