Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Moved ModelModule from container module to model module

Rich Turner6a8bafa95672
diff --git a/container/src/main/java/org/openremote/container/Container.java b/container/src/main/java/org/openremote/container/Container.java
index 49a51cf44..7f2ad6627 100644
--- a/container/src/main/java/org/openremote/container/Container.java
+++ b/container/src/main/java/org/openremote/container/Container.java
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import org.openremote.container.concurrent.ContainerThreads;
-import org.openremote.container.json.ModelModule;
+import org.openremote.model.ModelModule;
import org.openremote.container.util.LogUtil;
import java.util.*;
diff --git a/container/src/main/java/org/openremote/container/json/ModelModule.java b/model/src/main/java/org/openremote/model/ModelModule.java
similarity index 95%
rename from container/src/main/java/org/openremote/container/json/ModelModule.java
rename to model/src/main/java/org/openremote/model/ModelModule.java
index 93b8cbd6b..e2f4b1c94 100644
--- a/container/src/main/java/org/openremote/container/json/ModelModule.java
+++ b/model/src/main/java/org/openremote/model/ModelModule.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package org.openremote.container.json;
+package org.openremote.model;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
@@ -36,7 +36,7 @@ import java.io.IOException;
public class ModelModule extends SimpleModule {
- private static class ValueJsonDeserializer<T extends Value> extends StdDeserializer<T> {
+ public static class ValueJsonDeserializer<T extends Value> extends StdDeserializer<T> {
public ValueJsonDeserializer() {
super(Value.class);
@@ -54,7 +54,7 @@ public class ModelModule extends SimpleModule {
}
}
- private static class ValueJsonSerializer extends JsonSerializer<Value> {
+ public static class ValueJsonSerializer extends JsonSerializer<Value> {
@Override
public void serialize(Value value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
if (value != null) {