[jackson-annotations] 73/207: Minor change: allow @JsonFormat on classes too
Timo Aaltonen
tjaalton at moszumanska.debian.org
Sat Sep 6 13:55:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
tjaalton pushed a commit to branch master
in repository jackson-annotations.
commit bb817069f6f9b254b4d1918cf527db34ee23a823
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date: Thu Jun 28 22:20:29 2012 -0700
Minor change: allow @JsonFormat on classes too
---
pom.xml | 8 +++-----
src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java | 9 ++++++++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 42ca2a4..ebb7689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,7 @@
| limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>com.fasterxml</groupId>
<artifactId>oss-parent</artifactId>
@@ -26,11 +24,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.1.0-SNAPSHOT</version>
-
<name>Jackson-annotations</name>
- <description>Core annotations used for value types, used by Jackson databinding package.
+ <version>2.1.0-SNAPSHOT</version>
+ <description>Core annotations used for value types, used by Jackson data binding package.
</description>
+
<url>http://wiki.fasterxml.com/JacksonHome</url>
<scm>
<connection>scm:git:git at github.com:FasterXML/jackson-annotations.git</connection>
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java b/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java
index f020099..620ff0e 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java
@@ -26,10 +26,17 @@ import java.util.TimeZone;
* pattern may contain {@link java.text.SimpleDateFormat}-compatible pattern definition.
* </li>
*</ul>
+ * Jackson 2.1 added following new features:
+ *<ul>
+ * <li>Can now be used on Classes (types) as well, for modified default behavior, possibly
+ * overridden by per-property annotation
+ * </li>
+ *</ul>
*
* @since 2.0
*/
- at Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+ at Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER,
+ ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@JacksonAnnotation
public @interface JsonFormat
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-annotations.git
More information about the pkg-java-commits
mailing list