Move JsonSerDes from "model.json" to "util.json" package

eclipse-leshan · Jan 3, 2020 · 3efc58b · 3efc58b
1 parent 7adef51
commit 3efc58b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/...ver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/PublicKeySerDes.java b/...ver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/PublicKeySerDes.java
@@ -19,9 +19,9 @@
 import java.security.interfaces.ECPublicKey;
 import java.util.Arrays;
 
-import org.eclipse.leshan.core.model.json.JsonSerDes;
 import org.eclipse.leshan.util.Base64;
 import org.eclipse.leshan.util.Hex;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.JsonObject;
 

diff --git a/...mo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/X509CertificateSerDes.java b/...mo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/X509CertificateSerDes.java
@@ -18,8 +18,8 @@
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 
-import org.eclipse.leshan.core.model.json.JsonSerDes;
 import org.eclipse.leshan.util.Base64;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/json/JsonArrayEntrySerDes.java b/leshan-core/src/main/java/org/eclipse/leshan/json/JsonArrayEntrySerDes.java
@@ -16,7 +16,7 @@
 package org.eclipse.leshan.json;
 
 import org.eclipse.leshan.core.model.ResourceModel.Type;
-import org.eclipse.leshan.core.model.json.JsonSerDes;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.JsonObject;
 import com.eclipsesource.json.JsonValue;

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/json/JsonRootObjectSerDes.java b/leshan-core/src/main/java/org/eclipse/leshan/json/JsonRootObjectSerDes.java
@@ -15,7 +15,7 @@
  *******************************************************************************/
 package org.eclipse.leshan.json;
 
-import org.eclipse.leshan.core.model.json.JsonSerDes;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.JsonArray;
 import com.eclipsesource.json.JsonObject;

diff --git a/...se/leshan/core/model/json/JsonSerDes.java → .../eclipse/leshan/util/json/JsonSerDes.java b/...se/leshan/core/model/json/JsonSerDes.java → .../eclipse/leshan/util/json/JsonSerDes.java
@@ -13,7 +13,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.leshan.core.model.json;
+package org.eclipse.leshan.util.json;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ObjectModelSerDes.java b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ObjectModelSerDes.java
@@ -22,7 +22,7 @@
 
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
-import org.eclipse.leshan.core.model.json.JsonSerDes;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;

diff --git a/...n-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ResourceModelSerDes.java b/...n-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ResourceModelSerDes.java
@@ -18,7 +18,7 @@
 import org.eclipse.leshan.core.model.ResourceModel;
 import org.eclipse.leshan.core.model.ResourceModel.Operations;
 import org.eclipse.leshan.core.model.ResourceModel.Type;
-import org.eclipse.leshan.core.model.json.JsonSerDes;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;

diff --git a/...erver-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/PublicKeySerDes.java b/...erver-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/PublicKeySerDes.java
@@ -19,9 +19,9 @@
 import java.security.interfaces.ECPublicKey;
 import java.util.Arrays;
 
-import org.eclipse.leshan.core.model.json.JsonSerDes;
 import org.eclipse.leshan.util.Base64;
 import org.eclipse.leshan.util.Hex;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.JsonObject;
 

diff --git a/...demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/X509CertificateSerDes.java b/...demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/X509CertificateSerDes.java
@@ -18,8 +18,8 @@
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 
-import org.eclipse.leshan.core.model.json.JsonSerDes;
 import org.eclipse.leshan.util.Base64;
+import org.eclipse.leshan.util.json.JsonSerDes;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;