Sync bndlib code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1381708 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java b/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
index a336e97..7622ae7 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
@@ -4,17 +4,17 @@
import java.lang.reflect.*;
import java.util.*;
-import aQute.lib.base64.*;
import aQute.lib.hex.*;
+/**
+ *
+ * Will now use hex for encoding byte arrays
+ *
+ */
public class ByteArrayHandler extends Handler {
-
@Override
void encode(Encoder app, Object object, Map<Object,Type> visited) throws IOException, Exception {
- if ( app.codec.isHex())
- StringHandler.string(app, Hex.toHexString((byte[]) object));
- else
- StringHandler.string(app, Base64.encodeBase64((byte[]) object));
+ StringHandler.string(app, Hex.toHexString((byte[]) object));
}
@Override
@@ -31,8 +31,6 @@
@Override
Object decode(Decoder dec, String s) throws Exception {
- if ( dec.codec.isHex())
- return Hex.toByteArray(s);
- return Base64.decodeBase64(s);
+ return Hex.toByteArray(s);
}
}
diff --git a/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java b/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java
index 47ad4ab..02601d4 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/JSONCodec.java
@@ -34,6 +34,8 @@
* <p/>
* This Codec class can be used in a concurrent environment. The Decoders and
* Encoders, however, must only be used in a single thread.
+ * <p/>
+ * Will now use hex for encoding byte arrays
*/
public class JSONCodec {
final static String START_CHARACTERS = "[{\"-0123456789tfn";
@@ -51,7 +53,6 @@
private static ByteArrayHandler byteh = new ByteArrayHandler();
boolean ignorenull;
- boolean useHex;
/**
* Create a new Encoder with the state and appropriate API.
@@ -488,19 +489,4 @@
return ignorenull;
}
- /**
- * Use hex instead of default base 64 encoding
- *
- * @param useHex
- * @return
- */
- public JSONCodec setHex(boolean useHex) {
- this.useHex = useHex;
- return this;
- }
-
- public boolean isHex() {
- return useHex;
- }
-
}
\ No newline at end of file
diff --git a/bundleplugin/src/main/java/aQute/lib/json/packageinfo b/bundleplugin/src/main/java/aQute/lib/json/packageinfo
index 86528b7..63eb236 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/packageinfo
+++ b/bundleplugin/src/main/java/aQute/lib/json/packageinfo
@@ -1 +1 @@
-version 2.4.0
+version 3.0.0