This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
The following commit(s) were added to refs/heads/master by this push:
new 5bca393 SLING-9630 : Mark conversion methods as deprecated
5bca393 is described below
commit 5bca393f86ea2447a5885578dda9d3923031a013
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Aug 5 09:59:01 2020 +0200
SLING-9630 : Mark conversion methods as deprecated
---
pom.xml | 23 ++++++++++------------
.../org/apache/sling/commons/osgi/OsgiUtil.java | 2 +-
.../apache/sling/commons/osgi/PropertiesUtil.java | 2 ++
.../sling/commons/osgi/SortingServiceTracker.java | 22 ++++++++++-----------
4 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index a520606..810d9e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>39</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.4.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Commons OSGi support</name>
<description>Commons OSGi</description>
@@ -47,11 +46,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -86,6 +80,10 @@
</build>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
<!-- OSGi Libraries -->
<dependency>
<groupId>org.osgi</groupId>
@@ -93,9 +91,8 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.event</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -121,9 +118,9 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
+ <artifactId>mockito-core</artifactId>
+ <version>3.3.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
b/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
index d77a4e9..1c076cd 100644
--- a/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
+++ b/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
@@ -30,7 +30,7 @@ import org.osgi.service.event.EventConstants;
/**
* The <code>OsgiUtil</code> is a utility class providing some usefull utility
* methods.
- * @deprecated Use PropertiesUtil and ServiceUtil instead
+ * @deprecated Use {@code org.osgi.util.converter.Converters} and {@code
ServiceUtil} instead
*/
@Deprecated
public class OsgiUtil {
diff --git a/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
b/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
index be806db..b94d76c 100644
--- a/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
+++ b/src/main/java/org/apache/sling/commons/osgi/PropertiesUtil.java
@@ -29,7 +29,9 @@ import java.util.Map;
* useful utility methods for converting property types.
*
* @since 2.1
+ * @deprecated Use {@code org.osgi.util.converter.Converters} instead
*/
+@Deprecated
public class PropertiesUtil {
/**
diff --git
a/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java
b/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java
index bb9640e..3d3eff1 100644
--- a/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java
+++ b/src/main/java/org/apache/sling/commons/osgi/SortingServiceTracker.java
@@ -32,7 +32,7 @@ import org.osgi.util.tracker.ServiceTracker;
* by service ranking.
*/
public class SortingServiceTracker<T>
- extends ServiceTracker {
+ extends ServiceTracker<T, T> {
private int lastCount = -1;
@@ -40,7 +40,7 @@ public class SortingServiceTracker<T>
private List<T> sortedServiceCache;
- private List<ServiceReference> sortedReferences;
+ private List<ServiceReference<T>> sortedReferences;
/**
* Constructor
@@ -56,7 +56,7 @@ public class SortingServiceTracker<T>
* @see
org.osgi.util.tracker.ServiceTracker#removedService(org.osgi.framework.ServiceReference,
java.lang.Object)
*/
@Override
- public void removedService(ServiceReference reference, Object service) {
+ public void removedService(ServiceReference<T> reference, T service) {
this.sortedServiceCache = null;
this.sortedReferences = null;
this.context.ungetService(reference);
@@ -66,7 +66,7 @@ public class SortingServiceTracker<T>
* @see
org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(org.osgi.framework.ServiceReference,
java.lang.Object)
*/
@Override
- public void modifiedService(ServiceReference reference, Object service) {
+ public void modifiedService(ServiceReference<T> reference, T service) {
this.sortedServiceCache = null;
this.sortedReferences = null;
}
@@ -75,7 +75,7 @@ public class SortingServiceTracker<T>
* @see
org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(org.osgi.framework.ServiceReference)
*/
@Override
- public Object addingService(ServiceReference reference) {
+ public T addingService(ServiceReference<T> reference) {
this.sortedServiceCache = null;
this.sortedReferences = null;
return context.getService(reference);
@@ -89,7 +89,7 @@ public class SortingServiceTracker<T>
List<T> result = this.sortedServiceCache;
if ( result == null || this.lastCount < this.getTrackingCount() ) {
this.lastCount = this.getTrackingCount();
- final ServiceReference[] references = this.getServiceReferences();
+ final ServiceReference<T>[] references =
this.getServiceReferences();
if ( references == null || references.length == 0 ) {
result = Collections.emptyList();
} else {
@@ -97,7 +97,7 @@ public class SortingServiceTracker<T>
result = new ArrayList<T>();
for(int i=0;i<references.length;i++) {
@SuppressWarnings("unchecked")
- final T service =
(T)this.getService(references[references.length - 1 - i]);
+ final T service =
this.getService(references[references.length - 1 - i]);
if ( service != null ) {
result.add(service);
}
@@ -112,16 +112,16 @@ public class SortingServiceTracker<T>
* Return a sorted list of the services references.
* @return Service list
*/
- public List<ServiceReference> getSortedServiceReferences() {
- List<ServiceReference> result = this.sortedReferences;
+ public List<ServiceReference<T>> getSortedServiceReferences() {
+ List<ServiceReference<T>> result = this.sortedReferences;
if ( result == null || this.lastRefCount < this.getTrackingCount() ) {
this.lastRefCount = this.getTrackingCount();
- final ServiceReference[] references = this.getServiceReferences();
+ final ServiceReference<T>[] references =
this.getServiceReferences();
if ( references == null || references.length == 0 ) {
result = Collections.emptyList();
} else {
Arrays.sort(references);
- result = new ArrayList<ServiceReference>();
+ result = new ArrayList<ServiceReference<T>>();
for(int i=0;i<references.length;i++) {
result.add(references[references.length - 1 - i]);
}
