Do not create instance for single object implicitly.

eclipse-leshan · Feb 4, 2019 · 05cd0b3 · 05cd0b3
1 parent 120d7eb
commit 05cd0b3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/ObjectsInitializer.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/ObjectsInitializer.java
@@ -249,12 +249,6 @@ protected LwM2mInstanceEnabler[] createInstances(ObjectModel objectModel) {
         LwM2mInstanceEnabler[] newInstances = new LwM2mInstanceEnabler[0];
         if (instances.containsKey(objectModel.id)) {
             newInstances = instances.get(objectModel.id);
-        } else {
-            // we create instance from class only for single object
-            if (!objectModel.multiple) {
-                LwM2mInstanceEnablerFactory instanceFactory = getFactoryFor(objectModel);
-                newInstances = new LwM2mInstanceEnabler[] { instanceFactory.create(objectModel, 0, null) };
-            }
         }
         return newInstances;
     }

diff --git a/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/IntegrationTestHelper.java b/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/IntegrationTestHelper.java
@@ -152,7 +152,7 @@ public void createClient(Map<String, String> additionalAttributes) {
         initializer.setInstancesForObject(LwM2mId.SERVER, new Server(12345, LIFETIME, BindingMode.U, false));
         initializer.setInstancesForObject(LwM2mId.DEVICE, new TestDevice("Eclipse Leshan", MODEL_NUMBER, "12345", "U"));
         initializer.setClassForObject(LwM2mId.ACCESS_CONTROL, DummyInstanceEnabler.class);
-        initializer.setClassForObject(2000, DummyInstanceEnabler.class);
+        initializer.setDummyInstancesForObject(2000);
         List<LwM2mObjectEnabler> objects = initializer.createAll();
 
         // Build Client

diff --git a/...ts/src/test/java/org/eclipse/leshan/integration/tests/QueueModeIntegrationTestHelper.java b/...ts/src/test/java/org/eclipse/leshan/integration/tests/QueueModeIntegrationTestHelper.java
@@ -69,7 +69,7 @@ public void createClient() {
         initializer.setInstancesForObject(LwM2mId.DEVICE,
                 new TestDevice("Eclipse Leshan", MODEL_NUMBER, "12345", "UQ"));
         initializer.setClassForObject(LwM2mId.ACCESS_CONTROL, DummyInstanceEnabler.class);
-        initializer.setClassForObject(2000, DummyInstanceEnabler.class);
+        initializer.setDummyInstancesForObject(2000);
         List<LwM2mObjectEnabler> objects = initializer.createAll();
 
         // Build Client