minor cleanup

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/objectid/JSOGDeserialize622Test.java

@@ -1,18 +1,12 @@
 package com.fasterxml.jackson.databind.objectid;
 
-import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
+
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.BaseMapTest;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import java.io.IOException;
@@ -27,88 +21,81 @@ public class JSOGDeserialize622Test extends BaseMapTest
     public static final String REF_KEY = "@ref";
 
     /**
-     * JSON input
-     */
-    private static final String EXP_EXAMPLE_JSOG =  aposToQuotes(
-            "{'@id':'1','foo':66,'next':{'"+REF_KEY+"':'1'}}");
-
-    /**
-     * Customer IdGenerator
+     * Custom IdGenerator
      */
     static class JSOGGenerator extends ObjectIdGenerator<JSOGRef>  {
+        private static final long serialVersionUID = 1L;
+        protected transient int _nextValue;
+        protected final Class<?> _scope;
 
-    private static final long serialVersionUID = 1L;
-    protected transient int _nextValue;
-    protected final Class<?> _scope;
+        protected JSOGGenerator() { this(null, -1); }
 
-    protected JSOGGenerator() { this(null, -1); }
-
-    protected JSOGGenerator(Class<?> scope, int nextValue) {
-        _scope = scope;
-        _nextValue = nextValue;
-    }
+        protected JSOGGenerator(Class<?> scope, int nextValue) {
+            _scope = scope;
+            _nextValue = nextValue;
+        }
 
-    @Override
-    public Class<?> getScope() {
-        return _scope;
-    }
+        @Override
+        public Class<?> getScope() {
+            return _scope;
+        }
 
-    @Override
-    public boolean canUseFor(ObjectIdGenerator<?> gen) {
-        return (gen.getClass() == getClass()) && (gen.getScope() == _scope);
-    }
+        @Override
+        public boolean canUseFor(ObjectIdGenerator<?> gen) {
+            return (gen.getClass() == getClass()) && (gen.getScope() == _scope);
+        }
 
-    @Override
-    public ObjectIdGenerator<JSOGRef> forScope(Class<?> scope) {
-          return (_scope == scope) ? this : new JSOGGenerator(scope, _nextValue);
-    }
+        @Override
+        public ObjectIdGenerator<JSOGRef> forScope(Class<?> scope) {
+              return (_scope == scope) ? this : new JSOGGenerator(scope, _nextValue);
+        }
 
-    @Override
-    public ObjectIdGenerator<JSOGRef> newForSerialization(Object context) {
-          return new JSOGGenerator(_scope, 1);
-    }
+        @Override
+        public ObjectIdGenerator<JSOGRef> newForSerialization(Object context) {
+              return new JSOGGenerator(_scope, 1);
+        }
 
-    @Override
-    public com.fasterxml.jackson.annotation.ObjectIdGenerator.IdKey key(Object key) {
-          return new IdKey(getClass(), _scope, key);
-    }
+        @Override
+        public com.fasterxml.jackson.annotation.ObjectIdGenerator.IdKey key(Object key) {
+              return new IdKey(getClass(), _scope, key);
+        }
 
-    // important: otherwise won't get proper handling
-    @Override
-    public boolean maySerializeAsObject() { return true; }
+        // important: otherwise won't get proper handling
+        @Override
+        public boolean maySerializeAsObject() { return true; }
 
-    // ditto: needed for handling Object-valued Object references
-    @Override
-    public boolean isValidReferencePropertyName(String name, Object parser) {
-        return REF_KEY.equals(name);
-    }
+        // ditto: needed for handling Object-valued Object references
+        @Override
+        public boolean isValidReferencePropertyName(String name, Object parser) {
+            return REF_KEY.equals(name);
+        }
 
-    @Override
-    public JSOGRef generateId(Object forPojo) {
-          int id = _nextValue;
-          ++_nextValue;
-          return new JSOGRef(id);
-    }
+        @Override
+        public JSOGRef generateId(Object forPojo) {
+              int id = _nextValue;
+              ++_nextValue;
+              return new JSOGRef(id);
+        }
     }
 
     /**
      * The reference deserializer
      */
     static class JSOGRefDeserializer extends JsonDeserializer<JSOGRef>
     {
-      @Override
-      public JSOGRef deserialize(JsonParser p, DeserializationContext ctx) throws IOException {
-          JsonNode node = p.readValueAsTree();
-          if (node.isTextual()) {
-              return new JSOGRef(node.asInt());
-          }
-          JsonNode n = node.get(REF_KEY);
-          if (n == null) {
-              throw new JsonMappingException(p, "Could not find key '"+REF_KEY
-                      +"' from ("+node.getClass().getName()+"): "+node);
-          }
-          return new JSOGRef(n.asInt());
-      }
+        @Override
+        public JSOGRef deserialize(JsonParser p, DeserializationContext ctx) throws IOException {
+            JsonNode node = p.readValueAsTree();
+            if (node.isTextual()) {
+                return new JSOGRef(node.asInt());
+            }
+            JsonNode n = node.get(REF_KEY);
+            if (n == null) {
+                throw new JsonMappingException(p, "Could not find key '"+REF_KEY
+                        +"' from ("+node.getClass().getName()+"): "+node);
+            }
+            return new JSOGRef(n.asInt());
+        }
     }
 
     /**
@@ -204,6 +191,9 @@ public static class Outer {
     // Basic for [databind#622]
     public void testStructJSOGRef() throws Exception
     {
+        final String EXP_EXAMPLE_JSOG =  aposToQuotes(
+                "{'@id':'1','foo':66,'next':{'"+REF_KEY+"':'1'}}");
+
         IdentifiableExampleJSOG result = MAPPER.readValue(EXP_EXAMPLE_JSOG,
                 IdentifiableExampleJSOG.class);
         assertEquals(66, result.foo);