You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/09/11 10:40:41 UTC
[jackrabbit-oak] branch OAK-6759 created (now d6eb069c5c)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-6759
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at d6eb069c5c OAK-6759: Convert oak-blob-cloud-azure to OSGi R6 annotations
This branch includes the following new commits:
new d6eb069c5c OAK-6759: Convert oak-blob-cloud-azure to OSGi R6 annotations
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-6759: Convert oak-blob-cloud-azure to OSGi R6 annotations
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-6759
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit d6eb069c5c4a1303b238e6f2fc36b5ad73addc11
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Sep 11 11:40:27 2023 +0100
OAK-6759: Convert oak-blob-cloud-azure to OSGi R6 annotations
---
oak-blob-cloud-azure/pom.xml | 4 ++--
.../cloud/azure/blobstorage/AbstractAzureDataStoreService.java | 8 ++++++++
.../oak/blob/cloud/azure/blobstorage/AzureDataStoreService.java | 6 +++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml
index 6900a0fba8..91d8d9a319 100644
--- a/oak-blob-cloud-azure/pom.xml
+++ b/oak-blob-cloud-azure/pom.xml
@@ -76,8 +76,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AbstractAzureDataStoreService.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AbstractAzureDataStoreService.java
index 6e4a325e04..761c4784d1 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AbstractAzureDataStoreService.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AbstractAzureDataStoreService.java
@@ -19,10 +19,12 @@
package org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage;
+import org.osgi.service.component.annotations.Reference;
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.core.data.DataStoreException;
import org.apache.jackrabbit.oak.plugins.blob.AbstractSharedCachingDataStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.AbstractDataStoreService;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.ComponentContext;
@@ -37,6 +39,12 @@ public abstract class AbstractAzureDataStoreService extends AbstractDataStoreSer
private ServiceRegistration delegateReg;
+ // OAK-6759: we redeclare "statisticsProvider" (from
+ // AbstractDataStoreService) so that we do not gave to rely on annotation
+ // inheritance
+ @Reference
+ private StatisticsProvider statisticsProvider;
+
@Override
protected DataStore createDataStore(ComponentContext context, Map<String, Object> config) {
Properties properties = new Properties();
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreService.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreService.java
index bdc7abe320..5fa57e88fb 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreService.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreService.java
@@ -19,10 +19,10 @@
package org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
-@Component(policy = ConfigurationPolicy.REQUIRE, name = AzureDataStoreService.NAME)
+@Component(configurationPolicy = ConfigurationPolicy.REQUIRE, name = AzureDataStoreService.NAME)
public class AzureDataStoreService extends AbstractAzureDataStoreService {
public static final String NAME = "org.apache.jackrabbit.oak.plugins.blob.datastore.AzureDataStore";
}