Repository: knox
Updated Branches:
  refs/heads/master 93fd7c712 -> a80769278


KNOX-1345 - Fix javadoc errors


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/a8076927
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/a8076927
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/a8076927

Branch: refs/heads/master
Commit: a8076927814f3f921d167428ef73260ce00100ba
Parents: 93fd7c7
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Fri Jun 15 12:22:00 2018 +0100
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Fri Jun 15 12:22:00 2018 +0100

----------------------------------------------------------------------
 .../org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java  | 4 +---
 .../org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java  | 2 +-
 .../knox/gateway/ha/provider/impl/HaDescriptorConstants.java | 5 ++++-
 .../common/filter/AbstractIdentityAssertionFilter.java       | 4 ++--
 .../gateway/filter/rewrite/api/UrlRewriteRuleDescriptor.java | 4 ++++
 .../filter/rewrite/api/UrlRewriteRulesDescriptor.java        | 4 ++++
 .../rewrite/impl/html/HtmlImportFunctionProcessor.java       | 8 ++++++++
 .../filter/rewrite/impl/html/HtmlPrefixProcessor.java        | 8 ++++++++
 .../gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java | 4 ++++
 .../knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java     | 2 +-
 .../knox/gateway/preauth/filter/PreAuthFederationFilter.java | 2 +-
 .../apache/knox/gateway/preauth/filter/PreAuthService.java   | 2 +-
 .../knox/gateway/shirorealm/KnoxLdapContextFactory.java      | 4 ++--
 .../org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java    | 3 ++-
 .../org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java    | 3 ---
 .../knox/gateway/dispatch/AbstractGatewayDispatch.java       | 2 +-
 .../gateway/security/principal/SimplePrincipalMapper.java    | 4 ++--
 .../src/main/java/org/apache/knox/gateway/util/Urls.java     | 2 +-
 pom.xml                                                      | 2 +-
 19 files changed, 48 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
----------------------------------------------------------------------
diff --git 
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
 
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
index 78ecddc..e2cf8a4 100644
--- 
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
+++ 
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
@@ -22,9 +22,7 @@ import javax.servlet.ServletException;
  * limitations under the License.
  */
 public class RMHaDispatch extends 
