You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2019/01/11 14:47:33 UTC
svn commit: r1851056 - in /turbine/fulcrum/trunk/parser/src:
changes/changes.xml java/org/apache/fulcrum/parser/DefaultCookieParser.java
java/org/apache/fulcrum/parser/DefaultParameterParser.java
java/org/apache/fulcrum/parser/DefaultParserService.java
Author: painter
Date: Fri Jan 11 14:47:32 2019
New Revision: 1851056
URL: http://svn.apache.org/viewvc?rev=1851056&view=rev
Log:
Code formattting cleanup
Modified:
turbine/fulcrum/trunk/parser/src/changes/changes.xml
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java
Modified: turbine/fulcrum/trunk/parser/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/changes/changes.xml?rev=1851056&r1=1851055&r2=1851056&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/parser/src/changes/changes.xml Fri Jan 11 14:47:32 2019
@@ -23,6 +23,9 @@
<body>
<release version="2.0.0" date="in SVN">
+ <action dev="gk" type="update">
+ Added tests for getParts()
+ </action>
<action dev="painter" type="update">
PMD report cleanup
</action>
Modified: turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java?rev=1851056&r1=1851055&r2=1851056&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java (original)
+++ turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java Fri Jan 11 14:47:32 2019
@@ -107,15 +107,14 @@ public class DefaultCookieParser
setCharacterEncoding(enc != null ? enc : "US-ASCII");
Cookie[] cookies = request.getCookies();
-
getLogger().debug ("Number of Cookies "+cookies.length);
- for (int i=0; i<cookies.length; i++)
+ for (Cookie cookie : cookies)
{
- String name = convert (cookies[i].getName());
- String value = cookies[i].getValue();
- getLogger().debug ("Adding "+name+"="+value);
- add (name,value);
+ String name = convert(cookie.getName());
+ String value = cookie.getValue();
+ getLogger().debug ("Adding " + name + "=" + value);
+ add(name, value);
}
this.request = request;
@@ -128,7 +127,7 @@ public class DefaultCookieParser
*/
public void set (String name, String value)
{
- set (name,value,AGE_SESSION);
+ set (name, value, AGE_SESSION);
}
/**
@@ -142,10 +141,10 @@ public class DefaultCookieParser
throw new IllegalStateException("Servlet response not available");
}
- Cookie cookie = new Cookie (name,value);
- cookie.setMaxAge (seconds_age);
- cookie.setPath (request.getServletPath());
- response.addCookie (cookie);
+ Cookie cookie = new Cookie(name, value);
+ cookie.setMaxAge(seconds_age);
+ cookie.setPath(request.getServletPath());
+ response.addCookie(cookie);
}
/**
@@ -153,7 +152,7 @@ public class DefaultCookieParser
*/
public void unset (String name)
{
- set (name," ",AGE_DELETE);
+ set (name, " ", AGE_DELETE);
}
}
Modified: turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java?rev=1851056&r1=1851055&r2=1851056&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java (original)
+++ turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java Fri Jan 11 14:47:32 2019
@@ -247,15 +247,19 @@ public class DefaultParameterParser
{
String enc = request.getCharacterEncoding();
- if (enc == null && !parserService.getParameterEncoding().equals(ParserService.PARAMETER_ENCODING_DEFAULT )) {
+ if (enc == null && !parserService.getParameterEncoding().equals(ParserService.PARAMETER_ENCODING_DEFAULT ))
+ {
try
{
// no-op if data was read (parameter, POST..)
request.setCharacterEncoding( parserService.getParameterEncoding() );
enc = request.getCharacterEncoding();
- if (enc != null) {
+ if (enc != null)
+ {
getLogger().debug("Set the request encoding successfully to parameterEncoding of parser: "+enc );
- } else {
+ }
+ else
+ {
getLogger().warn("Unsuccessfully (data read happened) tried to set the request encoding to "+ parserService.getParameterEncoding() );
}
}
@@ -311,6 +315,8 @@ public class DefaultParameterParser
}
/**
+ * @see org.apache.fulcrum.parser.ParameterParser#getPart(java.lang.String)
+ *
* Return a Part object for the given name. If the name does
* not exist or the object stored is not a Part, return null.
*
@@ -337,12 +343,14 @@ public class DefaultParameterParser
}
/**
+ * @see org.apache.fulcrum.parser.ParameterParser#getParts(java.lang.String)
+ *
* Return an array of Part objects for the given name. If the
* name does not exist or the object stored is not a Part
* array, return null.
*
* @param name A String with the name.
- * @return A Part[].
+ * @return A Part[]
*/
@Override
public Part[] getParts(String name)
@@ -357,6 +365,9 @@ public class DefaultParameterParser
}
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.parser.ParameterParser#getParts()
+ */
@Override
public Collection<Part> getParts()
{
@@ -367,22 +378,34 @@ public class DefaultParameterParser
}
+ /* (non-Javadoc)
+ * @see org.apache.fulcrum.parser.ParameterParser#getFileName(javax.servlet.http.Part)
+ */
@Override
- public String getFileName( Part part )
+ public String getFileName(Part part)
{
final String partHeader = part.getHeader("content-disposition");
- Pattern regex = Pattern.compile("filename\\*?=\"?(.[^\"]+)\"?"); // rfc2183, rfc5987 quoted string, but attachments may have not?
- for (String content : partHeader.split(";")) {
- if (content.trim().contains( "filename" )) { // could also filename*=<encoding>''<value>
+
+ // rfc2183, rfc5987 quoted string, but attachments may have not?
+ Pattern regex = Pattern.compile("filename\\*?=\"?(.[^\"]+)\"?");
+
+ for (String content : partHeader.split(";"))
+ {
+ // could also filename*=<encoding>''<value>
+ if (content.trim().contains( "filename" ))
+ {
String fnTmp = "";
String srcStr = content.trim();
Matcher regexMatcher = regex.matcher(srcStr);
- if (regexMatcher.find()) {
+ if (regexMatcher.find())
+ {
fnTmp = regexMatcher.group(1);
- if (getLogger().isDebugEnabled()) {
+ if (getLogger().isDebugEnabled())
+ {
getLogger().debug( "matched fileName:" + fnTmp );
}
- } else { // last resort
+ } else {
+ // last resort
fnTmp = srcStr.substring(srcStr.indexOf('=')+1).replace( "\"", "" );
getLogger().debug( "second fileName match:" + fnTmp );
}
Modified: turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java?rev=1851056&r1=1851055&r2=1851056&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java (original)
+++ turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParserService.java Fri Jan 11 14:47:32 2019
@@ -118,7 +118,7 @@ public class DefaultParserService
@Override
public String convertAndTrim(String value, URLCaseFolding fold)
{
- if(value == null)
+ if (value == null)
{
return "";
}