From ee91de0ba614f69705729552ef826a873e7da02c Mon Sep 17 00:00:00 2001 From: Simon Bernard Date: Wed, 6 Dec 2017 16:59:58 +0100 Subject: [PATCH] clean some code (missing final ..) --- .../java/org/eclipse/leshan/core/model/ObjectLoader.java | 2 +- .../leshan/core/node/codec/DefaultLwM2mNodeEncoder.java | 2 +- .../java/org/eclipse/leshan/json/ObjectModelSerDesTest.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java b/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java index 793a7db6af..2cbdce6af3 100644 --- a/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java @@ -37,7 +37,7 @@ public class ObjectLoader { private static final Logger LOG = LoggerFactory.getLogger(ObjectLoader.class); - private static String[] ddfpaths = new String[] { "LWM2M_Security-v1_0.xml", "LWM2M_Server-v1_0.xml", + private static final String[] ddfpaths = new String[] { "LWM2M_Security-v1_0.xml", "LWM2M_Server-v1_0.xml", "LWM2M_Access_Control-v1_0.xml", "LWM2M_Device-v1_0.xml", "LWM2M_Connectivity_Monitoring-v1_0.xml", "LWM2M_Firmware_Update-v1_0.xml", "LWM2M_Location-v1_0.xml", "LWM2M_Connectivity_Statistics-v1_0.xml" }; diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mNodeEncoder.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mNodeEncoder.java index f4e497aa26..0a9c7db9e0 100644 --- a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mNodeEncoder.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mNodeEncoder.java @@ -35,7 +35,7 @@ public class DefaultLwM2mNodeEncoder implements LwM2mNodeEncoder { private static final Logger LOG = LoggerFactory.getLogger(DefaultLwM2mNodeEncoder.class); - private LwM2mValueConverter converter; + private final LwM2mValueConverter converter; public DefaultLwM2mNodeEncoder() { this(new DefaultLwM2mValueConverter()); diff --git a/leshan-core/src/test/java/org/eclipse/leshan/json/ObjectModelSerDesTest.java b/leshan-core/src/test/java/org/eclipse/leshan/json/ObjectModelSerDesTest.java index 38c8a658a0..6f42c86067 100644 --- a/leshan-core/src/test/java/org/eclipse/leshan/json/ObjectModelSerDesTest.java +++ b/leshan-core/src/test/java/org/eclipse/leshan/json/ObjectModelSerDesTest.java @@ -45,12 +45,12 @@ public void des_ser_must_be_equals() throws IOException { String smodel = result.toString("UTF-8"); // deserialize - ObjectModelSerDes SerDes = new ObjectModelSerDes(); + ObjectModelSerDes serDes = new ObjectModelSerDes(); JsonValue json = Json.parse(smodel); - List models = new ObjectModelSerDes().deserialize(json.asArray()); + List models = serDes.deserialize(json.asArray()); // serialize - JsonArray arr = SerDes.jSerialize(models); + JsonArray arr = serDes.jSerialize(models); String res = arr.toString(WriterConfig.PRETTY_PRINT); Assert.assertEquals("value should be equals", smodel, res);