Repository: camel Updated Branches: refs/heads/master 6eb2abe89 -> 0ab557c0c
Factorize Json schema loading code Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a3ecc214 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a3ecc214 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a3ecc214 Branch: refs/heads/master Commit: a3ecc2145ac7a5dc12c63c7d9044cb47b71a1ddc Parents: 39376f5 Author: Aurelien Pupier <apup...@redhat.com> Authored: Thu Apr 20 14:18:54 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Apr 20 17:07:31 2017 +0200 ---------------------------------------------------------------------- .../catalog/maven/ConnectorArtifactHelper.java | 39 ++++++-------------- 1 file changed, 11 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a3ecc214/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 475eb91..454b639 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 @@ -32,38 +32,21 @@ public final class ConnectorArtifactHelper { public static String[] loadJSonSchemas(ClassLoader classLoader) { String[] answer = new String[3]; + answer[0] = loadJsonSchema(classLoader, "camel-connector.json"); + answer[1] = loadJsonSchema(classLoader, "camel-connector-schema.json"); + answer[2] = loadJsonSchema(classLoader, "camel-component-schema.json"); + return answer; + } - String path = "camel-connector.json"; - try { - InputStream is = classLoader.getResourceAsStream(path); - if (is != null) { - answer[0] = loadText(is); - } - } catch (Throwable e) { - LOG.warn("Error loading " + path + " file", e); - } - - path = "camel-connector-schema.json"; - try { - InputStream is = classLoader.getResourceAsStream(path); - if (is != null) { - answer[1] = loadText(is); - } - } catch (Throwable e) { - LOG.warn("Error loading " + path + " file", e); - } - - path = "camel-component-schema.json"; - try { - InputStream is = classLoader.getResourceAsStream(path); + private static String loadJsonSchema(ClassLoader classLoader, String jsonSchemaPath) { + try (InputStream is = classLoader.getResourceAsStream(jsonSchemaPath)) { if (is != null) { - answer[2] = loadText(is); + return loadText(is); } } catch (Throwable e) { - LOG.warn("Error loading " + path + " file", e); + LOG.warn("Error loading " + jsonSchemaPath + " file", e); } - - return answer; - } + return null; + } }
