[jackson-jaxrs-providers] 25/162: Yet more refactoring

Timo Aaltonen tjaalton at moszumanska.debian.org
Mon Sep 8 22:16:24 UTC 2014


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

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

commit c0b0cf6c601ac7309086203a0cac04b468279560
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date:   Sat Mar 16 20:50:18 2013 -0700

    Yet more refactoring
---
 .../fasterxml/jackson/jaxrs}/annotation/JacksonFeatures.java |  2 +-
 .../java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java  |  8 ++++----
 .../jaxrs/{base/util => cfg}/AnnotationBundleKey.java        |  2 +-
 .../jackson/jaxrs/{base => }/cfg/EndpointConfigBase.java     | 12 +++++++++++-
 .../jackson/jaxrs/{base => }/cfg/MapperConfiguratorBase.java |  2 +-
 .../fasterxml/jackson/jaxrs/{base => }/util/ClassKey.java    |  2 +-
 .../com/fasterxml/jackson/jaxrs/{base => }/util/LRUMap.java  |  2 +-
 .../com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java |  8 ++++----
 .../fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java |  2 +-
 .../jackson/jaxrs/json/annotation/JacksonFeatures.java       |  3 +++
 .../fasterxml/jackson/jaxrs/json/TestJacksonFeatures.java    |  3 +--
 .../jackson/jaxrs/json/util/TestAnnotationBundleKey.java     |  2 +-
 .../fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java   |  8 ++++----
 .../jackson/jaxrs/smile/SmileMapperConfigurator.java         |  2 +-
 .../jackson/jaxrs/smile/annotation/JacksonFeatures.java      |  3 +++
 .../com/fasterxml/jackson/jaxrs/xml/XMLEndpointConfig.java   |  8 ++++----
 .../fasterxml/jackson/jaxrs/xml/XMLMapperConfigurator.java   |  2 +-
 .../jackson/jaxrs/xml/annotation/JacksonFeatures.java        |  3 +++
 ...tJacksonFeatures.java => TestJacksonFeaturesWithXML.java} |  4 ++--
 19 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/JacksonFeatures.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/annotation/JacksonFeatures.java
similarity index 95%
copy from xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/JacksonFeatures.java
copy to base/src/main/java/com/fasterxml/jackson/jaxrs/annotation/JacksonFeatures.java
index e128a41..4d9d420 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/JacksonFeatures.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/annotation/JacksonFeatures.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.xml.annotation;
+package com.fasterxml.jackson.jaxrs.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java
index 9fe0563..d67e181 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java
@@ -16,10 +16,10 @@ import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.util.LRUMap;
 
