[jackson-annotations] 18/207: ...

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository jackson-annotations.

commit af6a98a302ab7fbea90993e661d7c842214dee2e
Author: Tatu <tatu at ning.com>
Date:   Tue Feb 7 15:13:51 2012 -0800

    ...
---
 src/main/java/com/fasterxml/jackson/annotation/JsonIdentityInfo.java  | 4 ++--
 src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java      | 2 +-
 src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerator.java | 4 ----
 .../java/com/fasterxml/jackson/annotation/ObjectIdGenerators.java     | 3 ++-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonIdentityInfo.java b/src/main/java/com/fasterxml/jackson/annotation/JsonIdentityInfo.java
index bb729a8..06f0fa9 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonIdentityInfo.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonIdentityInfo.java
@@ -18,7 +18,7 @@ import java.lang.annotation.Target;
  * either using a generator (either one of standard ones, or a custom
  * generator), or using a value of a property. The latter case is
  * indicated by using a placeholder generator marker
- * {@link ObjectIdGenerators#ObjectIdGenerator}; former by using explicit generator.
+ * {@link ObjectIdGenerators.PropertyGenerator}; former by using explicit generator.
  * Object id has to be serialized as a property in case of POJOs;
  * object identity is currently NOT support for JSON Array types
  * (Java arrays or Lists) or Java Map types.
@@ -46,7 +46,7 @@ public @interface JsonIdentityInfo
     /**
      * Generator to use for producing Object Identifier for objects:
      * either one of pre-defined generators from
-     * {@link IdGenerator}, or a custom generator.
+     * {@link ObjectIdGenerator}, or a custom generator.
      * Defined as class to instantiate.
      */
     public Class<? extends ObjectIdGenerator<?>> generator();
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java b/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
index 8811a1e..b20111f 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
@@ -19,7 +19,7 @@ import java.lang.annotation.*;
  *  @JsonSubTypes({com.myemp.Impl1.class, com.myempl.Impl2.class})
  *</pre>
  * Alternatively you can also define fully customized type handling by using
- * {@link org.codehaus.jackson.map.annotate.JsonTypeResolver} annotation.
+ * <code>@JsonTypeResolver</code> annotation (from databind package).
  *<p>
  * This annotation can be used both for types (classes) and properties.
  * If both exist, annotation on property has precedence, as it is
diff --git a/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerator.java b/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerator.java
index a7b9099..d4b0dac 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerator.java
@@ -14,8 +14,6 @@ public abstract class ObjectIdGenerator<T>
      * Factory method called to create a new instance to use for
      * serialization. This includes initializing storage for keeping
      * track of serialized instances, along with id used.
-     * Caller has to make sure to create proper number of instances
-     * to ensure scoping (as implied by {@link #usesGlobalScope()}).
      */
     public abstract ObjectIdGenerator<T> newForSerialization(Class<?> scope);
 
@@ -23,8 +21,6 @@ public abstract class ObjectIdGenerator<T>
      * Factory method called to create a new instance to use for
      * serialization. This includes initializing storage for keeping
      * track of deserialized instances, along with id used.
-     * Caller has to make sure to create proper number of instances
-     * to ensure scoping (as implied by {@link #usesGlobalScope()}).
      */
     public abstract ObjectIdGenerator<T> newForDeserialization(Class<?> scope);
     
diff --git a/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerators.java b/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerators.java
index d5c0fdb..c344c4a 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerators.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/ObjectIdGenerators.java
@@ -106,7 +106,7 @@ public class ObjectIdGenerators
     {
         protected int _nextValue;
 
-        public IntSequenceGenerator(Class<?> scope) { this(scope, 1); }
+        public IntSequenceGenerator(Class<?> scope) { this(Object.class, 1); }
         public IntSequenceGenerator(Class<?> scope, int fv) {
             super(scope);
             _nextValue = fv;
@@ -138,6 +138,7 @@ public class ObjectIdGenerators
      */
     public final static class UUIDGenerator extends Base<UUID>
     {
+        public UUIDGenerator() { this(Object.class); }
         public UUIDGenerator(Class<?> scope) {
             super(scope);
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-annotations.git