Repository: camel Updated Branches: refs/heads/master 3a1ef7892 -> bf794e830
CAMEL-8378: Renamed Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb903ef9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb903ef9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb903ef9 Branch: refs/heads/master Commit: bb903ef923d2f907ee73be4ca1cc737da17db1c1 Parents: 3a1ef78 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Feb 21 08:55:47 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Feb 21 08:55:47 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/catalog/CamelCatalog.java | 149 ++++++ .../catalog/CamelCatalogMBeanExporter.java | 10 +- .../camel/catalog/CamelComponentCatalog.java | 149 ------ .../camel/catalog/DefaultCamelCatalog.java | 499 +++++++++++++++++++ .../catalog/DefaultCamelComponentCatalog.java | 499 ------------------- .../apache/camel/catalog/CamelCatalogTest.java | 2 +- .../camel/commands/AbstractCamelController.java | 6 +- .../commands/catalog/CamelCatalogTest.java | 124 +++++ .../catalog/CamelComponentCatalogTest.java | 124 ----- .../commands/catalog/CamelModelCatalogTest.java | 16 +- 10 files changed, 789 insertions(+), 789 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java new file mode 100644 index 0000000..3826063 --- /dev/null +++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java @@ -0,0 +1,149 @@ +/** + * 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.catalog; + +import java.util.List; +import java.util.Set; +import javax.management.MXBean; + +/** + * Catalog of components, data formats, models (EIPs), languages, and more from this Apache Camel release. + */ +@MXBean +public interface CamelCatalog { + + /** + * Find all the component names from the Camel catalog + */ + List<String> findComponentNames(); + + /** + * Find all the data format names from the Camel catalog + */ + List<String> findDataFormatNames(); + + /** + * Find all the language names from the Camel catalog + */ + List<String> findLanguageNames(); + + /** + * Find all the model names from the Camel catalog + */ + List<String> findModelNames(); + + /** + * Find all the component names from the Camel catalog that matches the label + */ + List<String> findComponentNames(String filter); + + /** + * Find all the data format names from the Camel catalog that matches the label + */ + List<String> findDataFormatNames(String filter); + + /** + * Find all the language names from the Camel catalog that matches the label + */ + List<String> findLanguageNames(String filter); + + /** + * Find all the model names from the Camel catalog that matches the label + */ + List<String> findModelNames(String filter); + + /** + * Returns the component information as JSon format. + * + * @param name the component name + * @return component details in JSon + */ + String componentJSonSchema(String name); + + /** + * Returns the data format information as JSon format. + * + * @param name the data format name + * @return data format details in JSon + */ + String dataFormatJSonSchema(String name); + + /** + * Returns the language information as JSon format. + * + * @param name the language name + * @return language details in JSon + */ + String languageJSonSchema(String name); + + /** + * Returns the model information as JSon format. + * + * @param name the model name + * @return model details in JSon + */ + String modelJSonSchema(String name); + + /** + * Find all the unique label names all the components are using. + * + * @return a set of all the labels. + */ + Set<String> findComponentLabels(); + + /** + * Find all the unique label names all the data formats are using. + * + * @return a set of all the labels. + */ + Set<String> findDataFormatLabels(); + + /** + * Find all the unique label names all the data formats are using. + * + * @return a set of all the labels. + */ + Set<String> findLanguageLabels(); + + /** + * Find all the unique label names all the models are using. + * + * @return a set of all the labels. + */ + Set<String> findModelLabels(); + + /** + * Returns the Apache Camel Maven Archetype catalog in XML format. + * + * @return the catalog in XML + */ + String archetypeCatalogAsXml(); + + /** + * Returns the Camel Spring XML schema + * + * @return the spring XML schema + */ + String springSchemaAsXml(); + + /** + * Returns the Camel Blueprint XML schema + * + * @return the blueprint XML schema + */ + String blueprintSchemaAsXml(); +} http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java index 063011b..c5d64ba 100644 --- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java +++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java @@ -23,24 +23,24 @@ import javax.management.ObjectInstance; import javax.management.ObjectName; /** - * MBean exporter to register the {@link CamelComponentCatalog} in JMX. + * MBean exporter to register the {@link CamelCatalog} in JMX. */ public class CamelCatalogMBeanExporter { public static final String MBEAN_NAME = "org.apache.camel.catalog:type=catalog,name=catalog"; - private CamelComponentCatalog catalog; + private CamelCatalog catalog; private ObjectName objectName; private MBeanServer mBeanServer; /** - * Initializes and exports the {@link org.apache.camel.catalog.CamelComponentCatalog} in JMX using the domain name, + * Initializes and exports the {@link CamelCatalog} in JMX using the domain name, * which can be obtained using {@link #getObjectName()}. * * @throws Exception */ public void init() throws Exception { - catalog = new DefaultCamelComponentCatalog(); + catalog = new DefaultCamelCatalog(); if (objectName == null) { objectName = getObjectName(); @@ -66,7 +66,7 @@ public class CamelCatalogMBeanExporter { } /** - * Destroyes and unregisteres the {@link org.apache.camel.catalog.CamelComponentCatalog} from JMX. + * Destroyes and unregisteres the {@link CamelCatalog} from JMX. * * @throws Exception is thrown if error during unregistration */ http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java deleted file mode 100644 index bae84e0..0000000 --- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java +++ /dev/null @@ -1,149 +0,0 @@ -/** - * 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.catalog; - -import java.util.List; -import java.util.Set; -import javax.management.MXBean; - -/** - * Catalog of all the Camel components from this Apache Camel release. - */ -@MXBean -public interface CamelComponentCatalog { - - /** - * Find all the component names from the Camel catalog - */ - List<String> findComponentNames(); - - /** - * Find all the data format names from the Camel catalog - */ - List<String> findDataFormatNames(); - - /** - * Find all the language names from the Camel catalog - */ - List<String> findLanguageNames(); - - /** - * Find all the model names from the Camel catalog - */ - List<String> findModelNames(); - - /** - * Find all the component names from the Camel catalog that matches the label - */ - List<String> findComponentNames(String filter); - - /** - * Find all the data format names from the Camel catalog that matches the label - */ - List<String> findDataFormatNames(String filter); - - /** - * Find all the language names from the Camel catalog that matches the label - */ - List<String> findLanguageNames(String filter); - - /** - * Find all the model names from the Camel catalog that matches the label - */ - List<String> findModelNames(String filter); - - /** - * Returns the component information as JSon format. - * - * @param name the component name - * @return component details in JSon - */ - String componentJSonSchema(String name); - - /** - * Returns the data format information as JSon format. - * - * @param name the data format name - * @return data format details in JSon - */ - String dataFormatJSonSchema(String name); - - /** - * Returns the language information as JSon format. - * - * @param name the language name - * @return language details in JSon - */ - String languageJSonSchema(String name); - - /** - * Returns the model information as JSon format. - * - * @param name the model name - * @return model details in JSon - */ - String modelJSonSchema(String name); - - /** - * Find all the unique label names all the components are using. - * - * @return a set of all the labels. - */ - Set<String> findComponentLabels(); - - /** - * Find all the unique label names all the data formats are using. - * - * @return a set of all the labels. - */ - Set<String> findDataFormatLabels(); - - /** - * Find all the unique label names all the data formats are using. - * - * @return a set of all the labels. - */ - Set<String> findLanguageLabels(); - - /** - * Find all the unique label names all the models are using. - * - * @return a set of all the labels. - */ - Set<String> findModelLabels(); - - /** - * Returns the Apache Camel Maven Archetype catalog in XML format. - * - * @return the catalog in XML - */ - String archetypeCatalogAsXml(); - - /** - * Returns the Camel Spring XML schema - * - * @return the spring XML schema - */ - String springSchemaAsXml(); - - /** - * Returns the Camel Blueprint XML schema - * - * @return the blueprint XML schema - */ - String blueprintSchemaAsXml(); -} http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java new file mode 100644 index 0000000..ec94fce --- /dev/null +++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java @@ -0,0 +1,499 @@ +/** + * 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.catalog; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.regex.PatternSyntaxException; + +/** + * Default {@link CamelCatalog}. + */ +public class DefaultCamelCatalog implements CamelCatalog { + + private static final String MODELS_CATALOG = "org/apache/camel/catalog/models.properties"; + private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/components.properties"; + private static final String DATA_FORMATS_CATALOG = "org/apache/camel/catalog/dataformats.properties"; + private static final String LANGUAGE_CATALOG = "org/apache/camel/catalog/languages.properties"; + private static final String MODEL_JSON = "org/apache/camel/catalog/models"; + private static final String COMPONENTS_JSON = "org/apache/camel/catalog/components"; + private static final String DATA_FORMATS_JSON = "org/apache/camel/catalog/dataformats"; + private static final String LANGUAGE_JSON = "org/apache/camel/catalog/languages"; + private static final String ARCHETYPES_CATALOG = "org/apache/camel/catalog/archetypes/archetype-catalog.xml"; + private static final String SCHEMAS_XML = "org/apache/camel/catalog/schemas"; + + @Override + public List<String> findComponentNames() { + List<String> names = new ArrayList<String>(); + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(COMPONENTS_CATALOG); + if (is != null) { + try { + loadLines(is, names); + } catch (IOException e) { + // ignore + } + } + return names; + } + + @Override + public List<String> findDataFormatNames() { + List<String> names = new ArrayList<String>(); + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(DATA_FORMATS_CATALOG); + if (is != null) { + try { + loadLines(is, names); + } catch (IOException e) { + // ignore + } + } + return names; + } + + @Override + public List<String> findLanguageNames() { + List<String> names = new ArrayList<String>(); + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(LANGUAGE_CATALOG); + if (is != null) { + try { + loadLines(is, names); + } catch (IOException e) { + // ignore + } + } + return names; + } + + @Override + public List<String> findModelNames() { + List<String> names = new ArrayList<String>(); + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(MODELS_CATALOG); + if (is != null) { + try { + loadLines(is, names); + } catch (IOException e) { + // ignore + } + } + return names; + } + + @Override + public List<String> findModelNames(String filter) { + List<String> answer = new ArrayList<String>(); + + List<String> names = findModelNames(); + for (String name : names) { + String json = modelJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + try { + if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { + answer.add(name); + } + } catch (PatternSyntaxException e) { + // ignore as filter is maybe not a pattern + } + } + } + } + } + } + + return answer; + } + + @Override + public List<String> findComponentNames(String filter) { + List<String> answer = new ArrayList<String>(); + + List<String> names = findComponentNames(); + for (String name : names) { + String json = componentJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + try { + if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { + answer.add(name); + } + } catch (PatternSyntaxException e) { + // ignore as filter is maybe not a pattern + } + } + } + } + } + } + + return answer; + } + + @Override + public List<String> findDataFormatNames(String filter) { + List<String> answer = new ArrayList<String>(); + + List<String> names = findDataFormatNames(); + for (String name : names) { + String json = dataFormatJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + try { + if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { + answer.add(name); + } + } catch (PatternSyntaxException e) { + // ignore as filter is maybe not a pattern + } + } + } + } + } + } + + return answer; + } + + @Override + public List<String> findLanguageNames(String filter) { + List<String> answer = new ArrayList<String>(); + + List<String> names = findLanguageNames(); + for (String name : names) { + String json = languageJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + try { + if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { + answer.add(name); + } + } catch (PatternSyntaxException e) { + // ignore as filter is maybe not a pattern + } + } + } + } + } + } + + return answer; + } + + @Override + public String modelJSonSchema(String name) { + String file = MODEL_JSON + "/" + name + ".json"; + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file); + if (is != null) { + try { + return loadText(is); + } catch (IOException e) { + // ignore + } + } + + return null; + } + + @Override + public String componentJSonSchema(String name) { + String file = COMPONENTS_JSON + "/" + name + ".json"; + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file); + if (is != null) { + try { + return loadText(is); + } catch (IOException e) { + // ignore + } + } + + return null; + } + + @Override + public String dataFormatJSonSchema(String name) { + String file = DATA_FORMATS_JSON + "/" + name + ".json"; + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file); + if (is != null) { + try { + return loadText(is); + } catch (IOException e) { + // ignore + } + } + + return null; + } + + @Override + public String languageJSonSchema(String name) { + String file = LANGUAGE_JSON + "/" + name + ".json"; + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file); + if (is != null) { + try { + return loadText(is); + } catch (IOException e) { + // ignore + } + } + + return null; + } + + @Override + public Set<String> findModelLabels() { + SortedSet<String> answer = new TreeSet<String>(); + + List<String> names = findModelNames(); + for (String name : names) { + String json = modelJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + answer.add(part); + } + } + } + } + } + + return answer; + } + + @Override + public Set<String> findComponentLabels() { + SortedSet<String> answer = new TreeSet<String>(); + + List<String> names = findComponentNames(); + for (String name : names) { + String json = componentJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + answer.add(part); + } + } + } + } + } + + return answer; + } + + @Override + public Set<String> findDataFormatLabels() { + SortedSet<String> answer = new TreeSet<String>(); + + List<String> names = findDataFormatNames(); + for (String name : names) { + String json = dataFormatJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + answer.add(part); + } + } + } + } + } + + return answer; + } + + @Override + public Set<String> findLanguageLabels() { + SortedSet<String> answer = new TreeSet<String>(); + + List<String> names = findLanguageNames(); + for (String name : names) { + String json = languageJSonSchema(name); + if (json != null) { + List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false); + for (Map<String, String> row : rows) { + if (row.containsKey("label")) { + String label = row.get("label"); + String[] parts = label.split(","); + for (String part : parts) { + answer.add(part); + } + } + } + } + } + + return answer; + } + + @Override + public String archetypeCatalogAsXml() { + String file = ARCHETYPES_CATALOG; + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file); + if (is != null) { + try { + return loadText(is); + } catch (IOException e) { + // ignore + } + } + + return null; + } + + @Override + public String springSchemaAsXml() { + String file = SCHEMAS_XML + "/camel-spring.xsd"; + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file); + if (is != null) { + try { + return loadText(is); + } catch (IOException e) { + // ignore + } + } + + return null; + } + + @Override + public String blueprintSchemaAsXml() { + String file = SCHEMAS_XML + "/camel-blueprint.xsd"; + + InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file); + if (is != null) { + try { + return loadText(is); + } catch (IOException e) { + // ignore + } + } + + return null; + } + + /** + * Loads the entire stream into memory as a String and returns it. + * <p/> + * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line + * terminator at the of the text. + * <p/> + * Warning, don't use for crazy big streams :) + */ + private static void loadLines(InputStream in, List<String> lines) throws IOException { + InputStreamReader isr = new InputStreamReader(in); + try { + BufferedReader reader = new LineNumberReader(isr); + while (true) { + String line = reader.readLine(); + if (line != null) { + lines.add(line); + } else { + break; + } + } + } finally { + isr.close(); + in.close(); + } + } + + /** + * Loads the entire stream into memory as a String and returns it. + * <p/> + * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line + * terminator at the of the text. + * <p/> + * Warning, don't use for crazy big streams :) + */ + public static String loadText(InputStream in) throws IOException { + StringBuilder builder = new StringBuilder(); + InputStreamReader isr = new InputStreamReader(in); + try { + BufferedReader reader = new LineNumberReader(isr); + while (true) { + String line = reader.readLine(); + if (line != null) { + builder.append(line); + builder.append("\n"); + } else { + break; + } + } + return builder.toString(); + } finally { + isr.close(); + in.close(); + } + } + + private static boolean matchWildcard(String name, String pattern) { + // we have wildcard support in that hence you can match with: file* to match any file endpoints + if (pattern.endsWith("*") && name.startsWith(pattern.substring(0, pattern.length() - 1))) { + return true; + } + return false; + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java deleted file mode 100644 index 7ccfc3a..0000000 --- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java +++ /dev/null @@ -1,499 +0,0 @@ -/** - * 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.catalog; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.regex.PatternSyntaxException; - -/** - * Default {@link org.apache.camel.catalog.CamelComponentCatalog}. - */ -public class DefaultCamelComponentCatalog implements CamelComponentCatalog { - - private static final String MODELS_CATALOG = "org/apache/camel/catalog/models.properties"; - private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/components.properties"; - private static final String DATA_FORMATS_CATALOG = "org/apache/camel/catalog/dataformats.properties"; - private static final String LANGUAGE_CATALOG = "org/apache/camel/catalog/languages.properties"; - private static final String MODEL_JSON = "org/apache/camel/catalog/models"; - private static final String COMPONENTS_JSON = "org/apache/camel/catalog/components"; - private static final String DATA_FORMATS_JSON = "org/apache/camel/catalog/dataformats"; - private static final String LANGUAGE_JSON = "org/apache/camel/catalog/languages"; - private static final String ARCHETYPES_CATALOG = "org/apache/camel/catalog/archetypes/archetype-catalog.xml"; - private static final String SCHEMAS_XML = "org/apache/camel/catalog/schemas"; - - @Override - public List<String> findComponentNames() { - List<String> names = new ArrayList<String>(); - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(COMPONENTS_CATALOG); - if (is != null) { - try { - loadLines(is, names); - } catch (IOException e) { - // ignore - } - } - return names; - } - - @Override - public List<String> findDataFormatNames() { - List<String> names = new ArrayList<String>(); - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(DATA_FORMATS_CATALOG); - if (is != null) { - try { - loadLines(is, names); - } catch (IOException e) { - // ignore - } - } - return names; - } - - @Override - public List<String> findLanguageNames() { - List<String> names = new ArrayList<String>(); - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(LANGUAGE_CATALOG); - if (is != null) { - try { - loadLines(is, names); - } catch (IOException e) { - // ignore - } - } - return names; - } - - @Override - public List<String> findModelNames() { - List<String> names = new ArrayList<String>(); - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(MODELS_CATALOG); - if (is != null) { - try { - loadLines(is, names); - } catch (IOException e) { - // ignore - } - } - return names; - } - - @Override - public List<String> findModelNames(String filter) { - List<String> answer = new ArrayList<String>(); - - List<String> names = findModelNames(); - for (String name : names) { - String json = modelJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - try { - if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { - answer.add(name); - } - } catch (PatternSyntaxException e) { - // ignore as filter is maybe not a pattern - } - } - } - } - } - } - - return answer; - } - - @Override - public List<String> findComponentNames(String filter) { - List<String> answer = new ArrayList<String>(); - - List<String> names = findComponentNames(); - for (String name : names) { - String json = componentJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - try { - if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { - answer.add(name); - } - } catch (PatternSyntaxException e) { - // ignore as filter is maybe not a pattern - } - } - } - } - } - } - - return answer; - } - - @Override - public List<String> findDataFormatNames(String filter) { - List<String> answer = new ArrayList<String>(); - - List<String> names = findDataFormatNames(); - for (String name : names) { - String json = dataFormatJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - try { - if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { - answer.add(name); - } - } catch (PatternSyntaxException e) { - // ignore as filter is maybe not a pattern - } - } - } - } - } - } - - return answer; - } - - @Override - public List<String> findLanguageNames(String filter) { - List<String> answer = new ArrayList<String>(); - - List<String> names = findLanguageNames(); - for (String name : names) { - String json = languageJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - try { - if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) { - answer.add(name); - } - } catch (PatternSyntaxException e) { - // ignore as filter is maybe not a pattern - } - } - } - } - } - } - - return answer; - } - - @Override - public String modelJSonSchema(String name) { - String file = MODEL_JSON + "/" + name + ".json"; - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file); - if (is != null) { - try { - return loadText(is); - } catch (IOException e) { - // ignore - } - } - - return null; - } - - @Override - public String componentJSonSchema(String name) { - String file = COMPONENTS_JSON + "/" + name + ".json"; - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file); - if (is != null) { - try { - return loadText(is); - } catch (IOException e) { - // ignore - } - } - - return null; - } - - @Override - public String dataFormatJSonSchema(String name) { - String file = DATA_FORMATS_JSON + "/" + name + ".json"; - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file); - if (is != null) { - try { - return loadText(is); - } catch (IOException e) { - // ignore - } - } - - return null; - } - - @Override - public String languageJSonSchema(String name) { - String file = LANGUAGE_JSON + "/" + name + ".json"; - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file); - if (is != null) { - try { - return loadText(is); - } catch (IOException e) { - // ignore - } - } - - return null; - } - - @Override - public Set<String> findModelLabels() { - SortedSet<String> answer = new TreeSet<String>(); - - List<String> names = findModelNames(); - for (String name : names) { - String json = modelJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - answer.add(part); - } - } - } - } - } - - return answer; - } - - @Override - public Set<String> findComponentLabels() { - SortedSet<String> answer = new TreeSet<String>(); - - List<String> names = findComponentNames(); - for (String name : names) { - String json = componentJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - answer.add(part); - } - } - } - } - } - - return answer; - } - - @Override - public Set<String> findDataFormatLabels() { - SortedSet<String> answer = new TreeSet<String>(); - - List<String> names = findDataFormatNames(); - for (String name : names) { - String json = dataFormatJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - answer.add(part); - } - } - } - } - } - - return answer; - } - - @Override - public Set<String> findLanguageLabels() { - SortedSet<String> answer = new TreeSet<String>(); - - List<String> names = findLanguageNames(); - for (String name : names) { - String json = languageJSonSchema(name); - if (json != null) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false); - for (Map<String, String> row : rows) { - if (row.containsKey("label")) { - String label = row.get("label"); - String[] parts = label.split(","); - for (String part : parts) { - answer.add(part); - } - } - } - } - } - - return answer; - } - - @Override - public String archetypeCatalogAsXml() { - String file = ARCHETYPES_CATALOG; - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file); - if (is != null) { - try { - return loadText(is); - } catch (IOException e) { - // ignore - } - } - - return null; - } - - @Override - public String springSchemaAsXml() { - String file = SCHEMAS_XML + "/camel-spring.xsd"; - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file); - if (is != null) { - try { - return loadText(is); - } catch (IOException e) { - // ignore - } - } - - return null; - } - - @Override - public String blueprintSchemaAsXml() { - String file = SCHEMAS_XML + "/camel-blueprint.xsd"; - - InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file); - if (is != null) { - try { - return loadText(is); - } catch (IOException e) { - // ignore - } - } - - return null; - } - - /** - * Loads the entire stream into memory as a String and returns it. - * <p/> - * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line - * terminator at the of the text. - * <p/> - * Warning, don't use for crazy big streams :) - */ - private static void loadLines(InputStream in, List<String> lines) throws IOException { - InputStreamReader isr = new InputStreamReader(in); - try { - BufferedReader reader = new LineNumberReader(isr); - while (true) { - String line = reader.readLine(); - if (line != null) { - lines.add(line); - } else { - break; - } - } - } finally { - isr.close(); - in.close(); - } - } - - /** - * Loads the entire stream into memory as a String and returns it. - * <p/> - * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line - * terminator at the of the text. - * <p/> - * Warning, don't use for crazy big streams :) - */ - public static String loadText(InputStream in) throws IOException { - StringBuilder builder = new StringBuilder(); - InputStreamReader isr = new InputStreamReader(in); - try { - BufferedReader reader = new LineNumberReader(isr); - while (true) { - String line = reader.readLine(); - if (line != null) { - builder.append(line); - builder.append("\n"); - } else { - break; - } - } - return builder.toString(); - } finally { - isr.close(); - in.close(); - } - } - - private static boolean matchWildcard(String name, String pattern) { - // we have wildcard support in that hence you can match with: file* to match any file endpoints - if (pattern.endsWith("*") && name.startsWith(pattern.substring(0, pattern.length() - 1))) { - return true; - } - return false; - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index e40f212..50a55bf 100644 --- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -23,7 +23,7 @@ import org.junit.Test; public class CamelCatalogTest extends TestCase { - private CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + private CamelCatalog catalog = new DefaultCamelCatalog(); @Test public void testFindNames() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java index 9b80102..b7faa92 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.camel.catalog.CamelComponentCatalog; -import org.apache.camel.catalog.DefaultCamelComponentCatalog; +import org.apache.camel.catalog.CamelCatalog; +import org.apache.camel.catalog.DefaultCamelCatalog; import org.apache.camel.commands.internal.RegexUtil; import org.apache.camel.util.JsonSchemaHelper; @@ -34,7 +34,7 @@ import org.apache.camel.util.JsonSchemaHelper; */ public abstract class AbstractCamelController implements CamelController { - private CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + private CamelCatalog catalog = new DefaultCamelCatalog(); @Override public List<Map<String, String>> listEipsCatalog(String filter) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java new file mode 100644 index 0000000..e115836 --- /dev/null +++ b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java @@ -0,0 +1,124 @@ +/** + * 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.commands.catalog; + +import java.util.List; +import java.util.Set; + +import org.apache.camel.catalog.CamelCatalog; +import org.apache.camel.catalog.DefaultCamelCatalog; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +public class CamelCatalogTest { + + private static final Logger LOG = LoggerFactory.getLogger(CamelCatalogTest.class); + + @Test + public void testFindComponentNames() { + CamelCatalog catalog = new DefaultCamelCatalog(); + List<String> names = catalog.findComponentNames(); + + assertNotNull(names); + + LOG.info("Found {} names", names.size()); + assertTrue("Should find some components", names.size() > 0); + } + + @Test + public void testFindComponentNamesFilter() { + CamelCatalog catalog = new DefaultCamelCatalog(); + List<String> names = catalog.findComponentNames("testing"); + + assertNotNull(names); + + LOG.info("Found {} names", names.size()); + assertTrue("Should find some testing components", names.size() > 0); + } + + @Test + public void testFindComponentNamesFilterWildcard() { + CamelCatalog catalog = new DefaultCamelCatalog(); + List<String> names = catalog.findComponentNames("t*"); + + assertNotNull(names); + + LOG.info("Found {} names", names.size()); + assertTrue("Should find some t* components", names.size() > 0); + } + + @Test + public void testFindComponentNamesFilterTwo() { + CamelCatalog catalog = new DefaultCamelCatalog(); + List<String> names = catalog.findComponentNames("transformation"); + + assertNotNull(names); + + LOG.info("Found {} names", names.size()); + assertTrue("Should find some transformation components", names.size() > 0); + } + + @Test + public void testFindComponentNamesFilterNoMatch() { + CamelCatalog catalog = new DefaultCamelCatalog(); + List<String> names = catalog.findComponentNames("cannotmatchme"); + + assertNotNull(names); + + assertTrue("Should not match any components", names.size() == 0); + } + + @Test + public void testCoreComponentJson() { + CamelCatalog catalog = new DefaultCamelCatalog(); + String json = catalog.componentJSonSchema("bean"); + + assertNotNull(json); + LOG.info(json); + + assertTrue("Should find bean component", json.contains("bean")); + } + + @Test + public void testFtpComponentJson() { + CamelCatalog catalog = new DefaultCamelCatalog(); + String json = catalog.componentJSonSchema("ftp"); + + assertNotNull(json); + LOG.info(json); + + assertTrue("Should find ftp component", json.contains("ftp")); + } + + @Test + public void testLabels() { + CamelCatalog catalog = new DefaultCamelCatalog(); + Set<String> labels = catalog.findComponentLabels(); + + assertNotNull(labels); + + assertTrue("Should find labels", labels.size() > 0); + assertTrue("Should find core label", labels.contains("core")); + assertTrue("Should find testing label", labels.contains("testing")); + assertTrue("Should find rest label", labels.contains("rest")); + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java deleted file mode 100644 index 95bd1dc..0000000 --- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/** - * 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.commands.catalog; - -import java.util.List; -import java.util.Set; - -import org.apache.camel.catalog.CamelComponentCatalog; -import org.apache.camel.catalog.DefaultCamelComponentCatalog; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -public class CamelComponentCatalogTest { - - private static final Logger LOG = LoggerFactory.getLogger(CamelComponentCatalogTest.class); - - @Test - public void testFindComponentNames() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - List<String> names = catalog.findComponentNames(); - - assertNotNull(names); - - LOG.info("Found {} names", names.size()); - assertTrue("Should find some components", names.size() > 0); - } - - @Test - public void testFindComponentNamesFilter() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - List<String> names = catalog.findComponentNames("testing"); - - assertNotNull(names); - - LOG.info("Found {} names", names.size()); - assertTrue("Should find some testing components", names.size() > 0); - } - - @Test - public void testFindComponentNamesFilterWildcard() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - List<String> names = catalog.findComponentNames("t*"); - - assertNotNull(names); - - LOG.info("Found {} names", names.size()); - assertTrue("Should find some t* components", names.size() > 0); - } - - @Test - public void testFindComponentNamesFilterTwo() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - List<String> names = catalog.findComponentNames("transformation"); - - assertNotNull(names); - - LOG.info("Found {} names", names.size()); - assertTrue("Should find some transformation components", names.size() > 0); - } - - @Test - public void testFindComponentNamesFilterNoMatch() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - List<String> names = catalog.findComponentNames("cannotmatchme"); - - assertNotNull(names); - - assertTrue("Should not match any components", names.size() == 0); - } - - @Test - public void testCoreComponentJson() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - String json = catalog.componentJSonSchema("bean"); - - assertNotNull(json); - LOG.info(json); - - assertTrue("Should find bean component", json.contains("bean")); - } - - @Test - public void testFtpComponentJson() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - String json = catalog.componentJSonSchema("ftp"); - - assertNotNull(json); - LOG.info(json); - - assertTrue("Should find ftp component", json.contains("ftp")); - } - - @Test - public void testLabels() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); - Set<String> labels = catalog.findComponentLabels(); - - assertNotNull(labels); - - assertTrue("Should find labels", labels.size() > 0); - assertTrue("Should find core label", labels.contains("core")); - assertTrue("Should find testing label", labels.contains("testing")); - assertTrue("Should find rest label", labels.contains("rest")); - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java index 748c1e4..764406e 100644 --- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java +++ b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java @@ -19,8 +19,8 @@ package org.apache.camel.commands.catalog; import java.util.List; import java.util.Set; -import org.apache.camel.catalog.CamelComponentCatalog; -import org.apache.camel.catalog.DefaultCamelComponentCatalog; +import org.apache.camel.catalog.CamelCatalog; +import org.apache.camel.catalog.DefaultCamelCatalog; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ public class CamelModelCatalogTest { @Test public void testFindModelNames() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + CamelCatalog catalog = new DefaultCamelCatalog(); List<String> names = catalog.findModelNames(); assertNotNull(names); @@ -45,7 +45,7 @@ public class CamelModelCatalogTest { @Test public void testFindModelNamesFilter() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + CamelCatalog catalog = new DefaultCamelCatalog(); List<String> names = catalog.findModelNames("transformation"); assertNotNull(names); @@ -56,7 +56,7 @@ public class CamelModelCatalogTest { @Test public void testFindModelNamesFilterWildcard() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + CamelCatalog catalog = new DefaultCamelCatalog(); List<String> names = catalog.findModelNames("t*"); assertNotNull(names); @@ -67,7 +67,7 @@ public class CamelModelCatalogTest { @Test public void testFindComponentNamesFilterNoMatch() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + CamelCatalog catalog = new DefaultCamelCatalog(); List<String> names = catalog.findModelNames("cannotmatchme"); assertNotNull(names); @@ -77,7 +77,7 @@ public class CamelModelCatalogTest { @Test public void testCoreComponentJson() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + CamelCatalog catalog = new DefaultCamelCatalog(); String json = catalog.modelJSonSchema("split"); assertNotNull(json); @@ -88,7 +88,7 @@ public class CamelModelCatalogTest { @Test public void testLabels() { - CamelComponentCatalog catalog = new DefaultCamelComponentCatalog(); + CamelCatalog catalog = new DefaultCamelCatalog(); Set<String> labels = catalog.findModelLabels(); assertNotNull(labels);
