From 07e81b4eee64fe40af40c362ea58aa67788829ff Mon Sep 17 00:00:00 2001 From: Frank Dinoff Date: Mon, 29 Jun 2015 21:22:58 -0400 Subject: [PATCH] Rename Extended to Extension A previous commit changed most references extended to extension since the Message Pack spec calls them Extension type. This converts a few missed references to extension. --- .../jackson/dataformat/MessagePackExtensionType.java | 4 ++-- .../jackson/dataformat/MessagePackGenerator.java | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackExtensionType.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackExtensionType.java index abceffcb9..1906757f5 100644 --- a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackExtensionType.java +++ b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackExtensionType.java @@ -37,8 +37,8 @@ public void serialize(MessagePackExtensionType value, JsonGenerator gen, Seriali throws IOException, JsonProcessingException { if (gen instanceof MessagePackGenerator) { - MessagePackGenerator msgpackGenerator = (MessagePackGenerator)gen; - msgpackGenerator.writeExtendedType(value); + MessagePackGenerator msgpackGenerator = (MessagePackGenerator) gen; + msgpackGenerator.writeExtensionType(value); } else { throw new IllegalStateException("'gen' is expected to be MessagePackGenerator but it's " + gen.getClass()); diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java index 3bdf2d035..9ba9a5ac3 100644 --- a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java +++ b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java @@ -214,9 +214,9 @@ else if (v instanceof Boolean) { messagePacker.packBoolean((Boolean) v); } else if (v instanceof MessagePackExtensionType) { - MessagePackExtensionType extendedType = (MessagePackExtensionType) v; - byte[] extData = extendedType.getData(); - messagePacker.packExtensionTypeHeader((byte)extendedType.getType(), extData.length); + MessagePackExtensionType extensionType = (MessagePackExtensionType) v; + byte[] extData = extensionType.getData(); + messagePacker.packExtensionTypeHeader(extensionType.getType(), extData.length); messagePacker.writePayload(extData); } else { @@ -414,8 +414,10 @@ public void writeNull() addValueToStackTop(null); } - public void writeExtendedType(MessagePackExtensionType extendedType) throws IOException { - addValueToStackTop(extendedType); + public void writeExtensionType(MessagePackExtensionType extensionType) + throws IOException + { + addValueToStackTop(extensionType); } @Override