Resolved issue JERSEY-1482.

- added support for disabling resource model validation (root and sub resources)
- added support for disabling deployment failure on invalid resource model.
  - added new unit test to cover this.

Extras:
- configuration property renames to fit a common scheme.
- updated javadoc of some properties.

Change-Id: Ie958f0eab2a1782d765caa53cb0cce3e9d829905

Author: Marek Potociar

core-client/src/main/java/org/glassfish/jersey/client/ClientConfig.java

@@ -353,7 +353,7 @@ private ClientRuntime initRuntime() {
 
             // AutoDiscoverable.
             if (!PropertiesHelper.getValue(runtimeConfig.getProperties(), RuntimeType.CLIENT,
-                    CommonProperties.FEATURE_DISABLE_AUTO_DISCOVERY, Boolean.FALSE, Boolean.class)) {
+                    CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, Boolean.FALSE, Boolean.class)) {
                 runtimeConfig.configureAutoDiscoverableProviders(locator);
             }
 

core-client/src/main/java/org/glassfish/jersey/client/ClientProperties.java

@@ -164,7 +164,7 @@ public final class ClientProperties {
      * If {@code true} then disable auto-discovery on the client.
      * <p>
      * By default auto-discovery on client is automatically enabled if global property
-     * {@value org.glassfish.jersey.CommonProperties#FEATURE_DISABLE_AUTO_DISCOVERY} is not disabled. If set then the client
+     * {@value org.glassfish.jersey.CommonProperties#FEATURE_AUTO_DISCOVERY_DISABLE} is not disabled. If set then the client
      * property value overrides the global property value.
      * <p>
      * The default value is {@code false}.
@@ -173,15 +173,15 @@ public final class ClientProperties {
      * The name of the configuration property is <tt>{@value}</tt>.
      * </p>
      *
-     * @see org.glassfish.jersey.CommonProperties#FEATURE_DISABLE_AUTO_DISCOVERY
+     * @see org.glassfish.jersey.CommonProperties#FEATURE_AUTO_DISCOVERY_DISABLE
      */
-    public static final String FEATURE_DISABLE_AUTO_DISCOVERY = CommonProperties.FEATURE_DISABLE_AUTO_DISCOVERY + ".client";
+    public static final String FEATURE_AUTO_DISCOVERY_DISABLE = CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE + ".client";
 
     /**
      * If {@code true} then disable registration of Json Processing (JSR-353) feature on client.
      * <p>
      * By default Json Processing on client is automatically enabled if global property
-     * {@value org.glassfish.jersey.CommonProperties#FEATURE_DISABLE_JSON_PROCESSING} is not disabled. If set then the client
+     * {@value org.glassfish.jersey.CommonProperties#JSON_PROCESSING_FEATURE_DISABLE} is not disabled. If set then the client
      * property value overrides the global property value.
      * <p>
      * The default value is {@code false}.
@@ -190,9 +190,9 @@ public final class ClientProperties {
      * The name of the configuration property is <tt>{@value}</tt>.
      * </p>
      *
-     * @see org.glassfish.jersey.CommonProperties#FEATURE_DISABLE_JSON_PROCESSING
+     * @see org.glassfish.jersey.CommonProperties#JSON_PROCESSING_FEATURE_DISABLE
      */
-    public static final String FEATURE_DISABLE_JSON_PROCESSING = CommonProperties.FEATURE_DISABLE_JSON_PROCESSING + ".client";
+    public static final String JSON_PROCESSING_FEATURE_DISABLE = CommonProperties.JSON_PROCESSING_FEATURE_DISABLE + ".client";
 
     private ClientProperties() {
         // prevents instantiation

core-client/src/main/java/org/glassfish/jersey/client/ClientRequest.java

@@ -397,7 +397,7 @@ void setAsynchronous(boolean async) {
     /**
      * Enable a buffering of serialized entity. The buffering will be configured from runtime configuration
      * associated with this request. The property determining the size of the buffer
-     * is {@link org.glassfish.jersey.CommonProperties#CONTENT_LENGTH_BUFFER}.
+     * is {@link org.glassfish.jersey.CommonProperties#OUTBOUND_CONTENT_LENGTH_BUFFER}.
      * <p/>
      * The buffering functionality is by default disabled and could be enabled by calling this method. In this case
      * this method must be called before first bytes are written to the {@link #getEntityStream() entity stream}.

core-client/src/test/java/org/glassfish/jersey/client/AutoDiscoverableClientTest.java

@@ -148,10 +148,10 @@ private void _test(final String response, final Boolean globalDisable, final Boo
         config.property(PROPERTY, true);
 
         if (globalDisable != null) {
-            config.property(CommonProperties.FEATURE_DISABLE_AUTO_DISCOVERY, globalDisable);
+            config.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, globalDisable);
         }
         if (clientDisable != null) {
-            config.property(ClientProperties.FEATURE_DISABLE_AUTO_DISCOVERY, clientDisable);
+            config.property(ClientProperties.FEATURE_AUTO_DISCOVERY_DISABLE, clientDisable);
         }
 
         final Client client = ClientBuilder.newClient(config);

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

@@ -48,7 +48,7 @@
 public final class CommonProperties {
 
     /**
-     * If {@code true} then disable auto discovery on client/server.
+     * If {@code true} then disable feature auto discovery globally on client/server.
      * <p>
      * By default auto discovery is automatically enabled. The value of this property may be overridden by the client/server
      * variant of this property.
@@ -59,7 +59,7 @@ public final class CommonProperties {
      * The name of the configuration property is <tt>{@value}</tt>.
      * </p>
      */
-    public static final String FEATURE_DISABLE_AUTO_DISCOVERY = "jersey.config.disableAutoDiscovery";
+    public static final String FEATURE_AUTO_DISCOVERY_DISABLE = "jersey.config.disableAutoDiscovery";
 
     /**
      * If {@code true} then disable registration of Json Processing (JSR-353) feature.
@@ -73,26 +73,26 @@ public final class CommonProperties {
      * The name of the configuration property is <tt>{@value}</tt>.
      * </p>
      */
-    public static final String FEATURE_DISABLE_JSON_PROCESSING = "jersey.config.disableJsonProcessing";
+    public static final String JSON_PROCESSING_FEATURE_DISABLE = "jersey.config.disableJsonProcessing";
 
     /**
-     * An integer value that defines the buffer size used to buffer the outbound response entity in order to
+     * An integer value that defines the buffer size used to buffer the outbound message entity in order to
      * determine its size and set the value of HTTP <tt>{@value javax.ws.rs.core.HttpHeaders#CONTENT_LENGTH}</tt> header.
      * <p>
      * If the entity size exceeds the configured buffer size, the buffering would be cancelled and the entity size
      * would not be determined. Value less or equal to zero disable the buffering of the entity at all.
      * </p>
      * The value of this property may be overridden by the client/server variant of this property by defining the suffix
-     * to this property "<code>.server</code>" or "<code>.client</code>"
-     * (<tt>{@value}</tt><code>.server</code> or  <tt>{@value}</tt><code>.client</code>).
+     * to this property "<tt>.server</tt>" or "<tt>.client</tt>"
+     * (<tt>{@value}.server</tt> or  <tt>{@value}.client</tt>).
      * <p>
      * The default value is <tt>{@value org.glassfish.jersey.message.internal.CommittingOutputStream#DEFAULT_BUFFER_SIZE}</tt>.
      * </p>
      * <p>
      * The name of the configuration property is <tt>{@value}</tt>.
      * </p>
      */
-    public static final String CONTENT_LENGTH_BUFFER = "jersey.config.contentLength.buffer";
+    public static final String OUTBOUND_CONTENT_LENGTH_BUFFER = "jersey.config.contentLength.buffer";
 
     /**
      * Prevent instantiation.

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

@@ -39,8 +39,11 @@
  */
 package org.glassfish.jersey.internal;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.logging.Logger;
@@ -117,36 +120,72 @@ public static void hint(final Object source, final String message) {
         getInstance().issues.add(new ErrorMessage(source, message, Severity.HINT));
     }
 
-    private static List<ErrorMessage> processErrors(final boolean throwException) {
-        final List<ErrorMessage> messages = new ArrayList<ErrorMessage>(errors.get().issues);
+    /**
+     * Log errors and throw an exception if there are any fatal issues detected and
+     * the {@code throwException} flag has been set to {@code true}.
+     *
+     * @param throwException if set to {@code true}, any fatal issues will cause a {@link ErrorMessagesException}
+     *                       to be thrown.
+     */
+    private static void processErrors(final boolean throwException) {
+        final List<ErrorMessage> errors = new ArrayList<ErrorMessage>(Errors.errors.get().issues);
+        boolean isFatal = logErrors(errors);
+        if (throwException && isFatal) {
+            throw new ErrorMessagesException(errors);
+        }
+    }
+
+    /**
+     * Log errors and return a status flag indicating whether a fatal issue has been found
+     * in the error collection.
+     * <p>
+     * The {@code afterMark} flag indicates whether only those issues should be logged that were
+     * added after a {@link #mark() mark has been set}.
+     * </p>
+     *
+     * @param afterMark if {@code true}, only issues added after a mark has been set are returned,
+     *                  if {@code false} all issues are returned.
+     * @return {@code true} if there are any fatal issues present in the collection, {@code false}
+     *         otherwise.
+     */
+    public static boolean logErrors(final boolean afterMark) {
+        return logErrors(getInstance()._getErrorMessages(afterMark));
+    }
+
+    /**
+     * Log supplied errors and return a status flag indicating whether a fatal issue has been found
+     * in the error collection.
+     *
+     * @param errors a collection of errors to be logged.
+     * @return {@code true} if there are any fatal issues present in the collection, {@code false}
+     *         otherwise.
+     */
+    private static boolean logErrors(final Collection<ErrorMessage> errors) {
         boolean isFatal = false;
 
-        if (!messages.isEmpty()) {
-            StringBuilder errors = new StringBuilder("\n");
+        if (!errors.isEmpty()) {
+            StringBuilder fatals = new StringBuilder("\n");
             StringBuilder warnings = new StringBuilder();
             StringBuilder hints = new StringBuilder();
 
-            for (final ErrorMessage issue : messages) {
-                switch (issue.getSeverity()) {
+            for (final ErrorMessage error : errors) {
+                switch (error.getSeverity()) {
                     case FATAL:
                         isFatal = true;
-                        errors.append(LocalizationMessages.ERROR_MSG(issue.getMessage())).append('\n');
+                        fatals.append(LocalizationMessages.ERROR_MSG(error.getMessage())).append('\n');
                         break;
                     case WARNING:
-                        warnings.append(LocalizationMessages.WARNING_MSG(issue.getMessage())).append('\n');
+                        warnings.append(LocalizationMessages.WARNING_MSG(error.getMessage())).append('\n');
                         break;
                     case HINT:
-                        warnings.append(LocalizationMessages.HINT_MSG(issue.getMessage())).append('\n');
+                        warnings.append(LocalizationMessages.HINT_MSG(error.getMessage())).append('\n');
                         break;
                 }
             }
 
             if (isFatal) {
-                LOGGER.severe(LocalizationMessages.ERRORS_AND_WARNINGS_DETECTED(errors.append(warnings)
+                LOGGER.severe(LocalizationMessages.ERRORS_AND_WARNINGS_DETECTED(fatals.append(warnings)
                         .append(hints).toString()));
-                if (throwException) {
-                    throw new ErrorMessagesException(messages);
-                }
             } else {
                 if (warnings.length() > 0) {
                     LOGGER.warning(LocalizationMessages.WARNINGS_DETECTED(warnings.toString()));
@@ -158,9 +197,10 @@ private static List<ErrorMessage> processErrors(final boolean throwException) {
             }
         }
 
-        return messages;
+        return isFatal;
     }
 
+
     /**
      * Check whether a fatal error is present in the list of all messages.
      *
@@ -310,9 +350,10 @@ public static List<ErrorMessage> getErrorMessages() {
 
     /**
      * Get the list of error messages.
-     * <p/>
+     * <p>
      * The {@code afterMark} flag indicates whether only those issues should be returned that were
      * added after a {@link #mark() mark has been set}.
+     * </p>
      *
      * @param afterMark if {@code true}, only issues added after a mark has been set are returned,
      *                  if {@code false} all issues are returned.
@@ -337,9 +378,8 @@ public static void unmark() {
     }
 
     /**
-     * Removes all issues that have been added since the last marked position.
-     * <p/>
-     * If no mark has been set in the errors list, the method call is ignored.
+     * Removes all issues that have been added since the last marked position as well as
+     * removes the last mark.
      */
     public static void reset() {
         getInstance()._reset();
@@ -350,21 +390,23 @@ public static void reset() {
     private Errors() {
     }
 
-    private int mark = -1;
+    private Deque<Integer> mark = new ArrayDeque<Integer>(4);
     private int stack = 0;
 
     private void _mark() {
-        mark = issues.size();
+        mark.addLast(issues.size());
     }
 
     private void _unmark() {
-        mark = -1;
+        mark.pollLast();
     }
 
     private void _reset() {
-        if (mark >= 0 && mark < issues.size()) {
-            issues.subList(mark, issues.size()).clear();
-            _unmark();
+        final Integer _pos = mark.pollLast(); // also performs "unmark" functionality
+        final int markedPos = (_pos == null) ? -1 : _pos;
+
+        if (markedPos >= 0 && markedPos < issues.size()) {
+            issues.subList(markedPos, issues.size()).clear();
         }
     }
 
@@ -387,11 +429,16 @@ private void postProcess(boolean throwException) {
     }
 
     private List<ErrorMessage> _getErrorMessages(final boolean afterMark) {
-        if (afterMark && mark >= 0 && mark < issues.size()) {
-            return Collections.unmodifiableList(new ArrayList<ErrorMessage>(issues.subList(mark, issues.size())));
-        } else {
-            return Collections.unmodifiableList(new ArrayList<ErrorMessage>(issues));
+        if (afterMark) {
+            final Integer _pos = mark.peekLast();
+            final int markedPos = (_pos == null) ? -1 : _pos;
+
+            if (markedPos >= 0 && markedPos < issues.size()) {
+                return Collections.unmodifiableList(new ArrayList<ErrorMessage>(issues.subList(markedPos, issues.size())));
+            } // else return all errors
         }
+
+        return Collections.unmodifiableList(new ArrayList<ErrorMessage>(issues));
     }
 
     /**
@@ -433,7 +480,7 @@ private ErrorMessage(final Object source, final String message, Severity severit
         /**
          * Get {@link Severity}.
          *
-         * @return severity of current {@link ErrorMessage}.
+         * @return severity of current {@code ErrorMessage}.
          */
         public Severity getSeverity() {
             return severity;

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

@@ -73,7 +73,6 @@
  * A base class for implementing JAXB-based readers and writers.
  *
  * @param <T> Java type supported by the provider.
- *
  * @author Paul Sandoz
  * @author Marek Potociar (marek.potociar at oracle.com)
  */
@@ -163,7 +162,8 @@ protected final Unmarshaller getUnmarshaller(Class type, MediaType mt) throws JA
             }
         }
 
-        return getJAXBContext(type, mt).createUnmarshaller();
+        final JAXBContext ctx = getJAXBContext(type, mt);
+        return (ctx == null) ? null : ctx.createUnmarshaller();
     }
 
     private Unmarshaller getUnmarshaller(Class type) throws JAXBException {
@@ -175,7 +175,8 @@ private Unmarshaller getUnmarshaller(Class type) throws JAXBException {
             }
         }
 
-        return getJAXBContext(type).createUnmarshaller();
+        final JAXBContext ctx = getJAXBContext(type);
+        return (ctx == null) ? null : ctx.createUnmarshaller();
     }
 
     protected final Marshaller getMarshaller(Class type, MediaType mt) throws JAXBException {
@@ -191,7 +192,12 @@ protected final Marshaller getMarshaller(Class type, MediaType mt) throws JAXBEx
             }
         }
 
-        Marshaller m = getJAXBContext(type, mt).createMarshaller();
+        final JAXBContext ctx = getJAXBContext(type, mt);
+        if (ctx == null) {
+            return null;
+        }
+
+        Marshaller m = ctx.createMarshaller();
         if (formattedOutput.get()) {
             m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, formattedOutput.get());
         }
@@ -208,7 +214,12 @@ private Marshaller getMarshaller(Class type) throws JAXBException {
             }
         }
 
-        Marshaller m = getJAXBContext(type).createMarshaller();
+        final JAXBContext ctx = getJAXBContext(type);
+        if (ctx == null) {
+            return null;
+        }
+
+        Marshaller m = ctx.createMarshaller();
         if (formattedOutput.get()) {
             m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, formattedOutput.get());
         }
@@ -252,7 +263,7 @@ protected JAXBContext getStoredJaxbContext(Class type) throws JAXBException {
     }
 
     protected static SAXSource getSAXSource(SAXParserFactory spf,
-            InputStream entityStream) throws JAXBException {
+                                            InputStream entityStream) throws JAXBException {
         try {
             return new SAXSource(
                     spf.newSAXParser().getXMLReader(),

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

@@ -781,7 +781,7 @@ public void setEntityStream(OutputStream outputStream) {
 
     /**
      * Enable a buffering of serialized entity. The buffering will be configured from configuration. The property
-     * determining the size of the buffer is {@link CommonProperties#CONTENT_LENGTH_BUFFER}.
+     * determining the size of the buffer is {@link CommonProperties#OUTBOUND_CONTENT_LENGTH_BUFFER}.
      * </p>
      * The buffering functionality is by default disabled and could be enabled by calling this method. In this case
      * this method must be called before first bytes are written to the {@link #getEntityStream() entity stream}.
@@ -790,7 +790,7 @@ public void setEntityStream(OutputStream outputStream) {
      */
     public void enableBuffering(Configuration configuration) {
         final Integer bufferSize = PropertiesHelper.getValue(configuration.getProperties(),
-                configuration.getRuntimeType(), CommonProperties.CONTENT_LENGTH_BUFFER, Integer.class);
+                configuration.getRuntimeType(), CommonProperties.OUTBOUND_CONTENT_LENGTH_BUFFER, Integer.class);
         if (bufferSize != null) {
             committingOutputStream.enableBuffering(bufferSize);
         } else {