Merge branch '2.13' into jsonproperty-enum

Author: MikeDombo

jr-annotation-support/src/main/java/com/fasterxml/jackson/jr/annotationsupport/AnnotationBasedIntrospector.java

@@ -39,12 +39,14 @@ public class AnnotationBasedIntrospector
     // // // State only for deserialization:
 
     protected Set<String> _ignorableNames;
+    protected int _features;
 
     protected AnnotationBasedIntrospector(Class<?> type, boolean serialization,
-            JsonAutoDetect.Value visibility) {
+                                          JsonAutoDetect.Value visibility, int features) {
         _type = type;
         _forSerialization = serialization;
         _ignorableNames = serialization ? null : new HashSet<String>();
+        _features = features;
 
         // First things first: find possible `@JsonAutoDetect` to override
         // default visibility settings
@@ -58,13 +60,13 @@ protected AnnotationBasedIntrospector(Class<?> type, boolean serialization,
 
     public static POJODefinition pojoDefinitionForDeserialization(JSONReader r,
             Class<?> pojoType, JsonAutoDetect.Value visibility) {
-        return new AnnotationBasedIntrospector(pojoType, false, visibility)
+        return new AnnotationBasedIntrospector(pojoType, false, visibility, r.features())
                 .introspectDefinition();
     }
 
     public static POJODefinition pojoDefinitionForSerialization(JSONWriter w,
             Class<?> pojoType, JsonAutoDetect.Value visibility) {
-        return new AnnotationBasedIntrospector(pojoType, true, visibility)
+        return new AnnotationBasedIntrospector(pojoType, true, visibility, w.features())
                 .introspectDefinition();
     }
 
@@ -235,9 +237,9 @@ protected void _findFields(final Class<?> currType)
 
         // then get fields from within class itself
         for (Field f : currType.getDeclaredFields()) {
-            // Does not include static fields, but there are couple of things we do
-            // not include regardless:
-            if (f.isSynthetic()) {
+            // skip static fields and synthetic fields except for enum constants
+            if ((JSON.Feature.INCLUDE_STATIC_FIELDS.isDisabled(_features) && Modifier.isStatic(f.getModifiers())
+                    && !f.isEnumConstant()) || f.isSynthetic()) {
                 continue;
             }
             // otherwise, first things first; explicit ignoral?
@@ -284,7 +286,7 @@ protected void _findMethods(final Class<?> currType)
             final int flags = m.getModifiers();
             // 13-Jun-2015, tatu: Skip synthetic, bridge methods altogether, for now
             //    at least (add more complex handling only if absolutely necessary)
-            if (Modifier.isStatic(flags)
+            if ((JSON.Feature.INCLUDE_STATIC_FIELDS.isDisabled(_features) && Modifier.isStatic(flags))
                     || m.isSynthetic() || m.isBridge()) {
                 continue;
             }
@@ -410,9 +412,10 @@ protected void _checkSetterMethod(Method m)
      */
 
     protected boolean _isFieldVisible(Field f) {
-        // Consider transient to be non-visible
+        // Consider transient and static-final to be non-visible
         // TODO: (maybe?) final
-        return !Modifier.isTransient(f.getModifiers())
+        return !(Modifier.isFinal(f.getModifiers()) && Modifier.isStatic(f.getModifiers()))
+                && !Modifier.isTransient(f.getModifiers())
                 && _visibility.getFieldVisibility().isVisible(f);
     }
 

jr-annotation-support/src/test/java/com/fasterxml/jackson/jr/annotationsupport/BasicIgnoralTest.java

@@ -7,6 +7,8 @@
 public class BasicIgnoralTest extends ASTestBase
 {
     static class XY {
+        public static int DEFAULT = 123;
+        public static final int DEFAULT_FINAL = 123;
         @JsonIgnore
         public int x;
         public int y;
@@ -42,13 +44,16 @@ public XYZ(int x, int y, int z) {
     }
 
     private final JSON JSON_WITH_ANNO = jsonWithAnnotationSupport();
+    private final JSON JSON_WITH_ANNO_WITH_STATIC =
+            JSON.builder().register(JacksonAnnotationExtension.std).enable(JSON.Feature.INCLUDE_STATIC_FIELDS).build();
+    private final JSON JSON_WITH_STATIC = JSON.builder().enable(JSON.Feature.INCLUDE_STATIC_FIELDS).build();
 
     /*
     /**********************************************************************
     /* Tests for basic @JsonIgnore
     /**********************************************************************
      */
-    
+
     public void testPropertyIgnoralOnSerialize() throws Exception
     {
         final XY input = new XY(1, 2);
@@ -60,26 +65,41 @@ public void testPropertyIgnoralOnSerialize() throws Exception
 
         // and ensure no leakage to default one:
         assertEquals(a2q("{'x':1,'y':2}"), JSON.std.asString(input));
+
+        // Verify serialization of static fields when the INCLUDE_STATIC_FIELDS option is enabled
+        assertEquals(a2q("{'DEFAULT':123,'x':1,'y':2}"), JSON_WITH_STATIC.asString(input));
+        assertEquals(a2q("{'DEFAULT':123,'y':2}"), JSON_WITH_ANNO_WITH_STATIC.asString(input));
     }
 
     public void testPropertyIgnoralOnDeserialize() throws Exception
     {
-        final String json = a2q("{'x':1,'y':2}");
+        final String json = a2q("{'DEFAULT':125,'x':1,'y':2}");
 
         // default: no filtering by ignorals
         XY result = JSON.std.beanFrom(XY.class, json);
         assertEquals(1, result.x);
         assertEquals(2, result.y);
+        assertEquals(XY.DEFAULT_FINAL, XY.DEFAULT);
 
         // but with ignore, should skip
         result = JSON_WITH_ANNO.beanFrom(XY.class, json);
         assertEquals(0, result.x);
         assertEquals(2, result.y);
+        assertEquals(XY.DEFAULT_FINAL, XY.DEFAULT);
 
         // and once again verify non-stickiness
         result = JSON.std.beanFrom(XY.class, json);
         assertEquals(1, result.x);
         assertEquals(2, result.y);
+        assertEquals(XY.DEFAULT_FINAL, XY.DEFAULT);
+
+        // Verify setting static field from serialized data when the INCLUDE_STATIC_FIELDS option is enabled
+        JSON_WITH_STATIC.beanFrom(XY.class, json);
+        assertEquals(125, XY.DEFAULT);
+        XY.DEFAULT = XY.DEFAULT_FINAL;
+        JSON_WITH_ANNO_WITH_STATIC.beanFrom(XY.class, json);
+        assertEquals(125, XY.DEFAULT);
+        XY.DEFAULT = XY.DEFAULT_FINAL;
     }
 
     public void testPropertyIgnoreWithUnknown() throws Exception

jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/JSON.java

@@ -31,7 +31,7 @@
  * <li>{@link URL}</li>
  * <li>{@link File}</li>
  * </ul>
- * 
+ *
  */
 @SuppressWarnings("resource")
 public class JSON implements Versioned
@@ -167,7 +167,7 @@ public enum Feature
         * @since 2.7
         */
        WRITE_DATES_AS_TIMESTAMP(false),
-       
+
        /**
         * Feature that can be enabled to use "pretty-printing", basic indentation
         * to make resulting JSON easier to read by humans by adding white space
@@ -241,7 +241,7 @@ public enum Feature
         * so that all Bean properties are serialized.
         */
        WRITE_READONLY_BEAN_PROPERTIES(true, true),
-       
+
        /**
         * Feature that determines whether access to {@link java.lang.reflect.Method}s and
         * {@link java.lang.reflect.Constructor}s that are used with dynamically
@@ -260,7 +260,7 @@ public enum Feature
         * @since 2.5
         */
        USE_IS_GETTERS(true, true),
-       
+
        /**
         * Feature that enables use of public fields instead of setters and getters,
         * in cases where no setter/getter is available.
@@ -271,6 +271,16 @@ public enum Feature
         * @since 2.8 (enabled by default since 2.10)
         */
        USE_FIELDS(true, true),
+
+        /**
+         * Feature that enables serialization and deserialization of non-final static fields.
+         *<p>
+         * Feature did not exist, but was implicitly <b>enabled</b> by default. <b>disabled</b> for
+         * 2.13).
+         *
+         * @since 2.13
+         */
+        INCLUDE_STATIC_FIELDS(false, true),
        ;
 
        /*
@@ -422,7 +432,7 @@ public static class Builder {
         protected PrettyPrinter _prettyPrinter;
 
         // Configuration, helper objects
-        
+
         protected final JsonFactory _streamFactory;
         protected TreeCodec _treeCodec;
 
@@ -502,7 +512,7 @@ public Builder disable(Feature ... features)
         }
 
         // // // Mutators, helper objects
-        
+
         /**
          * Method for specifying {@link PrettyPrinter} {@link JSON} to be built
          * should use on serialization.
@@ -732,7 +742,7 @@ protected JSONWriter _defaultWriter() {
     public ObjectCodec asCodec() {
         return new JSONAsObjectCodec(this);
     }
-    
+
     /*
     /**********************************************************************
     /* Versioned
@@ -785,7 +795,7 @@ public JSON with(Feature feature, boolean state)
         }
         return _with(f);
     }
-    
+
     /**
      * Mutant factory for constructing an instance with specified features
      * enabled.
@@ -825,7 +835,7 @@ protected final JSON _with(int features)
         //    changes
         JSONReader r = _reader.withCacheCheck(features);
         JSONWriter w = _writer.withCacheCheck(features);
-        
+
         return _with(features, _jsonFactory, _treeCodec,
                 r, w, _prettyPrinter);
     }
@@ -839,14 +849,14 @@ protected final JSON _with(int features)
     /**
      * Mutant factory method for constructing new instance with specified {@link JsonFactory}
      * if different from currently configured one (if not, return {@code this} as-is)
-     * 
+     *
      * @param f Jackson core format factory to use for low-level decoding/encoding
      *
      * @return New instance with specified factory (if not same as currently configured);
      *   {@code this} otherwise.
      *
      * @deprecated Since 2.11 should not try changing underlying stream factory but create
-     *   a new instance if necessary: method will be removed from 3.0 at latest 
+     *   a new instance if necessary: method will be removed from 3.0 at latest
      */
     @Deprecated
     public JSON with(JsonFactory f) {
@@ -966,7 +976,7 @@ public JSON with(ReaderWriterProvider rwp) {
     /* Methods sub-classes must override
     /**********************************************************************
      */
-    
+
     protected JSON _with(int features,
             JsonFactory jsonF, TreeCodec trees,
             JSONReader reader, JSONWriter writer,
@@ -992,7 +1002,7 @@ public JsonFactory getStreamingFactory() {
     public final boolean isEnabled(Feature f) {
         return (f.mask() & _features) != 0;
     }
-    
+
     /*
     /**********************************************************************
     /* Public factory methods for parsers, generators
@@ -1122,7 +1132,7 @@ public CollectionComposer<?,List<Object>> composeList() {
     public <C extends Collection<Object>> CollectionComposer<?,C> composeCollection(C collection) {
         return new CollectionComposer<ComposerBase,C>(collection);
     }
-    
+
     public MapComposer<?> composeMap() {
         return composeMap(new LinkedHashMap<String,Object>());
     }
@@ -1294,7 +1304,7 @@ public <T> T beanFrom(Class<T> type, Object source) throws IOException, JSONObje
             return _closeWithError(p, e);
         }
     }
-    
+
     /**
      * Read method that will take given JSON Source (of one of supported types),
      * read contents and map it to one of simple mappings ({@link java.util.Map}
@@ -1476,7 +1486,7 @@ public <T extends TreeNode> T createArrayNode() {
           }
          return (T) _treeCodec.createArrayNode();
     }
-    
+
     /**
      * Convenience method, equivalent to:
      *<pre>
@@ -1527,7 +1537,7 @@ protected JSONWriter _writerForOperation(JsonGenerator gen) {
     /* Internal methods, reading
     /**********************************************************************
      */
-    
+
     protected JSONReader _readerForOperation(JsonParser p) {
         return _reader.perOperationInstance(_features, _valueReaderLocator, _treeCodec, p);
     }
@@ -1585,7 +1595,7 @@ protected JsonParser _initForReading(JsonParser p) throws IOException
     /* Internal methods, other
     /**********************************************************************
      */
-    
+
     protected JsonGenerator _config(JsonGenerator g)
     {
         // First, possible pretty printing
@@ -1629,7 +1639,7 @@ protected <T> T _throw(Exception e) throws IOException {
         }
         throw new IOException(e); // should never occur
     }
-    
+
     protected void _noTreeCodec(String msg) {
          throw new IllegalStateException("JSON instance does not have configured `TreeCodec` to "+msg);
     }
@@ -1641,7 +1651,7 @@ protected void _noTreeCodec(String msg) {
      */
 
     /**
-     * Extension context implementation used when 
+     * Extension context implementation used when
      */
     private static class ExtContextImpl extends ExtensionContext {
         final Builder _builder;