[jackson-dataformat-smile] 12/31: Fix version handling
Hilko Bengen
bengen at alioth.debian.org
Mon Sep 2 17:37:23 UTC 2013
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag jackson-dataformat-smile-2.0.0
in repository jackson-dataformat-smile.
commit 8f0a560eb91ec7829066a76da4b55b5f2cacaec2
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date: Wed Dec 28 20:51:37 2011 -0800
Fix version handling
---
pom.xml | 7 ++++
.../jackson/dataformat/smile/SmileFactory.java | 14 ++++++--
.../jackson/dataformat/smile/SmileGenerator.java | 2 --
.../jackson/dataformat/smile/SmileParser.java | 15 ++++++--
.../fasterxml/jackson/dataformat/smile/VERSION.txt | 1 +
.../jackson/dataformat/smile/TestVersions.java | 37 ++++++++++++++++++++
6 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7acbf6b..eac2b58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,13 @@
</dependencies>
<build>
+ <!-- need to enable filtering to add version info -->
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
index a7c6ce7..de7a7db 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.format.InputAccessor;
import com.fasterxml.jackson.core.format.MatchStrength;
import com.fasterxml.jackson.core.io.IOContext;
+import com.fasterxml.jackson.core.util.VersionUtil;
/**
* Factory used for constructing {@link SmileParser} and {@link SmileGenerator}
@@ -23,8 +24,6 @@ import com.fasterxml.jackson.core.io.IOContext;
* generator).
*
* @author tatu
- *
- * @since 1.6
*/
public class SmileFactory extends JsonFactory
{
@@ -89,6 +88,17 @@ public class SmileFactory extends JsonFactory
_cfgDelegateToTextual = state;
}
+ /*
+ /**********************************************************
+ /* Versioned
+ /**********************************************************
+ */
+
+ @Override
+ public Version version() {
+ return VersionUtil.versionFor(getClass());
+ }
+
/*
/**********************************************************
/* Format detection functionality (since 1.8)
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
index 2c4a078..b3180c2 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
@@ -179,8 +179,6 @@ public class SmileGenerator
/**
* Helper object used for low-level recycling of Smile-generator
* specific buffers.
- *
- * @since 1.7
*/
final protected SmileBufferRecycler<SharedStringNode> _smileBufferRecycler;
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
index e4ef68b..0a1c2c7 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
@@ -15,6 +15,7 @@ import com.fasterxml.jackson.core.base.ParserBase;
import com.fasterxml.jackson.core.io.IOContext;
import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer;
import com.fasterxml.jackson.core.sym.Name;
+import com.fasterxml.jackson.core.util.VersionUtil;
public class SmileParser
extends ParserBase
@@ -294,9 +295,6 @@ public class SmileParser
return true;
}
- /**
- * @since 1.7
- */
protected final static SmileBufferRecycler<String> _smileBufferRecycler()
{
SoftReference<SmileBufferRecycler<String>> ref = _smileRecyclerRef.get();
@@ -309,6 +307,17 @@ public class SmileParser
return br;
}
+ /*
+ /**********************************************************
+ /* Versioned
+ /**********************************************************
+ */
+
+ @Override
+ public Version version() {
+ return VersionUtil.versionFor(getClass());
+ }
+
/*
/**********************************************************
/* Former StreamBasedParserBase methods
diff --git a/src/main/resources/com/fasterxml/jackson/dataformat/smile/VERSION.txt b/src/main/resources/com/fasterxml/jackson/dataformat/smile/VERSION.txt
new file mode 100644
index 0000000..ad96e7c
--- /dev/null
+++ b/src/main/resources/com/fasterxml/jackson/dataformat/smile/VERSION.txt
@@ -0,0 +1 @@
+${project.version}
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestVersions.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestVersions.java
new file mode 100644
index 0000000..2d2e3d7
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestVersions.java
@@ -0,0 +1,37 @@
+package com.fasterxml.jackson.dataformat.smile;
+
+import com.fasterxml.jackson.core.Version;
+
+/**
+ * Tests to verify [JACKSON-278]
+ */
+public class TestVersions extends SmileTestBase
+{
+ /**
+ * Not a good to do this, but has to do, for now...
+ */
+ private final static int MAJOR_VERSION = 2;
+ private final static int MINOR_VERSION = 0;
+
+ public void testMapperVersions()
+ {
+ SmileFactory f = new SmileFactory();
+ assertVersion(f.version(), MAJOR_VERSION, MINOR_VERSION);
+ }
+
+ /*
+ /**********************************************************
+ /* Helper methods
+ /**********************************************************
+ */
+
+ private void assertVersion(Version v, int major, int minor)
+ {
+ assertFalse("Should find version information (got "+v+")", v.isUknownVersion());
+ assertEquals(major, v.getMajorVersion());
+ assertEquals(minor, v.getMinorVersion());
+ // Check patch level initially, comment out for maint versions
+ assertEquals(0, v.getPatchLevel());
+ }
+}
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-smile.git
More information about the pkg-java-commits
mailing list