Rename ObservationRegistry to ObservationService

leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/ObserveTest.java

@@ -50,7 +50,7 @@
 import org.eclipse.leshan.core.response.LwM2mResponse;
 import org.eclipse.leshan.core.response.ObserveResponse;
 import org.eclipse.leshan.core.response.ReadResponse;
-import org.eclipse.leshan.server.observation.ObservationRegistryListener;
+import org.eclipse.leshan.server.observation.ObservationListener;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -79,7 +79,7 @@ public void stop() {
     @Test
     public void can_observe_resource() throws InterruptedException {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
 
         // observe device timezone
         ObserveResponse observeResponse = helper.server.send(helper.getCurrentRegistration(), new ObserveRequest(3, 0, 15));
@@ -108,7 +108,7 @@ public void can_observe_resource() throws InterruptedException {
     @Test
     public void can_observe_instance() throws InterruptedException {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
 
         // observe device timezone
         ObserveResponse observeResponse = helper.server.send(helper.getCurrentRegistration(), new ObserveRequest(3, 0));
@@ -142,7 +142,7 @@ public void can_observe_instance() throws InterruptedException {
     @Test
     public void can_observe_object() throws InterruptedException {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
 
         // observe device timezone
         ObserveResponse observeResponse = helper.server.send(helper.getCurrentRegistration(), new ObserveRequest(3));
@@ -176,7 +176,7 @@ public void can_observe_object() throws InterruptedException {
     @Test
     public void can_observe_timestamped_resource() throws InterruptedException {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
 
         // observe device timezone
         ObserveResponse observeResponse = helper.server.send(helper.getCurrentRegistration(),
@@ -216,7 +216,7 @@ public void can_observe_timestamped_resource() throws InterruptedException {
     @Test
     public void can_observe_timestamped_instance() throws InterruptedException {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
 
         // observe device timezone
         ObserveResponse observeResponse = helper.server.send(helper.getCurrentRegistration(),
@@ -256,7 +256,7 @@ public void can_observe_timestamped_instance() throws InterruptedException {
     @Test
     public void can_observe_timestamped_object() throws InterruptedException {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
 
         // observe device timezone
         ObserveResponse observeResponse = helper.server.send(helper.getCurrentRegistration(),
@@ -322,7 +322,7 @@ private void sendNotification(final byte[] payload, final Response firstCoapResp
         }
     }
 
-    private final class TestObservationListener implements ObservationRegistryListener {
+    private final class TestObservationListener implements ObservationListener {
 
         private final CountDownLatch latch = new CountDownLatch(1);
         private final AtomicBoolean receivedNotify = new AtomicBoolean();

leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/QueueModeIntegrationTestHelper.java

@@ -42,7 +42,7 @@
 import org.eclipse.leshan.integration.tests.util.QueueModeLeshanServer;
 import org.eclipse.leshan.integration.tests.util.QueuedModeLeshanClient;
 import org.eclipse.leshan.server.californium.impl.CaliforniumLwM2mRequestSender;
-import org.eclipse.leshan.server.californium.impl.CaliforniumObservationRegistryImpl;
+import org.eclipse.leshan.server.californium.impl.ObservationServiceImpl;
 import org.eclipse.leshan.server.californium.impl.InMemoryRegistrationStore;
 import org.eclipse.leshan.server.californium.impl.RegisterResource;
 import org.eclipse.leshan.server.client.Registration;
@@ -115,22 +115,22 @@ protected void saveToFile() {
         LwM2mModelProvider modelProvider = new StandardModelProvider();
         LwM2mNodeEncoder encoder = new DefaultLwM2mNodeEncoder();
         LwM2mNodeDecoder decoder = new DefaultLwM2mNodeDecoder();
-        CaliforniumObservationRegistryImpl observationRegistry = new CaliforniumObservationRegistryImpl(
+        ObservationServiceImpl observationService = new ObservationServiceImpl(
                 registrationStore, modelProvider, decoder);
-        observationRegistry.setSecureEndpoint(secureEndpoint);
-        secureEndpoint.addNotificationListener(observationRegistry);
-        observationRegistry.setNonSecureEndpoint(noSecureEndpoint);
-        noSecureEndpoint.addNotificationListener(observationRegistry);
+        observationService.setSecureEndpoint(secureEndpoint);
+        secureEndpoint.addNotificationListener(observationService);
+        observationService.setNonSecureEndpoint(noSecureEndpoint);
+        noSecureEndpoint.addNotificationListener(observationService);
         LwM2mRequestSender delegateSender = new CaliforniumLwM2mRequestSender(new HashSet<>(coapServer.getEndpoints()),
-                observationRegistry, modelProvider, encoder, decoder);
+                observationService, modelProvider, encoder, decoder);
         LwM2mRequestSender secondDelegateSender = new CaliforniumLwM2mRequestSender(
-                new HashSet<>(coapServer.getEndpoints()), observationRegistry, modelProvider, encoder, decoder);
+                new HashSet<>(coapServer.getEndpoints()), observationService, modelProvider, encoder, decoder);
         QueuedRequestSender queueRequestSender = QueuedRequestSender.builder().setMessageStore(inMemoryMessageStore)
                 .setRequestSender(secondDelegateSender).setRegistrationService(registrationService)
-                .setObservationRegistry(observationRegistry).build();
+                .setObservationService(observationService).build();
         LwM2mRequestSender lwM2mRequestSender = new LwM2mRequestSenderImpl(delegateSender, queueRequestSender);
 
-        server = new QueueModeLeshanServer(coapServer, registrationService, observationRegistry, securityRegistry,
+        server = new QueueModeLeshanServer(coapServer, registrationService, observationService, securityRegistry,
                 modelProvider, lwM2mRequestSender, inMemoryMessageStore);
     }
 

leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/QueueModeTest.java

@@ -39,7 +39,7 @@
 import org.eclipse.leshan.integration.tests.util.QueuedModeLeshanClient;
 import org.eclipse.leshan.integration.tests.util.QueuedModeLeshanClient.OnGetCallback;
 import org.eclipse.leshan.server.client.Registration;
-import org.eclipse.leshan.server.observation.ObservationRegistryListener;
+import org.eclipse.leshan.server.observation.ObservationListener;
 import org.eclipse.leshan.server.queue.MessageStore;
 import org.eclipse.leshan.server.queue.impl.InMemoryMessageStore;
 import org.eclipse.leshan.server.response.ResponseListener;
@@ -219,7 +219,7 @@ public boolean handleGet(CoapExchange coapExchange) {
     @Test
     public void request_sent_after_client_notify() throws Exception {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
         // stop default client as we need client with a custom life time.
         helper.client.stop(false);
 
@@ -282,7 +282,7 @@ public void onError(Registration registration, String requestTicket, Exception e
     @Test
     public void all_requests_sent_if_client_reachable() throws Exception {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
         QueuedModeLeshanClient client = (QueuedModeLeshanClient) helper.client;
 
         responseListener = new ResponseListener() {
@@ -350,7 +350,7 @@ public void onError(Registration registration, String requestTicket, Exception e
     @Test
     public void no_duplicate_send_on_consecutive_notifies() throws Exception {
         TestObservationListener listener = new TestObservationListener();
-        helper.server.getObservationRegistry().addListener(listener);
+        helper.server.getObservationService().addListener(listener);
         // stop default client as we need client with a custom life time.
         helper.client.stop(false);
 
@@ -665,7 +665,7 @@ public boolean handleGet(CoapExchange coapExchange) {
         };
     }
 
-    private final class TestObservationListener implements ObservationRegistryListener {
+    private final class TestObservationListener implements ObservationListener {
 
         private CountDownLatch latch = new CountDownLatch(1);
         private final AtomicBoolean receivedNotify = new AtomicBoolean();

leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/RegistrationTest.java

@@ -213,7 +213,7 @@ public void register_observe_deregister_observe() throws NonUniqueSecurityInfoEx
 
         // check observation registry is not null
         Registration currentRegistration = helper.getCurrentRegistration();
-        Set<Observation> observations = helper.server.getObservationRegistry()
+        Set<Observation> observations = helper.server.getObservationService()
                 .getObservations(currentRegistration);
         assertEquals(1, observations.size());
         Observation obs = observations.iterator().next();
@@ -224,7 +224,7 @@ public void register_observe_deregister_observe() throws NonUniqueSecurityInfoEx
         helper.client.stop(true);
         helper.waitForDeregistration(1);
         helper.assertClientNotRegisterered();
-        observations = helper.server.getObservationRegistry()
+        observations = helper.server.getObservationService()
                 .getObservations(currentRegistration);
         assertTrue(observations.isEmpty());
 
@@ -233,7 +233,7 @@ public void register_observe_deregister_observe() throws NonUniqueSecurityInfoEx
         assertNull(observeResponse);
 
         // check observationStore is empty
-        observations = helper.server.getObservationRegistry().getObservations(currentRegistration);
+        observations = helper.server.getObservationService().getObservations(currentRegistration);
         assertTrue(observations.isEmpty());
     }
 

leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/QueueModeLeshanServer.java

@@ -26,11 +26,11 @@
 import org.eclipse.leshan.server.Startable;
 import org.eclipse.leshan.server.Stoppable;
 import org.eclipse.leshan.server.client.Registration;
-import org.eclipse.leshan.server.client.RegistrationService;
 import org.eclipse.leshan.server.client.RegistrationListener;
+import org.eclipse.leshan.server.client.RegistrationService;
 import org.eclipse.leshan.server.client.RegistrationUpdate;
 import org.eclipse.leshan.server.model.LwM2mModelProvider;
-import org.eclipse.leshan.server.observation.ObservationRegistry;
+import org.eclipse.leshan.server.observation.ObservationService;
 import org.eclipse.leshan.server.queue.MessageStore;
 import org.eclipse.leshan.server.request.LwM2mRequestSender;
 import org.eclipse.leshan.server.response.ResponseListener;
@@ -42,20 +42,20 @@ public class QueueModeLeshanServer implements LwM2mServer {
     private static final Logger LOG = LoggerFactory.getLogger(QueueModeLeshanServer.class);
     private final CoapServer coapServer;
     private final RegistrationService registrationService;
-    private final ObservationRegistry observationRegistry;
+    private final ObservationService observationService;
     private final SecurityRegistry securityRegistry;
     private final LwM2mModelProvider modelProvider;
     private final LwM2mRequestSender lwM2mRequestSender;
     private final MessageStore messageStore;
 
     public QueueModeLeshanServer(CoapServer coapServer, RegistrationService registrationService,
-            ObservationRegistry observationRegistry, SecurityRegistry securityRegistry,
+            ObservationService observationService, SecurityRegistry securityRegistry,
             LwM2mModelProvider modelProvider, LwM2mRequestSender lwM2mRequestSender,
             MessageStore inMemoryMessageStore) {
 
         this.coapServer = coapServer;
         this.registrationService = registrationService;
-        this.observationRegistry = observationRegistry;
+        this.observationService = observationService;
         this.securityRegistry = securityRegistry;
         this.modelProvider = modelProvider;
         this.lwM2mRequestSender = lwM2mRequestSender;
@@ -70,7 +70,7 @@ public void updated(RegistrationUpdate update, Registration updatedRegistration)
 
             @Override
             public void unregistered(Registration registration) {
-                QueueModeLeshanServer.this.observationRegistry.cancelObservations(registration);
+                QueueModeLeshanServer.this.observationService.cancelObservations(registration);
                 QueueModeLeshanServer.this.lwM2mRequestSender.cancelPendingRequests(registration);
             }
 
@@ -90,8 +90,8 @@ public void start() {
         if (securityRegistry instanceof Startable) {
             ((Startable) securityRegistry).start();
         }
-        if (observationRegistry instanceof Startable) {
-            ((Startable) observationRegistry).start();
+        if (observationService instanceof Startable) {
+            ((Startable) observationService).start();
         }
 
         // Start server
@@ -112,8 +112,8 @@ public void stop() {
         if (securityRegistry instanceof Stoppable) {
             ((Stoppable) securityRegistry).stop();
         }
-        if (observationRegistry instanceof Stoppable) {
-            ((Stoppable) observationRegistry).stop();
+        if (observationService instanceof Stoppable) {
+            ((Stoppable) observationService).stop();
         }
         if (lwM2mRequestSender instanceof Stoppable) {
             ((Stoppable) lwM2mRequestSender).stop();
@@ -134,8 +134,8 @@ public void destroy() {
         if (securityRegistry instanceof Destroyable) {
             ((Destroyable) securityRegistry).destroy();
         }
-        if (observationRegistry instanceof Destroyable) {
-            ((Destroyable) observationRegistry).destroy();
+        if (observationService instanceof Destroyable) {
+            ((Destroyable) observationService).destroy();
         }
 
         LOG.info("LW-M2M server destroyed");
@@ -180,8 +180,8 @@ public RegistrationService getRegistrationService() {
     }
 
     @Override
-    public ObservationRegistry getObservationRegistry() {
-        return observationRegistry;
+    public ObservationService getObservationService() {
+        return observationService;
     }
 
     @Override

leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/impl/CaliforniumLwM2mRequestSender.java

@@ -47,7 +47,7 @@
 public class CaliforniumLwM2mRequestSender implements LwM2mRequestSender {
 
     private final Set<Endpoint> endpoints;
-    private final CaliforniumObservationRegistryImpl observationRegistry;
+    private final ObservationServiceImpl observationService;
     private final LwM2mModelProvider modelProvider;
     private final LwM2mNodeDecoder decoder;
     private final LwM2mNodeEncoder encoder;
@@ -60,16 +60,16 @@ public class CaliforniumLwM2mRequestSender implements LwM2mRequestSender {
 
     /**
      * @param endpoints the CoAP endpoints to use for sending requests
-     * @param observationRegistry the registry for keeping track of observed resources
+     * @param observationService the service for keeping track of observed resources
      * @param modelProvider provides the supported objects definitions
      */
     public CaliforniumLwM2mRequestSender(final Set<Endpoint> endpoints,
-            final CaliforniumObservationRegistryImpl observationRegistry, LwM2mModelProvider modelProvider,
+            final ObservationServiceImpl observationService, LwM2mModelProvider modelProvider,
             LwM2mNodeEncoder encoder, LwM2mNodeDecoder decoder) {
         Validate.notNull(endpoints);
-        Validate.notNull(observationRegistry);
+        Validate.notNull(observationService);
         Validate.notNull(modelProvider);
-        this.observationRegistry = observationRegistry;
+        this.observationService = observationService;
         this.endpoints = endpoints;
         this.modelProvider = modelProvider;
         this.encoder = encoder;
@@ -96,7 +96,7 @@ public <T extends LwM2mResponse> T send(final Registration destination, final Do
             public T buildResponse(final Response coapResponse) {
                 // Build LwM2m response
                 final LwM2mResponseBuilder<T> lwm2mResponseBuilder = new LwM2mResponseBuilder<T>(coapRequest,
-                        coapResponse, destination, model, observationRegistry, decoder);
+                        coapResponse, destination, model, observationService, decoder);
                 request.accept(lwm2mResponseBuilder);
                 return lwm2mResponseBuilder.getResponse();
             }
@@ -133,7 +133,7 @@ public <T extends LwM2mResponse> void send(final Registration destination, final
             public T buildResponse(final Response coapResponse) {
                 // Build LwM2m response
                 final LwM2mResponseBuilder<T> lwm2mResponseBuilder = new LwM2mResponseBuilder<T>(coapRequest,
-                        coapResponse, destination, model, observationRegistry, decoder);
+                        coapResponse, destination, model, observationService, decoder);
                 request.accept(lwm2mResponseBuilder);
                 return lwm2mResponseBuilder.getResponse();
             }