-import com.fasterxml.jackson.jaxrs.base.cfg.EndpointConfigBase;
-import com.fasterxml.jackson.jaxrs.base.cfg.MapperConfiguratorBase;
-import com.fasterxml.jackson.jaxrs.base.util.AnnotationBundleKey;
-import com.fasterxml.jackson.jaxrs.base.util.ClassKey;
+import com.fasterxml.jackson.jaxrs.cfg.AnnotationBundleKey;
+import com.fasterxml.jackson.jaxrs.cfg.EndpointConfigBase;
+import com.fasterxml.jackson.jaxrs.cfg.MapperConfiguratorBase;
+import com.fasterxml.jackson.jaxrs.util.ClassKey;
 
 public abstract class ProviderBase<
     THIS extends ProviderBase<THIS, MAPPER, ANN, EP_CONFIG, MAPPER_CONFIG>,
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/AnnotationBundleKey.java
similarity index 98%
rename from base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java
rename to base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/AnnotationBundleKey.java
index 5c82831..83c5f56 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/AnnotationBundleKey.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/AnnotationBundleKey.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.base.util;
+package com.fasterxml.jackson.jaxrs.cfg;
 
 import java.lang.annotation.Annotation;
 
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/cfg/EndpointConfigBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java
similarity index 90%
rename from base/src/main/java/com/fasterxml/jackson/jaxrs/base/cfg/EndpointConfigBase.java
rename to base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java
index 76b56ec..043e5b9 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/cfg/EndpointConfigBase.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.base.cfg;
+package com.fasterxml.jackson.jaxrs.cfg;
 
 import java.lang.annotation.Annotation;
 
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
 
 /**
  * Container class for figuring out annotation-based configuration
@@ -63,6 +64,15 @@ public abstract class EndpointConfigBase<THIS extends EndpointConfigBase<THIS>>
             // Can only use one view; but if multiple defined, use first (no exception)
             Class<?>[] views = ((JsonView) annotation).value();
             _activeView = (views.length > 0) ? views[0] : null;
+        } else if (type == JacksonFeatures.class) {
+            JacksonFeatures feats = (JacksonFeatures) annotation;
+            if (forWriting) {
+                _serEnable = nullIfEmpty(feats.serializationEnable());
+                _serDisable = nullIfEmpty(feats.serializationDisable());
+            } else {
+                _deserEnable = nullIfEmpty(feats.deserializationEnable());
+                _deserDisable = nullIfEmpty(feats.deserializationDisable());
+            }
         } else if (type == JsonRootName.class) {
             _rootName = ((JsonRootName) annotation).value();
         } else if (type == JacksonAnnotationsInside.class) {
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/cfg/MapperConfiguratorBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java
similarity index 98%
rename from base/src/main/java/com/fasterxml/jackson/jaxrs/base/cfg/MapperConfiguratorBase.java
rename to base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java
index 91bdb18..df4b4ca 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/cfg/MapperConfiguratorBase.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.base.cfg;
+package com.fasterxml.jackson.jaxrs.cfg;
 
 import com.fasterxml.jackson.core.*;
 
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/ClassKey.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/util/ClassKey.java
similarity index 98%
rename from base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/ClassKey.java
rename to base/src/main/java/com/fasterxml/jackson/jaxrs/util/ClassKey.java
index 1ee6327..ce4fa68 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/ClassKey.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/util/ClassKey.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.base.util;
+package com.fasterxml.jackson.jaxrs.util;
 
 /**
  * Efficient key class, used instead of using <code>Class</code>.
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/LRUMap.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/util/LRUMap.java
similarity index 92%
rename from base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/LRUMap.java
rename to base/src/main/java/com/fasterxml/jackson/jaxrs/util/LRUMap.java
index 40a607f..1998596 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/util/LRUMap.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/util/LRUMap.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.base.util;
+package com.fasterxml.jackson.jaxrs.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java
index 1b0b4e6..149e089 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java
@@ -6,9 +6,8 @@ import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.util.JSONPObject;
 import com.fasterxml.jackson.databind.util.JSONWrappedObject;
 
-import com.fasterxml.jackson.jaxrs.base.cfg.EndpointConfigBase;
+import com.fasterxml.jackson.jaxrs.cfg.EndpointConfigBase;
 import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
-import com.fasterxml.jackson.jaxrs.json.annotation.JacksonFeatures;
 
 /**
  * Container class for figuring out annotation-based configuration
@@ -55,6 +54,7 @@ public class JsonEndpointConfig
     /**********************************************************
      */
 
+    @SuppressWarnings("deprecation")
     @Override
     protected void addAnnotation(Class<? extends Annotation> type,
             Annotation annotation, boolean forWriting)
@@ -63,8 +63,8 @@ public class JsonEndpointConfig
             if (forWriting) {
                 _jsonp = new JSONP.Def((JSONP) annotation);
             }
