[jackson-dataformat-smile] 15/31: Update Maven group id
Hilko Bengen
bengen at alioth.debian.org
Mon Sep 2 17:37:24 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 151dbabe3fed1003f0c7bb71ad6ddf75d26d3cdc
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date: Sat Jan 21 12:57:42 2012 -0800
Update Maven group id
---
.../fasterxml/jackson/dataformat/smile/ModuleVersion.java | 2 +-
.../fasterxml/jackson/dataformat/smile/SmileFactory.java | 9 ++++++---
.../jackson/dataformat/smile/SmileGenerator.java | 11 -----------
.../fasterxml/jackson/dataformat/smile/SmileParser.java | 13 -------------
.../jackson/dataformat/smile/SmileParserBootstrapper.java | 6 +++---
.../fasterxml/jackson/dataformat/smile/TestVersions.java | 2 +-
6 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/ModuleVersion.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/ModuleVersion.java
index ae02a60..ee212c2 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/ModuleVersion.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/ModuleVersion.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.util.VersionUtil;
* Helper class used for finding and caching version information
* for this module.
*/
-public class ModuleVersion extends VersionUtil
+class ModuleVersion extends VersionUtil
{
public final static ModuleVersion instance = new ModuleVersion();
}
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 86f6827..369e6ea 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileFactory.java
@@ -301,7 +301,8 @@ public class SmileFactory extends JsonFactory
throws IOException, JsonParseException
{
return new SmileParserBootstrapper(ctxt, in).constructParser(_parserFeatures,
- _smileParserFeatures, _objectCodec, _rootByteSymbols);
+ _smileParserFeatures, isEnabled(JsonFactory.Feature.INTERN_FIELD_NAMES),
+ _objectCodec, _rootByteSymbols);
}
/**
@@ -326,8 +327,10 @@ public class SmileFactory extends JsonFactory
protected SmileParser _createJsonParser(byte[] data, int offset, int len, IOContext ctxt)
throws IOException, JsonParseException
{
- return new SmileParserBootstrapper(ctxt, data, offset, len).constructParser(_parserFeatures,
- _smileParserFeatures, _objectCodec, _rootByteSymbols);
+ return new SmileParserBootstrapper(ctxt, data, offset, len).constructParser(
+ _parserFeatures, _smileParserFeatures,
+ isEnabled(JsonFactory.Feature.INTERN_FIELD_NAMES),
+ _objectCodec, _rootByteSymbols);
}
/**
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 79c4f1d..800bfa5 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
@@ -453,17 +453,6 @@ public class SmileGenerator
}
_writeFieldName(name);
}
-
- @Override
- public final void writeFieldName(SerializedString name)
- throws IOException, JsonGenerationException
- {
- // Object is a value, need to verify it's allowed
- if (_writeContext.writeFieldName(name.getValue()) == JsonWriteContext.STATUS_EXPECT_VALUE) {
- _reportError("Can not write a field name, expecting a value");
- }
- _writeFieldName(name);
- }
@Override
public final void writeFieldName(SerializableString name)
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 8339d4d..2b35d14 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
@@ -1204,19 +1204,6 @@ public class SmileParser
if (_currToken == JsonToken.VALUE_EMBEDDED_OBJECT ) {
return _binaryValue;
}
- return super.getEmbeddedObject();
- }
-
-
- /* NOTE: must still implement just because 1.9.0 - 1.9.2 did require
- * its implementation (and we'll try to avoid introducing binary
- * incompatibilities); however, should be deleted from 2.0
- */
- protected byte[] _decodeBase64(Base64Variant b64variant)
- throws IOException, JsonParseException
- {
- // Should never get called, but must be defined for base class
- _throwInternal();
return null;
}
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java
index 5cfae84..b219ac2 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBootstrapper.java
@@ -93,11 +93,11 @@ public class SmileParserBootstrapper
}
public SmileParser constructParser(int generalParserFeatures, int smileFeatures,
- ObjectCodec codec, BytesToNameCanonicalizer rootByteSymbols)
+ boolean internNames,
+ ObjectCodec codec, BytesToNameCanonicalizer rootByteSymbols)
throws IOException, JsonParseException
{
- boolean intern = JsonParser.Feature.INTERN_FIELD_NAMES.enabledIn(generalParserFeatures);
- BytesToNameCanonicalizer can = rootByteSymbols.makeChild(true, intern);
+ BytesToNameCanonicalizer can = rootByteSymbols.makeChild(true, internNames);
// We just need a single byte, really, to know if it starts with header
ensureLoaded(1);
SmileParser p = new SmileParser(_context, generalParserFeatures, smileFeatures,
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestVersions.java b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestVersions.java
index 2c29e96..7292288 100644
--- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestVersions.java
+++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestVersions.java
@@ -16,7 +16,7 @@ public class TestVersions extends SmileTestBase
private final static int MAJOR_VERSION = 2;
private final static int MINOR_VERSION = 0;
- private final static String GROUP_ID = "com.fasterxml.jackson";
+ private final static String GROUP_ID = "com.fasterxml.jackson.dataformat";
private final static String ARTIFACT_ID = "jackson-dataformat-smile";
public void testMapperVersions() throws IOException
--
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