Skip to content

Commit 0828012

Browse files
frsyukifrsyuki
committed
move JSON classes to org.msgpack.util.json package
1 parent 9c3432e commit 0828012

14 files changed

+32
-17
lines changed

‎src/main/java/org/msgpack/packer/PackerStack.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919

2020
import org.msgpack.MessageTypeException;
2121

22-
final class PackerStack {
22+
public final class PackerStack {
2323
private int top;
2424
private byte[] types;
2525
private int[] counts;
2626

27-
static final int MAX_STACK_SIZE = 128;
27+
public static final int MAX_STACK_SIZE = 128;
28+
2829
private static final byte TYPE_INVALID = 0;
2930
private static final byte TYPE_ARRAY = 1;
3031
private static final byte TYPE_MAP = 2;

‎src/main/java/org/msgpack/unpacker/UnpackerStack.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
import org.msgpack.type.Value;
2222
import org.msgpack.type.ValueFactory;
2323

24-
final class UnpackerStack {
24+
public final class UnpackerStack {
2525
private int top;
2626
private byte[] types;
2727
private int[] counts;
2828

29-
static final int MAX_STACK_SIZE = 128;
29+
public static final int MAX_STACK_SIZE = 128;
30+
3031
private static final byte TYPE_INVALID = 0;
3132
private static final byte TYPE_ARRAY = 1;
3233
private static final byte TYPE_MAP = 2;

src/main/java/org/msgpack/JSON.java renamed to src/main/java/org/msgpack/util/json/JSON.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,17 @@
1515
// See the License for the specific language governing permissions and
1616
// limitations under the License.
1717
//
18-
package org.msgpack;
18+
package org.msgpack.util.json;
1919

2020
import java.io.InputStream;
2121
import java.io.OutputStream;
2222
import java.nio.ByteBuffer;
23+
import org.msgpack.MessagePack;
24+
import org.msgpack.MessageTypeException;
2325
import org.msgpack.packer.Packer;
2426
import org.msgpack.packer.BufferPacker;
25-
import org.msgpack.packer.JSONPacker;
26-
import org.msgpack.packer.JSONBufferPacker;
2727
import org.msgpack.unpacker.Unpacker;
2828
import org.msgpack.unpacker.BufferUnpacker;
29-
import org.msgpack.unpacker.JSONUnpacker;
30-
import org.msgpack.unpacker.JSONBufferUnpacker;
3129

3230

3331
public class JSON extends MessagePack {

src/main/java/org/msgpack/packer/JSONBufferPacker.java renamed to src/main/java/org/msgpack/util/json/JSONBufferPacker.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
// See the License for the specific language governing permissions and
1616
// limitations under the License.
1717
//
18-
package org.msgpack.packer;
18+
package org.msgpack.util.json;
1919

2020
import org.msgpack.MessagePack;
2121
import org.msgpack.io.Output;
2222
import org.msgpack.io.LinkedBufferOutput;
23+
import org.msgpack.packer.Packer;
24+
import org.msgpack.packer.BufferPacker;
2325

2426

2527
public class JSONBufferPacker extends JSONPacker implements BufferPacker {

src/main/java/org/msgpack/unpacker/JSONBufferUnpacker.java renamed to src/main/java/org/msgpack/util/json/JSONBufferUnpacker.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// See the License for the specific language governing permissions and
1616
// limitations under the License.
1717
//
18-
package org.msgpack.unpacker;
18+
package org.msgpack.util.json;
1919

2020
import java.io.IOException;
2121
import java.io.EOFException;
@@ -26,6 +26,8 @@
2626
import org.msgpack.MessagePack;
2727
import org.msgpack.MessageTypeException;
2828
import org.msgpack.type.Value;
29+
import org.msgpack.unpacker.Unpacker;
30+
import org.msgpack.unpacker.BufferUnpacker;
2931

3032

3133
public class JSONBufferUnpacker extends JSONUnpacker implements BufferUnpacker {

src/main/java/org/msgpack/packer/JSONPacker.java renamed to src/main/java/org/msgpack/util/json/JSONPacker.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// See the License for the specific language governing permissions and
1616
// limitations under the License.
1717
//
18-
package org.msgpack.packer;
18+
package org.msgpack.util.json;
1919

2020
import java.io.IOException;
2121
import java.io.OutputStream;
@@ -31,6 +31,9 @@
3131
import org.msgpack.io.StreamOutput;
3232
import org.msgpack.MessagePack;
3333
import org.msgpack.MessageTypeException;
34+
import org.msgpack.packer.Packer;
35+
import org.msgpack.packer.AbstractPacker;
36+
import org.msgpack.packer.PackerStack;
3437

3538

3639
public class JSONPacker extends AbstractPacker {

src/main/java/org/msgpack/unpacker/JSONUnpacker.java renamed to src/main/java/org/msgpack/util/json/JSONUnpacker.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// See the License for the specific language governing permissions and
1616
// limitations under the License.
1717
//
18-
package org.msgpack.unpacker;
18+
package org.msgpack.util.json;
1919

2020
import java.io.IOException;
2121
import java.io.EOFException;
@@ -33,6 +33,8 @@
3333
//import org.msgpack.io.StreamInput;
3434
import org.msgpack.MessagePack;
3535
import org.msgpack.MessageTypeException;
36+
import org.msgpack.unpacker.Unpacker;
37+
import org.msgpack.unpacker.Converter;
3638
import org.msgpack.type.Value;
3739
import org.msgpack.type.ValueFactory;
3840

‎src/test/java/org/msgpack/TestJSONBufferPackBufferUnpack.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.junit.Test;
1818
import org.msgpack.packer.BufferPacker;
1919
import org.msgpack.unpacker.Unpacker;
20+
import org.msgpack.util.json.JSON;
2021

2122

2223
public class TestJSONBufferPackBufferUnpack extends TestSet {

‎src/test/java/org/msgpack/TestJSONBufferPackUnpack.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.junit.Test;
1818
import org.msgpack.packer.BufferPacker;
1919
import org.msgpack.unpacker.Unpacker;
20+
import org.msgpack.util.json.JSON;
2021

2122

2223
public class TestJSONBufferPackUnpack extends TestSet {

‎src/test/java/org/msgpack/TestJSONPackBufferUnpack.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.junit.Test;
1919
import org.msgpack.packer.Packer;
2020
import org.msgpack.unpacker.Unpacker;
21+
import org.msgpack.util.json.JSON;
2122

2223

2324
public class TestJSONPackBufferUnpack extends TestSet {

0 commit comments

Comments
 (0)