getProfile based on registrationid

JaroslawLegierski · Mar 15, 2023 · b67d369 · b67d369
1 parent ca1e6bc
commit b67d369
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/...va/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpointsProvider.java b/...va/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpointsProvider.java
@@ -46,7 +46,6 @@
 import org.eclipse.leshan.core.observation.Observation;
 import org.eclipse.leshan.core.observation.ObservationIdentifier;
 import org.eclipse.leshan.core.observation.SingleObservation;
-import org.eclipse.leshan.core.request.Identity;
 import org.eclipse.leshan.core.response.AbstractLwM2mResponse;
 import org.eclipse.leshan.core.response.ObserveCompositeResponse;
 import org.eclipse.leshan.core.response.ObserveResponse;
@@ -156,8 +155,9 @@ public void onNotification(Request coapRequest, Response coapResponse) {
                             return;
                         }
                         // Get profile
-                        Identity identity = identityHandler.getIdentity(coapResponse);
-                        ClientProfile profile = toolbox.getProfileProvider().getProfile(identity);
+                        // Identity identity = identityHandler.getIdentity(coapResponse);
+                        // ClientProfile profile = toolbox.getProfileProvider().getProfile(identity);
+                        ClientProfile profile = toolbox.getProfileProvider().getProfile(regid);
 
                         // create Observe Response
                         try {

diff --git a/...an-server-core/src/main/java/org/eclipse/leshan/server/profile/ClientProfileProvider.java b/...an-server-core/src/main/java/org/eclipse/leshan/server/profile/ClientProfileProvider.java
@@ -20,4 +20,6 @@
 public interface ClientProfileProvider {
 
     ClientProfile getProfile(Identity identity);
+
+    ClientProfile getProfile(String registrationid);
 }
diff --git a/...er-core/src/main/java/org/eclipse/leshan/server/profile/DefaultClientProfileProvider.java b/...er-core/src/main/java/org/eclipse/leshan/server/profile/DefaultClientProfileProvider.java
@@ -38,4 +38,10 @@ public ClientProfile getProfile(Identity identity) {
         return new ClientProfile(registration, model);
     }
 
+    @Override
+    public ClientProfile getProfile(String registrationid) {
+        Registration registration = registrationStore.getRegistration(registrationid);
+        LwM2mModel model = modelProvider.getObjectModel(registration);
+        return new ClientProfile(registration, model);
+    }
 }
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
@@ -161,7 +161,7 @@ public static LeshanServer createLeshanServer(LeshanServerDemoCLI cli) throws Ex
             builder.setRegistrationStore(new RedisRegistrationStore(cli.main.redis));
         }
         builder.setSecurityStore(securityStore);
-
+        builder.setUpdateRegistrationOnNotification(true);
         if (cli.identity.isx509()) {
             // use X.509 mode (+ RPK)
             builder.setPrivateKey(cli.identity.getPrivateKey());