org.apache.knox.gateway.rm.dispatch.RMHaDispatch {
-  /**
-   * @throws ServletException
-   */
+
   public RMHaDispatch() {
     super();
   }

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
----------------------------------------------------------------------
diff --git 
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
 
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
index a2efdb9..46a07c0 100644
--- 
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
+++ 
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
@@ -75,7 +75,7 @@ public class KnoxLdapRealm
   /**
    * Returns the LDAP User Distinguished Name (DN) to use when acquiring an
    * {@link LdapContext LdapContext} from the {@link LdapContextFactory}.
-   * <p/>
+   *
    * If the the {@link #getUserDnTemplate() userDnTemplate} property has been
    * set, this implementation will construct the User DN by substituting the
    * specified {@code principal} into the configured template.  If the {@link

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
 
b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
index 5ea6b4a..54aa8f2 100644
--- 
a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
+++ 
b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorConstants.java
@@ -19,10 +19,13 @@ package org.apache.knox.gateway.ha.provider.impl;
 
 /**
  * The constants for xml elements and attributes are meant to help 
render/consume the following:
- * <p/>
+ * <pre>
+ * {@code
  * <ha>
  * <service name='foo' failoverLimit='3' enabled='true'/>
  * </ha>
+ * }
+ * </pre>
  */
 public interface HaDescriptorConstants {
 

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
 
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
index a007ab6..1a3d8d5 100644
--- 
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
+++ 
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java
@@ -88,7 +88,7 @@ public abstract class AbstractIdentityAssertionFilter extends
   public abstract String mapUserPrincipal(String principalName);
 
   /**
-   * @param wrapper
+   * @param request
    * @param response
    * @param chain
    * @param mappedPrincipalName
@@ -195,4 +195,4 @@ public abstract class AbstractIdentityAssertionFilter 
extends
       throws IOException, ServletException {
     chain.doFilter(request, response);
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRuleDescriptor.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRuleDescriptor.java
 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRuleDescriptor.java
index b65670a..6f7e598 100644
--- 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRuleDescriptor.java
+++ 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRuleDescriptor.java
@@ -23,7 +23,11 @@ import java.net.URISyntaxException;
 import java.util.EnumSet;
 
 /**
+ * <pre>
+ * {@code
  *  <rule name="..." pattern="..." dir="request" 
flow="and"><match></match></rule>
+ * }
+ * </pre>
  */
 public interface UrlRewriteRuleDescriptor extends 
UrlRewriteFlowDescriptor<UrlRewriteRuleDescriptor> {
 

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
index f046921..f12760c 100644
--- 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
+++ 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptor.java
@@ -20,7 +20,11 @@ package org.apache.knox.gateway.filter.rewrite.api;
 import java.util.List;
 
 /**
+ * <pre>
+ * {@code
  * <rules><rule></rule></rules>
+ * }
+ * </pre>
  */
 public interface UrlRewriteRulesDescriptor {
 

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
index 0b3b3c6..198bf39 100644
--- 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
+++ 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
@@ -33,11 +33,19 @@ import java.util.List;
  * along with the '@import' literal. This is a workaround for the requirement 
to provide the ability to rewrite
  * a portion of html content that contains a tag like the following
  *
+ * <pre>
+ * {@code
  * <head> <style type=\"text/css\">@import "pretty.css";</style></head>
+ * }
+ * </pre>
  *
  * and needs to be rewritten to something like
  *
+ * <pre>
+ * {@code
  * <head> <style type=\"text/css\">@import 
"http://localhost:8443/sandbox/service/pretty.css";;</style></head>
+ * }
+ * </pre>
  *
  * The rewrite rule could then contain the $import function that would 
delegate to the frontend function.
  *

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
index 7fe26ad..bccc844 100644
--- 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
+++ 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlPrefixProcessor.java
@@ -32,11 +32,19 @@ import java.util.List;
  * prefix to the rewritten frontend portion along with the literals
  * provided as an argument.
  * <p>
+ * <pre>
+ * {@code
  * <div ng-include 
src=\"'components/navbar/navbar.html?v=1498928142479'\"></div>
+ * }
+ * </pre>
  * <p>
  * and needs to be rewritten to something like
  * <p>
+ * <pre>
+ * {@code
  * <div ng-include 
src=\"'http://localhost:8443/sandbox/service/components/navbar/navbar.html?v=1498928142479'\"></div>
+ * }
+ * </pre>
  * <p>
  * The rewrite rule could then contain the $prefix function that would delegate
  * to the frontend function.

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
index 872521a..9ff2434 100644
--- 
a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
+++ 
b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlRewriteRulesTags.java
@@ -18,6 +18,8 @@
 package org.apache.knox.gateway.filter.rewrite.impl.xml;
 
 /**
+ * <pre>
+ * {@code
  * <rules>
  *   <filter name="">
  *     <content type="json"> == <scope path="$"/>
@@ -30,6 +32,8 @@ package org.apache.knox.gateway.filter.rewrite.impl.xml;
  *     </content>
  *   </filter>
  * </rules>
+ * }
+ * </pre>
  */
 public interface XmlRewriteRulesTags {
 

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
 
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
index 46186f6..34d7978 100644
--- 
a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
+++ 
b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
@@ -52,7 +52,7 @@ import java.util.Map;
  * <p>This filter dispatches the HTTP calls between the j2e-pac4j filters:</p>
  * <ul>
  *     <li>to the {@link CallbackFilter} if the <code>client_name</code> 
parameter exists: it finishes the authentication process</li>
- *     <li>to the {@link RequiresAuthenticationFilter} otherwise: it starts 
the authentication process (redirection to the identity provider) if the user 
is not authenticated</li>
+ *     <li>to the {@link SecurityFilter} otherwise: it starts the 
authentication process (redirection to the identity provider) if the user is 
not authenticated</li>
  * </ul>
  * <p>It uses the {@link KnoxSessionStore} to manage session data. The 
generated cookies are defined on a domain name
  * which can be configured via the domain suffix parameter: 
<code>pac4j.cookie.domain.suffix</code>.</p>

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java
 
b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java
index 13e023f..67e3a7c 100644
--- 
a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java
+++ 
b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java
@@ -82,7 +82,7 @@ public class PreAuthFederationFilter implements Filter {
    * Recreate the current Subject based upon the provided mappedPrincipal
    * and look for the groups that should be associated with the new Subject.
    * Upon finding groups mapped to the principal - add them to the new Subject.
-   * @param mappedPrincipalName
+   * @param principal
    * @throws ServletException
    * @throws IOException
    */

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java
 
b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java
index 5e0ef6a..5c6e868 100644
--- 
a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java
+++ 
b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java
@@ -66,7 +66,7 @@ public class PreAuthService {
    *
    * @since 0.12
    * @param filterConfig
-   * @return List<PreAuthValidator>
+   * @return a list of PreAuthValidator instances as defined in config
    * @throws ServletException
    */
   public static List<PreAuthValidator> getValidators(FilterConfig 
filterConfig) throws ServletException {

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
 
b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
index aa28594..30c38cc 100644
--- 
a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
+++ 
b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java
@@ -38,7 +38,7 @@ import org.apache.shiro.realm.ldap.JndiLdapContextFactory;
  * compared to regular authentication.
  * 
  * <p>
- * See {@link IsisLdapRealm} for typical configuration within 
<tt>shiro.ini</tt>.
+ * See {@link KnoxLdapRealm} for typical configuration within 
<tt>shiro.ini</tt>.
  */
 public class KnoxLdapContextFactory extends JndiLdapContextFactory {
 
@@ -122,4 +122,4 @@ public class KnoxLdapContextFactory extends 
JndiLdapContextFactory {
       }
     }
     
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
----------------------------------------------------------------------
diff --git 
a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
 
b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
index 8c99358..3978de4 100644
--- 
a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
+++ 
b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
@@ -87,6 +87,7 @@ import org.apache.shiro.util.StringUtils;
  * <p>
  * Sample config for <tt>shiro.ini</tt>:
  * 
+ * <pre>
  * [main]
  * ldapRealm=KnoxLdapRealm
  * ldapGroupContextFactory=KnoxLdapContextFactory
@@ -663,7 +664,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
   /**
      * Returns the LDAP User Distinguished Name (DN) to use when acquiring an
      * {@link javax.naming.ldap.LdapContext LdapContext} from the {@link 
LdapContextFactory}.
-     * <p/>
+     *
      * If the the {@link #getUserDnTemplate() userDnTemplate} property has 
been set, this implementation will construct
      * the User DN by substituting the specified {@code principal} into the 
configured template.  If the
      * {@link #getUserDnTemplate() userDnTemplate} has not been set, the 
method argument will be returned directly

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
----------------------------------------------------------------------
diff --git 
a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
 
b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
index eebf55e..0bf372b 100644
--- 
a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
+++ 
b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaDispatch.java
@@ -25,9 +25,6 @@ public class RMHaDispatch extends RMHaBaseDispatcher {
     private static final String RESOURCE_ROLE = "RESOURCEMANAGER";
     private HaProvider haProvider;
 
-    /**
-   * @throws javax.servlet.ServletException
-   */
   public RMHaDispatch() {
     super();
   }

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
----------------------------------------------------------------------
diff --git 
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
 
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
index d89a1dd..88e1287 100644
--- 
a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
+++ 
b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/AbstractGatewayDispatch.java
@@ -117,7 +117,7 @@ public abstract class AbstractGatewayDispatch implements 
Dispatch {
   }
 
   /**
-   * @sine 0.14.0
+   * @since 0.14.0
    */
   public void doHead( URI url, HttpServletRequest request, HttpServletResponse 
response )
       throws IOException, URISyntaxException {

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
----------------------------------------------------------------------
diff --git 
a/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
 
b/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
index 68f63d6..8bb9478 100644
--- 
a/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
+++ 
b/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
@@ -112,8 +112,8 @@ public class SimplePrincipalMapper implements 
PrincipalMapper {
   }
 
   /**
-   * @param groups
-   * @param wildCardGroups
+   * @param first
+   * @param second
    * @return
    */
   public static <T> T[] concat(T[] first, T[] second) {

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java
----------------------------------------------------------------------
diff --git 
a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java 
b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java
index 04af03f..54cff6b 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java
@@ -81,7 +81,7 @@ public class Urls {
    * @param url a given URL
    * @param domainSuffix a domain suffix (can be <code>null</code>)
    * @return the extracted domain name
-   * @throws URISyntaxException
+   * @throws MalformedURLException
    */
   public static String getDomainName(String url, String domainSuffix) throws 
MalformedURLException {
 

http://git-wip-us.apache.org/repos/asf/knox/blob/a8076927/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e8c4814..ec9ff24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,7 +430,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
+                <version>3.0.1</version>
                 <!--
                 <executions>
                     <execution>

Reply via email to