[jackson-jaxrs-providers] 26/162: More refactoring, centralizing `Annotations` enumeration
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 c200d91abebb08b29c627651fd7a93c6e353fc53
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date: Sat Mar 16 20:56:38 2013 -0700
More refactoring, centralizing `Annotations` enumeration
---
.../fasterxml/jackson/jaxrs/base/ProviderBase.java | 8 ++++----
.../fasterxml/jackson/jaxrs/cfg}/Annotations.java | 4 +++-
.../jackson/jaxrs/cfg/MapperConfiguratorBase.java | 16 ++++++++--------
.../fasterxml/jackson/jaxrs/json/Annotations.java | 21 ---------------------
.../jackson/jaxrs/json/JacksonJaxbJsonProvider.java | 1 +
.../jackson/jaxrs/json/JacksonJsonProvider.java | 3 ++-
.../jackson/jaxrs/json/JsonMapperConfigurator.java | 3 ++-
.../fasterxml/jackson/jaxrs/smile/Annotations.java | 21 ---------------------
.../jaxrs/smile/JacksonJaxbSmileProvider.java | 1 +
.../jackson/jaxrs/smile/JacksonSmileProvider.java | 3 ++-
.../jaxrs/smile/SmileMapperConfigurator.java | 4 ++--
.../jackson/jaxrs/xml/JacksonJaxbXMLProvider.java | 1 +
.../jackson/jaxrs/xml/JacksonXMLProvider.java | 3 ++-
.../jackson/jaxrs/xml/XMLMapperConfigurator.java | 4 ++--
14 files changed, 30 insertions(+), 63 deletions(-)
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 d67e181..a31eccb 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
@@ -17,16 +17,16 @@ import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.util.LRUMap;
import com.fasterxml.jackson.jaxrs.cfg.AnnotationBundleKey;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
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>,
+ THIS extends ProviderBase<THIS, MAPPER, EP_CONFIG, MAPPER_CONFIG>,
MAPPER extends ObjectMapper,
- ANN extends Enum<ANN>,
EP_CONFIG extends EndpointConfigBase<EP_CONFIG>,
- MAPPER_CONFIG extends MapperConfiguratorBase<MAPPER_CONFIG,MAPPER,ANN>
+ MAPPER_CONFIG extends MapperConfiguratorBase<MAPPER_CONFIG,MAPPER>
>
implements
MessageBodyReader<Object>,
@@ -199,7 +199,7 @@ public abstract class ProviderBase<
* @param annotationsToUse Ordered list of annotation sets to use; if null,
* default
*/
- public void setAnnotationsToUse(ANN[] annotationsToUse) {
+ public void setAnnotationsToUse(Annotations[] annotationsToUse) {
_mapperConfig.setAnnotationsToUse(annotationsToUse);
}
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/Annotations.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/Annotations.java
similarity index 80%
rename from xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/Annotations.java
rename to base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/Annotations.java
index b8dc022..2c1164f 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/Annotations.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/Annotations.java
@@ -1,8 +1,10 @@
-package com.fasterxml.jackson.jaxrs.xml;
+package com.fasterxml.jackson.jaxrs.cfg;
/**
* Enumeration that defines standard annotation sets available for configuring
* data binding aspects.
+ *
+ * @since 2.2 (earlier located in actual datatype-specific modules)
*/
public enum Annotations {
/**
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java
index df4b4ca..234c972 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java
@@ -9,9 +9,9 @@ import com.fasterxml.jackson.databind.*;
* {@link ObjectMapper} instance to be used for data binding, as
* well as accessing it.
*/
-public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase<IMPL,MAPPER,ANN>,
- MAPPER extends ObjectMapper,
- ANN extends Enum<ANN>>
+public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase<IMPL,MAPPER>,
+ MAPPER extends ObjectMapper
+>
{
/**
* Mapper provider was constructed with if any, or that was constructed
@@ -33,7 +33,7 @@ public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase
* Annotations set to use by default; overridden by explicit call
* to {@link #setAnnotationsToUse}
*/
- protected ANN[] _defaultAnnotationsToUse;
+ protected Annotations[] _defaultAnnotationsToUse;
/**
* To support optional dependency to Jackson JAXB annotations module
@@ -47,7 +47,7 @@ public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase
/**********************************************************
*/
- public MapperConfiguratorBase(MAPPER mapper, ANN[] defaultAnnotations)
+ public MapperConfiguratorBase(MAPPER mapper, Annotations[] defaultAnnotations)
{
_mapper = mapper;
_defaultAnnotationsToUse = defaultAnnotations;
@@ -73,7 +73,7 @@ public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase
*/
protected abstract MAPPER mapper();
- protected abstract AnnotationIntrospector _resolveIntrospectors(ANN[] annotationsToUse);
+ protected abstract AnnotationIntrospector _resolveIntrospectors(Annotations[] annotationsToUse);
/*
/***********************************************************
@@ -85,7 +85,7 @@ public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase
_mapper = m;
}
- public synchronized final void setAnnotationsToUse(ANN[] annotationsToUse) {
+ public synchronized final void setAnnotationsToUse(Annotations[] annotationsToUse) {
_setAnnotations(mapper(), annotationsToUse);
}
@@ -111,7 +111,7 @@ public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase
/***********************************************************
*/
- protected final void _setAnnotations(ObjectMapper mapper, ANN[] annotationsToUse)
+ protected final void _setAnnotations(ObjectMapper mapper, Annotations[] annotationsToUse)
{
AnnotationIntrospector intr;
if (annotationsToUse == null || annotationsToUse.length == 0) {
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/Annotations.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/Annotations.java
deleted file mode 100644
index cd536d8..0000000
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/Annotations.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.fasterxml.jackson.jaxrs.json;
-
-/**
- * Enumeration that defines standard annotation sets available for configuring
- * data binding aspects.
- */
-public enum Annotations {
- /**
- * Standard Jackson annotations, defined in Jackson core and databind
- * packages
- */
- JACKSON,
-
- /**
- * Standard JAXB annotations, used in a way that approximates expected
- * definitions (since JAXB defines XML aspects, not all features map
- * well to JSON handling)
- */
- JAXB
- ;
-}
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJaxbJsonProvider.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJaxbJsonProvider.java
index d6b2473..6d08b8b 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJaxbJsonProvider.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJaxbJsonProvider.java
@@ -6,6 +6,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
/**
* JSON content type provider automatically configured to use both Jackson
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java
index 1aad274..923207f 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.jaxrs.base.ProviderBase;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
/**
@@ -47,7 +48,7 @@ import com.fasterxml.jackson.jaxrs.base.ProviderBase;
@Produces(MediaType.WILDCARD)
public class JacksonJsonProvider
extends ProviderBase<JacksonJsonProvider,
- ObjectMapper, Annotations,
+ ObjectMapper,
JsonEndpointConfig, JsonMapperConfigurator>
{
/**
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 dadd901..5b22e8b 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,6 +4,7 @@ import java.util.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
import com.fasterxml.jackson.jaxrs.cfg.MapperConfiguratorBase;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
@@ -13,7 +14,7 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
* well as accessing it.
*/
public class JsonMapperConfigurator
- extends MapperConfiguratorBase<JsonMapperConfigurator, ObjectMapper, Annotations>
+ extends MapperConfiguratorBase<JsonMapperConfigurator, ObjectMapper>
{
/*
/**********************************************************
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/Annotations.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/Annotations.java
deleted file mode 100644
index 00322b6..0000000
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/Annotations.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.fasterxml.jackson.jaxrs.smile;
-
-/**
- * Enumeration that defines standard annotation sets available for configuring
- * data binding aspects.
- */
-public enum Annotations {
- /**
- * Standard Jackson annotations, defined in Jackson core and databind
- * packages
- */
- JACKSON,
-
- /**
- * Standard JAXB annotations, used in a way that approximates expected
- * definitions (since JAXB defines XML aspects, not all features map
- * well to JSON handling)
- */
- JAXB
- ;
-}
\ No newline at end of file
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java
index 24a8d57..f2bfd66 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java
@@ -5,6 +5,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.ext.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
/**
* JSON content type provider automatically configured to use both Jackson
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
index 74ea46c..ba06384 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
@@ -9,6 +9,7 @@ import javax.ws.rs.ext.*;
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.jaxrs.base.ProviderBase;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
/**
* Basic implementation of JAX-RS abstractions ({@link MessageBodyReader},
@@ -45,7 +46,7 @@ import com.fasterxml.jackson.jaxrs.base.ProviderBase;
@Produces(SmileMediaTypes.APPLICATION_JACKSON_SMILE)
public class JacksonSmileProvider
extends ProviderBase<JacksonSmileProvider,
- ObjectMapper, Annotations,
+ ObjectMapper,
SmileEndpointConfig,
SmileMapperConfigurator
>
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 e38374c..b9d9864 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,17 +6,17 @@ import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
import com.fasterxml.jackson.jaxrs.cfg.MapperConfiguratorBase;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
-
/**
* Helper class used to encapsulate details of configuring an
* {@link ObjectMapper} instance to be used for data binding, as
* well as accessing it.
*/
public class SmileMapperConfigurator
- extends MapperConfiguratorBase<SmileMapperConfigurator, ObjectMapper, Annotations>
+ extends MapperConfiguratorBase<SmileMapperConfigurator, ObjectMapper>
{
/*
/**********************************************************
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonJaxbXMLProvider.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonJaxbXMLProvider.java
index 4a15c63..ecaa9a8 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonJaxbXMLProvider.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonJaxbXMLProvider.java
@@ -6,6 +6,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.Provider;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
/**
* JSON content type provider automatically configured to use both Jackson
diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java
index e996367..0d2f0d4 100644
--- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java
+++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java
@@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import com.fasterxml.jackson.jaxrs.base.ProviderBase;
+import com.fasterxml.jackson.jaxrs.cfg.Annotations;
/**
* Basic implementation of JAX-RS abstractions ({@link MessageBodyReader},
@@ -49,7 +50,7 @@ import com.fasterxml.jackson.jaxrs.base.ProviderBase;
@Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML})
public class JacksonXMLProvider
extends ProviderBase<JacksonXMLProvider,
- XmlMapper, Annotations,
+ XmlMapper,
XMLEndpointConfig,
XMLMapperConfigurator
>
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 56ad41d..319d720 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,16 +9,16 @@ 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.cfg.Annotations;
import com.fasterxml.jackson.jaxrs.cfg.MapperConfiguratorBase;
-
/**
* Helper class used to encapsulate details of configuring an
* {@link XmlMapper} instance to be used for data binding, as
* well as accessing it.
*/
public class XMLMapperConfigurator
- extends MapperConfiguratorBase<XMLMapperConfigurator, XmlMapper, Annotations>
+ extends MapperConfiguratorBase<XMLMapperConfigurator, XmlMapper>
{
/*
/**********************************************************
--
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