-        } else if (type == JacksonFeatures.class) {
-            JacksonFeatures feats = (JacksonFeatures) annotation;
+        } else if (type == com.fasterxml.jackson.jaxrs.json.annotation.JacksonFeatures.class) {
+            com.fasterxml.jackson.jaxrs.json.annotation.JacksonFeatures feats = (com.fasterxml.jackson.jaxrs.json.annotation.JacksonFeatures) annotation;
             if (forWriting) {
                 _serEnable = nullIfEmpty(feats.serializationEnable());
                 _serDisable = nullIfEmpty(feats.serializationDisable());
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java
index d3824d3..dadd901 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java
@@ -4,7 +4,7 @@ import java.util.*;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-import com.fasterxml.jackson.jaxrs.base.cfg.MapperConfiguratorBase;
+import com.fasterxml.jackson.jaxrs.cfg.MapperConfiguratorBase;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 /**
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/annotation/JacksonFeatures.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/annotation/JacksonFeatures.java
index c5d0c9c..a7216f6 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/annotation/JacksonFeatures.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/annotation/JacksonFeatures.java
@@ -11,10 +11,13 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 /**
  * Annotation that can be used enable and/or disable various
  * features for <code>ObjectReader</code>s and <code>ObjectWriter</code>s.
+ * 
+ * @deprecated Since 2.2, use shared {@link com.fasterxml.jackson.jaxrs.annotation.JacksonAnnotation} instead
  */
 @Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @com.fasterxml.jackson.annotation.JacksonAnnotation
+ at Deprecated // since 2.2
 public @interface JacksonFeatures
 {
     /**
diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestJacksonFeatures.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestJacksonFeatures.java
index 9c3dc12..022a7f3 100644
--- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestJacksonFeatures.java
+++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestJacksonFeatures.java
@@ -11,8 +11,7 @@ import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.SerializationFeature;
-
-import com.fasterxml.jackson.jaxrs.json.annotation.JacksonFeatures;
+import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
 
 /**
  * Tests for [Issue-2], Addition of {@link JacksonFeatures}.
diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java
index 2be4bfd..1039a22 100644
--- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java
+++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/util/TestAnnotationBundleKey.java
@@ -3,7 +3,7 @@ package com.fasterxml.jackson.jaxrs.json.util;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
-import com.fasterxml.jackson.jaxrs.base.util.AnnotationBundleKey;
+import com.fasterxml.jackson.jaxrs.cfg.AnnotationBundleKey;
 
 import com.fasterxml.jackson.jaxrs.json.JaxrsTestBase;
 import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java
index 35a1bb7..4611c00 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java
@@ -3,8 +3,7 @@ package com.fasterxml.jackson.jaxrs.smile;
 import java.lang.annotation.Annotation;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.jaxrs.base.cfg.EndpointConfigBase;
-import com.fasterxml.jackson.jaxrs.smile.annotation.JacksonFeatures;
+import com.fasterxml.jackson.jaxrs.cfg.EndpointConfigBase;
 
 /**
  * Container class for figuring out annotation-based configuration
@@ -37,12 +36,13 @@ public class SmileEndpointConfig
         ;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected void addAnnotation(Class<? extends Annotation> type,
             Annotation annotation, boolean forWriting)
     {
-        if (type == JacksonFeatures.class) {
-            JacksonFeatures feats = (JacksonFeatures) annotation;
+        if (type == com.fasterxml.jackson.jaxrs.smile.annotation.JacksonFeatures.class) {
+            com.fasterxml.jackson.jaxrs.smile.annotation.JacksonFeatures feats = (com.fasterxml.jackson.jaxrs.smile.annotation.JacksonFeatures) annotation;
             if (forWriting) {
                 _serEnable = nullIfEmpty(feats.serializationEnable());
                 _serDisable = nullIfEmpty(feats.serializationDisable());
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileMapperConfigurator.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileMapperConfigurator.java
index 70d9bce..e38374c 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileMapperConfigurator.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileMapperConfigurator.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
-import com.fasterxml.jackson.jaxrs.base.cfg.MapperConfiguratorBase;
+import com.fasterxml.jackson.jaxrs.cfg.MapperConfiguratorBase;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/JacksonFeatures.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/JacksonFeatures.java
index 689729d..6c5ce6d 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/JacksonFeatures.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/JacksonFeatures.java
@@ -11,10 +11,13 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 /**
  * Annotation that can be used enable and/or disable various
  * features for <code>ObjectReader</code>s and <code>ObjectWriter</code>s.
+ * 
+ * @deprecated Since 2.2, use shared {@link com.fasterxml.jackson.jaxrs.annotation.JacksonAnnotation} instead
  */
 @Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @com.fasterxml.jackson.annotation.JacksonAnnotation
+ at Deprecated // since 2.2
 public @interface JacksonFeatures
 {
     /**
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLEndpointConfig.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLEndpointConfig.java
index 32534eb..2c17735 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLEndpointConfig.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLEndpointConfig.java
@@ -4,8 +4,7 @@ import java.lang.annotation.Annotation;
 
 import com.fasterxml.jackson.databind.*;
 
-import com.fasterxml.jackson.jaxrs.base.cfg.EndpointConfigBase;
-import com.fasterxml.jackson.jaxrs.xml.annotation.JacksonFeatures;
+import com.fasterxml.jackson.jaxrs.cfg.EndpointConfigBase;
 
 /**
  * Container class for figuring out annotation-based configuration
@@ -38,12 +37,13 @@ public class XMLEndpointConfig
         ;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected void addAnnotation(Class<? extends Annotation> type,
             Annotation annotation, boolean forWriting)
     {
-        if (type == JacksonFeatures.class) {
-            JacksonFeatures feats = (JacksonFeatures) annotation;
+        if (type == com.fasterxml.jackson.jaxrs.xml.annotation.JacksonFeatures.class) {
+            com.fasterxml.jackson.jaxrs.xml.annotation.JacksonFeatures feats = (com.fasterxml.jackson.jaxrs.xml.annotation.JacksonFeatures) annotation;
             if (forWriting) {
                 _serEnable = nullIfEmpty(feats.serializationEnable());
                 _serDisable = nullIfEmpty(feats.serializationDisable());
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLMapperConfigurator.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLMapperConfigurator.java
index ee5cdce..56ad41d 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLMapperConfigurator.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/XMLMapperConfigurator.java
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.jaxb.XmlJaxbAnnotationIntrospector;
 
-import com.fasterxml.jackson.jaxrs.base.cfg.MapperConfiguratorBase;
+import com.fasterxml.jackson.jaxrs.cfg.MapperConfiguratorBase;
 
 
 /**
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/JacksonFeatures.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/JacksonFeatures.java
index e128a41..a3834fe 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/JacksonFeatures.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/annotation/JacksonFeatures.java
@@ -11,10 +11,13 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 /**
  * Annotation that can be used enable and/or disable various
  * features for <code>ObjectReader</code>s and <code>ObjectWriter</code>s.
+ * 
+ * @deprecated Since 2.2, use shared {@link com.fasterxml.jackson.jaxrs.annotation.JacksonAnnotation} instead
  */
 @Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @com.fasterxml.jackson.annotation.JacksonAnnotation
+ at Deprecated // since 2.2
 public @interface JacksonFeatures
 {
     /**
diff --git a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJacksonFeatures.java b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJacksonFeaturesWithXML.java
similarity index 97%
rename from xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJacksonFeatures.java
rename to xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJacksonFeaturesWithXML.java
index cce1705..41df5f0 100644
--- a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJacksonFeatures.java
+++ b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestJacksonFeaturesWithXML.java
@@ -12,13 +12,13 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
 import com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
-import com.fasterxml.jackson.jaxrs.xml.annotation.JacksonFeatures;
 
 /**
  * Tests for [Issue-2], Addition of {@link JacksonFeatures}.
  */
-public class TestJacksonFeatures extends JaxrsTestBase
+public class TestJacksonFeaturesWithXML extends JaxrsTestBase
 {
     static class Bean {
         public int a = 3;

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



More information about the pkg-java-commits mailing list