Sync with latest bnd code for testing purposes
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1354104 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/lib/json/ArrayHandler.java b/bundleplugin/src/main/java/aQute/lib/json/ArrayHandler.java
index 1eb83ac..7e3b35e 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/ArrayHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/ArrayHandler.java
@@ -7,7 +7,7 @@
public class ArrayHandler extends Handler {
Type componentType;
- ArrayHandler(Class< ? > rawClass, Type componentType) {
+ ArrayHandler(@SuppressWarnings("unused") Class< ? > rawClass, Type componentType) {
this.componentType = componentType;
}
diff --git a/bundleplugin/src/main/java/aQute/lib/json/CharacterHandler.java b/bundleplugin/src/main/java/aQute/lib/json/CharacterHandler.java
index 3d00cdc..23605bf 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/CharacterHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/CharacterHandler.java
@@ -8,7 +8,7 @@
@Override
void encode(Encoder app, Object object, Map<Object,Type> visited) throws Exception {
Character c = (Character) object;
- int v = (int) c.charValue();
+ int v = c.charValue();
app.append(v + "");
}
diff --git a/bundleplugin/src/main/java/aQute/lib/json/CollectionHandler.java b/bundleplugin/src/main/java/aQute/lib/json/CollectionHandler.java
index 0ebfc62..aacbb0a 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/CollectionHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/CollectionHandler.java
@@ -48,7 +48,6 @@
app.append("]");
}
- @SuppressWarnings("unchecked")
@Override
Object decodeArray(Decoder r) throws Exception {
Collection<Object> c = (Collection<Object>) rawClass.newInstance();
diff --git a/bundleplugin/src/main/java/aQute/lib/json/Decoder.java b/bundleplugin/src/main/java/aQute/lib/json/Decoder.java
index 703331d..09b6a7f 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/Decoder.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/Decoder.java
@@ -67,7 +67,6 @@
return digest.digest();
}
- @SuppressWarnings("unchecked")
public <T> T get(Class<T> clazz) throws Exception {
return (T) codec.decode(clazz, this);
}
@@ -80,7 +79,6 @@
return codec.decode(null, this);
}
- @SuppressWarnings("unchecked")
public <T> T get(TypeReference<T> ref) throws Exception {
return (T) codec.decode(ref.getType(), this);
}
diff --git a/bundleplugin/src/main/java/aQute/lib/json/Handler.java b/bundleplugin/src/main/java/aQute/lib/json/Handler.java
index f002f50..c5e8b17 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/Handler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/Handler.java
@@ -7,23 +7,23 @@
abstract class Handler {
abstract void encode(Encoder app, Object object, Map<Object,Type> visited) throws IOException, Exception;
- Object decodeObject(Decoder isr) throws Exception {
+ Object decodeObject(@SuppressWarnings("unused") Decoder isr) throws Exception {
throw new UnsupportedOperationException("Cannot be mapped to object " + this);
}
- Object decodeArray(Decoder isr) throws Exception {
+ Object decodeArray(@SuppressWarnings("unused") Decoder isr) throws Exception {
throw new UnsupportedOperationException("Cannot be mapped to array " + this);
}
- Object decode(String s) throws Exception {
+ Object decode(@SuppressWarnings("unused") String s) throws Exception {
throw new UnsupportedOperationException("Cannot be mapped to string " + this);
}
- Object decode(Number s) throws Exception {
+ Object decode(@SuppressWarnings("unused") Number s) throws Exception {
throw new UnsupportedOperationException("Cannot be mapped to number " + this);
}
- Object decode(boolean s) {
+ Object decode(@SuppressWarnings("unused") boolean s) {
throw new UnsupportedOperationException("Cannot be mapped to boolean " + this);
}
diff --git a/bundleplugin/src/main/java/aQute/lib/json/MapHandler.java b/bundleplugin/src/main/java/aQute/lib/json/MapHandler.java
index 4a12c02..349737a 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/MapHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/MapHandler.java
@@ -49,7 +49,6 @@
app.append("}");
}
- @SuppressWarnings("unchecked")
@Override
Object decodeObject(Decoder r) throws Exception {
assert r.current() == '{';
diff --git a/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java b/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java
index 50aaac0..9b297b7 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/ObjectHandler.java
@@ -11,7 +11,7 @@
final Object defaults[];
final Field extra;
- ObjectHandler(JSONCodec codec, Class< ? > c) throws Exception {
+ ObjectHandler(@SuppressWarnings("unused") JSONCodec codec, Class< ? > c) throws Exception {
rawClass = c;
fields = c.getFields();
@@ -74,7 +74,6 @@
app.append("}");
}
- @SuppressWarnings("unchecked")
@Override
Object decodeObject(Decoder r) throws Exception {
assert r.current() == '{';
diff --git a/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java b/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java
index 8ebfee2..0971826 100644
--- a/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java
+++ b/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java
@@ -103,7 +103,7 @@
* @return
* @throws Exception
*/
- private Object collect(Decoder isr, char close) throws Exception {
+ private Object collect(Decoder isr, @SuppressWarnings("unused") char close) throws Exception {
boolean instring = false;
int level = 1;
StringBuilder sb = new StringBuilder();