This is an automated email from the ASF dual-hosted git repository. timothyjward pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/aries-typedevent.git
commit bb780b97059a73c851531a956a8d535990191161 Merge: 0fd7863 2c93df8 Author: Tim Ward <[email protected]> AuthorDate: Mon Mar 3 12:54:15 2025 +0000 Merge branch 'feature/v1.1' Move Feature Branch for OSGi Type Safe Events 1.1 into the main development branch org.apache.aries.typedevent.bus/pom.xml | 37 ++- org.apache.aries.typedevent.bus/run.bndrun | 2 +- .../aries/typedevent/bus/impl/EventSelector.java | 99 +++++- .../typedevent/bus/impl/HistoryReplayTask.java | 62 ++++ .../typedevent/bus/impl/MonitorEventTask.java | 2 +- .../aries/typedevent/bus/impl/TopicHistory.java | 72 ++++ .../typedevent/bus/impl/TypedEventBusImpl.java | 241 +++++++++++--- .../typedevent/bus/impl/TypedEventMonitorImpl.java | 369 ++++++++++++++++----- .../bus/impl/TypedHistoryReplayTask.java | 47 +++ ...ventTask.java => UntypedHistoryReplayTask.java} | 39 +-- .../aries/typedevent/bus/impl/RecordConverter.java | 2 +- .../typedevent/bus/impl/EventSelectorTest.java | 7 +- .../typedevent/bus/impl/TypedEventBusImplTest.java | 229 +++++++++++-- .../bus/osgi/EventDeliveryIntegrationTest.java | 62 +++- .../typedevent/bus/osgi/FilterIntegrationTest.java | 17 +- .../bus/osgi/TypedEventMonitorIntegrationTest.java | 296 ++++++++++++++++- .../osgi/UnhandledEventHandlerIntegrationTest.java | 64 +++- org.apache.aries.typedevent.bus/test.bndrun | 13 +- .../org.apache.aries.typedevent.remote.api/pom.xml | 12 +- .../pom.xml | 12 +- .../remoteservices/impl/RemoteEventBusImpl.java | 4 +- .../osgi/RemoteEventBusIntegrationTest.java | 2 +- .../test.bndrun | 16 +- .../org.apache.aries.typedevent.remote.spi/pom.xml | 7 +- org.apache.aries.typedevent.remote/pom.xml | 2 +- pom.xml | 4 +- typedevent-test-bom/pom.xml | 8 +- 27 files changed, 1455 insertions(+), 272 deletions(-) diff --cc org.apache.aries.typedevent.bus/src/main/java/org/apache/aries/typedevent/bus/impl/TypedHistoryReplayTask.java index 0000000,a9e0287..d01b201 mode 000000,100644..100644 --- a/org.apache.aries.typedevent.bus/src/main/java/org/apache/aries/typedevent/bus/impl/TypedHistoryReplayTask.java +++ b/org.apache.aries.typedevent.bus/src/main/java/org/apache/aries/typedevent/bus/impl/TypedHistoryReplayTask.java @@@ -1,0 -1,46 +1,47 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.aries.typedevent.bus.impl; + + import java.util.List; + + import org.apache.aries.typedevent.bus.spi.CustomEventConverter; ++import org.apache.aries.typedevent.bus.spi.TypeData; + import org.osgi.service.typedevent.TypedEventHandler; + import org.osgi.service.typedevent.monitor.MonitorEvent; + + public class TypedHistoryReplayTask extends HistoryReplayTask { + + private final CustomEventConverter customEventConverter; + private final TypedEventHandler<Object> handler; + private final TypeData eventType; + + @SuppressWarnings("unchecked") + public TypedHistoryReplayTask(TypedEventMonitorImpl monitorImpl, + CustomEventConverter customEventConverter, TypedEventHandler<?> handler, + TypeData eventType, List<EventSelector> selectors, Integer history) { + super(monitorImpl, selectors, history); + this.customEventConverter = customEventConverter; + this.handler = (TypedEventHandler<Object>) handler; + this.eventType = eventType; + } + + @Override + protected void notifyListener(MonitorEvent me) { + handler.notify(me.topic, (Object) EventConverter.forUntypedEvent(me.eventData, customEventConverter).toTypedEvent(eventType)); + } + + } diff --cc org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.remoteservices/test.bndrun index 60f4365,9d9e626..f87adea --- a/org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.remoteservices/test.bndrun +++ b/org.apache.aries.typedevent.remote/org.apache.aries.typedevent.remote.remoteservices/test.bndrun @@@ -32,12 -32,13 +32,9 @@@ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\ - org.osgi.service.typedevent;version='[1.0.0,1.0.1)',\ org.osgi.util.converter;version='[1.0.9,1.0.10)',\ org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ - org.osgi.util.pushstream;version='[1.0.1,1.0.2)',\ slf4j.api;version='[1.7.30,1.7.31)',\ - org.apache.aries.typedevent.bus;version='[1.1.0,1.1.1)',\ - org.apache.aries.typedevent.remote.remoteservices;version='[1.1.0,1.1.1)',\ - org.apache.aries.typedevent.remote.remoteservices-tests;version='[1.1.0,1.1.1)',\ - org.apache.aries.typedevent.remote.spi;version='[1.1.0,1.1.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-jupiter-params;version='[5.10.0,5.10.1)',\ @@@ -52,8 -53,8 +49,11 @@@ org.opentest4j;version='[1.3.0,1.3.1)',\ org.osgi.test.common;version='[1.2.1,1.2.2)',\ org.osgi.test.junit5;version='[1.2.1,1.2.2)',\ - org.apache.aries.typedevent.bus;version='[1.0.0,1.0.1)',\ - org.apache.aries.typedevent.remote.api;version='[1.0.0,1.0.1)',\ - org.apache.aries.typedevent.remote.remoteservices;version='[1.0.0,1.0.1)',\ - org.apache.aries.typedevent.remote.remoteservices-tests;version='[1.0.0,1.0.1)',\ - org.apache.aries.typedevent.remote.spi;version='[1.0.0,1.0.1)' ++ org.apache.aries.typedevent.bus;version='[1.1.0,1.1.1)',\ ++ org.apache.aries.typedevent.remote.api;version='[1.1.0,1.1.1)',\ ++ org.apache.aries.typedevent.remote.remoteservices;version='[1.1.0,1.1.1)',\ ++ org.apache.aries.typedevent.remote.remoteservices-tests;version='[1.1.0,1.1.1)',\ ++ org.apache.aries.typedevent.remote.spi;version='[1.1.0,1.1.1)',\ + org.osgi.service.typedevent;version='[1.1.0,1.1.1)',\ + org.osgi.util.promise;version='[1.1.1,1.1.2)',\ - org.osgi.util.pushstream;version='[1.0.1,1.0.2)',\ - org.apache.aries.typedevent.remote.api;version='[1.1.0,1.1.1)' - ++ org.osgi.util.pushstream;version='[1.0.1,1.0.2)'
