Merge branch 'master' into 2.4.x

Author: Martin Leon

connectors/jetty-connector/pom.xml

@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>${jersey.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

core-common/src/main/java/org/glassfish/jersey/SslConfigurator.java

@@ -436,7 +436,7 @@ public SslConfigurator keyStorePassword(String password) {
      * @return updated SSL configurator instance.
      */
     public SslConfigurator keyStorePassword(char[] password) {
-        this.keyStorePass = password;
+        this.keyStorePass = password.clone();
         return this;
     }
 
@@ -458,7 +458,7 @@ public SslConfigurator keyPassword(String password) {
      * @return updated SSL configurator instance.
      */
     public SslConfigurator keyPassword(char[] password) {
-        this.keyPass = password;
+        this.keyPass = password.clone();
         return this;
     }
 
@@ -490,7 +490,7 @@ public SslConfigurator trustStoreFile(String fileName) {
      * @return updated SSL configurator instance.
      */
     public SslConfigurator trustStoreBytes(byte[] payload) {
-        this.trustStoreBytes = payload;
+        this.trustStoreBytes = payload.clone();
         this.trustStoreFile = null;
         this.trustStore = null;
         return this;
@@ -524,7 +524,7 @@ public SslConfigurator keyStoreFile(String fileName) {
      * @return updated SSL configurator instance.
      */
     public SslConfigurator keyStoreBytes(byte[] payload) {
-        this.keyStoreBytes = payload;
+        this.keyStoreBytes = payload.clone();
         this.keyStoreFile = null;
         this.keyStore = null;
         return this;

core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessage.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -64,7 +64,7 @@ public String getKey() {
 
     @Override
     public Object[] getArguments() {
-        return _args;
+        return _args.clone();
     }
 
     @Override

core-common/src/main/java/org/glassfish/jersey/message/internal/OutboundMessageContext.java

@@ -739,7 +739,7 @@ public void setEntityType(Type type) {
      * @return entity annotations.
      */
     public Annotation[] getEntityAnnotations() {
-        return entityAnnotations;
+        return entityAnnotations.clone();
     }
 
     /**

core-common/src/main/java/org/glassfish/jersey/uri/PathPattern.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -47,7 +47,7 @@
  * <p>
  * The path pattern is normalized by removing a terminating "/" if present.
  * <p>
- * The path pattern is postfixed with a right hand pattern that consists of either
+ * The path pattern is post-fixed with a right hand pattern that consists of either
  * a matching group that matches zero or more path segments,
  * see {@link RightHandPath#capturingZeroOrMoreSegments}, or zero path
  * segments, see {@link RightHandPath#capturingZeroSegments}.

core-common/src/main/java/org/glassfish/jersey/uri/PatternWithGroups.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -50,7 +50,7 @@
  * A pattern for matching a string against a regular expression
  * and returning capturing group values for any capturing groups present in
  * the expression.
- *
+ * <p/>
  * #renamed com.sun.jersey.api.uri.UriPattern
  *
  * @author Paul Sandoz
@@ -76,7 +76,7 @@ public class PatternWithGroups {
     private final int[] groupIndexes;
 
     /**
-     *  Construct an empty pattern.
+     * Construct an empty pattern.
      */
     protected PatternWithGroups() {
         this.regex = "";
@@ -87,11 +87,9 @@ protected PatternWithGroups() {
     /**
      * Construct a new pattern.
      *
-     * @param regex the regular expression. If the expression is null or an
-     *        empty string then the pattern will only match a null or empty
-     *        string.
-     * @throws java.util.regex.PatternSyntaxException if the
-     *         regular expression could not be compiled
+     * @param regex the regular expression. If the expression is {@code null} or an empty string then the pattern will only match
+     * a {@code null} or empty string.
+     * @throws java.util.regex.PatternSyntaxException if the regular expression could not be compiled.
      */
     public PatternWithGroups(final String regex) throws PatternSyntaxException {
         this(regex, EMPTY_INT_ARRAY);
@@ -100,12 +98,10 @@ public PatternWithGroups(final String regex) throws PatternSyntaxException {
     /**
      * Construct a new pattern.
      *
-     * @param regex the regular expression. If the expression is null or an
-     *        empty string then the pattern will only match a null or empty
-     *        string.
+     * @param regex the regular expression. If the expression is {@code null} or an empty string then the pattern will only match
+     * a {@code null} or empty string.
      * @param groupIndexes the array of group indexes to capturing groups.
-     * @throws java.util.regex.PatternSyntaxException if the
-     *         regular expression could not be compiled
+     * @throws java.util.regex.PatternSyntaxException if the regular expression could not be compiled.
      */
     public PatternWithGroups(final String regex, final int[] groupIndexes) throws PatternSyntaxException {
         this(compile(regex), groupIndexes);
@@ -118,8 +114,8 @@ private static Pattern compile(final String regex) throws PatternSyntaxException
     /**
      * Construct a new pattern.
      *
-     * @param regexPattern  the regular expression pattern
-     * @throws IllegalArgumentException if the regexPattern is null.
+     * @param regexPattern the regular expression pattern.
+     * @throws IllegalArgumentException if the regexPattern is {@code null}.
      */
     public PatternWithGroups(final Pattern regexPattern) throws IllegalArgumentException {
         this(regexPattern, EMPTY_INT_ARRAY);
@@ -128,9 +124,9 @@ public PatternWithGroups(final Pattern regexPattern) throws IllegalArgumentExcep
     /**
      * Construct a new pattern.
      *
-     * @param regexPattern the regular expression pattern
+     * @param regexPattern the regular expression pattern.
      * @param groupIndexes the array of group indexes to capturing groups.
-     * @throws IllegalArgumentException if the regexPattern is null.
+     * @throws IllegalArgumentException if the regexPattern is {@code null}.
      */
     public PatternWithGroups(final Pattern regexPattern, final int[] groupIndexes) throws IllegalArgumentException {
         if (regexPattern == null) {
@@ -139,7 +135,7 @@ public PatternWithGroups(final Pattern regexPattern, final int[] groupIndexes) t
 
         this.regex = regexPattern.toString();
         this.regexPattern = regexPattern;
-        this.groupIndexes = groupIndexes;
+        this.groupIndexes = groupIndexes.clone();
     }
 
     /**
@@ -157,7 +153,7 @@ public final String getRegex() {
      * @return the group indexes.
      */
     public final int[] getGroupIndexes() {
-        return groupIndexes;
+        return groupIndexes.clone();
     }
 
     private static final class EmptyStringMatchResult implements MatchResult {
@@ -206,6 +202,7 @@ public int groupCount() {
             return 0;
         }
     }
+
     private static final EmptyStringMatchResult EMPTY_STRING_MATCH_RESULT = new EmptyStringMatchResult();
 
     private final class GroupIndexMatchResult implements MatchResult {
@@ -293,17 +290,14 @@ public final MatchResult match(final CharSequence cs) {
 
     /**
      * Match against the pattern.
-     * <p>
-     * If a matched then the capturing group values
-     * (if any) will be added to a list passed in as parameter.
+     * <p/>
+     * If a matched then the capturing group values (if any) will be added to a list passed in as parameter.
      *
      * @param cs the char sequence to match against the template.
-     * @param groupValues the list to add the values of a pattern's
-     *        capturing groups if matching is successful. The values are added
-     *        in the same order as the pattern's capturing groups. The list
-     *        is cleared before values are added.
-     * @return true if the char sequence matches the pattern, otherwise false.
-     * @throws IllegalArgumentException if the group values is null.
+     * @param groupValues the list to add the values of a pattern's capturing groups if matching is successful. The values are
+     * added in the same order as the pattern's capturing groups. The list is cleared before values are added.
+     * @return {@code true} if the char sequence matches the pattern, otherwise {@code false}.
+     * @throws IllegalArgumentException if the group values is {@code null}.
      */
     public final boolean match(final CharSequence cs, final List<String> groupValues) throws IllegalArgumentException {
         if (groupValues == null) {
@@ -312,7 +306,7 @@ public final boolean match(final CharSequence cs, final List<String> groupValues
 
         // Check for match against the empty pattern
         if (cs == null || cs.length() == 0) {
-            return (regexPattern == null) ? true : false;
+            return regexPattern == null;
         } else if (regexPattern == null) {
             return false;
         }
@@ -342,33 +336,26 @@ public final boolean match(final CharSequence cs, final List<String> groupValues
 
     /**
      * Match against the pattern.
-     * <p>
-     * If a matched then the capturing group values
-     * (if any) will be added to a list passed in as parameter.
+     * <p/>
+     * If a matched then the capturing group values (if any) will be added to a list passed in as parameter.
      *
      * @param cs the char sequence to match against the template.
-     * @param groupNames the list names associated with a pattern's
-     *        capturing groups. The names MUST be in the same order as the
-     *        pattern's capturing groups and the size MUST be equal to or
-     *        less than the number of capturing groups.
-     * @param groupValues the map to add the values of a pattern's
-     *        capturing groups if matching is successful. A values is put
-     *        into the map using the group name associated with the
-     *        capturing group. The map is cleared before values are added.
-     * @return true if the matches the pattern, otherwise false.
-     * @throws IllegalArgumentException if group values is null.
+     * @param groupNames the list names associated with a pattern's capturing groups. The names MUST be in the same order as the
+     * pattern's capturing groups and the size MUST be equal to or less than the number of capturing groups.
+     * @param groupValues the map to add the values of a pattern's capturing groups if matching is successful. A values is put
+     * into the map using the group name associated with the capturing group. The map is cleared before values are added.
+     * @return {@code true} if the matches the pattern, otherwise {@code false}.
+     * @throws IllegalArgumentException if group values is {@code null}.
      */
-    public final boolean match(
-            final CharSequence cs,
-            final List<String> groupNames,
-            final Map<String, String> groupValues) throws IllegalArgumentException {
+    public final boolean match(final CharSequence cs, final List<String> groupNames, final Map<String,
+            String> groupValues) throws IllegalArgumentException {
         if (groupValues == null) {
             throw new IllegalArgumentException();
         }
 
         // Check for match against the empty pattern
         if (cs == null || cs.length() == 0) {
-            return (regexPattern == null) ? true : false;
+            return regexPattern == null;
         } else if (regexPattern == null) {
             return false;
         }
@@ -385,7 +372,7 @@ public final boolean match(
             String name = groupNames.get(i);
             String currentValue = m.group((groupIndexes.length > 0) ? groupIndexes[i] : i + 1);
 
-            // Group names can have the same name occuring more than once,
+            // Group names can have the same name occurring more than once,
             // check that groups values are same.
             String previousValue = groupValues.get(name);
             if (previousValue != null && !previousValue.equals(currentValue)) {

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/EmptyRequestEventBuilder.java

@@ -54,10 +54,11 @@
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
 public class EmptyRequestEventBuilder implements RequestEventBuilder {
+
     /**
      * Instance of empty request event builder.
      */
-    public static EmptyRequestEventBuilder EMPTY_EVENT_BUILDER = new EmptyRequestEventBuilder();
+    public static final EmptyRequestEventBuilder EMPTY_EVENT_BUILDER = new EmptyRequestEventBuilder();
 
     @Override
     public RequestEventBuilder setExceptionMapper(ExceptionMapper<?> exceptionMapper) {

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/jmx/ApplicationMXBeanImpl.java

@@ -52,10 +52,12 @@
 import com.google.common.collect.Sets;
 
 /**
- * MXBean implementing {@link org.glassfish.jersey.server.monitoring.ApplicationMXBean} MXbean interface.
+ * MXBean implementing {@link org.glassfish.jersey.server.monitoring.ApplicationMXBean} MXBean interface.
+ *
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
 public class ApplicationMXBeanImpl implements ApplicationMXBean {
+
     private final String applicationName;
     private final String applicationClass;
     private final Map<String, String> configurationProperties;
@@ -66,12 +68,12 @@ public class ApplicationMXBeanImpl implements ApplicationMXBean {
 
     /**
      * Create a new application MXBean and register it to the mbean server using {@code mBeanExposer}.
+     *
      * @param applicationStatistics Application statistics which should be exposed.
      * @param mBeanExposer MBean exposer.
      * @param parentName {@link javax.management.ObjectName Object name} prefix of parent mbeans.
      */
-    public ApplicationMXBeanImpl(ApplicationStatistics applicationStatistics,
-                                 MBeanExposer mBeanExposer, String parentName) {
+    public ApplicationMXBeanImpl(ApplicationStatistics applicationStatistics, MBeanExposer mBeanExposer, String parentName) {
         this.providers = Sets.newHashSet();
         this.registeredClasses = Sets.newHashSet();
         this.registeredInstances = Sets.newHashSet();
@@ -95,7 +97,7 @@ public ApplicationMXBeanImpl(ApplicationStatistics applicationStatistics,
         for (Map.Entry<String, Object> entry : resourceConfig.getProperties().entrySet()) {
             configurationProperties.put(entry.getKey(), entry.getValue().toString());
         }
-        this.startTime = applicationStatistics.getStartTime();
+        this.startTime = new Date(applicationStatistics.getStartTime().getTime());
 
         mBeanExposer.registerMBean(this, parentName + ",global=Configuration");
     }

core-server/src/main/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScanner.java

@@ -125,7 +125,7 @@ public PackageNamesScanner(final String[] packages, final boolean recursive) {
      */
     public PackageNamesScanner(final ClassLoader classLoader, final String[] packages, final boolean recursive) {
         this.recursive = recursive;
-        this.packages = packages;
+        this.packages = packages.clone();
         this.classloader = classLoader;
 
         this.finderFactories = new HashMap<String, UriSchemeResourceFinderFactory>();