This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git
The following commit(s) were added to refs/heads/master by this push:
new 17c3ae2 silence IDE warnings
17c3ae2 is described below
commit 17c3ae2704daaed995e4eea1387880329cb333c0
Author: Raymond Augé <[email protected]>
AuthorDate: Tue Mar 1 09:25:41 2022 -0500
silence IDE warnings
Signed-off-by: Raymond Augé <[email protected]>
---
.../src/main/java/org/apache/aries/component/dsl/OSGi.java | 4 +++-
.../src/main/java/org/apache/aries/component/dsl/Publisher.java | 2 ++
.../src/main/java/org/apache/aries/component/dsl/Utils.java | 3 ++-
.../org/apache/aries/component/dsl/internal/BaseOSGiImpl.java | 2 +-
.../apache/aries/component/dsl/internal/CoalesceOSGiImpl.java | 1 +
.../aries/component/dsl/internal/ConcurrentDoublyLinkedList.java | 9 +++++----
.../apache/aries/component/dsl/internal/DistributeOSGiImpl.java | 1 +
.../java/org/apache/aries/component/dsl/internal/OSGiImpl.java | 1 +
.../aries/component/dsl/internal/PublisherRethrowException.java | 1 +
.../component/dsl/internal/ServiceRegistrationOSGiImpl.java | 3 ++-
10 files changed, 19 insertions(+), 8 deletions(-)
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
index 45a5d7c..168cbc7 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
@@ -451,6 +451,7 @@ public interface OSGi<T> extends OSGiRunnable<T> {
return register(clazz, service, () -> properties);
}
+ @SuppressWarnings({ "rawtypes", "unchecked" })
static OSGi<ServiceRegistration<?>> register(
String[] classes, Object service, Map<String, ?> properties) {
@@ -472,6 +473,7 @@ public interface OSGi<T> extends OSGiRunnable<T> {
return new ServiceRegistrationOSGiImpl<>(clazz, service,
properties);
}
+ @SuppressWarnings({ "rawtypes", "unchecked" })
static OSGi<ServiceRegistration<?>> register(
String[] classes, Supplier<Object> service,
Supplier<Map<String, ?>> properties) {
@@ -591,7 +593,7 @@ public interface OSGi<T> extends OSGiRunnable<T> {
Function<T, OSGi<Boolean>> chooser, Function<OSGi<T>, OSGi<S>>
then,
Function<OSGi<T>, OSGi<S>> otherwise);
- <S> OSGi<S> distribute(Function<OSGi<T>, OSGi<S>> ... funs);
+ <S> OSGi<S> distribute(@SuppressWarnings("unchecked") Function<OSGi<T>,
OSGi<S>> ... funs);
default OSGi<T> effects(
Consumer<? super T> onAdded, Consumer<? super T> onRemoved) {
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java
index 61565af..a7e7cb4 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/Publisher.java
@@ -30,6 +30,7 @@ public interface Publisher<T> extends Function<T, Runnable> {
OSGiResult publish(T t);
+ @SuppressWarnings("unchecked")
default <E extends Exception> OSGiResult error(T t, Exception e) throws E {
throw (E)e;
}
@@ -42,6 +43,7 @@ public interface Publisher<T> extends Function<T, Runnable> {
return next.apply(t);
}
+ @SuppressWarnings("unchecked")
@Override
public <E extends Exception> OSGiResult error(S s, Exception e)
throws E {
return Publisher.this.error((T)s, e);
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java
index 7caf5ad..7e8d322 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/Utils.java
@@ -41,10 +41,11 @@ public interface Utils {
then(OSGi.just(() -> new ArrayList<>(list)
))
).transform(
- op -> new OnlyLastPublisher(op, () -> new ArrayList<>(list)))
+ op -> new OnlyLastPublisher<>(op, () -> new ArrayList<>(list)))
);
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
static <K, V, T extends Comparable<T>> OSGi<Map<K, V>> accumulateInMap(
OSGi<T> program, Function<T, OSGi<K>> keyFun,
Function<T, OSGi<V>> valueFun) {
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java
index 85209fe..2b8da59 100644
---
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java
+++
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java
@@ -220,7 +220,7 @@ public class BaseOSGiImpl<T> implements OSGi<T> {
}
@Override
- public <S> OSGi<S> distribute(Function<OSGi<T>, OSGi<S>>... funs) {
+ public <S> OSGi<S> distribute(@SuppressWarnings("unchecked")
Function<OSGi<T>, OSGi<S>>... funs) {
return new DistributeOSGiImpl<>(this, funs);
}
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/CoalesceOSGiImpl.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/CoalesceOSGiImpl.java
index 113d51f..e7c4f58 100644
---
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/CoalesceOSGiImpl.java
+++
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/CoalesceOSGiImpl.java
@@ -38,6 +38,7 @@ public class CoalesceOSGiImpl<T> extends OSGiImpl<T> {
AtomicInteger[] atomicIntegers = new
AtomicInteger[programs.length];
OSGiResult[] results = new OSGiResult[programs.length];
AtomicInteger index = new AtomicInteger();
+ @SuppressWarnings("unchecked")
Publisher<T>[] publishers = new Publisher[programs.length];
for (int i = 0; i < atomicIntegers.length; i++) {
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java
index 615e2c2..330fc23 100644
---
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java
+++
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ConcurrentDoublyLinkedList.java
@@ -179,8 +179,8 @@ public class ConcurrentDoublyLinkedList<E> extends
AbstractCollection<E>
* Constructs an empty deque.
*/
public ConcurrentDoublyLinkedList() {
- NodeImpl h = new NodeImpl(null, null, null);
- NodeImpl t = new NodeImpl(null, null, h);
+ NodeImpl<E> h = new NodeImpl<>(null, null, null);
+ NodeImpl<E> t = new NodeImpl<>(null, null, h);
h.setNext(t);
header = h;
trailer = t;
@@ -665,6 +665,7 @@ public class ConcurrentDoublyLinkedList<E> extends
AbstractCollection<E>
* unrecoverably stale.
*/
+@SuppressWarnings("serial")
class NodeImpl<E> extends AtomicReference<NodeImpl<E>>
implements ConcurrentDoublyLinkedList.Node {
@@ -933,7 +934,7 @@ class NodeImpl<E> extends AtomicReference<NodeImpl<E>>
NodeImpl<E> b = getPrev();
NodeImpl<E> f = getNext();
if (b != null && f != null && !f.isMarker()
- && casNext(f, new NodeImpl(f))) {
+ && casNext(f, new NodeImpl<>(f))) {
if (b.casNext(this, f))
f.setPrev(b);
return true;
@@ -956,7 +957,7 @@ class NodeImpl<E> extends AtomicReference<NodeImpl<E>>
if (b == null || f == null || f.isMarker())
return null;
NodeImpl<E> x = new NodeImpl<E>(newElement, f, b);
- if (casNext(f, new NodeImpl(x))) {
+ if (casNext(f, new NodeImpl<>(x))) {
b.successor(); // to relink b
x.successor(); // to relink f
return x;
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/DistributeOSGiImpl.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/DistributeOSGiImpl.java
index 8c96066..46ac6e0 100644
---
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/DistributeOSGiImpl.java
+++
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/DistributeOSGiImpl.java
@@ -34,6 +34,7 @@ public class DistributeOSGiImpl<T, S> extends BaseOSGiImpl<S>
{
public DistributeOSGiImpl(OSGi<T> operation, Function<OSGi<T>, OSGi<S>>...
funs) {
super((executionContext, publisher) -> {
+ @SuppressWarnings("unchecked")
Pad<T, S>[] pads = new Pad[funs.length];
for (int i = 0; i < funs.length; i++) {
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OSGiImpl.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OSGiImpl.java
index 6529225..1d46573 100644
---
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OSGiImpl.java
+++
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/OSGiImpl.java
@@ -28,6 +28,7 @@ public class OSGiImpl<T> extends BaseOSGiImpl<T> {
super(new ErrorHandlerOSGiRunnable<>(operation));
}
+ @SuppressWarnings("unchecked")
static <T extends Throwable> void rethrow(Throwable t) throws T {
throw (T)t;
}
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/PublisherRethrowException.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/PublisherRethrowException.java
index 85c33b5..c42b536 100644
---
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/PublisherRethrowException.java
+++
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/PublisherRethrowException.java
@@ -17,6 +17,7 @@
package org.apache.aries.component.dsl.internal;
+@SuppressWarnings("serial")
public class PublisherRethrowException extends Error {
public PublisherRethrowException(Throwable cause) {
super(cause);
diff --git
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceRegistrationOSGiImpl.java
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceRegistrationOSGiImpl.java
index d4479e8..e8a4a33 100644
---
a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceRegistrationOSGiImpl.java
+++
b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceRegistrationOSGiImpl.java
@@ -87,7 +87,8 @@ public class ServiceRegistrationOSGiImpl<T>
ServiceRegistration<?> serviceRegistration,
Publisher<? super ServiceRegistration<T>> op) {
- OSGiResult terminator =
((Publisher)op).publish(serviceRegistration);
+ @SuppressWarnings("unchecked")
+ OSGiResult terminator =
((Publisher<Object>)op).publish(serviceRegistration);
return new OSGiResultImpl(
() -> {
