Fixed CS. This closes #1646. This closes #1645
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0ab557c0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0ab557c0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0ab557c0 Branch: refs/heads/master Commit: 0ab557c0ca3b830b913e991c3b5683e52bb85655 Parents: a3ecc21 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Apr 20 17:09:51 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Apr 20 17:09:51 2017 +0200 ---------------------------------------------------------------------- .../catalog/maven/ConnectorArtifactHelper.java | 8 ++-- .../maven/DefaultMavenArtifactProvider.java | 46 ++++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0ab557c0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java index 454b639..b233e95 100644 --- a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java +++ b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java @@ -38,15 +38,15 @@ public final class ConnectorArtifactHelper { return answer; } - private static String loadJsonSchema(ClassLoader classLoader, String jsonSchemaPath) { - try (InputStream is = classLoader.getResourceAsStream(jsonSchemaPath)) { + private static String loadJsonSchema(ClassLoader classLoader, String jsonSchemaPath) { + try (InputStream is = classLoader.getResourceAsStream(jsonSchemaPath)) { if (is != null) { return loadText(is); } } catch (Throwable e) { LOG.warn("Error loading " + jsonSchemaPath + " file", e); } - return null; - } + return null; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/0ab557c0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java index 1a7f3cb..9361195 100644 --- a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java +++ b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java @@ -73,27 +73,27 @@ public class DefaultMavenArtifactProvider implements MavenArtifactProvider { Grape.setEnableAutoDownload(true); - try (final GroovyClassLoader classLoader = new GroovyClassLoader()){ - - Map<String, Object> param = new HashMap<>(); - param.put("classLoader", classLoader); - param.put("group", groupId); - param.put("module", artifactId); - param.put("version", version); - // no need to download transitive dependencies as we only need to check the component or connector itself - param.put("validate", false); - param.put("transitive", false); - - LOG.debug("Downloading {}:{}:{}", groupId, artifactId, version); - Grape.grab(param); - - // the classloader can load content from the downloaded JAR - if (camelCatalog != null) { - scanCamelComponents(camelCatalog, classLoader, names); - } - if (camelConnectorCatalog != null) { - scanCamelConnectors(camelConnectorCatalog, classLoader, groupId, artifactId, version, names); - } + try (final GroovyClassLoader classLoader = new GroovyClassLoader()) { + + Map<String, Object> param = new HashMap<>(); + param.put("classLoader", classLoader); + param.put("group", groupId); + param.put("module", artifactId); + param.put("version", version); + // no need to download transitive dependencies as we only need to check the component or connector itself + param.put("validate", false); + param.put("transitive", false); + + LOG.debug("Downloading {}:{}:{}", groupId, artifactId, version); + Grape.grab(param); + + // the classloader can load content from the downloaded JAR + if (camelCatalog != null) { + scanCamelComponents(camelCatalog, classLoader, names); + } + if (camelConnectorCatalog != null) { + scanCamelConnectors(camelConnectorCatalog, classLoader, groupId, artifactId, version, names); + } } } catch (Exception e) { @@ -129,8 +129,8 @@ public class DefaultMavenArtifactProvider implements MavenArtifactProvider { } protected void scanCamelConnectors(CamelConnectorCatalog camelConnectorCatalog, ClassLoader classLoader, - String groupId, String artifactId, String version, - Set<String> names) { + String groupId, String artifactId, String version, + Set<String> names) { String[] json = loadJSonSchemas(classLoader); if (json != null) { if (!camelConnectorCatalog.hasConnector(groupId, artifactId, version)) {
