This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-6760
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 68caa355afbc8ae40c2d516cd6bbdff2a496df5d
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Tue Oct 10 11:50:33 2023 +0100
OAK-6760: Convert oak-blob-cloud to OSGi R6 annotations
---
oak-blob-cloud/pom.xml | 4 ++--
.../oak/blob/cloud/s3/AbstractS3DataStoreService.java | 16 ----------------
.../oak/blob/cloud/s3/S3DataStoreService.java | 19 ++++++++++++++++---
.../oak/blob/cloud/s3/SharedS3DataStoreService.java | 19 ++++++++++++++++---
4 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml
index bf3c2be617..b3789f0f0b 100644
--- a/oak-blob-cloud/pom.xml
+++ b/oak-blob-cloud/pom.xml
@@ -71,8 +71,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/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
index f2c823a436..db28127cf2 100644
---
a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
+++
b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/AbstractS3DataStoreService.java
@@ -24,26 +24,19 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.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;
-@Component(componentAbstract = true)
public abstract class AbstractS3DataStoreService extends
AbstractDataStoreService {
private static final String DESCRIPTION = "oak.datastore.description";
private ServiceRegistration delegateReg;
- @Reference
- private StatisticsProvider statisticsProvider;
-
@Override
protected DataStore createDataStore(ComponentContext context, Map<String,
Object> config) {
Properties properties = new Properties();
@@ -72,15 +65,6 @@ public abstract class AbstractS3DataStoreService extends
AbstractDataStoreServic
super.deactivate();
}
- @Override
- protected StatisticsProvider getStatisticsProvider(){
- return statisticsProvider;
- }
-
- protected void setStatisticsProvider(StatisticsProvider
statisticsProvider) {
- this.statisticsProvider = statisticsProvider;
- }
-
@Override
protected String[] getDescription() {
return new String[] {"type=S3"};
diff --git
a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
index 272a159981..40404cd522 100644
---
a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
+++
b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreService.java
@@ -19,10 +19,23 @@
package org.apache.jackrabbit.oak.blob.cloud.s3;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Reference;
-@Component(policy = ConfigurationPolicy.REQUIRE, name =
S3DataStoreService.NAME)
+@Component(configurationPolicy = ConfigurationPolicy.REQUIRE, name =
S3DataStoreService.NAME)
public class S3DataStoreService extends AbstractS3DataStoreService {
+ @Reference
+ private StatisticsProvider statisticsProvider;
+
public static final String NAME =
"org.apache.jackrabbit.oak.plugins.blob.datastore.S3DataStore";
+
+ protected StatisticsProvider getStatisticsProvider(){
+ return statisticsProvider;
+ }
+
+ protected void setStatisticsProvider(StatisticsProvider
statisticsProvider) {
+ this.statisticsProvider = statisticsProvider;
+ }
}
diff --git
a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java
b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java
index 42b8e67de8..024af2a03b 100644
---
a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java
+++
b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/SharedS3DataStoreService.java
@@ -19,10 +19,23 @@
package org.apache.jackrabbit.oak.blob.cloud.s3;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Reference;
-@Component(policy = ConfigurationPolicy.REQUIRE, name =
SharedS3DataStoreService.NAME)
+@Component(configurationPolicy = ConfigurationPolicy.REQUIRE, name =
SharedS3DataStoreService.NAME)
public class SharedS3DataStoreService extends AbstractS3DataStoreService {
+ @Reference
+ private StatisticsProvider statisticsProvider;
+
public static final String NAME =
"org.apache.jackrabbit.oak.plugins.blob.datastore.SharedS3DataStore";
+
+ protected StatisticsProvider getStatisticsProvider(){
+ return statisticsProvider;
+ }
+
+ protected void setStatisticsProvider(StatisticsProvider
statisticsProvider) {
+ this.statisticsProvider = statisticsProvider;
+ }
}
