Remove obsolete dependency to commons-codec.

We have copied the Hex class from commons-codec into the leshan-core code base several weeks ago. Thus, we do not need the dependency on the commons-codec component anymore.
eclipse-leshan · Dec 9, 2015 · fa4daee · fa4daee
1 parent 77dd845
commit fa4daee
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/leshan-bs-server/pom.xml b/leshan-bs-server/pom.xml
@@ -31,10 +31,6 @@ Contributors:
             <groupId>org.eclipse.leshan</groupId>
             <artifactId>leshan-server-cf</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/leshan-standalone/pom.xml b/leshan-standalone/pom.xml
@@ -35,10 +35,6 @@ Contributors:
             <groupId>org.eclipse.californium</groupId>
             <artifactId>californium-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/...dalone/src/main/java/org/eclipse/leshan/standalone/servlet/json/SecurityDeserializer.java b/...dalone/src/main/java/org/eclipse/leshan/standalone/servlet/json/SecurityDeserializer.java
@@ -29,9 +29,8 @@
 import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.KeySpec;
 
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
 import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.util.Hex;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -74,8 +73,8 @@ public SecurityInfo deserialize(JsonElement json, Type typeOfT, JsonDeserializat
                 byte[] key;
                 try {
                     key = Hex.decodeHex(psk.get("key").getAsString().toCharArray());
-                } catch (DecoderException e) {
-                    throw new JsonParseException(e);
+                } catch (IllegalArgumentException e) {
+                    throw new JsonParseException("key parameter must be a valid hex string", e);
                 }
 
                 info = SecurityInfo.newPreSharedKeyInfo(endpoint, identity, key);
@@ -94,7 +93,7 @@ public SecurityInfo deserialize(JsonElement json, Type typeOfT, JsonDeserializat
                             parameterSpec);
 
                     key = KeyFactory.getInstance("EC").generatePublic(keySpec);
-                } catch (DecoderException | InvalidKeySpecException | NoSuchAlgorithmException
+                } catch (IllegalArgumentException | InvalidKeySpecException | NoSuchAlgorithmException
                         | InvalidParameterSpecException e) {
                     throw new JsonParseException("Invalid security info content", e);
                 }

diff --git a/...andalone/src/main/java/org/eclipse/leshan/standalone/servlet/json/SecuritySerializer.java b/...andalone/src/main/java/org/eclipse/leshan/standalone/servlet/json/SecuritySerializer.java
@@ -20,8 +20,8 @@
 import java.security.interfaces.ECPublicKey;
 import java.util.Arrays;
 
-import org.apache.commons.codec.binary.Hex;
 import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.util.Hex;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

diff --git a/leshan-standalone/src/main/java/org/eclipse/leshan/standalone/servlet/log/CoapMessage.java b/leshan-standalone/src/main/java/org/eclipse/leshan/standalone/servlet/log/CoapMessage.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.Charsets;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.californium.core.coap.CoAP.Type;
@@ -31,6 +30,7 @@
 import org.eclipse.californium.core.coap.OptionSet;
 import org.eclipse.californium.core.coap.Request;
 import org.eclipse.californium.core.coap.Response;
+import org.eclipse.leshan.util.Hex;
 
 public class CoapMessage {