Repository: incubator-juneau Updated Branches: refs/heads/master 1dab7d84c -> b93b57330
Fix whitespace. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/b93b5733 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/b93b5733 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/b93b5733 Branch: refs/heads/master Commit: b93b5733046102a03dff3456b41e4c470f933318 Parents: 1dab7d8 Author: JamesBognar <[email protected]> Authored: Fri Apr 7 14:15:39 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Fri Apr 7 14:15:39 2017 -0400 ---------------------------------------------------------------------- .../org/apache/juneau/rest/RestRequest.java | 14 ++++----- .../java/org/apache/juneau/rest/RestUtils.java | 32 ++++++++++---------- .../juneau/rest/annotation/RestResource.java | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b93b5733/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java index 28bfb2a..99f09d0 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java @@ -1988,13 +1988,13 @@ public final class RestRequest extends HttpServletRequestWrapper { * Converts an Accept-Language value entry to a Locale. */ private static Locale toLocale(String lang) { - String country = ""; - int i = lang.indexOf('-'); - if (i > -1) { - country = lang.substring(i+1).trim(); - lang = lang.substring(0,i).trim(); - } - return new Locale(lang, country); + String country = ""; + int i = lang.indexOf('-'); + if (i > -1) { + country = lang.substring(i+1).trim(); + lang = lang.substring(0,i).trim(); + } + return new Locale(lang, country); } private Encoder getEncoder() { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b93b5733/juneau-rest/src/main/java/org/apache/juneau/rest/RestUtils.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestUtils.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestUtils.java index a4291a0..607f659 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestUtils.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestUtils.java @@ -119,12 +119,12 @@ public final class RestUtils { return s; } - /** - * Decodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme. - * + /** + * Decodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme. + * * @param s The string to decode. * @return The decoded string, or <jk>null</jk> if input is <jk>null</jk>. - */ + */ public static String decode(String s) { if (s == null) return s; @@ -144,12 +144,12 @@ public final class RestUtils { // Characters that do not need to be URL-encoded private static final AsciiSet unencodedChars = new AsciiSet("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.!~*'()\\"); - /** - * Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme. - * - * @param s The string to encode. - * @return The encoded string, or <jk>null</jk> if input is <jk>null</jk>. - */ + /** + * Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme. + * + * @param s The string to encode. + * @return The encoded string, or <jk>null</jk> if input is <jk>null</jk>. + */ public static String encode(String s) { if (s == null) return null; @@ -163,12 +163,12 @@ public final class RestUtils { return s; } - /** - * Identical to {@link HttpServletRequest#getPathInfo()} but doesn't decode encoded characters. - * - * @param req The HTTP request - * @return The undecoded path info. - */ + /** + * Identical to {@link HttpServletRequest#getPathInfo()} but doesn't decode encoded characters. + * + * @param req The HTTP request + * @return The undecoded path info. + */ public static String getPathInfoUndecoded(HttpServletRequest req) { String requestURI = req.getRequestURI(); String contextPath = req.getContextPath(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/b93b5733/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java index 8492770..6f0c323 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java @@ -74,7 +74,7 @@ public @interface RestResource { * but it can also be used for other purposes like pre-call validation of a request. * <p> * The programmatic equivalent to this annotation are the {@link RestConfig#addGuards(Class...)}/{@link RestConfig#addGuards(RestGuard...)} methods. - */ + */ Class<? extends RestGuard>[] guards() default {}; /**
