[1/4] camel git commit: FUSETOOLS-1352 - Found issue with camel-dozer loading script files for expression mappings. Added functionality and new tests to camel component
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x bfcd55687 - ae1f2015e
refs/heads/master 3fbf4e851 - 0fa00d30d
FUSETOOLS-1352 - Found issue with camel-dozer loading script files for
expression mappings. Added functionality and new tests to camel
component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad77413b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad77413b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad77413b
Branch: refs/heads/master
Commit: ad77413bfa7e3a4b6a52c201416ec8c44e7959e6
Parents: 3fbf4e8
Author: Brian Fitzpatrick bfitz...@redhat.com
Authored: Tue Jun 23 11:32:27 2015 -0600
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 07:58:50 2015 +0200
--
.../camel/component/dozer/ExpressionMapper.java | 83 +++-
.../dozer/ExpressionMappingClasspathTest.java | 72 +
.../dozer/ExpressionMappingFileTest.java| 72 +
.../component/dozer/ExpressionMappingTest.java | 1 +
.../ExpressionMappingClasspathTest-context.xml | 29 +++
.../dozer/ExpressionMappingFileTest-context.xml | 29 +++
.../component/dozer/expressionClasspath.txt | 1 +
.../camel/component/dozer/expressionFile.txt| 1 +
.../dozer/expressionMappingClasspath.xml| 43 ++
.../component/dozer/expressionMappingFile.xml | 43 ++
10 files changed, 373 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ad77413b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
index afee452..007cc97 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
@@ -16,9 +16,14 @@
*/
package org.apache.camel.component.dozer;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.spi.Language;
+import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.util.IOHelper;
/**
* Provides support for mapping a Camel expression to a target field in a
@@ -44,7 +49,22 @@ public class ExpressionMapper extends BaseConverter {
// Resolve the language being used for this expression and evaluate
Exchange exchange = currentExchange.get();
Language expLang =
exchange.getContext().resolveLanguage(getLanguagePart());
-Expression exp = expLang.createExpression(getExpressionPart());
+String scheme = getSchemePart();
+Expression exp = null;
+if (scheme != null
+(scheme.equalsIgnoreCase(classpath) ||
+scheme.equalsIgnoreCase(file) ||
+scheme.equalsIgnoreCase(http))) {
+String path = getPathPart();
+try {
+exp = expLang.createExpression(resolveScript(scheme + :
+ path));
+} catch (IOException e) {
+throw new IllegalStateException(
+Expression script specified but not found, e);
+}
+} else {
+exp = expLang.createExpression(getExpressionPart());
+}
return exp.evaluate(exchange, destinationClass);
} finally {
done();
@@ -52,6 +72,37 @@ public class ExpressionMapper extends BaseConverter {
}
/**
+ * Resolves the script.
+ *
+ * @param script script or uri for a script to load
+ * @return the script
+ * @throws IOException is thrown if error loading the script
+ */
+protected String resolveScript(String script) throws IOException {
+String answer;
+if (ResourceHelper.hasScheme(script)) {
+InputStream is = loadResource(script);
+answer =
currentExchange.get().getContext().getTypeConverter().convertTo(String.class,
is);
+IOHelper.close(is);
+} else {
+answer = script;
+}
+
+return answer;
+}
+
+/**
+ * Loads the given resource.
+ *
+ * @param uri uri of the resource.
+ * @return the loaded resource
+ * @throws IOException is thrown if resource is not found or cannot be
loaded
+ */
+protected InputStream loadResource(String uri) throws IOException {
+return
[3/4] camel git commit: FUSETOOLS-1352 - Found issue with camel-dozer loading script files for expression mappings. Added functionality and new tests to camel component
FUSETOOLS-1352 - Found issue with camel-dozer loading script files for
expression mappings. Added functionality and new tests to camel
component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ee7b9ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ee7b9ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ee7b9ec
Branch: refs/heads/camel-2.15.x
Commit: 6ee7b9ec7507f5f69ef78ac889408d47e58766e5
Parents: bfcd556
Author: Brian Fitzpatrick bfitz...@redhat.com
Authored: Tue Jun 23 11:32:27 2015 -0600
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 08:12:03 2015 +0200
--
.../camel/component/dozer/ExpressionMapper.java | 83 +++-
.../dozer/ExpressionMappingClasspathTest.java | 72 +
.../dozer/ExpressionMappingFileTest.java| 72 +
.../component/dozer/ExpressionMappingTest.java | 1 +
.../ExpressionMappingClasspathTest-context.xml | 29 +++
.../dozer/ExpressionMappingFileTest-context.xml | 29 +++
.../component/dozer/expressionClasspath.txt | 1 +
.../camel/component/dozer/expressionFile.txt| 1 +
.../dozer/expressionMappingClasspath.xml| 43 ++
.../component/dozer/expressionMappingFile.xml | 43 ++
10 files changed, 373 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6ee7b9ec/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
index afee452..007cc97 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
@@ -16,9 +16,14 @@
*/
package org.apache.camel.component.dozer;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.spi.Language;
+import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.util.IOHelper;
/**
* Provides support for mapping a Camel expression to a target field in a
@@ -44,7 +49,22 @@ public class ExpressionMapper extends BaseConverter {
// Resolve the language being used for this expression and evaluate
Exchange exchange = currentExchange.get();
Language expLang =
exchange.getContext().resolveLanguage(getLanguagePart());
-Expression exp = expLang.createExpression(getExpressionPart());
+String scheme = getSchemePart();
+Expression exp = null;
+if (scheme != null
+(scheme.equalsIgnoreCase(classpath) ||
+scheme.equalsIgnoreCase(file) ||
+scheme.equalsIgnoreCase(http))) {
+String path = getPathPart();
+try {
+exp = expLang.createExpression(resolveScript(scheme + :
+ path));
+} catch (IOException e) {
+throw new IllegalStateException(
+Expression script specified but not found, e);
+}
+} else {
+exp = expLang.createExpression(getExpressionPart());
+}
return exp.evaluate(exchange, destinationClass);
} finally {
done();
@@ -52,6 +72,37 @@ public class ExpressionMapper extends BaseConverter {
}
/**
+ * Resolves the script.
+ *
+ * @param script script or uri for a script to load
+ * @return the script
+ * @throws IOException is thrown if error loading the script
+ */
+protected String resolveScript(String script) throws IOException {
+String answer;
+if (ResourceHelper.hasScheme(script)) {
+InputStream is = loadResource(script);
+answer =
currentExchange.get().getContext().getTypeConverter().convertTo(String.class,
is);
+IOHelper.close(is);
+} else {
+answer = script;
+}
+
+return answer;
+}
+
+/**
+ * Loads the given resource.
+ *
+ * @param uri uri of the resource.
+ * @return the loaded resource
+ * @throws IOException is thrown if resource is not found or cannot be
loaded
+ */
+protected InputStream loadResource(String uri) throws IOException {
+return
ResourceHelper.resolveMandatoryResourceAsInputStream(currentExchange.get().getContext().getClassResolver(),
uri);
+}
+
+/**
*
[2/4] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0fa00d30
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0fa00d30
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0fa00d30
Branch: refs/heads/master
Commit: 0fa00d30d0ec7c0ada6d7c661ac6e1263030c57a
Parents: ad77413
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 24 08:11:02 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 08:11:02 2015 +0200
--
.../apache/camel/component/dozer/ExpressionMapper.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0fa00d30/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
index 007cc97..9a6ec17 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.spi.Language;
-import org.apache.camel.util.ResourceHelper;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ResourceHelper;
/**
* Provides support for mapping a Camel expression to a target field in a
@@ -46,15 +46,14 @@ public class ExpressionMapper extends BaseConverter {
throw new IllegalStateException(
Current exchange has not been set for
ExpressionMapper);
}
+
+Expression exp;
+
// Resolve the language being used for this expression and evaluate
Exchange exchange = currentExchange.get();
Language expLang =
exchange.getContext().resolveLanguage(getLanguagePart());
String scheme = getSchemePart();
-Expression exp = null;
-if (scheme != null
-(scheme.equalsIgnoreCase(classpath) ||
-scheme.equalsIgnoreCase(file) ||
-scheme.equalsIgnoreCase(http))) {
+if (scheme != null (scheme.equalsIgnoreCase(classpath) ||
scheme.equalsIgnoreCase(file) || scheme.equalsIgnoreCase(http))) {
String path = getPathPart();
try {
exp = expLang.createExpression(resolveScript(scheme + :
+ path));
[4/4] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae1f2015
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae1f2015
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae1f2015
Branch: refs/heads/camel-2.15.x
Commit: ae1f2015ee6127e32f165646b62cd2d9cd0583d1
Parents: 6ee7b9e
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 24 08:11:02 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 08:12:08 2015 +0200
--
.../apache/camel/component/dozer/ExpressionMapper.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ae1f2015/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
--
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
index 007cc97..9a6ec17 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.spi.Language;
-import org.apache.camel.util.ResourceHelper;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ResourceHelper;
/**
* Provides support for mapping a Camel expression to a target field in a
@@ -46,15 +46,14 @@ public class ExpressionMapper extends BaseConverter {
throw new IllegalStateException(
Current exchange has not been set for
ExpressionMapper);
}
+
+Expression exp;
+
// Resolve the language being used for this expression and evaluate
Exchange exchange = currentExchange.get();
Language expLang =
exchange.getContext().resolveLanguage(getLanguagePart());
String scheme = getSchemePart();
-Expression exp = null;
-if (scheme != null
-(scheme.equalsIgnoreCase(classpath) ||
-scheme.equalsIgnoreCase(file) ||
-scheme.equalsIgnoreCase(http))) {
+if (scheme != null (scheme.equalsIgnoreCase(classpath) ||
scheme.equalsIgnoreCase(file) || scheme.equalsIgnoreCase(http))) {
String path = getPathPart();
try {
exp = expLang.createExpression(resolveScript(scheme + :
+ path));
[2/2] camel git commit: CAMEL-8895: camel-swagger should filter out older Camel releases that dont support rest-dsl
CAMEL-8895: camel-swagger should filter out older Camel releases that dont
support rest-dsl
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9f71d51
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9f71d51
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9f71d51
Branch: refs/heads/camel-2.15.x
Commit: c9f71d5197ae8662017e7155a1f3c97adf411d8c
Parents: ae1f201
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 24 09:56:34 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 09:57:26 2015 +0200
--
.../apache/camel/util/CamelVersionHelper.java | 42
.../camel/util/CamelVersionHelperTest.java | 38 ++
.../swagger/DefaultCamelSwaggerServlet.scala| 9 -
3 files changed, 87 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c9f71d51/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
b/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
new file mode 100644
index 000..368b4c7
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
@@ -0,0 +1,42 @@
+/**
+ * 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.util;
+
+/**
+ * A simple util to test Camel versions.
+ */
+public final class CamelVersionHelper {
+
+/**
+ * Checks whether other = base
+ *
+ * @param base the base version
+ * @param other the other version
+ * @return tttrue/tt if GE, ttfalse/tt otherwise
+ */
+public static boolean isGE(String base, String other) {
+String s1 = base.replaceAll(\\., );
+String s2 = other.replaceAll(\\., );
+// SNAPSHOT as .0
+s1 = s1.replace(-SNAPSHOT, 0);
+s2 = s2.replace(-SNAPSHOT, 0);
+// then use number comparison
+int n1 = Integer.valueOf(s1);
+int n2 = Integer.valueOf(s2);
+return Integer.compare(n2, n1) = 0;
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c9f71d51/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
b/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
new file mode 100644
index 000..bf249ba
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
@@ -0,0 +1,38 @@
+/**
+ * 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.util;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.apache.camel.util.CamelVersionHelper.isGE;
+
+public class CamelVersionHelperTest extends TestCase {
+
+@Test
+public void testGE() throws Exception {
+assertTrue(isGE(2.15.0, 2.15.0));
+assertTrue(isGE(2.15.0, 2.15.1));
+assertTrue(isGE(2.15.0, 2.16.0));
+assertTrue(isGE(2.15.0, 2.16-SNAPSHOT));
+
+assertFalse(isGE(2.15.0, 2.14.3));
+assertFalse(isGE(2.15.0, 2.13.0));
+
[1/2] camel git commit: CAMEL-8895: camel-swagger should filter out older Camel releases that dont support rest-dsl
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x ae1f2015e - c9f71d519
refs/heads/master 0fa00d30d - 07439e2c5
CAMEL-8895: camel-swagger should filter out older Camel releases that dont
support rest-dsl
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07439e2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07439e2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07439e2c
Branch: refs/heads/master
Commit: 07439e2c5f4e3737e608361648cb9bbbd5615b98
Parents: 0fa00d3
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 24 09:56:34 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 09:56:34 2015 +0200
--
.../apache/camel/util/CamelVersionHelper.java | 42
.../camel/util/CamelVersionHelperTest.java | 38 ++
.../swagger/DefaultCamelSwaggerServlet.scala| 9 -
3 files changed, 87 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/07439e2c/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
b/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
new file mode 100644
index 000..368b4c7
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java
@@ -0,0 +1,42 @@
+/**
+ * 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.util;
+
+/**
+ * A simple util to test Camel versions.
+ */
+public final class CamelVersionHelper {
+
+/**
+ * Checks whether other = base
+ *
+ * @param base the base version
+ * @param other the other version
+ * @return tttrue/tt if GE, ttfalse/tt otherwise
+ */
+public static boolean isGE(String base, String other) {
+String s1 = base.replaceAll(\\., );
+String s2 = other.replaceAll(\\., );
+// SNAPSHOT as .0
+s1 = s1.replace(-SNAPSHOT, 0);
+s2 = s2.replace(-SNAPSHOT, 0);
+// then use number comparison
+int n1 = Integer.valueOf(s1);
+int n2 = Integer.valueOf(s2);
+return Integer.compare(n2, n1) = 0;
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/07439e2c/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
b/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
new file mode 100644
index 000..bf249ba
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
@@ -0,0 +1,38 @@
+/**
+ * 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.util;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.apache.camel.util.CamelVersionHelper.isGE;
+
+public class CamelVersionHelperTest extends TestCase {
+
+@Test
+public void testGE() throws Exception {
+assertTrue(isGE(2.15.0, 2.15.0));
+assertTrue(isGE(2.15.0, 2.15.1));
+assertTrue(isGE(2.15.0, 2.16.0));
+
svn commit: r955838 - in /websites/production/camel/content: cache/main.pageCache camel-2160-release.html
Author: buildbot Date: Wed Jun 24 08:18:38 2015 New Revision: 955838 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2160-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2160-release.html == --- websites/production/camel/content/camel-2160-release.html (original) +++ websites/production/camel/content/camel-2160-release.html Wed Jun 24 08:18:38 2015 @@ -84,7 +84,7 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontenth1 id=Camel2.16.0Release-Camel2.16.0release(currentlyinprogress)Camel 2.16.0#160;release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px;pimg class=confluence-embedded-image confluence-external-resource src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; data-image-src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;/p/divdiv style=min-height:200px#160;/divh2 id=Camel2.16.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.16.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/ppNoteworthy improvements:/pulliThe route models (definition classes) preserve property placeholders, which allows round trip editing, and also prevents showing potential sensitive information/liliAdded onPrepareFailure option to#160;a shape=rect href=dead-letter-channel.htmlDead Letter Ch annel/a to allow a custom processor to prepare the Exchange before sending to the dead letter queue./lilia shape=rect href=mongodb.htmlMongoDB/a tailable consumers now allow setting the codereadPreference/code option./liliUsing setFaultBody / setFaultHeader behaves similar to setBody / setHeader to preserve existing headers/attachments by setting on existing IN or OUT message./liliJava DSL using choice with end vs endChoice now validates you use them as intended. Any misconfiguration now throws an exception explaining the problem./lilia shape=rect href=pojo-producing.htmlPOJO Producing/a and#160;a shape=rect href=pojo-consuming.htmlPOJO Consuming/a lifecycle is now in sync with a shape=rect href=camelcontext.htmlCamelContext/a#160;which ensures it works as similar to Camel#160;a shape=rect href=routes.htmlRoutes/a does. Also the created producer/consumer is stopped when#160;a shape=rect href=camelcontext.htmlCam elContext/a#160;is stopping to cleanup properly./lilia shape=rect href=jms.htmlJMS/a#160;component now allows configuring concurrentConsumers/maxConcurrentConsumers separately between from(jms) vs to(jms) using request/reply over JMS/lilispana shape=rect class=external-link href=https://issues.apache.org/jira/browse/CAMEL-8506;Added SEARCH/a operation to Elasticsearch component/span/lilispanThe#160;a shape=rect href=properties.htmlProperties/a component (property placeholder) now supports an encoding option to allow reading the .properties files using a specific charset such as UTF-8. By default ISO-8859-1 is used (latin1)/span/lilispanAdded#160;codereceviveBufferSize/code option to the a shape=rect href=ftp.htmlFTP/a#160;component to make download faster. The size is by default 32kb buffer./span/lilispanThe#160;a shape=rect href=aggregator2.htmlAggregator2/a EIP now allows an external source usin g a#160;codeAggregateController/code to control the aggregator, such as for forcing completing a group or all groups, or query runtime information from the aggregator. A default controller is provided out of the box if none has been configured./span/lilispanThe#160;a shape=rect href=aggregator2.htmlAggregator2/a now enlists in JMX using a#160;codeManagedAggregateProcessorMBean/code which has more information, and also allows using the aggregate controller to control it./span/lilispanThe#160;a shape=rect href=aggregator2.htmlAggregator2/a now includes more runtime statistics which can be accessed from Java and JMX about number of incoming and completed exchanges, and per different completion triggers./span/lilispanThe#160;a shape=rect href=aggregator2.htmlAggregator2/a now supports pre-completion mode if the aggregation strategy implements#160;codePreCompletionAwareAggregationStrategy/code. This supports the use-case w here an incoming Exchange are used to determine if the current aggregated group is completed or not. If completed the group is emitted as-is, and the new incoming Exchange is used to start a new group from scratch./span/lilispanAdded options to#160;a shape=rect href=mail.htmlMail/a consumer so it can skip or handle a mail message that cannot be read from the mail server in the batch; and then move on to read the
camel git commit: Upgrade Chunk to version 2.6.4
Repository: camel Updated Branches: refs/heads/master 07439e2c5 - 55da6ced1 Upgrade Chunk to version 2.6.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/55da6ced Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/55da6ced Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/55da6ced Branch: refs/heads/master Commit: 55da6ced13ce41bf1c110cb655577cbfc2f91446 Parents: 07439e2 Author: Andrea Cosentino anco...@gmail.com Authored: Wed Jun 24 09:10:25 2015 +0200 Committer: Andrea Cosentino anco...@gmail.com Committed: Wed Jun 24 17:38:31 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/55da6ced/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 7f664f9..941b803 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -87,7 +87,7 @@ cdi-api-version1.0/cdi-api-version cglib-bundle-version2.1_3_7/cglib-bundle-version cglib-version2.2/cglib-version -chunk-templates-version2.6.3/chunk-templates-version +chunk-templates-version2.6.4/chunk-templates-version classmate-version1.0.0/classmate-version cmis-version0.8.0/cmis-version cometd-bayeux-version6.1.11/cometd-bayeux-version
[4/4] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor
refactor, added missing Salesforce fields for latest API
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c22af742
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c22af742
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c22af742
Branch: refs/heads/master
Commit: c22af7426ce3780c77ea63e3ab3398efd86ae9b5
Parents: cb71d6b
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Wed Jun 24 18:14:02 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Wed Jun 24 20:33:32 2015 -0700
--
.../camel-salesforce-component/pom.xml | 5 +
.../salesforce/SalesforceEndpointConfig.java| 59 ++-
.../salesforce/SalesforceProducer.java | 20 +-
.../SalesforceReportResultsToListConverter.java | 515 +++
.../salesforce/api/dto/PickListValue.java | 2 +-
.../salesforce/api/dto/RestResources.java | 9 +
.../salesforce/api/dto/SObjectField.java| 9 +
.../reports/AbstractAttributesBase.java | 53 ++
.../reports/AbstractReportResultsBase.java | 91
.../analytics/reports/AggregateColumnInfo.java | 42 ++
.../dto/analytics/reports/AsyncAttributes.java | 71 +++
.../analytics/reports/AsyncReportResults.java | 33 ++
.../analytics/reports/ColumnSortOrderEnum.java | 24 +
.../analytics/reports/DateGranularityEnum.java | 73 +++
.../dto/analytics/reports/DetailColumnInfo.java | 44 ++
.../dto/analytics/reports/FilterOperator.java | 44 ++
.../api/dto/analytics/reports/FilterValue.java | 44 ++
.../api/dto/analytics/reports/FormatEnum.java | 57 ++
.../analytics/reports/GroupingColumnInfo.java | 33 ++
.../api/dto/analytics/reports/GroupingInfo.java | 62 +++
.../dto/analytics/reports/GroupingValue.java| 72 +++
.../api/dto/analytics/reports/Groupings.java| 35 ++
.../analytics/reports/QueryRecordsReport.java | 40 ++
.../api/dto/analytics/reports/RecentReport.java | 71 +++
.../api/dto/analytics/reports/Report.java | 100
.../analytics/reports/ReportDescription.java| 53 ++
.../reports/ReportExtendedMetadata.java | 55 ++
.../reports/ReportFactWithDetails.java | 44 ++
.../api/dto/analytics/reports/ReportFilter.java | 53 ++
.../dto/analytics/reports/ReportFormatEnum.java | 24 +
.../dto/analytics/reports/ReportInstance.java | 90
.../dto/analytics/reports/ReportMetadata.java | 143 +
.../api/dto/analytics/reports/ReportRow.java| 35 ++
.../dto/analytics/reports/ReportStatusEnum.java | 24 +
.../api/dto/analytics/reports/ReportType.java | 44 ++
.../dto/analytics/reports/ReportTypeColumn.java | 62 +++
.../reports/ReportTypeColumnCategory.java | 46 ++
.../analytics/reports/ReportTypeMetadata.java | 47 ++
.../api/dto/analytics/reports/SummaryValue.java | 58 +++
.../dto/analytics/reports/SyncAttributes.java | 43 ++
.../analytics/reports/SyncReportResults.java| 34 ++
.../salesforce/internal/OperationName.java | 10 +-
.../internal/client/AnalyticsApiClient.java | 71 +++
.../client/DefaultAnalyticsApiClient.java | 339
.../processor/AbstractRestProcessor.java| 10 +-
.../processor/AbstractSalesforceProcessor.java | 65 ++-
.../processor/AnalyticsApiProcessor.java| 227
.../internal/processor/BulkApiProcessor.java| 10 +-
.../services/org/apache/camel/TypeConverter | 18 +
.../salesforce/AnalyticsApiIntegrationTest.java | 285 ++
.../component/salesforce/LoginConfigHelper.java | 2 +-
51 files changed, 3473 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c22af742/components/camel-salesforce/camel-salesforce-component/pom.xml
--
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 1be59f0..3420a5c 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -115,6 +115,11 @@
scopetest/scope
/dependency
dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-csv/artifactId
+ scopetest/scope
+/dependency
+dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-server/artifactId
version${jetty-version}/version
http://git-wip-us.apache.org/repos/asf/camel/blob/c22af742/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
--
diff --git
[3/4] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
http://git-wip-us.apache.org/repos/asf/camel/blob/c22af742/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
new file mode 100644
index 000..b1f039b
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.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.component.salesforce.api.dto.analytics.reports;
+
+import java.util.Map;
+
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
+
+/**
+ * Report results extended metadata.
+ */
+public class ReportExtendedMetadata extends AbstractDTOBase {
+
+private MapString, GroupingColumnInfo groupingColumnInfo;
+private MapString, DetailColumnInfo detailColumnInfo;
+private MapString, AggregateColumnInfo aggregateColumnInfo;
+
+public MapString, GroupingColumnInfo getGroupingColumnInfo() {
+return groupingColumnInfo;
+}
+
+public void setGroupingColumnInfo(MapString, GroupingColumnInfo
groupingColumnInfo) {
+this.groupingColumnInfo = groupingColumnInfo;
+}
+
+public MapString, DetailColumnInfo getDetailColumnInfo() {
+return detailColumnInfo;
+}
+
+public void setDetailColumnInfo(MapString, DetailColumnInfo
detailColumnInfo) {
+this.detailColumnInfo = detailColumnInfo;
+}
+
+public MapString, AggregateColumnInfo getAggregateColumnInfo() {
+return aggregateColumnInfo;
+}
+
+public void setAggregateColumnInfo(MapString, AggregateColumnInfo
aggregateColumnInfo) {
+this.aggregateColumnInfo = aggregateColumnInfo;
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c22af742/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
new file mode 100644
index 000..bf600ae
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
@@ -0,0 +1,44 @@
+/**
+ * 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.component.salesforce.api.dto.analytics.reports;
+
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
+
+/**
+ * Report results fact with details.
+ */
+public class ReportFactWithDetails extends AbstractDTOBase {
+
+private ReportRow[] rows;
+private SummaryValue[] aggregates;
+
+public
[1/4] camel git commit: CAMEL-8900: Fixed Javadoc parser missing first void method in API Component Framework
Repository: camel
Updated Branches:
refs/heads/master 67513554a - c22af7426
CAMEL-8900: Fixed Javadoc parser missing first void method in API Component
Framework
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb71d6b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb71d6b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb71d6b3
Branch: refs/heads/master
Commit: cb71d6b3b7eb7920da818f7d94be36ee4138d728
Parents: 6751355
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Wed Jun 24 16:16:13 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Wed Jun 24 20:33:31 2015 -0700
--
.../src/main/java/org/apache/camel/maven/JavadocParser.java| 5 +++--
.../test/java/org/apache/camel/maven/JavadocParserTest.java| 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cb71d6b3/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
--
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
index 706e0b5..b6a1ea2 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
@@ -86,7 +86,6 @@ public class JavadocParser extends Parser {
final String hrefAttr = (String)
attributes.getAttribute(HTML.Attribute.HREF);
if (hrefAttr != null
hrefAttr.contains(hrefPattern)) {
-
// unescape HTML
String methodSignature =
hrefAttr.substring(hrefAttr.indexOf('#') + 1);
final int firstHyphen =
methodSignature.indexOf('-');
@@ -146,7 +145,9 @@ public class JavadocParser extends Parser {
}
parserState = ParserState.METHOD_SUMMARY;
-} else if (parserState == ParserState.METHOD_SUMMARY
HTML.Tag.TABLE.equals(tag.getHTMLTag())) {
+} else if (parserState == ParserState.METHOD_SUMMARY
+ !methods.isEmpty()
+ HTML.Tag.TABLE.equals(tag.getHTMLTag())) {
// end of method summary table
parserState = ParserState.INIT;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cb71d6b3/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
--
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
index 183ffbb..8ee9e1e 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
@@ -40,16 +40,16 @@ public class JavadocParserTest extends Assert {
htmlParser.parse(new InputStreamReader(new
URL(JAVA6_STRING).openStream(), UTF-8));
assertNull(Java6 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java6 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java6 getMethods, 65, htmlParser.getMethods().size());
htmlParser.reset();
htmlParser.parse(new InputStreamReader(new
URL(JAVA7_STRING).openStream(), UTF-8));
assertNull(Java7 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java7 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java7 getMethods, 65, htmlParser.getMethods().size());
htmlParser.reset();
htmlParser.parse(new InputStreamReader(new
URL(JAVA8_STRING).openStream(), UTF-8));
assertNull(Java8 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java8 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java8 getMethods, 67, htmlParser.getMethods().size());
}
}
[2/4] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
http://git-wip-us.apache.org/repos/asf/camel/blob/c22af742/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
new file mode 100644
index 000..8df7b07
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
@@ -0,0 +1,285 @@
+/**
+ * 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.component.salesforce;
+
+import java.io.FileInputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.builder.RouteBuilder;
+import
org.apache.camel.component.salesforce.api.SalesforceReportResultsToListConverter;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.AsyncReportResults;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.QueryRecordsReport;
+import org.apache.camel.component.salesforce.api.dto.analytics.reports.Report;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportDescription;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportInstance;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportStatusEnum;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.SyncReportResults;
+import org.apache.camel.dataformat.csv.CsvDataFormat;
+import org.apache.commons.csv.CSVFormat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Integration test for Salesforce analytics API endpoints.
+ */
+@RunWith(Theories.class)
+public class AnalyticsApiIntegrationTest extends AbstractSalesforceTestBase {
+
+private static final Logger LOG =
LoggerFactory.getLogger(AnalyticsApiIntegrationTest.class);
+private static final int RETRY_DELAY = 5000;
+private static final int REPORT_RESULT_RETRIES = 5;
+private static final String[] REPORT_OPTIONS = new String[]{
+SalesforceReportResultsToListConverter.INCLUDE_HEADERS,
+SalesforceReportResultsToListConverter.INCLUDE_DETAILS,
+SalesforceReportResultsToListConverter.INCLUDE_SUMMARY
+};
+private static final int NUM_OPTIONS = REPORT_OPTIONS.length;
+private static final int[] POWERS = new int[] {4, 2, 1};
+
+private static String[] testReportNames;
+private boolean bodyMetadata;
+
+/**
+ * Get test report developer names as data points.
+ * @return test report developer names in test-salesforce-login.properties
+ * @throws Exception
+ */
+@DataPoints
+public static String[] getTestReportDeveloperNames() throws Exception {
+return testReportNames;
+}
+
+@BeforeClass
+public static void getReportNames() throws Exception {
+// get test report names
+Properties testProperties = new Properties();
+testProperties.load(new
FileInputStream(LoginConfigHelper.TEST_LOGIN_PROPERTIES));
+
+MapString, String reports = new TreeMapString, String();
+for (Map.EntryObject, Object entry : testProperties.entrySet()) {
+final String key = entry.getKey().toString();
+if (key.matches(report.[0-9]+)) {
+reports.put(key, entry.getValue().toString());
+}
+}
+assertFalse(Missing entries report.[0-9]+=Report
[5/8] camel git commit: CAMEL-8900: Fixed Javadoc parser missing first void method in API Component Framework
CAMEL-8900: Fixed Javadoc parser missing first void method in API Component
Framework
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef5614d1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef5614d1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef5614d1
Branch: refs/heads/camel-2.14.x
Commit: ef5614d1ec50e00f97b89fdd20ec1f3881b7a388
Parents: dc370b5
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Wed Jun 24 16:16:13 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Wed Jun 24 20:35:35 2015 -0700
--
.../src/main/java/org/apache/camel/maven/JavadocParser.java| 5 +++--
.../test/java/org/apache/camel/maven/JavadocParserTest.java| 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ef5614d1/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
--
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
index 706e0b5..b6a1ea2 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
@@ -86,7 +86,6 @@ public class JavadocParser extends Parser {
final String hrefAttr = (String)
attributes.getAttribute(HTML.Attribute.HREF);
if (hrefAttr != null
hrefAttr.contains(hrefPattern)) {
-
// unescape HTML
String methodSignature =
hrefAttr.substring(hrefAttr.indexOf('#') + 1);
final int firstHyphen =
methodSignature.indexOf('-');
@@ -146,7 +145,9 @@ public class JavadocParser extends Parser {
}
parserState = ParserState.METHOD_SUMMARY;
-} else if (parserState == ParserState.METHOD_SUMMARY
HTML.Tag.TABLE.equals(tag.getHTMLTag())) {
+} else if (parserState == ParserState.METHOD_SUMMARY
+ !methods.isEmpty()
+ HTML.Tag.TABLE.equals(tag.getHTMLTag())) {
// end of method summary table
parserState = ParserState.INIT;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ef5614d1/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
--
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
index 183ffbb..8ee9e1e 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
@@ -40,16 +40,16 @@ public class JavadocParserTest extends Assert {
htmlParser.parse(new InputStreamReader(new
URL(JAVA6_STRING).openStream(), UTF-8));
assertNull(Java6 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java6 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java6 getMethods, 65, htmlParser.getMethods().size());
htmlParser.reset();
htmlParser.parse(new InputStreamReader(new
URL(JAVA7_STRING).openStream(), UTF-8));
assertNull(Java7 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java7 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java7 getMethods, 65, htmlParser.getMethods().size());
htmlParser.reset();
htmlParser.parse(new InputStreamReader(new
URL(JAVA8_STRING).openStream(), UTF-8));
assertNull(Java8 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java8 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java8 getMethods, 67, htmlParser.getMethods().size());
}
}
[4/8] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor
refactor, added missing Salesforce fields for latest API
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e3b3510
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e3b3510
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e3b3510
Branch: refs/heads/camel-2.15.x
Commit: 7e3b3510130d0f26838e79f90a1d77610619de76
Parents: 59ae68d
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Wed Jun 24 18:14:02 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Wed Jun 24 20:35:12 2015 -0700
--
.../camel-salesforce-component/pom.xml | 5 +
.../salesforce/SalesforceEndpointConfig.java| 59 ++-
.../salesforce/SalesforceProducer.java | 20 +-
.../SalesforceReportResultsToListConverter.java | 515 +++
.../salesforce/api/dto/PickListValue.java | 2 +-
.../salesforce/api/dto/RestResources.java | 9 +
.../salesforce/api/dto/SObjectField.java| 9 +
.../reports/AbstractAttributesBase.java | 53 ++
.../reports/AbstractReportResultsBase.java | 91
.../analytics/reports/AggregateColumnInfo.java | 42 ++
.../dto/analytics/reports/AsyncAttributes.java | 71 +++
.../analytics/reports/AsyncReportResults.java | 33 ++
.../analytics/reports/ColumnSortOrderEnum.java | 24 +
.../analytics/reports/DateGranularityEnum.java | 73 +++
.../dto/analytics/reports/DetailColumnInfo.java | 44 ++
.../dto/analytics/reports/FilterOperator.java | 44 ++
.../api/dto/analytics/reports/FilterValue.java | 44 ++
.../api/dto/analytics/reports/FormatEnum.java | 57 ++
.../analytics/reports/GroupingColumnInfo.java | 33 ++
.../api/dto/analytics/reports/GroupingInfo.java | 62 +++
.../dto/analytics/reports/GroupingValue.java| 72 +++
.../api/dto/analytics/reports/Groupings.java| 35 ++
.../analytics/reports/QueryRecordsReport.java | 40 ++
.../api/dto/analytics/reports/RecentReport.java | 71 +++
.../api/dto/analytics/reports/Report.java | 100
.../analytics/reports/ReportDescription.java| 53 ++
.../reports/ReportExtendedMetadata.java | 55 ++
.../reports/ReportFactWithDetails.java | 44 ++
.../api/dto/analytics/reports/ReportFilter.java | 53 ++
.../dto/analytics/reports/ReportFormatEnum.java | 24 +
.../dto/analytics/reports/ReportInstance.java | 90
.../dto/analytics/reports/ReportMetadata.java | 143 +
.../api/dto/analytics/reports/ReportRow.java| 35 ++
.../dto/analytics/reports/ReportStatusEnum.java | 24 +
.../api/dto/analytics/reports/ReportType.java | 44 ++
.../dto/analytics/reports/ReportTypeColumn.java | 62 +++
.../reports/ReportTypeColumnCategory.java | 46 ++
.../analytics/reports/ReportTypeMetadata.java | 47 ++
.../api/dto/analytics/reports/SummaryValue.java | 58 +++
.../dto/analytics/reports/SyncAttributes.java | 43 ++
.../analytics/reports/SyncReportResults.java| 34 ++
.../salesforce/internal/OperationName.java | 10 +-
.../internal/client/AnalyticsApiClient.java | 71 +++
.../client/DefaultAnalyticsApiClient.java | 339
.../processor/AbstractRestProcessor.java| 10 +-
.../processor/AbstractSalesforceProcessor.java | 65 ++-
.../processor/AnalyticsApiProcessor.java| 227
.../internal/processor/BulkApiProcessor.java| 10 +-
.../services/org/apache/camel/TypeConverter | 18 +
.../salesforce/AnalyticsApiIntegrationTest.java | 285 ++
.../component/salesforce/LoginConfigHelper.java | 2 +-
51 files changed, 3473 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7e3b3510/components/camel-salesforce/camel-salesforce-component/pom.xml
--
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index a1291f1..bd01a68 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -115,6 +115,11 @@
scopetest/scope
/dependency
dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-csv/artifactId
+ scopetest/scope
+/dependency
+dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-server/artifactId
version${jetty-version}/version
http://git-wip-us.apache.org/repos/asf/camel/blob/7e3b3510/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
--
diff --git
[3/8] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
http://git-wip-us.apache.org/repos/asf/camel/blob/7e3b3510/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
new file mode 100644
index 000..b1f039b
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.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.component.salesforce.api.dto.analytics.reports;
+
+import java.util.Map;
+
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
+
+/**
+ * Report results extended metadata.
+ */
+public class ReportExtendedMetadata extends AbstractDTOBase {
+
+private MapString, GroupingColumnInfo groupingColumnInfo;
+private MapString, DetailColumnInfo detailColumnInfo;
+private MapString, AggregateColumnInfo aggregateColumnInfo;
+
+public MapString, GroupingColumnInfo getGroupingColumnInfo() {
+return groupingColumnInfo;
+}
+
+public void setGroupingColumnInfo(MapString, GroupingColumnInfo
groupingColumnInfo) {
+this.groupingColumnInfo = groupingColumnInfo;
+}
+
+public MapString, DetailColumnInfo getDetailColumnInfo() {
+return detailColumnInfo;
+}
+
+public void setDetailColumnInfo(MapString, DetailColumnInfo
detailColumnInfo) {
+this.detailColumnInfo = detailColumnInfo;
+}
+
+public MapString, AggregateColumnInfo getAggregateColumnInfo() {
+return aggregateColumnInfo;
+}
+
+public void setAggregateColumnInfo(MapString, AggregateColumnInfo
aggregateColumnInfo) {
+this.aggregateColumnInfo = aggregateColumnInfo;
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/7e3b3510/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
new file mode 100644
index 000..bf600ae
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
@@ -0,0 +1,44 @@
+/**
+ * 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.component.salesforce.api.dto.analytics.reports;
+
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
+
+/**
+ * Report results fact with details.
+ */
+public class ReportFactWithDetails extends AbstractDTOBase {
+
+private ReportRow[] rows;
+private SummaryValue[] aggregates;
+
+public
[8/8] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor
refactor, added missing Salesforce fields for latest API
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b508c4dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b508c4dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b508c4dc
Branch: refs/heads/camel-2.14.x
Commit: b508c4dc6d97ba8f7e12657e7e9a9f6ec53b8eb0
Parents: ef5614d
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Wed Jun 24 18:14:02 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Wed Jun 24 20:35:35 2015 -0700
--
.../camel-salesforce-component/pom.xml | 5 +
.../salesforce/SalesforceEndpointConfig.java| 59 ++-
.../salesforce/SalesforceProducer.java | 20 +-
.../SalesforceReportResultsToListConverter.java | 515 +++
.../salesforce/api/dto/PickListValue.java | 2 +-
.../salesforce/api/dto/RestResources.java | 9 +
.../salesforce/api/dto/SObjectField.java| 9 +
.../reports/AbstractAttributesBase.java | 53 ++
.../reports/AbstractReportResultsBase.java | 91
.../analytics/reports/AggregateColumnInfo.java | 42 ++
.../dto/analytics/reports/AsyncAttributes.java | 71 +++
.../analytics/reports/AsyncReportResults.java | 33 ++
.../analytics/reports/ColumnSortOrderEnum.java | 24 +
.../analytics/reports/DateGranularityEnum.java | 73 +++
.../dto/analytics/reports/DetailColumnInfo.java | 44 ++
.../dto/analytics/reports/FilterOperator.java | 44 ++
.../api/dto/analytics/reports/FilterValue.java | 44 ++
.../api/dto/analytics/reports/FormatEnum.java | 57 ++
.../analytics/reports/GroupingColumnInfo.java | 33 ++
.../api/dto/analytics/reports/GroupingInfo.java | 62 +++
.../dto/analytics/reports/GroupingValue.java| 72 +++
.../api/dto/analytics/reports/Groupings.java| 35 ++
.../analytics/reports/QueryRecordsReport.java | 40 ++
.../api/dto/analytics/reports/RecentReport.java | 71 +++
.../api/dto/analytics/reports/Report.java | 100
.../analytics/reports/ReportDescription.java| 53 ++
.../reports/ReportExtendedMetadata.java | 55 ++
.../reports/ReportFactWithDetails.java | 44 ++
.../api/dto/analytics/reports/ReportFilter.java | 53 ++
.../dto/analytics/reports/ReportFormatEnum.java | 24 +
.../dto/analytics/reports/ReportInstance.java | 90
.../dto/analytics/reports/ReportMetadata.java | 143 +
.../api/dto/analytics/reports/ReportRow.java| 35 ++
.../dto/analytics/reports/ReportStatusEnum.java | 24 +
.../api/dto/analytics/reports/ReportType.java | 44 ++
.../dto/analytics/reports/ReportTypeColumn.java | 62 +++
.../reports/ReportTypeColumnCategory.java | 46 ++
.../analytics/reports/ReportTypeMetadata.java | 47 ++
.../api/dto/analytics/reports/SummaryValue.java | 58 +++
.../dto/analytics/reports/SyncAttributes.java | 43 ++
.../analytics/reports/SyncReportResults.java| 34 ++
.../salesforce/internal/OperationName.java | 10 +-
.../internal/client/AnalyticsApiClient.java | 71 +++
.../client/DefaultAnalyticsApiClient.java | 339
.../processor/AbstractRestProcessor.java| 10 +-
.../processor/AbstractSalesforceProcessor.java | 65 ++-
.../processor/AnalyticsApiProcessor.java| 227
.../internal/processor/BulkApiProcessor.java| 10 +-
.../services/org/apache/camel/TypeConverter | 18 +
.../salesforce/AnalyticsApiIntegrationTest.java | 285 ++
.../component/salesforce/LoginConfigHelper.java | 2 +-
51 files changed, 3473 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b508c4dc/components/camel-salesforce/camel-salesforce-component/pom.xml
--
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index acda40d..5be895a 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -112,6 +112,11 @@
scopetest/scope
/dependency
dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-csv/artifactId
+ scopetest/scope
+/dependency
+dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-server/artifactId
version${jetty-version}/version
http://git-wip-us.apache.org/repos/asf/camel/blob/b508c4dc/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
--
diff --git
[7/8] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
http://git-wip-us.apache.org/repos/asf/camel/blob/b508c4dc/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.java
new file mode 100644
index 000..b1f039b
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportExtendedMetadata.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.component.salesforce.api.dto.analytics.reports;
+
+import java.util.Map;
+
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
+
+/**
+ * Report results extended metadata.
+ */
+public class ReportExtendedMetadata extends AbstractDTOBase {
+
+private MapString, GroupingColumnInfo groupingColumnInfo;
+private MapString, DetailColumnInfo detailColumnInfo;
+private MapString, AggregateColumnInfo aggregateColumnInfo;
+
+public MapString, GroupingColumnInfo getGroupingColumnInfo() {
+return groupingColumnInfo;
+}
+
+public void setGroupingColumnInfo(MapString, GroupingColumnInfo
groupingColumnInfo) {
+this.groupingColumnInfo = groupingColumnInfo;
+}
+
+public MapString, DetailColumnInfo getDetailColumnInfo() {
+return detailColumnInfo;
+}
+
+public void setDetailColumnInfo(MapString, DetailColumnInfo
detailColumnInfo) {
+this.detailColumnInfo = detailColumnInfo;
+}
+
+public MapString, AggregateColumnInfo getAggregateColumnInfo() {
+return aggregateColumnInfo;
+}
+
+public void setAggregateColumnInfo(MapString, AggregateColumnInfo
aggregateColumnInfo) {
+this.aggregateColumnInfo = aggregateColumnInfo;
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/b508c4dc/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
new file mode 100644
index 000..bf600ae
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/ReportFactWithDetails.java
@@ -0,0 +1,44 @@
+/**
+ * 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.component.salesforce.api.dto.analytics.reports;
+
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
+
+/**
+ * Report results fact with details.
+ */
+public class ReportFactWithDetails extends AbstractDTOBase {
+
+private ReportRow[] rows;
+private SummaryValue[] aggregates;
+
+public
[1/8] camel git commit: CAMEL-8900: Fixed Javadoc parser missing first void method in API Component Framework
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x dc370b570 - b508c4dc6
refs/heads/camel-2.15.x c9f71d519 - 7e3b35101
CAMEL-8900: Fixed Javadoc parser missing first void method in API Component
Framework
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59ae68db
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59ae68db
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59ae68db
Branch: refs/heads/camel-2.15.x
Commit: 59ae68db9f8d624fc0476a4320a2b2d40443d4b4
Parents: c9f71d5
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Wed Jun 24 16:16:13 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Wed Jun 24 20:35:11 2015 -0700
--
.../src/main/java/org/apache/camel/maven/JavadocParser.java| 5 +++--
.../test/java/org/apache/camel/maven/JavadocParserTest.java| 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/59ae68db/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
--
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
index 706e0b5..b6a1ea2 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
@@ -86,7 +86,6 @@ public class JavadocParser extends Parser {
final String hrefAttr = (String)
attributes.getAttribute(HTML.Attribute.HREF);
if (hrefAttr != null
hrefAttr.contains(hrefPattern)) {
-
// unescape HTML
String methodSignature =
hrefAttr.substring(hrefAttr.indexOf('#') + 1);
final int firstHyphen =
methodSignature.indexOf('-');
@@ -146,7 +145,9 @@ public class JavadocParser extends Parser {
}
parserState = ParserState.METHOD_SUMMARY;
-} else if (parserState == ParserState.METHOD_SUMMARY
HTML.Tag.TABLE.equals(tag.getHTMLTag())) {
+} else if (parserState == ParserState.METHOD_SUMMARY
+ !methods.isEmpty()
+ HTML.Tag.TABLE.equals(tag.getHTMLTag())) {
// end of method summary table
parserState = ParserState.INIT;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/59ae68db/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
--
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
index 183ffbb..8ee9e1e 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java
@@ -40,16 +40,16 @@ public class JavadocParserTest extends Assert {
htmlParser.parse(new InputStreamReader(new
URL(JAVA6_STRING).openStream(), UTF-8));
assertNull(Java6 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java6 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java6 getMethods, 65, htmlParser.getMethods().size());
htmlParser.reset();
htmlParser.parse(new InputStreamReader(new
URL(JAVA7_STRING).openStream(), UTF-8));
assertNull(Java7 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java7 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java7 getMethods, 65, htmlParser.getMethods().size());
htmlParser.reset();
htmlParser.parse(new InputStreamReader(new
URL(JAVA8_STRING).openStream(), UTF-8));
assertNull(Java8 getErrorMessage, htmlParser.getErrorMessage());
-assertFalse(Java8 getMethods, htmlParser.getMethods().isEmpty());
+assertEquals(Java8 getMethods, 67, htmlParser.getMethods().size());
}
}
[2/8] camel git commit: CAMEL-8397: Added support for Salesforce1 Anayltics reporting API, minor refactor, added missing Salesforce fields for latest API
http://git-wip-us.apache.org/repos/asf/camel/blob/7e3b3510/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
new file mode 100644
index 000..8df7b07
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
@@ -0,0 +1,285 @@
+/**
+ * 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.component.salesforce;
+
+import java.io.FileInputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.builder.RouteBuilder;
+import
org.apache.camel.component.salesforce.api.SalesforceReportResultsToListConverter;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.AsyncReportResults;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.QueryRecordsReport;
+import org.apache.camel.component.salesforce.api.dto.analytics.reports.Report;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportDescription;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportInstance;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportStatusEnum;
+import
org.apache.camel.component.salesforce.api.dto.analytics.reports.SyncReportResults;
+import org.apache.camel.dataformat.csv.CsvDataFormat;
+import org.apache.commons.csv.CSVFormat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Integration test for Salesforce analytics API endpoints.
+ */
+@RunWith(Theories.class)
+public class AnalyticsApiIntegrationTest extends AbstractSalesforceTestBase {
+
+private static final Logger LOG =
LoggerFactory.getLogger(AnalyticsApiIntegrationTest.class);
+private static final int RETRY_DELAY = 5000;
+private static final int REPORT_RESULT_RETRIES = 5;
+private static final String[] REPORT_OPTIONS = new String[]{
+SalesforceReportResultsToListConverter.INCLUDE_HEADERS,
+SalesforceReportResultsToListConverter.INCLUDE_DETAILS,
+SalesforceReportResultsToListConverter.INCLUDE_SUMMARY
+};
+private static final int NUM_OPTIONS = REPORT_OPTIONS.length;
+private static final int[] POWERS = new int[] {4, 2, 1};
+
+private static String[] testReportNames;
+private boolean bodyMetadata;
+
+/**
+ * Get test report developer names as data points.
+ * @return test report developer names in test-salesforce-login.properties
+ * @throws Exception
+ */
+@DataPoints
+public static String[] getTestReportDeveloperNames() throws Exception {
+return testReportNames;
+}
+
+@BeforeClass
+public static void getReportNames() throws Exception {
+// get test report names
+Properties testProperties = new Properties();
+testProperties.load(new
FileInputStream(LoginConfigHelper.TEST_LOGIN_PROPERTIES));
+
+MapString, String reports = new TreeMapString, String();
+for (Map.EntryObject, Object entry : testProperties.entrySet()) {
+final String key = entry.getKey().toString();
+if (key.matches(report.[0-9]+)) {
+reports.put(key, entry.getValue().toString());
+}
+}
+assertFalse(Missing entries report.[0-9]+=Report
camel git commit: Include hostname in the Camel Tomcat examples so if you try this on different hosts its easier to see the example actually runs where
Repository: camel
Updated Branches:
refs/heads/master 55da6ced1 - fd86e2de0
Include hostname in the Camel Tomcat examples so if you try this on different
hosts its easier to see the example actually runs where
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd86e2de
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd86e2de
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd86e2de
Branch: refs/heads/master
Commit: fd86e2de07653ec7a3e88c6d7d44d6496f9b5cde
Parents: 55da6ce
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 24 20:33:39 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 20:33:39 2015 +0200
--
.../src/main/resources/camel-config.xml| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fd86e2de/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
--
diff --git
a/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
b/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
index 4d8058e..cb07609 100755
--- a/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
+++ b/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
@@ -35,7 +35,7 @@
headername/header
!-- yes so return back a message to the user --
transform
-simpleHello ${header.name} how are you? You are from:
${sys.user.country}/simple
+simpleHi I am ${sysenv.HOSTNAME}. Hello ${header.name} how are
you today?/simple
/transform
/when
otherwise
camel git commit: Include hostname in the Camel Tomcat examples so if you try this on different hosts its easier to see the example actually runs where
Repository: camel
Updated Branches:
refs/heads/master fd86e2de0 - 67513554a
Include hostname in the Camel Tomcat examples so if you try this on different
hosts its easier to see the example actually runs where
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67513554
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67513554
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67513554
Branch: refs/heads/master
Commit: 67513554aea5f5c62d3252f9d2cc81219d80c4a9
Parents: fd86e2d
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Jun 24 20:44:55 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Jun 24 20:44:55 2015 +0200
--
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/67513554/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git
a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
index 2e9525c..1aa4b50 100644
---
a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
+++
b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
@@ -31,7 +31,7 @@
headername/header
!-- yes so return back a message to the user --
transform
-simpleHello ${header.name} how are you?/simple
+ simpleHi I am ${sysenv.HOSTNAME}. Hello ${header.name} how are
you today?/simple
/transform
/when
otherwise
