You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/12/06 11:57:45 UTC
[1/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS
application
Repository: camel
Updated Branches:
refs/heads/master 129bdf704 -> db116fa1a
CAMEL-10561: camel-catalog - Add REST JAX-RS application
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ac086c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ac086c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ac086c3
Branch: refs/heads/master
Commit: 1ac086c3e3a6b703ddbe867689dd297c19edc899
Parents: 129bdf7
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 10:43:46 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 10:43:46 2016 +0100
----------------------------------------------------------------------
platforms/catalog-rest/pom.xml | 135 ++++++++++++
.../camel/catalog/rest/CamelCatalogRest.java | 55 +++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../catalog/rest/CamelCatalogRestTest.java | 72 +++++++
.../src/test/resources/log4j2.properties | 28 +++
platforms/pom.xml | 1 +
7 files changed, 505 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1ac086c3/platforms/catalog-rest/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/pom.xml b/platforms/catalog-rest/pom.xml
new file mode 100644
index 0000000..3cc899e
--- /dev/null
+++ b/platforms/catalog-rest/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ 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.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>platforms</artifactId>
+ <version>2.19.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-catalog-rest</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Platforms :: Catalog :: REST</name>
+ <description>Camel Catalog REST</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog</artifactId>
+ </dependency>
+
+ <!-- REST api -->
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <!-- TODO: put in parent -->
+ <version>2.0.1</version>
+ </dependency>
+
+ <!-- cxf -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- to support json -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- use rest assured for REST/JSon testing -->
+ <dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <version>3.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- logging -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ </project>
http://git-wip-us.apache.org/repos/asf/camel/blob/1ac086c3/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
new file mode 100644
index 0000000..8ed40a2
--- /dev/null
+++ b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
@@ -0,0 +1,55 @@
+/**
+ * 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.rest;
+
+import java.util.Set;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.DefaultCamelCatalog;
+
+/**
+ * A REST based {@link CamelCatalog} service as a JAX-RS resource class.
+ */
+@Path("/camel-catalog")
+@Produces("application/json")
+public class CamelCatalogRest {
+
+ private CamelCatalog catalog = new DefaultCamelCatalog(true);
+
+ public CamelCatalog getCatalog() {
+ return catalog;
+ }
+
+ /**
+ * To inject an existing {@link CamelCatalog}
+ */
+ public void setCatalog(CamelCatalog catalog) {
+ this.catalog = catalog;
+ }
+
+ /**
+ * The GET order by id operation
+ */
+ @GET
+ @Path("/findComponentLabels")
+ public Set<String> findComponentLabels() {
+ return catalog.findComponentLabels();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/1ac086c3/platforms/catalog-rest/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/main/resources/META-INF/LICENSE.txt b/platforms/catalog-rest/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/platforms/catalog-rest/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/1ac086c3/platforms/catalog-rest/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/main/resources/META-INF/NOTICE.txt b/platforms/catalog-rest/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/platforms/catalog-rest/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/1ac086c3/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java
new file mode 100644
index 0000000..d67597f
--- /dev/null
+++ b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java
@@ -0,0 +1,72 @@
+/**
+ * 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.rest;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
+import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.hasItems;
+
+public class CamelCatalogRestTest {
+
+ private Server server;
+ private CamelCatalogRest catalog;
+ private int port;
+
+ @Before
+ public void setup() {
+ catalog = new CamelCatalogRest();
+
+ port = AvailablePortFinder.getNextAvailable(9000);
+
+ // setup Apache CXF REST server
+ JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
+ sf.setResourceClasses(CamelCatalogRest.class);
+ sf.setResourceProvider(CamelCatalogRest.class, new SingletonResourceProvider(catalog));
+ // to use jackson for json
+ sf.setProvider(JacksonJsonProvider.class);
+ sf.setAddress("http://localhost:" + port);
+
+ // create and start the CXF server (non blocking)
+ server = sf.create();
+ server.start();
+ }
+
+ @After
+ public void stop() {
+ if (server != null) {
+ server.stop();
+ }
+ }
+
+ @Test
+ public void testFindComponentLabels() throws Exception {
+ given().
+ baseUri("http://localhost:" + port).
+ when().
+ get("/camel-catalog/findComponentLabels").
+ then().
+ body("$", hasItems("bigdata", "messaging"));
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/1ac086c3/platforms/catalog-rest/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/test/resources/log4j2.properties b/platforms/catalog-rest/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..2b5b5d6
--- /dev/null
+++ b/platforms/catalog-rest/src/test/resources/log4j2.properties
@@ -0,0 +1,28 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-catalog-rest-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+rootLogger.level = INFO
+rootLogger.appenderRef.file.ref = file
http://git-wip-us.apache.org/repos/asf/camel/blob/1ac086c3/platforms/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 05bb78e..0f58ebf 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -39,6 +39,7 @@
<module>catalog</module>
<module>catalog-lucene</module>
<module>catalog-maven</module>
+ <module>catalog-rest</module>
<module>catalog-provider-karaf</module>
<module>catalog-provider-springboot</module>
</modules>
[6/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS
application
Posted by da...@apache.org.
CAMEL-10561: camel-catalog - Add REST JAX-RS application
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4df75000
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4df75000
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4df75000
Branch: refs/heads/master
Commit: 4df75000d9c32ebf72026edd3a2b33f977e7d6b9
Parents: 59a2585
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 12:06:36 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 12:27:36 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/catalog-rest/pom.xml | 27 ++--
.../camel/catalog/rest/CamelCatalogRest.java | 139 +++++++------------
.../catalog/rest/CamelCatalogRestTest.java | 13 +-
.../catalog/rest/CamelCatalogSwaggerTest.java | 6 +
.../org/apache/camel/catalog/CamelCatalog.java | 2 +-
6 files changed, 86 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4df75000/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bf2feb0..0b75b1b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -594,6 +594,7 @@
<swagger-java-version>1.5.10</swagger-java-version>
<swagger-java-parser-version>1.0.22</swagger-java-parser-version>
<swagger-java-guava-version>18.0</swagger-java-guava-version>
+ <swagger-ui-version>2.2.6</swagger-ui-version>
<stax-api-version>1.0.1</stax-api-version>
<stax2-api-bundle-version>3.1.4</stax2-api-bundle-version>
<stringtemplate-bundle-version>4.0.8_1</stringtemplate-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/4df75000/platforms/catalog-rest/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/pom.xml b/platforms/catalog-rest/pom.xml
index df6c625..b1e8784 100644
--- a/platforms/catalog-rest/pom.xml
+++ b/platforms/catalog-rest/pom.xml
@@ -43,22 +43,12 @@
<version>${javax.ws.rs-api-version}</version>
</dependency>
- <!-- swagger -->
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-core</artifactId>
- <version>${swagger-java-version}</version>
- </dependency>
+ <!-- swagger annotations -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-java-version}</version>
</dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jaxrs</artifactId>
- <version>${swagger-java-version}</version>
- </dependency>
<!-- cxf -->
<dependency>
@@ -121,6 +111,21 @@
<scope>test</scope>
</dependency>
+
+ <!-- swagger ui for testing -->
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>${swagger-ui-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty9-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- use rest assured for REST/JSon testing -->
<dependency>
<groupId>io.rest-assured</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/4df75000/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
index 4b54ee8..98a79e3 100644
--- a/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
+++ b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
@@ -25,6 +25,7 @@ import javax.ws.rs.Produces;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
@@ -48,9 +49,6 @@ public class CamelCatalogRest {
this.catalog = catalog;
}
- /**
- * The version of this Camel Catalog
- */
@GET
@Path("/catalogVersion")
@ApiOperation(value = "The version of this Camel Catalog")
@@ -58,203 +56,174 @@ public class CamelCatalogRest {
return catalog.getCatalogVersion();
}
- /**
- * Find all the component names from the Camel catalog
- */
@GET
@Path("/findComponentNames")
@Produces("application/json")
+ @ApiOperation(value = "Find all the component names from the Camel catalog")
public List<String> findComponentNames() {
return catalog.findComponentNames();
}
- /**
- * Find all the data format names from the Camel catalog
- */
@GET
@Path("/findDataFormatNames")
@Produces("application/json")
+ @ApiOperation(value = "Find all the data format names from the Camel catalog")
public List<String> findDataFormatNames() {
return catalog.findDataFormatNames();
}
- /**
- * Find all the language names from the Camel catalog
- */
@GET
@Path("/findLanguageNames")
@Produces("application/json")
+ @ApiOperation(value = "Find all the language names from the Camel catalog")
public List<String> findLanguageNames() {
return catalog.findLanguageNames();
}
- /**
- * Find all the model names from the Camel catalog
- */
@GET
@Path("/findModelNames")
@Produces("application/json")
+ @ApiOperation(value = "Find all the model (EIP) names from the Camel catalog")
public List<String> findModelNames() {
return catalog.findModelNames();
}
- /**
- * Find all the component names from the Camel catalog that matches the label
- */
@GET
@Path("/findComponentNames/{filter}")
@Produces("application/json")
- public List<String> findComponentNames(@PathParam("filter") String filter) {
+ @ApiOperation(value = "Find all the component names from the Camel catalog that matches the label")
+ public List<String> findComponentNames(@ApiParam("Filter used to only return component names that matches by their labels")
+ @PathParam("filter") String filter) {
return catalog.findComponentNames(filter);
}
- /**
- * Find all the data format names from the Camel catalog that matches the label
- */
@GET
@Path("/findDataFormatNames/{filter}")
@Produces("application/json")
- public List<String> findDataFormatNames(@PathParam("filter") String filter) {
+ @ApiOperation(value = "Find all the data format names from the Camel catalog that matches the label")
+ public List<String> findDataFormatNames(@ApiParam("Filter used to only return data format names that matches by their labels")
+ @PathParam("filter") String filter) {
return catalog.findDataFormatNames(filter);
}
- /**
- * Find all the language names from the Camel catalog that matches the label
- */
@GET
@Path("/findLanguageNames/{filter}")
@Produces("application/json")
- public List<String> findLanguageNames(@PathParam("filter") String filter) {
+ @ApiOperation(value = "Find all the language names from the Camel catalog that matches the label")
+ public List<String> findLanguageNames(@ApiParam("Filter used to only return language names that matches by their labels")
+ @PathParam("filter") String filter) {
return catalog.findLanguageNames(filter);
}
- /**
- * Find all the model names from the Camel catalog that matches the label
- */
@GET
@Path("/findModelNames/{filter}")
@Produces("application/json")
- public List<String> findModelNames(@PathParam("filter") String filter) {
+ @ApiOperation(value = "Find all the model (EIP) names from the Camel catalog that matches the label")
+ public List<String> findModelNames(@ApiParam("Filter used to only return model (EIP) names that matches by their labels")
+ @PathParam("filter") String filter) {
return catalog.findModelNames(filter);
}
- /**
- * Returns the component information as JSon format.
- */
@GET
@Path("/componentJSonSchema/{name}")
@Produces("application/json")
- public String componentJSonSchema(@PathParam("name") String name) {
+ @ApiOperation(value = "Returns the component information as JSon format")
+ public String componentJSonSchema(@ApiParam("The name of the component")
+ @PathParam("name") String name) {
return catalog.componentJSonSchema(name);
}
- /**
- * Returns the data format information as JSon format.
- */
@GET
@Path("/dataFormatJSonSchema/{name}")
@Produces("application/json")
- public String dataFormatJSonSchema(@PathParam("name") String name) {
+ @ApiOperation(value = "Returns the data format information as JSon format")
+ public String dataFormatJSonSchema(@ApiParam("The name of the data format")
+ @PathParam("name") String name) {
return catalog.dataFormatJSonSchema(name);
}
- /**
- * Returns the language information as JSon format.
- */
@GET
@Path("/languageJSonSchema/{name}")
@Produces("application/json")
- public String languageJSonSchema(@PathParam("name") String name) {
+ @ApiOperation(value = "Returns the language information as JSon format")
+ public String languageJSonSchema(@ApiParam("The name of the language")
+ @PathParam("name") String name) {
return catalog.languageJSonSchema(name);
}
- /**
- * Returns the model information as JSon format.
- */
@GET
@Path("/modelJSonSchema/{name}")
@Produces("application/json")
- public String modelJSonSchema(@PathParam("name") String name) {
+ @ApiOperation(value = "Returns the model (EIP) information as JSon format")
+ public String modelJSonSchema(@ApiParam("The name of the model (EIP)")
+ @PathParam("name") String name) {
return catalog.modelJSonSchema(name);
}
- /**
- * Returns the component documentation as Ascii doc format.
- */
@GET
@Path("/componentAsciiDoc/{name}")
@Produces("text/plain")
- public String componentAsciiDoc(@PathParam("name") String name) {
+ @ApiOperation(value = "Returns the component documentation as Ascii doc format")
+ public String componentAsciiDoc(@ApiParam("The name of the component")
+ @PathParam("name") String name) {
return catalog.componentAsciiDoc(name);
}
- /**
- * Returns the data format documentation as Ascii doc format.
- */
@GET
@Path("/dataFormatAsciiDoc/{name}")
@Produces("text/plain")
- public String dataFormatAsciiDoc(@PathParam("name") String name) {
+ @ApiOperation(value = "Returns the data format documentation as Ascii doc format")
+ public String dataFormatAsciiDoc(@ApiParam("The name of the data format")
+ @PathParam("name") String name) {
return catalog.dataFormatAsciiDoc(name);
}
- /**
- * Returns the language documentation as Ascii doc format.
- */
@GET
@Path("/languageAsciiDoc/{name}")
@Produces("text/plain")
- public String languageAsciiDoc(@PathParam("name") String name) {
+ @ApiOperation(value = "Returns the language documentation as Ascii doc format")
+ public String languageAsciiDoc(@ApiParam("The name of the language")
+ @PathParam("name") String name) {
return catalog.languageAsciiDoc(name);
}
- /**
- * Find all the unique label names all the components are using.
- */
@GET
@Path("/findComponentLabels")
@Produces("application/json")
+ @ApiOperation(value = "Find all the unique label names all the components are using")
public Set<String> findComponentLabels() {
return catalog.findComponentLabels();
}
- /**
- * Find all the unique label names all the data formats are using.
- */
@GET
@Path("/findDataFormatLabels")
@Produces("application/json")
+ @ApiOperation(value = "Find all the unique label names all the data formats are using")
public Set<String> findDataFormatLabels() {
return catalog.findDataFormatLabels();
}
- /**
- * Find all the unique label names all the data formats are using.
- */
@GET
@Path("/findLanguageLabels")
@Produces("application/json")
+ @ApiOperation(value = "Find all the unique label names all the languages are using")
public Set<String> findLanguageLabels() {
return catalog.findLanguageLabels();
}
- /**
- * Find all the unique label names all the models are using.
- */
@GET
@Path("/findModelLabels")
@Produces("application/json")
+ @ApiOperation(value = "Find all the unique label names all the models (EIP) are using.")
public Set<String> findModelLabels() {
return catalog.findModelLabels();
}
- /**
- * Returns the Apache Camel Maven Archetype catalog in XML format.
- */
@GET
@Path("/archetypeCatalogAsXml")
@Produces("application/xml")
+ @ApiOperation(value = "Returns the Apache Camel Maven Archetype catalog in XML format")
public String archetypeCatalogAsXml() {
return catalog.archetypeCatalogAsXml();
}
@@ -265,6 +234,7 @@ public class CamelCatalogRest {
@GET
@Path("/springSchemaAsXml")
@Produces("application/xml")
+ @ApiOperation(value = "Returns the Camel Spring XML schema")
public String springSchemaAsXml() {
return catalog.springSchemaAsXml();
}
@@ -275,56 +245,47 @@ public class CamelCatalogRest {
@GET
@Path("/blueprintSchemaAsXml")
@Produces("application/xml")
+ @ApiOperation(value = "Returns the Camel Blueprint XML schema")
public String blueprintSchemaAsXml() {
return catalog.blueprintSchemaAsXml();
}
- /**
- * Lists all the components summary details in JSon
- */
@GET
@Path("/listComponentsAsJson")
@Produces("application/json")
+ @ApiOperation(value = "Lists all the components summary details in JSon")
public String listComponentsAsJson() {
return catalog.listComponentsAsJson();
}
- /**
- * Lists all the data formats summary details in JSon
- */
@GET
@Path("/listDataFormatsAsJson")
@Produces("application/json")
+ @ApiOperation(value = "Lists all the data formats summary details in JSon")
public String listDataFormatsAsJson() {
return catalog.listDataFormatsAsJson();
}
- /**
- * Lists all the languages summary details in JSon
- */
@GET
@Path("/listLanguagesAsJson")
@Produces("application/json")
+ @ApiOperation(value = "Lists all the languages summary details in JSon")
public String listLanguagesAsJson() {
return catalog.listLanguagesAsJson();
}
- /**
- * Lists all the models (EIPs) summary details in JSon
- */
@GET
@Path("/listModelsAsJson")
@Produces("application/json")
+ @ApiOperation(value = "Lists all the models (EIP) summary details in JSon")
public String listModelsAsJson() {
return catalog.listModelsAsJson();
}
- /**
- * Reports a summary what the catalog contains in JSon
- */
@GET
@Path("/summaryAsJson")
@Produces("application/json")
+ @ApiOperation(value = "Reports a summary what the catalog contains in JSon")
public String summaryAsJson() {
return catalog.summaryAsJson();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4df75000/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java
index d67597f..44a17f6 100644
--- a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java
+++ b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogRestTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -63,10 +64,20 @@ public class CamelCatalogRestTest {
@Test
public void testFindComponentLabels() throws Exception {
given().
- baseUri("http://localhost:" + port).
+ baseUri("http://localhost:" + port).
when().
get("/camel-catalog/findComponentLabels").
then().
body("$", hasItems("bigdata", "messaging"));
}
+
+ @Test
+ public void testComponentJSonSchema() throws Exception {
+ given().
+ baseUri("http://localhost:" + port).
+ when().
+ get("/camel-catalog/componentJSonSchema/quartz2").
+ then().
+ body("component.description", Matchers.is("Provides a scheduled delivery of messages using the Quartz 2.x scheduler."));
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4df75000/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
index 339040f..feb6d63 100644
--- a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
+++ b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
@@ -50,6 +50,10 @@ public class CamelCatalogSwaggerTest {
swagger.setBasePath("/");
swagger.setScanAllResources(false);
swagger.setPrettyPrint(true);
+ swagger.setSupportSwaggerUi(true);
+ swagger.setDescription("Camel Catalog REST Api");
+ swagger.setVersion(catalog.getCatalogVersion());
+ swagger.setContact("Apache Camel");
sf.getFeatures().add(swagger);
// to use jackson for json
@@ -76,5 +80,7 @@ public class CamelCatalogSwaggerTest {
get("/swagger.json").
then().
body("paths./camel-catalog/catalogVersion.get.summary", Matchers.is("The version of this Camel Catalog"));
+
+ // System.out.println("Swagger UI: http://localhost:9000/api-docs?url=/swagger.json");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4df75000/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
index 426cd02..3c63ac5 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -240,7 +240,7 @@ public interface CamelCatalog {
Set<String> findDataFormatLabels();
/**
- * Find all the unique label names all the data formats are using.
+ * Find all the unique label names all the languages are using.
*
* @return a set of all the labels.
*/
[5/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS
application
Posted by da...@apache.org.
CAMEL-10561: camel-catalog - Add REST JAX-RS application
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59a2585c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59a2585c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59a2585c
Branch: refs/heads/master
Commit: 59a2585c0dd314711771eacc7f59def05f34daa7
Parents: 41d10de
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 11:40:27 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 11:40:27 2016 +0100
----------------------------------------------------------------------
platforms/catalog-rest/pom.xml | 23 ++++++
.../camel/catalog/rest/CamelCatalogRest.java | 4 +
.../catalog/rest/CamelCatalogSwaggerTest.java | 80 ++++++++++++++++++++
3 files changed, 107 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/59a2585c/platforms/catalog-rest/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/pom.xml b/platforms/catalog-rest/pom.xml
index e1e7e45..df6c625 100644
--- a/platforms/catalog-rest/pom.xml
+++ b/platforms/catalog-rest/pom.xml
@@ -43,6 +43,23 @@
<version>${javax.ws.rs-api-version}</version>
</dependency>
+ <!-- swagger -->
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-core</artifactId>
+ <version>${swagger-java-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-java-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jaxrs</artifactId>
+ <version>${swagger-java-version}</version>
+ </dependency>
+
<!-- cxf -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -68,6 +85,12 @@
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- to support json -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/59a2585c/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
index e2466d9..4b54ee8 100644
--- a/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
+++ b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
@@ -23,12 +23,15 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
/**
* A REST based {@link CamelCatalog} service as a JAX-RS resource class.
*/
+@Api(value = "/camel-catalog", description = "Camel Catalog REST API")
@Path("/camel-catalog")
public class CamelCatalogRest {
@@ -50,6 +53,7 @@ public class CamelCatalogRest {
*/
@GET
@Path("/catalogVersion")
+ @ApiOperation(value = "The version of this Camel Catalog")
public String getCatalogVersion() {
return catalog.getCatalogVersion();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/59a2585c/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
new file mode 100644
index 0000000..339040f
--- /dev/null
+++ b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
@@ -0,0 +1,80 @@
+/**
+ * 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.rest;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
+import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static io.restassured.RestAssured.given;
+
+public class CamelCatalogSwaggerTest {
+
+ private Server server;
+ private CamelCatalogRest catalog;
+ private int port;
+
+ @Before
+ public void setup() {
+ catalog = new CamelCatalogRest();
+
+ port = AvailablePortFinder.getNextAvailable(9000);
+
+ // setup Apache CXF REST server
+ JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
+ sf.setResourceClasses(CamelCatalogRest.class);
+ sf.setResourceProvider(CamelCatalogRest.class, new SingletonResourceProvider(catalog));
+
+ Swagger2Feature swagger = new Swagger2Feature();
+ swagger.setBasePath("/");
+ swagger.setScanAllResources(false);
+ swagger.setPrettyPrint(true);
+ sf.getFeatures().add(swagger);
+
+ // to use jackson for json
+ sf.setProvider(JacksonJsonProvider.class);
+ sf.setAddress("http://localhost:" + port);
+
+ // create and start the CXF server (non blocking)
+ server = sf.create();
+ server.start();
+ }
+
+ @After
+ public void stop() {
+ if (server != null) {
+ server.stop();
+ }
+ }
+
+ @Test
+ public void testSwagger() throws Exception {
+ given().
+ baseUri("http://localhost:" + port).
+ when().
+ get("/swagger.json").
+ then().
+ body("paths./camel-catalog/catalogVersion.get.summary", Matchers.is("The version of this Camel Catalog"));
+ }
+}
[2/8] camel git commit: Fixed wrong label on chronicle
Posted by da...@apache.org.
Fixed wrong label on chronicle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05f72482
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05f72482
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05f72482
Branch: refs/heads/master
Commit: 05f724820e55ee812d75e3f09613e9e53d6e68b8
Parents: 1ac086c
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 10:48:48 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 10:48:48 2016 +0100
----------------------------------------------------------------------
.../camel/component/chronicle/engine/ChronicleEngineEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/05f72482/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java
index cab5de2..570ceae 100644
--- a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java
+++ b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.spi.UriPath;
/**
* The camel chronicle-engine component let you leverage the power of OpenHFT's <a href="https://github.com/OpenHFT/Chronicle-Engine">Chronicle-Engine</a>.
*/
-@UriEndpoint(scheme = "chronicle-engine", title = "Chronicle Engine", syntax = "chronicle-engine:addresses/path", consumerClass = ChronicleEngineConsumer.class, label = "Chronicle")
+@UriEndpoint(scheme = "chronicle-engine", title = "Chronicle Engine", syntax = "chronicle-engine:addresses/path", consumerClass = ChronicleEngineConsumer.class, label = "datagrid,cache")
public class ChronicleEngineEndpoint extends DefaultEndpoint {
@UriPath(description = "Engine addresses. Multiple addresses can be separated by comman.")
[7/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS
application
Posted by da...@apache.org.
CAMEL-10561: camel-catalog - Add REST JAX-RS application
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bbc8fffc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bbc8fffc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bbc8fffc
Branch: refs/heads/master
Commit: bbc8fffcd8ae29932c8f347e1fb4a04a95147c02
Parents: 4df7500
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 12:49:36 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 12:49:36 2016 +0100
----------------------------------------------------------------------
.../src/main/docs/camel-catalog-rest.adoc | 31 ++++++++++++++++++++
.../catalog/rest/CamelCatalogSwaggerTest.java | 3 +-
2 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bbc8fffc/platforms/catalog-rest/src/main/docs/camel-catalog-rest.adoc
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/main/docs/camel-catalog-rest.adoc b/platforms/catalog-rest/src/main/docs/camel-catalog-rest.adoc
new file mode 100644
index 0000000..28424b7
--- /dev/null
+++ b/platforms/catalog-rest/src/main/docs/camel-catalog-rest.adoc
@@ -0,0 +1,31 @@
+= Camel Catalog REST Api
+
+The camel-catalog-rest is a tiny REST API of the Camel Catalog. The API is implemented as a JAX-RS resource class
+with Swagger Annotations to offer Swagger documentation.
+
+== Dependencies
+
+The camel-catalog-rest dependencies has been kept low and neutral so any JAX-RS server can be used to
+host the Camel Catalog REST API.
+
+```
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog</artifactId>
+ </dependency>
+
+ <!-- REST api -->
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>${javax.ws.rs-api-version}</version>
+ </dependency>
+
+ <!-- swagger annotations -->
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-java-version}</version>
+ </dependency>
+```
+
http://git-wip-us.apache.org/repos/asf/camel/blob/bbc8fffc/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
index feb6d63..91ca90e 100644
--- a/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
+++ b/platforms/catalog-rest/src/test/java/org/apache/camel/catalog/rest/CamelCatalogSwaggerTest.java
@@ -51,7 +51,8 @@ public class CamelCatalogSwaggerTest {
swagger.setScanAllResources(false);
swagger.setPrettyPrint(true);
swagger.setSupportSwaggerUi(true);
- swagger.setDescription("Camel Catalog REST Api");
+ swagger.setTitle("Camel Catalog REST Api");
+ swagger.setDescription("REST Api for the Camel Catalog");
swagger.setVersion(catalog.getCatalogVersion());
swagger.setContact("Apache Camel");
sf.getFeatures().add(swagger);
[3/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS
application
Posted by da...@apache.org.
CAMEL-10561: camel-catalog - Add REST JAX-RS application
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/799f90fa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/799f90fa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/799f90fa
Branch: refs/heads/master
Commit: 799f90fa289fe3ab091a3b9e2d111ec1f5d0bdd8
Parents: 05f7248
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 10:51:15 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 10:51:15 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/catalog-rest/pom.xml | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/799f90fa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0d65bf3..bf2feb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -305,6 +305,7 @@
<javax-inject-bundle-version>1_2</javax-inject-bundle-version>
<javax-mail-version>1.5.5</javax-mail-version>
<javax.servlet-api-version>3.1.0</javax.servlet-api-version>
+ <javax.ws.rs-api-version>2.0.1</javax.ws.rs-api-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
<jaxen-version>1.1.6</jaxen-version>
<jbpm-version>6.5.0.Final</jbpm-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/799f90fa/platforms/catalog-rest/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/pom.xml b/platforms/catalog-rest/pom.xml
index 3cc899e..e1e7e45 100644
--- a/platforms/catalog-rest/pom.xml
+++ b/platforms/catalog-rest/pom.xml
@@ -40,8 +40,7 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <!-- TODO: put in parent -->
- <version>2.0.1</version>
+ <version>${javax.ws.rs-api-version}</version>
</dependency>
<!-- cxf -->
@@ -103,7 +102,7 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
- <version>3.0.1</version>
+ <version>${rest-assured-version}</version>
<scope>test</scope>
</dependency>
<dependency>
[8/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS
application
Posted by da...@apache.org.
CAMEL-10561: camel-catalog - Add REST JAX-RS application
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/db116fa1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db116fa1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db116fa1
Branch: refs/heads/master
Commit: db116fa1a444b9b752b263eb98b1db298e1248af
Parents: bbc8fff
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 12:57:29 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 12:57:29 2016 +0100
----------------------------------------------------------------------
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
parent/pom.xml | 5 +++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/db116fa1/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 66d9c53..77827bf 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -2152,6 +2152,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog-rest</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-commands-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/db116fa1/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index d5146b4..31c0c4a 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -276,6 +276,7 @@
<include>org.apache.camel:camel-catalog-maven</include>
<include>org.apache.camel:camel-catalog-provider-karaf</include>
<include>org.apache.camel:camel-catalog-provider-springboot</include>
+ <include>org.apache.camel:camel-catalog-rest</include>
<include>org.apache.camel:camel-commands-core</include>
<include>org.apache.camel:camel-commands-jolokia</include>
<include>org.apache.camel:camel-commands-spring-boot</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/db116fa1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0b75b1b..62a16e2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1974,6 +1974,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog-rest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-commands-core</artifactId>
<version>${project.version}</version>
</dependency>
[4/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS
application
Posted by da...@apache.org.
CAMEL-10561: camel-catalog - Add REST JAX-RS application
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/41d10de3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/41d10de3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/41d10de3
Branch: refs/heads/master
Commit: 41d10de3aef6f1eef72eeffc8d215b5702095d90
Parents: 799f90f
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 6 11:13:45 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 6 11:14:30 2016 +0100
----------------------------------------------------------------------
.../camel/catalog/rest/CamelCatalogRest.java | 277 ++++++++++++++++++-
1 file changed, 275 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/41d10de3/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
index 8ed40a2..e2466d9 100644
--- a/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
+++ b/platforms/catalog-rest/src/main/java/org/apache/camel/catalog/rest/CamelCatalogRest.java
@@ -16,9 +16,11 @@
*/
package org.apache.camel.catalog.rest;
+import java.util.List;
import java.util.Set;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import org.apache.camel.catalog.CamelCatalog;
@@ -28,7 +30,6 @@ import org.apache.camel.catalog.DefaultCamelCatalog;
* A REST based {@link CamelCatalog} service as a JAX-RS resource class.
*/
@Path("/camel-catalog")
-@Produces("application/json")
public class CamelCatalogRest {
private CamelCatalog catalog = new DefaultCamelCatalog(true);
@@ -45,11 +46,283 @@ public class CamelCatalogRest {
}
/**
- * The GET order by id operation
+ * The version of this Camel Catalog
+ */
+ @GET
+ @Path("/catalogVersion")
+ public String getCatalogVersion() {
+ return catalog.getCatalogVersion();
+ }
+
+ /**
+ * Find all the component names from the Camel catalog
+ */
+ @GET
+ @Path("/findComponentNames")
+ @Produces("application/json")
+ public List<String> findComponentNames() {
+ return catalog.findComponentNames();
+ }
+
+ /**
+ * Find all the data format names from the Camel catalog
+ */
+ @GET
+ @Path("/findDataFormatNames")
+ @Produces("application/json")
+ public List<String> findDataFormatNames() {
+ return catalog.findDataFormatNames();
+ }
+
+ /**
+ * Find all the language names from the Camel catalog
+ */
+ @GET
+ @Path("/findLanguageNames")
+ @Produces("application/json")
+ public List<String> findLanguageNames() {
+ return catalog.findLanguageNames();
+
+ }
+
+ /**
+ * Find all the model names from the Camel catalog
+ */
+ @GET
+ @Path("/findModelNames")
+ @Produces("application/json")
+ public List<String> findModelNames() {
+ return catalog.findModelNames();
+ }
+
+ /**
+ * Find all the component names from the Camel catalog that matches the label
+ */
+ @GET
+ @Path("/findComponentNames/{filter}")
+ @Produces("application/json")
+ public List<String> findComponentNames(@PathParam("filter") String filter) {
+ return catalog.findComponentNames(filter);
+ }
+
+ /**
+ * Find all the data format names from the Camel catalog that matches the label
+ */
+ @GET
+ @Path("/findDataFormatNames/{filter}")
+ @Produces("application/json")
+ public List<String> findDataFormatNames(@PathParam("filter") String filter) {
+ return catalog.findDataFormatNames(filter);
+ }
+
+ /**
+ * Find all the language names from the Camel catalog that matches the label
+ */
+ @GET
+ @Path("/findLanguageNames/{filter}")
+ @Produces("application/json")
+ public List<String> findLanguageNames(@PathParam("filter") String filter) {
+ return catalog.findLanguageNames(filter);
+ }
+
+ /**
+ * Find all the model names from the Camel catalog that matches the label
+ */
+ @GET
+ @Path("/findModelNames/{filter}")
+ @Produces("application/json")
+ public List<String> findModelNames(@PathParam("filter") String filter) {
+ return catalog.findModelNames(filter);
+ }
+
+ /**
+ * Returns the component information as JSon format.
+ */
+ @GET
+ @Path("/componentJSonSchema/{name}")
+ @Produces("application/json")
+ public String componentJSonSchema(@PathParam("name") String name) {
+ return catalog.componentJSonSchema(name);
+ }
+
+ /**
+ * Returns the data format information as JSon format.
+ */
+ @GET
+ @Path("/dataFormatJSonSchema/{name}")
+ @Produces("application/json")
+ public String dataFormatJSonSchema(@PathParam("name") String name) {
+ return catalog.dataFormatJSonSchema(name);
+ }
+
+ /**
+ * Returns the language information as JSon format.
+ */
+ @GET
+ @Path("/languageJSonSchema/{name}")
+ @Produces("application/json")
+ public String languageJSonSchema(@PathParam("name") String name) {
+ return catalog.languageJSonSchema(name);
+ }
+
+ /**
+ * Returns the model information as JSon format.
+ */
+ @GET
+ @Path("/modelJSonSchema/{name}")
+ @Produces("application/json")
+ public String modelJSonSchema(@PathParam("name") String name) {
+ return catalog.modelJSonSchema(name);
+ }
+
+ /**
+ * Returns the component documentation as Ascii doc format.
+ */
+ @GET
+ @Path("/componentAsciiDoc/{name}")
+ @Produces("text/plain")
+ public String componentAsciiDoc(@PathParam("name") String name) {
+ return catalog.componentAsciiDoc(name);
+ }
+
+ /**
+ * Returns the data format documentation as Ascii doc format.
+ */
+ @GET
+ @Path("/dataFormatAsciiDoc/{name}")
+ @Produces("text/plain")
+ public String dataFormatAsciiDoc(@PathParam("name") String name) {
+ return catalog.dataFormatAsciiDoc(name);
+ }
+
+ /**
+ * Returns the language documentation as Ascii doc format.
+ */
+ @GET
+ @Path("/languageAsciiDoc/{name}")
+ @Produces("text/plain")
+ public String languageAsciiDoc(@PathParam("name") String name) {
+ return catalog.languageAsciiDoc(name);
+ }
+
+ /**
+ * Find all the unique label names all the components are using.
*/
@GET
@Path("/findComponentLabels")
+ @Produces("application/json")
public Set<String> findComponentLabels() {
return catalog.findComponentLabels();
}
+
+ /**
+ * Find all the unique label names all the data formats are using.
+ */
+ @GET
+ @Path("/findDataFormatLabels")
+ @Produces("application/json")
+ public Set<String> findDataFormatLabels() {
+ return catalog.findDataFormatLabels();
+ }
+
+ /**
+ * Find all the unique label names all the data formats are using.
+ */
+ @GET
+ @Path("/findLanguageLabels")
+ @Produces("application/json")
+ public Set<String> findLanguageLabels() {
+ return catalog.findLanguageLabels();
+ }
+
+ /**
+ * Find all the unique label names all the models are using.
+ */
+ @GET
+ @Path("/findModelLabels")
+ @Produces("application/json")
+ public Set<String> findModelLabels() {
+ return catalog.findModelLabels();
+ }
+
+ /**
+ * Returns the Apache Camel Maven Archetype catalog in XML format.
+ */
+ @GET
+ @Path("/archetypeCatalogAsXml")
+ @Produces("application/xml")
+ public String archetypeCatalogAsXml() {
+ return catalog.archetypeCatalogAsXml();
+ }
+
+ /**
+ * Returns the Camel Spring XML schema
+ */
+ @GET
+ @Path("/springSchemaAsXml")
+ @Produces("application/xml")
+ public String springSchemaAsXml() {
+ return catalog.springSchemaAsXml();
+ }
+
+ /**
+ * Returns the Camel Blueprint XML schema
+ */
+ @GET
+ @Path("/blueprintSchemaAsXml")
+ @Produces("application/xml")
+ public String blueprintSchemaAsXml() {
+ return catalog.blueprintSchemaAsXml();
+ }
+
+ /**
+ * Lists all the components summary details in JSon
+ */
+ @GET
+ @Path("/listComponentsAsJson")
+ @Produces("application/json")
+ public String listComponentsAsJson() {
+ return catalog.listComponentsAsJson();
+ }
+
+ /**
+ * Lists all the data formats summary details in JSon
+ */
+ @GET
+ @Path("/listDataFormatsAsJson")
+ @Produces("application/json")
+ public String listDataFormatsAsJson() {
+ return catalog.listDataFormatsAsJson();
+ }
+
+ /**
+ * Lists all the languages summary details in JSon
+ */
+ @GET
+ @Path("/listLanguagesAsJson")
+ @Produces("application/json")
+ public String listLanguagesAsJson() {
+ return catalog.listLanguagesAsJson();
+ }
+
+ /**
+ * Lists all the models (EIPs) summary details in JSon
+ */
+ @GET
+ @Path("/listModelsAsJson")
+ @Produces("application/json")
+ public String listModelsAsJson() {
+ return catalog.listModelsAsJson();
+ }
+
+ /**
+ * Reports a summary what the catalog contains in JSon
+ */
+ @GET
+ @Path("/summaryAsJson")
+ @Produces("application/json")
+ public String summaryAsJson() {
+ return catalog.summaryAsJson();
+ }
+
}