[utilities COMMIT] in /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support: logging/LogbackConfigu...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun  6 15:28:10 2014
New Revision: 591

URL: http://svn.shibboleth.net/view/utilities?rev=591&view=rev
Log:
Some work on JSPT-45: Implement class and method renames for new naming convention for any remaining components.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logging/LogbackConfigurationListener.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logging/LogbackConfigurationListener.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logging/LogbackConfigurationListener.java?rev=591&r1=590&r2=591&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logging/LogbackConfigurationListener.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logging/LogbackConfigurationListener.java Fri Jun  6 15:28:10 2014
@@ -68,7 +68,7 @@
             return;
         }
 
-        final URL url = toUrl(servletContext, configPath);
+        final URL url = toURL(servletContext, configPath);
         if (url == null) {
             servletContext.log("Can not configure logback. Could not find logback"
                     + " config neither as servlet context-, nor as" + " classpath-, nor as url-, nor as file system"
@@ -121,7 +121,7 @@
      * 
      * @return the absolute URL representing the logback configuration file
      */
-    protected URL toUrl(final ServletContext servletContext, final String location) {
+    protected URL toURL(final ServletContext servletContext, final String location) {
         if (location.startsWith("/")) {
             final File file = new File(location);
             if (!file.exists()) {

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java?rev=591&r1=590&r2=591&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java Fri Jun  6 15:28:10 2014
@@ -218,10 +218,10 @@
                 builder.append("&");
             }
 
-            builder.append(urlEncode(parameter.getFirst()));
+            builder.append(doURLEncode(parameter.getFirst()));
             builder.append("=");
             if (parameter.getSecond() != null) {
-                builder.append(urlEncode(parameter.getSecond()));
+                builder.append(doURLEncode(parameter.getSecond()));
             }
         }
 
@@ -245,7 +245,7 @@
             return null;
         }
 
-        final String encodedName = urlEncode(trimmedName);
+        final String encodedName = doURLEncode(trimmedName);
         
         String[] candidates = trimmedQuery.split("&");
         for (String candidate : candidates) {
@@ -279,9 +279,9 @@
         for (String paramPair : paramPairs) {
             param = paramPair.split("=");
             if (param.length == 1) {
-                queryParams.add(new Pair(urlDecode(param[0]), null));
+                queryParams.add(new Pair(doURLDecode(param[0]), null));
             } else {
-                queryParams.add(new Pair(urlDecode(param[0]), urlDecode(param[1])));
+                queryParams.add(new Pair(doURLDecode(param[0]), doURLDecode(param[1])));
             }
         }
 
@@ -360,12 +360,12 @@
     }
 
     /**
-     * URL Decode the given string.
+     * Perform URL decoding on the given string.
      * 
      * @param value the string to decode
      * @return the decoded string
      */
-    public static String urlDecode(final String value) {
+    public static String doURLDecode(final String value) {
         if (value == null) {
             return null;
         }
@@ -379,12 +379,12 @@
     }
 
     /**
-     * URL Encode the given string.
+     * Perform URL encoding on the given string.
      * 
      * @param value the string to encode
      * @return the encoded string
      */
-    public static String urlEncode(final String value) {
+    public static String doURLEncode(final String value) {
         if (value == null) {
             return null;
         }

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java?rev=591&r1=590&r2=591&view=diff
==============================================================================

[... 44 lines stripped ...]