[camel] branch master updated: [CAMEL-11257] Enhance unit tests and fixed Javadoc
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 399ac64 [CAMEL-11257] Enhance unit tests and fixed Javadoc 399ac64 is described below commit 399ac647ab05b7d608427d3ccb3e0bbf94e06310 Author: William Collins AuthorDate: Mon May 14 15:15:21 2018 -0400 [CAMEL-11257] Enhance unit tests and fixed Javadoc --- .../camel/component/as2/api/AS2ClientManager.java | 18 -- .../camel/component/as2/api/entity/MimeEntity.java | 12 +++ .../as2/AS2ClientManagerIntegrationTest.java | 38 +++--- 3 files changed, 55 insertions(+), 13 deletions(-) diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java index 72f5807..f13f282 100644 --- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java +++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java @@ -159,9 +159,21 @@ public class AS2ClientManager { * * @param ediMessage *- EDI message to transport - * @param httpContext - *- the subject sent in the interchange request. - * @throws HttpException + * @param requestUri + *- resource location to deliver message + * @param subject - message subject + * @param from - RFC2822 address of sender + * @param as2From - AS2 name of sender + * @param as2To - AS2 name of recipient + * @param as2MessageStructure - the structure of AS2 to send; see {@link AS2MessageStructure} + * @param ediMessageContentType - the content typw of EDI message + * @param ediMessageTransferEncoding - the transfer encoding used to transport EDI message + * @param signingCertificateChain - the chain of certificates used to sign the message or null if sending EDI message unsigned + * @param signingPrivateKey - the private key used to sign EDI message + * @param dispositionNotificationTo - an RFC2822 address to request a receipt or null if no receipt requested + * @param signedReceiptMicAlgorithms - the senders list of signing algorithms for signing receipt, in preferred order, or null if requesting an unsigned receipt. + * @return {@link HttpCoreContext} containing request and response used to send EDI message + * @throws HttpException when things go wrong. */ public HttpCoreContext send(String ediMessage, String requestUri, diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java index 56b8a4a..5eab3d1 100644 --- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java +++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java @@ -129,7 +129,7 @@ public abstract class MimeEntity extends AbstractHttpEntity { /** * Obtains the Content-Transfer-Encoding header. * The default implementation returns the value of the - * {@link #contentEncoding contentTransferEncoding} attribute. + * {@link #contentEncoding contentEncoding} attribute. * * @return the Content-Transfer-Encoding header, or {@code null} */ @@ -140,12 +140,12 @@ public abstract class MimeEntity extends AbstractHttpEntity { /** * Specifies the Content-Transfer-Encoding header. * The default implementation sets the value of the - * {@link #contentTranferEncoding contentTransferEncoding} attribute. + * {@link #contentTransferEncoding contentTransferEncoding} attribute. * * @param contentTransferEncoding the new Content-Transfer-Encoding header, or * {@code null} to unset */ -public void setContentTranserEncoding(final Header contentTransferEncoding) { +public void setContentTransferEncoding(final Header contentTransferEncoding) { this.contentTransferEncoding = contentTransferEncoding; if (contentTransferEncoding != null) { addHeader(contentTransferEncoding); @@ -157,9 +157,9 @@ public abstract class MimeEntity extends AbstractHttpEntity { /** * Specifies the Content-Transfer-Encoding header, as a string. * The default implementation calls - * {@link #setContentTransferEncoding(Header) setContentEncoding(Header)}. + * {@link #setContentTransferEncoding(Header) setContentTransferEncoding(Header)}. * - * @param ceString the new Content-Tra
[camel] branch master updated: Polish the docuement of karfak
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 5c804dd Polish the docuement of karfak 5c804dd is described below commit 5c804dde83fc8986f79119e8951d1afc97083826 Author: Willem Jiang AuthorDate: Mon May 14 09:20:42 2018 +0800 Polish the docuement of karfak --- .../camel-kafka/src/main/docs/kafka-component.adoc | 26 +++--- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc index ac32dca..7d89604 100644 --- a/components/camel-kafka/src/main/docs/kafka-component.adoc +++ b/components/camel-kafka/src/main/docs/kafka-component.adoc @@ -247,9 +247,13 @@ camelContext.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { from("kafka:" + TOPIC + "?brokers=localhost:{{kafkaPort}}" + - "&groupId=A" +// - "&autoOffsetReset=earliest" + // Ask to start from the beginning if we have unknown offset - "&offsetRepository=#offsetRepo") // Keep the offsets in the previously configured repository + // Setup the topic and broker address + "&groupId=A" + + // The consumer processor group ID + "&autoOffsetReset=earliest" + + // Ask to start from the beginning if we have unknown offset + "&offsetRepository=#offsetRepo") + // Keep the offsets in the previously configured repository .to("mock:result"); } }); @@ -308,8 +312,11 @@ camelContext.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { from("kafka:" + TOPIC + "?brokers=localhost:{{kafkaPort}}" + - "&groupId=A" +// - "&sslContextParameters=#ssl") // Reference the SSL configuration + // Setup the topic and broker address + "&groupId=A" + + // The consumer processor group ID + "&sslContextParameters=#ssl") + // Reference the SSL configuration .to("mock:result"); } }); @@ -365,13 +372,15 @@ In XML: [source,xml] - + - + @@ -408,7 +417,8 @@ You can then use the `KafkaManualCommit` from Java code such as a Camel `Process [source,java] public void process(Exchange exchange) { -KafkaManualCommit manual = exchange.getIn().getHeader(KafkaConstants.MANUAL_COMMIT, KafkaManualCommit.class); +KafkaManualCommit manual = +exchange.getIn().getHeader(KafkaConstants.MANUAL_COMMIT, KafkaManualCommit.class); manual.commitSync(); } -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[camel] branch master updated: Fixed some warnings in camel-package-maven-plugin
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 7d4020e Fixed some warnings in camel-package-maven-plugin 7d4020e is described below commit 7d4020e756aab92a8899c1f401a89450ed04315e Author: aldettinger AuthorDate: Mon May 14 18:25:51 2018 +0200 Fixed some warnings in camel-package-maven-plugin --- .../camel/maven/packaging/JSonSchemaHelper.java| 19 ++- .../maven/packaging/PackageDataFormatMojo.java | 80 ++-- .../camel/maven/packaging/PackageLanguageMojo.java | 141 +++-- .../maven/packaging/PrepareCatalogKarafMojo.java | 31 ++--- .../camel/maven/packaging/PrepareCatalogMojo.java | 30 +++-- .../packaging/PrepareCatalogSpringBootMojo.java| 30 +++-- .../packaging/SpringBootAutoConfigurationMojo.java | 12 +- 7 files changed, 179 insertions(+), 164 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java index f49de19..027a7ae 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java @@ -36,7 +36,6 @@ public final class JSonSchemaHelper { * @param json the json * @return a list of all the rows, where each row is a set of key value pairs with metadata */ -@SuppressWarnings("unchecked") public static List> parseJsonSchema(String group, String json, boolean parseProperties) { List> answer = new ArrayList<>(); if (json == null) { @@ -47,24 +46,24 @@ public final class JSonSchemaHelper { try { JsonObject output = (JsonObject) Jsoner.deserialize(json); for (String key : output.keySet()) { -Map row = output.getMap(key); +Map row = output.getMap(key); if (key.equals(group)) { if (parseProperties) { // flattern each entry in the row with name as they key, and its value as the content (its a map also) for (Object obj : row.entrySet()) { -Map.Entry entry = (Map.Entry) obj; -Map newRow = new LinkedHashMap(); +Map.Entry entry = (Map.Entry) obj; +Map newRow = new LinkedHashMap<>(); newRow.put("name", entry.getKey().toString()); -Map newData = transformMap((Map) entry.getValue()); +Map newData = transformMap((Map) entry.getValue()); newRow.putAll(newData); answer.add(newRow); } } else { // flattern each entry in the row as a list of single Map elements -Map newData = transformMap(row); +Map newData = transformMap(row); for (Object obj : newData.entrySet()) { -Map.Entry entry = (Map.Entry) obj; +Map.Entry entry = (Map.Entry) obj; Map newRow = new LinkedHashMap<>(); newRow.put(entry.getKey().toString(), entry.getValue().toString()); answer.add(newRow); @@ -80,16 +79,16 @@ public final class JSonSchemaHelper { return answer; } -private static Map transformMap(Map jsonMap) { +private static Map transformMap(Map jsonMap) { Map answer = new LinkedHashMap<>(); for (Object rowObj : jsonMap.entrySet()) { -Map.Entry rowEntry = (Map.Entry) rowObj; +Map.Entry rowEntry = (Map.Entry) rowObj; // if its a list type then its an enum, and we need to parse it as a single line separated with comma // to be backwards compatible Object newValue = rowEntry.getValue(); if (newValue instanceof List) { -List list = (List) newValue; +List list = (List) newValue; CollectionStringBuffer csb = new CollectionStringBuffer(","); for (Object line : list) { csb.append(line); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java index 1818e7c..04280fa 100644 --- a/tooling/maven/camel-package-maven-pl
svn commit: r1029873 [3/5] - in /websites/production/camel/content: ./ cache/
Modified: websites/production/camel/content/book-languages-appendix.html == --- websites/production/camel/content/book-languages-appendix.html (original) +++ websites/production/camel/content/book-languages-appendix.html Mon May 14 16:24:00 2018 @@ -42,6 +42,7 @@ + SyntaxHighlighter.defaults['toolbar'] = false; @@ -381,19 +382,36 @@ This is done using the following syntax:However any http://jcp.org/en/jsr/detail?id=223"; rel="nofollow">JSR 223 scripting language can be used using the generic DSL methods.
-
ScriptContext
Options
The JSR-223
scripting language'sScriptContext
is pre-configured with the following attributes all set atENGINE_SCOPE
.
Attribute
Type
Value
camelContext
org.apache.camel.CamelContext
The Camel Context.
context
class="confluenceTd">
org.apache.camel.CamelContext
colspan="1" rowspan="1" class="confluenceTd"> The Camel Context (cannot be >used in groovy).
class="confluenceTd">
exchange
rowspan="1" >class="confluenceTd">
org.apache.camel.Exchange
colspan="1" rowspan="1" class="confluenceTd"> The current >Exchange.
class="confluenceTd">
properties
rowspan="1" >class="confluenceTd">
org.apache.camel.builder.script.PropertiesFunction
colspan="1" rowspan="1" class="confluenceTd"> Camel 2.9: >Function with a
resolve
method to make it >easier to use Camels Properties >component from scripts. See further below for example.
request
org.apache.camel.Message
The
IN
message.
response
org.apache.camel.Message
Deprecated: The
OUT
message. TheOUT
message isnull
by default. Use theIN
message instead.See Scripting Languages for the list of languages with explicit DSL support.
Passing Additional Arguments to the
ScriptingEngine
Available from Camel 2.8
You can provide additional arguments to the
ScriptingEngine
using a header on the Camel message with the keyCamelScriptArguments
.Example:
{snippet:id=e1|lang=java|url=camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java} Using Properties Function
Available from Camel 2.9
If you need to use the Properties component from a script to lookup property placeholders, then its a bit cumbersome to do so. For example, to set a header name
myHeader
with a value from a property placeholder, whose key is taken from a he ader namedfoo
..setHeader("myHeader").groovy("context.resolvePropertyPlaceholders('{{' + request.headers.get('foo') + '
svn commit: r1029873 [4/5] - in /websites/production/camel/content: ./ cache/
Modified: websites/production/camel/content/groovy.html == --- websites/production/camel/content/groovy.html (original) +++ websites/production/camel/content/groovy.html Mon May 14 16:24:00 2018 @@ -41,6 +41,7 @@ + SyntaxHighlighter.defaults['toolbar'] = false; @@ -116,19 +117,36 @@ from("queue:foo").filter(groov </filter> </route> ]]> -ScriptContext Options The JSR-223 scripting language's ScriptContext is pre-configured with the following attributes all set at ENGINE_SCOPE.AttributeTypeValuecamelContextorg.apache.camel.CamelContextThe Camel Context.contextclass="confluenceTd">org.apache.camel.CamelContext colspan="1" rowspan="1" class="confluenceTd">The Camel Context (cannot be >used in groovy).class="confluenceTd">exchangerowspan="1" >class="confluenceTd">org.apache.camel.Exchangecolspan="1" rowspan="1" class="confluenceTd">The current >Exchange.class="confluenceTd">propertiesrowspan="1" >class="confluenceTd">org.apache.camel.builder.script.PropertiesFunction colspan="1" rowspan="1" class="confluenceTd">Camel 2.9: >Function with a resolve method to make it >easier to use Camels Properties >component from scripts. See further below for example.class="confluenceTd">requestrowspan="1" >class="confluenceTd">org.apache.camel.Messagecolspan="1" rowspan="1" >class="confluenceTd">The IN >message.class="confluenceTd">responserowspan="1" >class="confluenceTd">org.apache.camel.Messagecolspan="1" rowspan="1" class="confluenceTd">Deprecated: >The OUT message. >The OUT message >is null by default. Use the >IN message >instead.See href="scripting-languages.html">Scripting Languages for the list of >languages with explicit DSL support.id="Groovy-PassingAdditionalArguments totheScriptingEngine">Passing Additional Arguments to the ScriptingEngineAvailable from Camel 2.8You can provide additional arguments to the ScriptingEngine using a header on the Camel message with the key CamelScriptArguments.Example:{snippet:id=e1|lang=java|url=camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java}Using Properties FunctionAvailable from Camel 2.9If you need to use the Properties component from a script to lookup property placeholders, then its a bit cumbersome to do so. For example, to set a header name myHeader with a value from a property placeholder, whose key is taken from a header named f oo..setHeader("myHeader").groovy("context.resolvePropertyPlaceholders('{{' + request.headers.get('foo') + '}}')") -From Camel 2.9: you can now use the properties function and the same example is simpler:java.setHeader("myHeader").groovy("properties.resolve(request.headers.get('foo'))") -Loading Script From External ResourceAvailable from Camel 2.11You can externalize the script and have Camel load it from a resource such as classpath:, file:, or http:. This is done using the following syntax: resource:scheme:location e.g. to refer to a file on the classpath you can do:java.setHeader("myHeader").groovy("resource:classpath:mygroovy.groovy") -How to Get the Result from Multiple Statements ScriptAvailable from Camel 2.14The script engine's eval method returns a null when it runs a multi-statement script. However, Camel can look up the value of a script's result by using the key result from the value set. When writing a multi-statement script set the value of the result variable as the script return value.textbar = "baz"; -# some other statements ... -# camel take the result value as the script evaluation result -result = body * 2 + 1 - DependenciesTo use scripting languages in your camel routes you need to add the a dependency on camel-script which integrates the JSR-223 scripting engine.If you use maven you could just add the following to your pom.xml, substituting the version number for the latest & greatest release (see the download page for the latest versions).xml- - +ScriptContext Options The JSR-223 scripting language's ScriptContext is pre-configured with the following attributes all set at ENGINE_SCOPE.AttributeTypeValuecamelContextorg.apache.camel.CamelContextThe Camel Context.contextorg.apache.camel.CamelContextThe Camel Context (cannot be used in groovy).exchangeorg.apache.camel.ExchangeThe current Exchange.propertiesorg.apache.camel.builder.script.PropertiesFunctionCamel 2.9: Function with a resolve method to make it easier to use Camels Properties component from scripts. See further below for example.requestorg.apache.camel.MessageThe IN message.responseorg.apache.camel.MessageDeprecated: The OUT message. The OUT message is null by default. Use the IN message instead.See Scripting Languages for the list of laorg.apache.camel -camel-script -x.x.x -
svn commit: r1029873 [1/5] - in /websites/production/camel/content: ./ cache/
Author: buildbot Date: Mon May 14 16:24:00 2018 New Revision: 1029873 Log: Production update by buildbot for camel Modified: websites/production/camel/content/beanshell.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/book-languages-appendix.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/groovy.html websites/production/camel/content/javascript.html websites/production/camel/content/php.html websites/production/camel/content/python.html websites/production/camel/content/ruby.html websites/production/camel/content/scripting-languages-context.html websites/production/camel/content/scripting-languages.html Modified: websites/production/camel/content/beanshell.html == --- websites/production/camel/content/beanshell.html (original) +++ websites/production/camel/content/beanshell.html Mon May 14 16:24:00 2018 @@ -41,6 +41,7 @@ + SyntaxHighlighter.defaults['toolbar'] = false; @@ -117,19 +118,36 @@You could follow the examples above to create an Predicate in a Message Filter or as an Expression for a Recipient List
-
ScriptContext
Options
The JSR-223
scripting language'sScriptContext
is pre-configured with the following attributes all set atENGINE_SCOPE
.
Attribute
Type
Value
camelContext
org.apache.camel.CamelContext
The Camel Context.
context
org.apache.camel.CamelContext
The Camel Context (cannot be used in groovy).
exchange
org.apache.camel.Exchange
The current Exchange.
properties
org.apache.camel.builder.script.PropertiesFunction
Camel 2.9: Function with a
resolve
method to make it easier to use Camels Properties component from scripts. See further below for example.
request
org.apache.camel.Message
The
IN
message.
response
org.apache.camel.Message
Deprecated: The
OUT
message. TheOUT
message isnull
by default. Use theIN
message instead.See Scripting Languages for the list of languages with explicit DSL support.
Passing Additional Arguments to the
ScriptingEngine
Available from Camel 2.8
You can provide additional arguments to the
ScriptingEngine
using a header on the Camel message with the keyCamelScriptArguments
.Example:
{snippet:id=e1|lang=java|url=camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest
svn commit: r1029873 [5/5] - in /websites/production/camel/content: ./ cache/
Modified: websites/production/camel/content/scripting-languages-context.html == --- websites/production/camel/content/scripting-languages-context.html (original) +++ websites/production/camel/content/scripting-languages-context.html Mon May 14 16:24:00 2018 @@ -36,6 +36,17 @@ +Using Properties FunctionAvailable from Camel 2.9If you need to use the Properties component from a script to lookup property placeholders, then its a bit cumbersome to do so. For example, to set a header name myHeader with a value from a property placeholder, whose key is taken from a header named foo. + +From Camel 2.9: you can now use the properties function and the same example is simpler: + +Loading Script From External ResourceAvailable from Camel 2.11You can externalize the script and have Camel load it from a resource such as classpath:, file:, or http:. This is done using the following syntax: resource:scheme:location e.g. to refer to a file on the classpath you can do: + +How to Get the Result from Multiple Statements ScriptAvailable from Camel 2.14The script engine's eval method returns a null when it runs a multi-statement script. However, Camel can look up the value of a script's result by using the key result from the value set. When writing a multi-statement script set the value of the result variable as the script return value.textbar = "baz"; # some other statements ... # camel take the result value as the script evaluation result result = body * 2 + 1 DependenciesTo use scripting languages in your camel routes you need to add the a dependency on camel-script which integrates the JSR-223 scripting e ngine.If you use maven you could just add the following to your pom.xml, substituting the version number for the latest & greatest release (see the download page for the latest versions). + + Modified: websites/production/camel/content/scripting-languages.html == --- websites/production/camel/content/scripting-languages.html (original) +++ websites/production/camel/content/scripting-languages.html Mon May 14 16:24:00 2018 @@ -36,6 +36,18 @@ +Using Properties FunctionAvailable from Camel 2.9If you need to use the Properties component from a script to lookup property placeholders, then its a bit cumbersome to do so. For example, to set a header name myHeader with a value from a property placeholder, whose key is taken from a header named foo. + +From Camel 2.9: you can now use the properties function and the same example is simpler: + +Loading Script From External ResourceAvailable from Camel 2.11You can externalize the script and have Camel load it from a resource such as classpath:, file:, or http:. This is done using the following syntax: resource:scheme:location e.g. to refer to a file on the classpath you can do: + +How to Get the Result from Multiple Statements ScriptAvailable from Camel 2.14The script engine's eval method returns a null when it runs a multi-statement script. However, Camel can look up the value of a script's result by using the key result from the value set. When writing a multi-statement script set the value of the result variable as the script return value.textbar = "baz"; # some other statements ... # camel take the result value as the script evaluation result result = body * 2 + 1 DependenciesTo use scripting languages in your camel routes you need to add the a dependency on camel-script which integrates the JSR-223 scripting engine.I f you use maven you could just add the following to your pom.xml, substituting the version number for the latest & greatest release (see the download page for the latest versions). +
svn commit: r1029873 [2/5] - in /websites/production/camel/content: ./ cache/
Modified: websites/production/camel/content/book-in-one-page.html == --- websites/production/camel/content/book-in-one-page.html (original) +++ websites/production/camel/content/book-in-one-page.html Mon May 14 16:24:00 2018 @@ -42,6 +42,7 @@ + SyntaxHighlighter.defaults['toolbar'] = false; @@ -4371,11 +4372,11 @@ So we completed the last piece in the piThis example has been removed from Camel 2.9 onwards. Apache Axis 1.4 is a very old and unsupported framework. We encourage users to use CXF instead of Axis.