Merge pull request msgpack#264 from fdinoff/rename_extended_to_extension

xerial · xerial · commit b94d324bc832 · 2015-06-30T14:53:24.000+09:00
Rename Extended to Extension
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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public void serialize(MessagePackExtensionType value, JsonGenerator gen, Seriali`
`37`	`37`	`throws IOException, JsonProcessingException`
`38`	`38`	`{`
`39`	`39`	`if (gen instanceof MessagePackGenerator) {`
`40`		`- MessagePackGenerator msgpackGenerator = (MessagePackGenerator)gen;`
`41`		`- msgpackGenerator.writeExtendedType(value);`
	`40`	`+ MessagePackGenerator msgpackGenerator = (MessagePackGenerator) gen;`
	`41`	`+ msgpackGenerator.writeExtensionType(value);`
`42`	`42`	`}`
`43`	`43`	`else {`
`44`	`44`	`throw new IllegalStateException("'gen' is expected to be MessagePackGenerator but it's " + gen.getClass());`
Original file line number	Diff line number	Diff line change
`@@ -214,9 +214,9 @@ else if (v instanceof Boolean) {`
`214`	`214`	`messagePacker.packBoolean((Boolean) v);`
`215`	`215`	`}`
`216`	`216`	`else if (v instanceof MessagePackExtensionType) {`
`217`		`- MessagePackExtensionType extendedType = (MessagePackExtensionType) v;`
`218`		`- byte[] extData = extendedType.getData();`
`219`		`- messagePacker.packExtensionTypeHeader((byte)extendedType.getType(), extData.length);`
	`217`	`+ MessagePackExtensionType extensionType = (MessagePackExtensionType) v;`
	`218`	`+ byte[] extData = extensionType.getData();`
	`219`	`+ messagePacker.packExtensionTypeHeader(extensionType.getType(), extData.length);`
`220`	`220`	`messagePacker.writePayload(extData);`
`221`	`221`	`}`
`222`	`222`	`else {`
`@@ -414,8 +414,10 @@ public void writeNull()`
`414`	`414`	`addValueToStackTop(null);`
`415`	`415`	`}`
`416`	`416`
`417`		`- public void writeExtendedType(MessagePackExtensionType extendedType) throws IOException {`
`418`		`- addValueToStackTop(extendedType);`
	`417`	`+ public void writeExtensionType(MessagePackExtensionType extensionType)`
	`418`	`+ throws IOException`
	`419`	`+ {`
	`420`	`+ addValueToStackTop(extensionType);`
`419`	`421`	`}`
`420`	`422`
`421`	`423`	`@Override`