XCOMMONS-3250: Make as easy as possible for various features to use an object store

* Fix since versions and component metadata.
* Remove duplicate instance caching from S3 blob store manager.

Author: michitux

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-api/src/main/java/org/xwiki/store/blob/BlobPath.java

@@ -33,7 +33,7 @@
  * interpret them as needed (e.g. S3 keys).
  *
  * @version $Id$
- * @since 17.7.0RC
+ * @since 17.7.0RC1
  */
 @Unstable
 public final class BlobPath

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-api/src/main/java/org/xwiki/store/blob/internal/BlobStoreConfiguration.java

@@ -21,6 +21,7 @@
 
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import org.xwiki.component.annotation.Component;
 import org.xwiki.configuration.ConfigurationSource;
@@ -29,8 +30,10 @@
  * Configuration for the Blob Store.
  *
  * @version $Id$
+ * @since 17.7.0RC1
  */
-@Component
+@Component(roles = BlobStoreConfiguration.class)
+@Singleton
 public class BlobStoreConfiguration
 {
     @Inject

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-api/src/main/java/org/xwiki/store/blob/internal/DefaultBlobStoreManager.java

@@ -23,13 +23,24 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
+import org.xwiki.component.annotation.Component;
 import org.xwiki.component.manager.ComponentLookupException;
 import org.xwiki.component.manager.ComponentManager;
 import org.xwiki.store.blob.BlobStore;
 import org.xwiki.store.blob.BlobStoreException;
 import org.xwiki.store.blob.BlobStoreManager;
 
+/**
+ * Default implementation of {@link BlobStoreManager} that retrieves blob stores based on the name and the
+ * configured store hint.
+ *
+ * @version $Id$
+ * @since 17.7.0RC1
+ */
+@Component
+@Singleton
 public class DefaultBlobStoreManager implements BlobStoreManager
 {
     @Inject

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-api/src/main/resources/META-INF/components.txt

@@ -0,0 +1,2 @@
+org.xwiki.store.blob.internal.BlobStoreConfiguration
+org.xwiki.store.blob.internal.DefaultBlobStoreManager

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-filesystem/src/main/java/org/xwiki/store/blob/internal/FileSystemBlobStore.java

@@ -40,6 +40,7 @@
  * A {@link BlobStore} implementation that stores blobs in the file system.
  *
  * @version $Id$
+ * @since 17.7.0RC1
  */
 public class FileSystemBlobStore implements BlobStore
 {

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-filesystem/src/main/resources/META-INF/components.txt

@@ -0,0 +1 @@
+org.xwiki.store.blob.internal.FileSystemBlobStoreManager

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-s3/src/main/java/org/xwiki/store/blob/internal/S3BlobStoreManager.java

@@ -19,9 +19,6 @@
  */
 package org.xwiki.store.blob.internal;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
@@ -60,8 +57,6 @@ public class S3BlobStoreManager implements BlobStoreManager, Initializable
     @Inject
     private S3ClientManager clientManager;
 
-    private final ConcurrentMap<String, S3BlobStore> stores = new ConcurrentHashMap<>();
-
     private String bucketName;
 
     @Override
@@ -84,11 +79,6 @@ public void initialize() throws InitializationException
 
     @Override
     public BlobStore getBlobStore(String name) throws BlobStoreException
-    {
-        return this.stores.computeIfAbsent(name, this::createBlobStore);
-    }
-
-    private S3BlobStore createBlobStore(String name)
     {
         String keyPrefix = this.configuration.getS3KeyPrefix();
         if (StringUtils.isNotBlank(keyPrefix) && !StringUtils.isNotBlank(name)) {

xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-s3/src/main/resources/META-INF/components.txt

@@ -0,0 +1,2 @@
+org.xwiki.store.blob.internal.S3BlobStoreManager
+org.xwiki.store.blob.internal.S3ClientManager