/*
 * 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.camel.impl;

import java.io.IOException;

import org.apache.camel.CamelContext;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.HeadersMapFactory;
import org.apache.camel.spi.RestRegistryFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * Factory to create the {@link RestRegistryFactory} implementation to be used.
 *
 * @see RestRegistryFactory
 */
public class RestRegistryFactoryResolver {

    public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/";

    private static final Logger LOG = LoggerFactory.getLogger(RestRegistryFactoryResolver.class);

    private FactoryFinder factoryFinder;

    public RestRegistryFactory resolve(CamelContext context) {
        // use factory finder to find a custom implementations
        Class<?> type = null;
        try {
            type = findFactory("rest-registry-factory", context);
        } catch (Exception e) {
            // ignore
        }

        if (type != null) {
            if (LOG.isDebugEnabled()) {
                LOG.debug("Found RestRegistryFactory: {} via: {}{}", type.getName(), factoryFinder.getResourcePath(), "headers-map-factory");
            }
            if (RestRegistryFactory.class.isAssignableFrom(type)) {
                RestRegistryFactory answer = (RestRegistryFactory) context.getInjector().newInstance(type);
                LOG.info("Detected and using custom RestRegistryFactory: {}", answer);
                return answer;
            } else {
                throw new IllegalArgumentException("Type is not a RestRegistryFactory implementation. Found: " + type.getName());
            }
        }

        throw new IllegalArgumentException("No RestRegistryFactory implementation found.  You need to add camel-rest to the classpath.");
    }

    private Class<?> findFactory(String name, CamelContext context) throws ClassNotFoundException, IOException {
        if (factoryFinder == null) {
            factoryFinder = context.getFactoryFinder(RESOURCE_PATH);
        }
        return factoryFinder.findClass(name);
    }

}


@@ -942,55 +942,8 @@
 er;%0A
-import org.apache.camel.spi.HeadersMapFactory;%0A
 impo
@@ -1928,19 +1928,21 @@
 ), %22
-headers-map
+rest-registry
 -fac
@@ -2184,23 +2184,16 @@
 d using 
-custom 
 RestRegi

Move the rest registry to the rest component