/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

package org.apache.jackrabbit.oak.plugins.blob.datastore;

import java.util.Map;
import java.util.Properties;

import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.jackrabbit.aws.ext.ds.S3DataStore;
import org.apache.jackrabbit.core.data.DataStore;
import org.osgi.service.component.ComponentContext;

@Component(policy = ConfigurationPolicy.REQUIRE, name = S3DataStoreService.NAME)
public class S3DataStoreService extends AbstractDataStoreService{
    public static final String NAME = "org.apache.jackrabbit.oak.plugins.blob.datastore.S3DataStore";

    @Override
    protected DataStore createDataStore(ComponentContext context, Map<String, Object> config) {
        S3DataStore dataStore = new S3DataStore();

        Properties properties = new Properties();
        properties.putAll(config);

        dataStore.setProperties(properties);
        return dataStore;
    }

    @Override
    protected String[] getDescription() {
        return new String[] {"type=S3"};
    }
}

@@ -1058,21 +1058,18 @@
 bit.
-aws.ext.ds.S3
+core.data.
 Data
@@ -1100,34 +1100,48 @@
 .jackrabbit.
-core.data.
+oak.blob.cloud.aws.s3.S3
 DataStore;%0Ai

Switch S3DataStoreService to use oak-blob-cloud S3DataStore