svn commit: r1047921 - in /websites/production/camel/content: cache/main.pageCache index.html
Author: buildbot Date: Thu Jul 18 21:19:48 2019 New Revision: 1047921 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/index.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/index.html == --- websites/production/camel/content/index.html (original) +++ websites/production/camel/content/index.html Thu Jul 18 21:19:48 2019 @@ -71,14 +71,22 @@ - Since we're on a major migration process of this website, some component documents here are out of sync right now. In the meantime you may want to look at the asciidoc in the repository: -https://github.com/apache/camel/blob/master/README.md -https://github.com/apache/camel/blob/master/components/readme.adoc + + + + + Since we're on a major migration process of this website, some component documents here are out of sync right now. In the meantime you may want to look at the early version of the new website + https://camel.apache.org/staging/; rel="nofollow">https://camel.apache.org/staging/ + We would very much like to receive any feedback on the new site, please join the discussion on the https://camel.apache.org/staging/community/mailing-list/;>Camel user mailing list. + + + + - Since we're on a major migration process of this website, some component documents here are out of sync right now. In the meantime you may want to look at the asciidoc in the repository:https://github.com/apache/camel/blob/master/README.md; rel="nofollow">https://github.com/apache/camel/blob/master/README.mdhttps://github.com/apache/camel/blob/master/components/readme.adoc; rel="nofollow">https://github.com/apache/camel/blob/mas ter/components/readme.adocDownload it Today! http://camel.apache.org/images/camel-box-small.png; data-image-src="http://camel.apache.org/images/camel-box-small.png;>Apache Camel is a versatile open-source integration framework based on known Enterprise Integration Patterns.Camel empowers you to define routing and mediation rules in a variety of domain-specific languages, including a Java-based Fluent API, Spring or Blueprint XML Configuration files, and a Scala DSL. This means you get smart completion of routing rules in your IDE, whether in a Java, Scala or XML editor.Apache Camel uses URIs to work directly with any kind of Transport or messaging model such as HTTP, ActiveMQ, JMS, JBI, SCA, MINA or CXF, as well as pluggable Components and Data Format options. Apache Camel is a small library with minimal dependencies for easy embedding in any Java application. Apache Camel lets you work with the same API regardless which kind of Transport is used - so learn the API once and you can interact with all the Components provided out-of-box.Apache Camel provides support for Bean Binding and seamless integration with popular frameworks such as CDI,Spring, Blueprint and Guice. Camel also has extensive support for unit testing your routes.The following projects can leverage Apache Camel as a routing and mediation engine:http://servicemix.apache.org/;>Apache ServiceMix - a popular distributed open source ESB and JBI containerhttp://activemq.apache.org/;>Apache ActiveMQ - a mature, widely used open source message brokerhttp://cxf.apache.org/;>Apache CXF - a smart web services suite (JAX-WS and JAX-RS)http://karaf.apache.org/;>Apache Karaf - a small OSGi based runtime in which applications can be deployedhttp://mina.apache.org/;>Apache MINA - a high-performance http://en.wikipedia.org/wiki/New_I/O; rel="nofollow">NIO-driven networking frameworkSo don't get the hump - try Camel today! https://cwiki.apache.org/confluence/s/en_GB/8100/4410012ac87e845516b70bc6 9b6f7a893eabaa5a/_/images/icons/emoticons/smile.svg" data-emoticon-name="smile" alt="(smile)">Too many buzzwords - what exactly is Camel? Okay, so the description above is technology focused. There's a great discussion about Camel at http://stackoverflow.com/questions/8845186/what-exactly-is-apache-camel; rel="nofollow">Stack Overflow. We suggest you view the post, read the comments, and browse the suggested links for more details.News +Download it Today!http://camel.apache.org/images/camel-box-small.png; data-image-src="http://camel.apache.org/images/camel-box-small.png;>Apache Camel is a versatile open-source integration framework based on known Enterprise Integration Patterns.Camel empowers you to define routing and mediation rules in a variety of domain-specific languages, including a Java-based Fluent API,
svn commit: r1863337 - /camel/website/template/template.camel
Author: zregvart Date: Thu Jul 18 20:20:20 2019 New Revision: 1863337 URL: http://svn.apache.org/viewvc?rev=1863337=rev Log: Refined new site banner Modified: camel/website/template/template.camel Modified: camel/website/template/template.camel URL: http://svn.apache.org/viewvc/camel/website/template/template.camel?rev=1863337=1863336=1863337=diff == --- camel/website/template/template.camel (original) +++ camel/website/template/template.camel Thu Jul 18 20:20:20 2019 @@ -82,9 +82,17 @@ $content - Since we're on a major migration process of this website, some component documents here are out of sync right now. In the meantime you may want to look at the asciidoc in the repository: -https://github.com/apache/camel/blob/master/README.md -https://github.com/apache/camel/blob/master/components/readme.adoc + + + + + Since we're on a major migration process of this website, some component documents here are out of sync right now. In the meantime you may want to look at the early version of the new website + https://camel.apache.org/staging/; rel="nofollow">https://camel.apache.org/staging/ + We would very much like to receive any feedback on the new site, please join the discussion on the https://camel.apache.org/staging/community/mailing-list/;>Camel user mailing list. + + + +
[camel] branch CAMEL-13760 updated (b236efd -> 0618cee)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13760 in repository https://gitbox.apache.org/repos/asf/camel.git. from b236efd CAMEL-13760: camel3 - Remove configuring prefix and suffix token on property placeholder as it clashes and causes problems such as with simple language, and potentially elsewhere. new 313cfae CAMEL-13760: camel3 - Remove configuring prefix and suffix token on property placeholder as it clashes and causes problems such as with simple language, and potentially elsewhere. new 0618cee CAMEL-13760: Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/docs/properties-component.adoc| 4 +--- .../main/java/org/apache/camel/CamelContext.java | 18 -- .../org/apache/camel/spi/PropertiesComponent.java | 14 -- .../camel/impl/engine/AbstractCamelContext.java| 22 -- .../modules/ROOT/pages/properties-component.adoc | 8 ++-- 5 files changed, 3 insertions(+), 63 deletions(-)
[camel] 02/02: CAMEL-13760: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13760
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0618cee1305907f38d6cea39e05b93e42a007c17
Author: Claus Ibsen
AuthorDate: Thu Jul 18 21:13:18 2019 +0200
CAMEL-13760: Regen
---
.../camel-properties/src/main/docs/properties-component.adoc | 4 +---
docs/components/modules/ROOT/pages/properties-component.adoc | 8 ++--
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git
a/components/camel-properties/src/main/docs/properties-component.adoc
b/components/camel-properties/src/main/docs/properties-component.adoc
index 2da48fe..5870bf1 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -88,7 +88,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
-The component supports 15 options, which are listed below.
+The component supports 13 options, which are listed below.
@@ -105,10 +105,8 @@ The component supports 15 options, which are listed below.
| *camel.component.properties.location* | A list of locations to load
properties. You can use comma to separate multiple locations. This option will
override any default locations and only use the locations from this option. |
| String
| *camel.component.properties.locations* | A list of locations to load
properties. This option will override any default locations and only use the
locations from this option. | | List
| *camel.component.properties.override-properties* | Sets a special list of
override properties that take precedence and will use first, if a property
exist. The option is a java.util.Properties type. | | String
-| *camel.component.properties.prefix-token* | Sets the value of the prefix
token used to identify properties to replace. Setting a value of null restores
the default token (link DEFAULT_PREFIX_TOKEN). | {{ | String
| *camel.component.properties.properties-parser* | To use a custom
PropertiesParser. The option is a
org.apache.camel.component.properties.PropertiesParser type. | | String
| *camel.component.properties.resolve-property-placeholders* | Whether the
component should resolve property placeholders on itself when starting. Only
properties which are of String type can use property placeholders. | true |
Boolean
-| *camel.component.properties.suffix-token* | Sets the value of the suffix
token used to identify properties to replace. Setting a value of null restores
the default token (link DEFAULT_SUFFIX_TOKEN). | }} | String
| *camel.component.properties.system-properties-mode* | Sets the system
property mode. The default mode (override) is to use system properties if
present, and override any existing properties. | 2 | Integer
|===
// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc
b/docs/components/modules/ROOT/pages/properties-component.adoc
index a47fb77..5870bf1 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -15,7 +15,7 @@ Where *key* is the key for the property to lookup
=== Options
// component options: START
-The Properties component supports 14 options, which are listed below.
+The Properties component supports 12 options, which are listed below.
@@ -28,8 +28,6 @@ The Properties component supports 14 options, which are
listed below.
| *propertiesParser* (common) | To use a custom PropertiesParser | |
PropertiesParser
| *defaultFallbackEnabled* (common) | If false, the component does not attempt
to find a default for the key by looking after the colon separator. | true |
boolean
| *ignoreMissingLocation* (common) | Whether to silently ignore if a location
cannot be located, such as a properties file not found. | false | boolean
-| *prefixToken* (advanced) | Sets the value of the prefix token used to
identify properties to replace. Setting a value of null restores the default
token (link DEFAULT_PREFIX_TOKEN). | {{ | String
-| *suffixToken* (advanced) | Sets the value of the suffix token used to
identify properties to replace. Setting a value of null restores the default
token (link DEFAULT_SUFFIX_TOKEN). | }} | String
| *initialProperties* (advanced) | Sets initial properties which will be used
before any locations are resolved. | | Properties
| *overrideProperties* (advanced) | Sets a special list of override properties
that take precedence and will use first, if a property exist. | | Properties
| *systemPropertiesMode* (common) | Sets the system property mode. The default
mode (override) is to use system properties if present, and override any
existing properties. | 2 | int
@@ -90,7 +88,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
-The component
[camel] 01/02: CAMEL-13760: camel3 - Remove configuring prefix and suffix token on property placeholder as it clashes and causes problems such as with simple language, and potentially elsewhere.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13760
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 313cfaee46bf2966adfbae5852b9854553b33e81
Author: Claus Ibsen
AuthorDate: Thu Jul 18 21:06:31 2019 +0200
CAMEL-13760: camel3 - Remove configuring prefix and suffix token on
property placeholder as it clashes and causes problems such as with simple
language, and potentially elsewhere.
---
.../main/java/org/apache/camel/CamelContext.java | 18 --
.../org/apache/camel/spi/PropertiesComponent.java | 14 --
.../camel/impl/engine/AbstractCamelContext.java| 22 --
3 files changed, 54 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index d2db232..05a2be9 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -738,24 +738,6 @@ public interface CamelContext extends StatefulService,
RuntimeConfiguration {
String resolvePropertyPlaceholders(String text);
/**
- * Returns the configured property placeholder prefix token if and only if
the CamelContext has
- * property placeholder abilities, otherwise returns {@code null}.
- *
- * @return the prefix token or {@code null}
- */
-@Deprecated
-String getPropertyPrefixToken();
-
-/**
- * Returns the configured property placeholder suffix token if and only if
the CamelContext has
- * property placeholder abilities, otherwise returns {@code null}.
- *
- * @return the suffix token or {@code null}
- */
-@Deprecated
-String getPropertySuffixToken();
-
-/**
* Returns the configured properties component or create one if none has
been configured.
*
* @return the properties component
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
index 247c6b1..b063778 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
@@ -45,20 +45,6 @@ public interface PropertiesComponent extends Component,
StaticService {
String DEFAULT_CREATED = "PropertiesComponentDefaultCreated";
/**
- * The value of the prefix token used to identify properties to replace.
- * Is default {@link #PREFIX_TOKEN}
- */
-@Deprecated
-String getPrefixToken();
-
-/**
- * The value of the suffix token used to identify properties to replace.
- * Is default {@link #SUFFIX_TOKEN}
- */
-@Deprecated
-String getSuffixToken();
-
-/**
* Parses the input text and resolve all property placeholders from within
the text.
*
* @param uri input text
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 583bb8f..4350919 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -1637,28 +1637,6 @@ public abstract class AbstractCamelContext extends
ServiceSupport implements Ext
return answer;
}
-@Deprecated
-public String getPropertyPrefixToken() {
-PropertiesComponent pc = getPropertiesComponent(false);
-
-if (pc != null) {
-return pc.getPrefixToken();
-} else {
-return null;
-}
-}
-
-@Deprecated
-public String getPropertySuffixToken() {
-PropertiesComponent pc = getPropertiesComponent(false);
-
-if (pc != null) {
-return pc.getSuffixToken();
-} else {
-return null;
-}
-}
-
public String resolvePropertyPlaceholders(String text) {
// While it is more efficient to only do the lookup if we are sure we
// need the component,
[camel] branch CAMEL-13760 created (now b236efd)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13760 in repository https://gitbox.apache.org/repos/asf/camel.git. at b236efd CAMEL-13760: camel3 - Remove configuring prefix and suffix token on property placeholder as it clashes and causes problems such as with simple language, and potentially elsewhere. This branch includes the following new commits: new b236efd CAMEL-13760: camel3 - Remove configuring prefix and suffix token on property placeholder as it clashes and causes problems such as with simple language, and potentially elsewhere. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/01: CAMEL-13760: camel3 - Remove configuring prefix and suffix token on property placeholder as it clashes and causes problems such as with simple language, and potentially elsewhere.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13760
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b236efd25c2b2d628e8825435181641779d7721c
Author: Claus Ibsen
AuthorDate: Thu Jul 18 11:17:29 2019 +0200
CAMEL-13760: camel3 - Remove configuring prefix and suffix token on
property placeholder as it clashes and causes problems such as with simple
language, and potentially elsewhere.
---
MIGRATION.md | 3 ++
.../blueprint/handler/CamelNamespaceHandler.java | 8 ++--
.../src/main/docs/properties-component.adoc| 4 +-
.../properties/DefaultPropertiesParser.java| 28 +--
.../component/properties/PropertiesComponent.java | 42 +++-
.../component/properties/PropertiesParser.java | 7 +--
.../spi/BridgePropertyPlaceholderConfigurer.java | 10 ++--
.../properties/SpringPropertiesComponent2Test.java | 29 ---
.../properties/SpringPropertiesComponent2Test.xml | 56 --
.../main/java/org/apache/camel/CamelContext.java | 2 +
.../org/apache/camel/spi/PropertiesComponent.java | 14 +++---
.../camel/impl/engine/AbstractCamelContext.java| 6 ++-
.../impl/engine/CamelPostProcessorHelper.java | 5 +-
.../impl/engine/DefaultCamelBeanPostProcessor.java | 3 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 3 --
.../xml/CamelPropertyPlaceholderDefinition.java| 28 ---
.../camel/model/ProcessorDefinitionHelper.java | 8 ++--
.../properties/PropertiesComponentTest.java| 30
.../apache/camel/support/IntrospectionSupport.java | 4 +-
.../camel/support/builder/ExpressionBuilder.java | 2 +-
.../PropertiesComponentConfiguration.java | 28 ---
21 files changed, 60 insertions(+), 260 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index ea8a343..16a16f6 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -90,8 +90,11 @@ The Camel `Main` class has been moved out of `camel-core`
into `camel-main` so y
### Properties component
+The `properties` component has configuring custom prefix and suffix tokens
removed as if in use, they had potential issues with clashing with simple
languages and elsewhere. The default tokens are now hardcoded and always in use.
+
The `properties` component has some advanced options removed:
`propertyPrefix`, `propertySuffix`, and `fallbackToUnaugmented`; these options
was never really useable for end users anyway. The option `propertiesResolver`
has also been removed as you should use `PropertiesSource` instead.
+
### Removed components
We have removed all deprecated components from Camel 2.x, also including the
old `camel-http` component. Instead you can use `camel-http4`.
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 568395a..84b52df 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -688,7 +688,7 @@ public class CamelNamespaceHandler implements
NamespaceHandler {
private static ComponentMetadata
getDataformatResolverReference(ParserContext context, String dataformat) {
// we cannot resolve dataformat names using property placeholders at
this point in time
-if (dataformat.startsWith(PropertiesComponent.DEFAULT_PREFIX_TOKEN)) {
+if (dataformat.startsWith(PropertiesComponent.PREFIX_TOKEN)) {
return null;
}
ComponentDefinitionRegistry componentDefinitionRegistry =
context.getComponentDefinitionRegistry();
@@ -722,7 +722,7 @@ public class CamelNamespaceHandler implements
NamespaceHandler {
private static ComponentMetadata
getLanguageResolverReference(ParserContext context, String language) {
// we cannot resolve language names using property placeholders at
this point in time
-if (language.startsWith(PropertiesComponent.DEFAULT_PREFIX_TOKEN)) {
+if (language.startsWith(PropertiesComponent.PREFIX_TOKEN)) {
return null;
}
ComponentDefinitionRegistry componentDefinitionRegistry =
context.getComponentDefinitionRegistry();
@@ -756,7 +756,7 @@ public class CamelNamespaceHandler implements
NamespaceHandler {
private static ComponentMetadata
getComponentResolverReference(ParserContext context, String component) {
// we cannot resolve component names using property placeholders at
this point in time
-if (component.startsWith(PropertiesComponent.DEFAULT_PREFIX_TOKEN)) {
+if (component.startsWith(PropertiesComponent.PREFIX_TOKEN)) {
return null;
}
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35418 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel-k] branch master updated: route trait assumes target port name is always 'http' #837
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new b03fe86 route trait assumes target port name is always 'http' #837
b03fe86 is described below
commit b03fe8609a0bd1f42218fd11fb665cee6e2e5546
Author: lburgazzoli
AuthorDate: Thu Jul 18 11:48:42 2019 +0200
route trait assumes target port name is always 'http' #837
---
pkg/trait/route.go | 8 +++-
pkg/trait/route_test.go | 35 +++
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/pkg/trait/route.go b/pkg/trait/route.go
index c3eb320..f761a48 100644
--- a/pkg/trait/route.go
+++ b/pkg/trait/route.go
@@ -80,6 +80,12 @@ func (t *routeTrait) Configure(e *Environment) (bool, error)
{
}
func (t *routeTrait) Apply(e *Environment) error {
+ servicePortName := httpPortName
+ dt := e.Catalog.GetTrait(containerTraitID)
+ if dt != nil {
+ servicePortName = dt.(*containerTrait).ServicePortName
+ }
+
route := routev1.Route{
TypeMeta: metav1.TypeMeta{
Kind: "Route",
@@ -91,7 +97,7 @@ func (t *routeTrait) Apply(e *Environment) error {
},
Spec: routev1.RouteSpec{
Port: {
- TargetPort: intstr.FromString("http"),
+ TargetPort: intstr.FromString(servicePortName),
},
To: routev1.RouteTargetReference{
Kind: "Service",
diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go
index 0f81683..0d270fc 100644
--- a/pkg/trait/route_test.go
+++ b/pkg/trait/route_test.go
@@ -104,6 +104,7 @@ func TestRoute_Default(t *testing.T) {
assert.Nil(t, err)
assert.NotEmpty(t, environment.ExecutedTraits)
+ assert.NotNil(t, environment.GetTrait(ID("container")))
assert.NotNil(t, environment.GetTrait(ID("route")))
route := environment.Resources.GetRoute(func(r *routev1.Route) bool {
@@ -112,6 +113,8 @@ func TestRoute_Default(t *testing.T) {
assert.NotNil(t, route)
assert.Nil(t, route.Spec.TLS)
+ assert.NotNil(t, route.Spec.Port)
+ assert.Equal(t, httpPortName, route.Spec.Port.TargetPort.StrVal)
}
func TestRoute_Disabled(t *testing.T) {
@@ -166,3 +169,35 @@ func TestRoute_TLS(t *testing.T) {
assert.NotNil(t, route.Spec.TLS)
assert.Equal(t, routev1.TLSTerminationEdge, route.Spec.TLS.Termination)
}
+
+func TestRoute_WithCustomServicePort(t *testing.T) {
+ name := xid.New().String()
+ environment := createTestRouteEnvironment(t, name)
+ environment.Integration.Spec.Traits = map[string]v1alpha1.TraitSpec{
+ containerTraitID: {
+ Configuration: map[string]string{
+ "service-port-name": "my-port",
+ },
+ },
+ }
+
+ traitsCatalog := environment.Catalog
+ err := traitsCatalog.apply(environment)
+
+ assert.Nil(t, err)
+ assert.NotEmpty(t, environment.ExecutedTraits)
+ assert.NotNil(t, environment.GetTrait(ID("container")))
+ assert.NotNil(t, environment.GetTrait(ID("route")))
+
+ route := environment.Resources.GetRoute(func(r *routev1.Route) bool {
+ return r.ObjectMeta.Name == name
+ })
+
+ assert.NotNil(t, route)
+ assert.NotNil(t, route.Spec.Port)
+ assert.Equal(
+ t,
+
environment.Integration.Spec.Traits[containerTraitID].Configuration["service-port-name"],
+ route.Spec.Port.TargetPort.StrVal,
+ )
+}
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35417 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel-k] 02/02: Stable container name #826 (pr review)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 29df016d062b1696a9d8f2c670758a56f2e33e95
Author: lburgazzoli
AuthorDate: Thu Jul 18 17:31:07 2019 +0200
Stable container name #826 (pr review)
---
pkg/trait/container.go | 63 +++-
pkg/trait/deployment.go | 37 --
pkg/trait/knative_service.go | 54 -
3 files changed, 51 insertions(+), 103 deletions(-)
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index 2a127a8..d3044d9 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -19,6 +19,9 @@ package trait
import (
"fmt"
+ "strings"
+
+ "github.com/apache/camel-k/pkg/util/envvar"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
serving "github.com/knative/serving/pkg/apis/serving/v1alpha1"
@@ -29,7 +32,7 @@ import (
)
const (
- defaultContainerName = "integration-container"
+ defaultContainerName = "integration"
containerTraitID = "container"
)
@@ -80,23 +83,59 @@ func (t *containerTrait) Configure(e *Environment) (bool,
error) {
}
func (t *containerTrait) Apply(e *Environment) error {
+ container := corev1.Container{
+ Name: t.Name,
+ Image: e.Integration.Status.Image,
+ Env: make([]corev1.EnvVar, 0),
+ }
- //
- // Add mounted volumes as resources
- //
- e.Resources.VisitDeployment(func(deployment *appsv1.Deployment) {
- for i := 0; i < len(deployment.Spec.Template.Spec.Containers);
i++ {
- container :=
[i]
- container.Name = t.Name
+ // combine Environment of integration with platform, kit, integration
+ for key, value := range e.CollectConfigurationPairs("env") {
+ envvar.SetVal(, key, value)
+ }
+
+ envvar.SetVal(, "CAMEL_K_DIGEST",
e.Integration.Status.Digest)
+ envvar.SetVal(, "CAMEL_K_ROUTES",
strings.Join(e.ComputeSourcesURI(), ","))
+ envvar.SetVal(, "CAMEL_K_CONF",
"/etc/camel/conf/application.properties")
+ envvar.SetVal(, "CAMEL_K_CONF_D", "/etc/camel/conf.d")
- t.configureResources(e, container)
+ t.configureResources(e, )
+
+ e.Resources.VisitDeployment(func(deployment *appsv1.Deployment) {
+ for _, envVar := range e.EnvVars {
+ envvar.SetVar(, envVar)
}
+
+ e.ConfigureVolumesAndMounts(
+ ,
+ ,
+ )
+
+ deployment.Spec.Template.Spec.Containers =
append(deployment.Spec.Template.Spec.Containers, container)
})
+
e.Resources.VisitKnativeService(func(service *serving.Service) {
- container :=
- container.Name = t.Name
+ for _, env := range e.EnvVars {
+ switch {
+ case env.ValueFrom == nil:
+ envvar.SetVar(, env)
+ case env.ValueFrom.FieldRef != nil &&
env.ValueFrom.FieldRef.FieldPath == "metadata.namespace":
+ envvar.SetVar(,
corev1.EnvVar{Name: env.Name, Value: e.Integration.Namespace})
+ case env.ValueFrom.FieldRef != nil:
+ t.L.Infof("Environment variable %s uses
fieldRef and cannot be set on a Knative service", env.Name)
+ case env.ValueFrom.ResourceFieldRef != nil:
+ t.L.Infof("Environment variable %s uses
resourceFieldRef and cannot be set on a Knative service", env.Name)
+ default:
+ envvar.SetVar(, env)
+ }
+ }
+
+ e.ConfigureVolumesAndMounts(
+
,
+ ,
+ )
- t.configureResources(e, container)
+
service.Spec.RunLatest.Configuration.RevisionTemplate.Spec.Container = container
})
if t.Expose != nil && *t.Expose {
diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index 157ef84..b867366 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -18,10 +18,7 @@ limitations under the License.
package trait
import (
- "strings"
-
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/envvar"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -121,28 +118,6 @@ func (t *deploymentTrait) Apply(e *Environment) error {
// **
func (t *deploymentTrait) getDeploymentFor(e *Environment)
[camel-k] branch master updated (f889687 -> 29df016)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from f889687 Merge pull request #836 from
jamesnetherton/776-platform-strict-checksum
new 98a8b9b Stable container name #826
new 29df016 Stable container name #826 (pr review)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pkg/trait/container.go | 78
pkg/trait/{service_test.go => container_test.go} | 91 +++-
pkg/trait/deployment.go | 37 --
pkg/trait/jolokia.go | 9 ++-
pkg/trait/knative_service.go | 54 --
pkg/trait/knative_service_test.go| 79
pkg/trait/prometheus.go | 8 ++-
pkg/trait/service_test.go| 73 +++
pkg/util/kubernetes/collection.go| 10 +--
9 files changed, 241 insertions(+), 198 deletions(-)
copy pkg/trait/{service_test.go => container_test.go} (60%)
[camel-k] 01/02: Stable container name #826
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 98a8b9b1dfd5b285a7bc1881a3b73ad3a1a54ee0
Author: lburgazzoli
AuthorDate: Thu Jul 18 11:20:19 2019 +0200
Stable container name #826
---
pkg/trait/container.go | 41 +++
pkg/trait/{service_test.go => container_test.go} | 91 +++-
pkg/trait/jolokia.go | 9 ++-
pkg/trait/knative_service_test.go| 79
pkg/trait/prometheus.go | 8 ++-
pkg/trait/service_test.go| 73 +++
pkg/util/kubernetes/collection.go| 10 +--
7 files changed, 203 insertions(+), 108 deletions(-)
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index 118428a..2a127a8 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -28,6 +28,11 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
)
+const (
+ defaultContainerName = "integration-container"
+ containerTraitID = "container"
+)
+
type containerTrait struct {
BaseTrait `property:",squash"`
@@ -41,15 +46,17 @@ type containerTrait struct {
PortNamestring `property:"port-name"`
ServicePort int`property:"service-port"`
ServicePortName string `property:"service-port-name"`
+ Namestring `property:"name"`
}
func newContainerTrait() *containerTrait {
return {
- BaseTrait: newBaseTrait("container"),
+ BaseTrait: newBaseTrait(containerTraitID),
Port:8080,
PortName:httpPortName,
ServicePort: 80,
ServicePortName: httpPortName,
+ Name:defaultContainerName,
}
}
@@ -74,19 +81,23 @@ func (t *containerTrait) Configure(e *Environment) (bool,
error) {
func (t *containerTrait) Apply(e *Environment) error {
- if e.Resources != nil {
- //
- // Add mounted volumes as resources
- //
- e.Resources.VisitDeployment(func(deployment *appsv1.Deployment)
{
- for i := 0; i <
len(deployment.Spec.Template.Spec.Containers); i++ {
- t.configureResources(e,
[i])
- }
- })
- e.Resources.VisitKnativeService(func(service *serving.Service) {
- t.configureResources(e,
)
- })
- }
+ //
+ // Add mounted volumes as resources
+ //
+ e.Resources.VisitDeployment(func(deployment *appsv1.Deployment) {
+ for i := 0; i < len(deployment.Spec.Template.Spec.Containers);
i++ {
+ container :=
[i]
+ container.Name = t.Name
+
+ t.configureResources(e, container)
+ }
+ })
+ e.Resources.VisitKnativeService(func(service *serving.Service) {
+ container :=
+ container.Name = t.Name
+
+ t.configureResources(e, container)
+ })
if t.Expose != nil && *t.Expose {
t.configureService(e)
@@ -101,7 +112,7 @@ func (t *containerTrait) configureService(e *Environment) {
return
}
- container := e.Resources.GetContainerForIntegration(e.Integration)
+ container := e.Resources.GetContainerByName(t.Name)
if container == nil {
return
}
diff --git a/pkg/trait/service_test.go b/pkg/trait/container_test.go
similarity index 60%
copy from pkg/trait/service_test.go
copy to pkg/trait/container_test.go
index 4e14f66..f5793cc 100644
--- a/pkg/trait/service_test.go
+++ b/pkg/trait/container_test.go
@@ -27,19 +27,13 @@ import (
"github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/test"
- appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/stretchr/testify/assert"
)
-const (
- ServiceTestNamespace = "ns"
- ServiceTestName = "test"
-)
-
-func TestServiceWithDefaults(t *testing.T) {
+func TestContainerWithDefaults(t *testing.T) {
catalog, err := test.DefaultCatalog()
assert.Nil(t, err)
@@ -58,24 +52,6 @@ func TestServiceWithDefaults(t *testing.T) {
},
Spec: v1alpha1.IntegrationSpec{
Profile: v1alpha1.TraitProfileKubernetes,
- Sources: []v1alpha1.SourceSpec{
- {
- DataSpec: v1alpha1.DataSpec{
- Name:
[camel] branch master updated: CAMEL-13764 - Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 c718950 CAMEL-13764 - Regen
c718950 is described below
commit c718950eb5316a4e839b8a0163cc0058aa74b082
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 17:36:00 2019 +0200
CAMEL-13764 - Regen
---
.../camel-mongodb3/src/main/docs/mongodb3-component.adoc | 2 +-
.../mongodb3/springboot/MongoDbComponentConfiguration.java | 14 ++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
b/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
index 74c061c..afe98e8 100644
--- a/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
+++ b/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
@@ -62,7 +62,7 @@ The MongoDB component supports 3 options, which are listed
below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *mongoConnection* (common) | Set the client used for connection | |
MongoClient
+| *mongoConnection* (common) | Set a client used for connection: all endpoints
generated from the component will share this connection bean. | | MongoClient
| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
|===
diff --git
a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
index 55e654e..a17b62a 100644
---
a/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-mongodb3-starter/src/main/java/org/apache/camel/component/mongodb3/springboot/MongoDbComponentConfiguration.java
@@ -37,6 +37,12 @@ public class MongoDbComponentConfiguration
*/
private Boolean enabled;
/**
+ * Set a client used for connection: all endpoints generated from the
+ * component will share this connection bean. The option is a
+ * com.mongodb.MongoClient type.
+ */
+private String mongoConnection;
+/**
* Whether the component should resolve property placeholders on itself
when
* starting. Only properties which are of String type can use property
* placeholders.
@@ -48,6 +54,14 @@ public class MongoDbComponentConfiguration
*/
private Boolean basicPropertyBinding = false;
+public String getMongoConnection() {
+return mongoConnection;
+}
+
+public void setMongoConnection(String mongoConnection) {
+this.mongoConnection = mongoConnection;
+}
+
public Boolean getResolvePropertyPlaceholders() {
return resolvePropertyPlaceholders;
}
[camel] 02/02: CAMEL-13764 - fixing javadoc with PR suggestions
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3fb01b6dc5910a3aa199b5f00510ec827037ffc0
Author: Pasquale Congiusti
AuthorDate: Thu Jul 18 10:18:43 2019 +0200
CAMEL-13764 - fixing javadoc with PR suggestions
---
.../org/apache/camel/component/mongodb3/MongoDbComponent.java| 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
index 0463b1e..206230f 100644
---
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
+++
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
@@ -62,18 +62,19 @@ public class MongoDbComponent extends DefaultComponent {
}
/**
- * Get the client used for connection
+ * Get the connection bean client used for connection.
*
- * @return the client using for connection to db
+ * @return the client used for connection to db
*/
public MongoClient getMongoConnection() {
return mongoConnection;
}
/**
- * Set the client used for connection
+ * Set a client used for connection: all endpoints generated from the
component
+ * will share this connection bean.
*
- * @param mongoConnection
+ * @param mongoConnection the connection bean used as client
*/
public void setMongoConnection(MongoClient mongoConnection) {
this.mongoConnection = mongoConnection;
[camel] 01/02: CAMEL-13764 component connection setting
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c8af27c55e3338e4b3f7f0c1949bb8a3c21e896c
Author: Pasquale Congiusti
AuthorDate: Wed Jul 17 17:44:11 2019 +0200
CAMEL-13764 component connection setting
---
.../src/main/docs/mongodb3-component.adoc | 3 ++-
.../camel/component/mongodb3/MongoDbComponent.java | 26 +-
.../mongodb3/MongoDbConnectionBeansTest.java | 14 +++-
3 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
b/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
index a03c1f5..74c061c 100644
--- a/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
+++ b/components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
@@ -55,13 +55,14 @@
mongodb3:connectionBean?database=databaseName=collectionName
// component options: START
-The MongoDB component supports 2 options, which are listed below.
+The MongoDB component supports 3 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *mongoConnection* (common) | Set the client used for connection | |
MongoClient
| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
|===
diff --git
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
index 476a548..0463b1e 100644
---
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
+++
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbComponent.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import com.mongodb.MongoClient;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.annotations.Component;
@@ -38,6 +39,11 @@ public class MongoDbComponent extends DefaultComponent {
MongoDbOperation.update,
MongoDbOperation.remove));
+/**
+ * A connection client provided externally
+ */
+private MongoClient mongoConnection;
+
public MongoDbComponent() {
this(null);
}
@@ -47,14 +53,32 @@ public class MongoDbComponent extends DefaultComponent {
}
protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
-
MongoDbEndpoint endpoint = new MongoDbEndpoint(uri, this);
endpoint.setConnectionBean(remaining);
+endpoint.setMongoConnection(mongoConnection);
setProperties(endpoint, parameters);
return endpoint;
}
+/**
+ * Get the client used for connection
+ *
+ * @return the client using for connection to db
+ */
+public MongoClient getMongoConnection() {
+return mongoConnection;
+}
+
+/**
+ * Set the client used for connection
+ *
+ * @param mongoConnection
+ */
+public void setMongoConnection(MongoClient mongoConnection) {
+this.mongoConnection = mongoConnection;
+}
+
@Override
protected void doShutdown() throws Exception {
super.doShutdown();
diff --git
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
index 8809c7f..171bf10 100644
---
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
+++
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbConnectionBeansTest.java
@@ -21,6 +21,7 @@ import java.util.Properties;
import com.mongodb.MongoClient;
import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.spring.SpringCamelContext;
@@ -53,7 +54,7 @@ public class MongoDbConnectionBeansTest extends
AbstractMongoDbTest {
"mongodb3:myDb?mongoConnection=#myDbS={{mongodb.testDb}}={{mongodb.testCollection}}=count=true",
MongoDbEndpoint.class);
assertEquals("myDb", testEndpoint.getConnectionBean());
-MongoClient myDbS = mongo = applicationContext.getBean("myDbS",
MongoClient.class);
[camel] branch master updated (c52fde1 -> 3fb01b6)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from c52fde1 Re-introduced Spring Boot Integration test for Camel-Elasticsearch-rest new c8af27c CAMEL-13764 component connection setting new 3fb01b6 CAMEL-13764 - fixing javadoc with PR suggestions The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/docs/mongodb3-component.adoc | 3 ++- .../camel/component/mongodb3/MongoDbComponent.java | 27 +- .../mongodb3/MongoDbConnectionBeansTest.java | 14 ++- 3 files changed, 41 insertions(+), 3 deletions(-)
[camel] 02/02: Re-introduced Spring Boot Integration test for Camel-Elasticsearch-rest
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c52fde146d385c0b644e0846ee4d0edc9ec8
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 17:26:38 2019 +0200
Re-introduced Spring Boot Integration test for Camel-Elasticsearch-rest
---
.../apache/camel/itest/springboot/CamelElasticsearchRestTest.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
index b265eda..61bd66a 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
@@ -20,13 +20,10 @@ import
org.apache.camel.itest.springboot.util.ArquillianPackager;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-
@RunWith(Arquillian.class)
-@Ignore("Requires Lucene 6.x and Spring-Boot 1.x is using 5.x")
public class CamelElasticsearchRestTest extends AbstractSpringBootTestSupport {
@Deployment
@@ -37,7 +34,9 @@ public class CamelElasticsearchRestTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelElasticsearchRestTest.class))
-
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseTest$)")
+
.dependency("org.elasticsearch.client:elasticsearch-rest-client-sniffer:7.1.1")
+
.dependency("org.elasticsearch.client:elasticsearch-rest-client:7.1.1")
+
.dependency("org.elasticsearch.client:elasticsearch-rest-high-level-client:7.1.1")
.build();
}
[camel] 01/02: CAMEL-13767 - Camel-elasticsearch-rest: Types are deprecated, we need to remove them and check if everything is still ok
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 29e51cdfb262bdf45fca7bea3505c0c2d5e303b7
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 17:00:37 2019 +0200
CAMEL-13767 - Camel-elasticsearch-rest: Types are deprecated, we need to
remove them and check if everything is still ok
---
.../src/main/docs/elasticsearch-rest-component.adoc | 3 +--
.../elasticsearch/ElasticsearchConfiguration.java | 13 -
.../component/elasticsearch/ElasticsearchConstants.java | 1 -
.../component/elasticsearch/ElasticsearchProducer.java | 11 ---
.../converter/ElasticsearchActionRequestConverter.java | 12 +++-
.../component/elasticsearch/ElasticsearchBulkTest.java | 4 ++--
.../elasticsearch/ElasticsearchClusterIndexTest.java| 6 ++
.../ElasticsearchGetSearchDeleteExistsUpdateTest.java | 17 ++---
.../component/elasticsearch/ElasticsearchIndexTest.java | 8 +++-
.../elasticsearch/ElasticsearchScrollSearchTest.java| 10 +-
.../dsl/ElasticsearchEndpointBuilderFactory.java| 11 ---
11 files changed, 22 insertions(+), 74 deletions(-)
diff --git
a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index e5e80fd..935c7e6 100644
---
a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++
b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -74,7 +74,7 @@ with the following path and query parameters:
|===
- Query Parameters (15 parameters):
+ Query Parameters (14 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -85,7 +85,6 @@ with the following path and query parameters:
| *enableSSL* (producer) | Enable SSL | false | boolean
| *hostAddresses* (producer) | *Required* Comma separated list with ip:port
formatted remote transport addresses to use. | | String
| *indexName* (producer) | The name of the index to act against | | String
-| *indexType* (producer) | The type of the index to act against | | String
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *maxRetryTimeout* (producer) | The time in ms before retry | 3 | int
| *operation* (producer) | What operation to perform | |
ElasticsearchOperation
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
index ffe47c9..23525d9 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
@@ -35,8 +35,6 @@ public class ElasticsearchConfiguration {
private ElasticsearchOperation operation;
@UriParam
private String indexName;
-@UriParam
-private String indexType;
@UriParam(defaultValue = "" +
ElasticsearchConstants.DEFAULT_FOR_WAIT_ACTIVE_SHARDS)
private int waitForActiveShards =
ElasticsearchConstants.DEFAULT_FOR_WAIT_ACTIVE_SHARDS;
@UriParam @Metadata(required = true)
@@ -96,17 +94,6 @@ public class ElasticsearchConfiguration {
}
/**
- * The type of the index to act against
- */
-public String getIndexType() {
-return indexType;
-}
-
-public void setIndexType(String indexType) {
-this.indexType = indexType;
-}
-
-/**
* Comma separated list with ip:port formatted remote transport addresses
to use.
*/
public String getHostAddresses() {
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
index 5b69da4..4d58345 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
@@ -21,7 +21,6 @@ public interface ElasticsearchConstants {
String PARAM_OPERATION
[camel] branch master updated (67dd7c3 -> c52fde1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 67dd7c3 Removed -XX:+PrintFlagsFinal from jvm.config new 29e51cd CAMEL-13767 - Camel-elasticsearch-rest: Types are deprecated, we need to remove them and check if everything is still ok new c52fde1 Re-introduced Spring Boot Integration test for Camel-Elasticsearch-rest The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/docs/elasticsearch-rest-component.adoc | 3 +-- .../elasticsearch/ElasticsearchConfiguration.java | 13 - .../component/elasticsearch/ElasticsearchConstants.java | 1 - .../component/elasticsearch/ElasticsearchProducer.java | 11 --- .../converter/ElasticsearchActionRequestConverter.java | 12 +++- .../component/elasticsearch/ElasticsearchBulkTest.java | 4 ++-- .../elasticsearch/ElasticsearchClusterIndexTest.java| 6 ++ .../ElasticsearchGetSearchDeleteExistsUpdateTest.java | 17 ++--- .../component/elasticsearch/ElasticsearchIndexTest.java | 8 +++- .../elasticsearch/ElasticsearchScrollSearchTest.java| 10 +- .../dsl/ElasticsearchEndpointBuilderFactory.java| 11 --- .../itest/springboot/CamelElasticsearchRestTest.java| 7 +++ 12 files changed, 25 insertions(+), 78 deletions(-)
[camel] branch master updated: Removed -XX:+PrintFlagsFinal from jvm.config
This is an automated email from the ASF dual-hosted git repository. acosentino 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 67dd7c3 Removed -XX:+PrintFlagsFinal from jvm.config 67dd7c3 is described below commit 67dd7c3c30526134905947fac97028da98117ff3 Author: Andrea Cosentino AuthorDate: Thu Jul 18 16:59:50 2019 +0200 Removed -XX:+PrintFlagsFinal from jvm.config --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index 769bfd4..8b88fcd 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx3584m -Djava.awt.headless=true -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+PrintFlagsFinal +-Xmx3584m -Djava.awt.headless=true -XX:+UseG1GC -XX:+UseStringDeduplication
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35412 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] 04/07: Jenkinsfile.karaf: Apply the same approach and ignore the .mavenrc from Jenkins node
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a281cf3631e3e77d55510dc3dedca327e49aba1b
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:43:38 2019 +0200
Jenkinsfile.karaf: Apply the same approach and ignore the .mavenrc from
Jenkins node
---
Jenkinsfile.karaf | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile.karaf b/Jenkinsfile.karaf
index f3be4c9..5f801d7 100644
--- a/Jenkinsfile.karaf
+++ b/Jenkinsfile.karaf
@@ -39,6 +39,10 @@ pipeline {
jdk JDK_NAME
}
+environment {
+MAVEN_SKIP_RC = true
+}
+
options {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
[camel] 06/07: Jenkinsfile.sb: Apply the same approach and ignore the .mavenrc from Jenkins node
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8e8517d36f2d2aa135a5c04b3f1396f0bfa9f6fd
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:45:08 2019 +0200
Jenkinsfile.sb: Apply the same approach and ignore the .mavenrc from
Jenkins node
---
Jenkinsfile.sb | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile.sb b/Jenkinsfile.sb
index 2b8294f..df71803 100644
--- a/Jenkinsfile.sb
+++ b/Jenkinsfile.sb
@@ -39,6 +39,10 @@ pipeline {
jdk JDK_NAME
}
+environment {
+MAVEN_SKIP_RC = true
+}
+
options {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
[camel] 07/07: Jenkinsfile.sb.jdk11: Apply the same approach and ignore the .mavenrc from Jenkins node
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 661bb7b7bbf24d85bfe93a8b14116f572d7bd0d5
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:46:05 2019 +0200
Jenkinsfile.sb.jdk11: Apply the same approach and ignore the .mavenrc from
Jenkins node
---
Jenkinsfile.sb.jdk11 | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile.sb.jdk11 b/Jenkinsfile.sb.jdk11
index f74f74b..f1c0e51 100644
--- a/Jenkinsfile.sb.jdk11
+++ b/Jenkinsfile.sb.jdk11
@@ -39,6 +39,10 @@ pipeline {
jdk JDK_NAME
}
+environment {
+MAVEN_SKIP_RC = true
+}
+
options {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
[camel] 02/07: Jenkinsfile.jdk11: Apply the same approach and ignore the .mavenrc from Jenkins node
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e7fa6bedc9067813dc2c8168338a72b686f14246
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:41:19 2019 +0200
Jenkinsfile.jdk11: Apply the same approach and ignore the .mavenrc from
Jenkins node
---
Jenkinsfile.jdk11 | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile.jdk11 b/Jenkinsfile.jdk11
index df8d867..519ec09 100644
--- a/Jenkinsfile.jdk11
+++ b/Jenkinsfile.jdk11
@@ -32,6 +32,10 @@ pipeline {
jdk JDK_NAME
}
+environment {
+MAVEN_SKIP_RC = true
+}
+
options {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
[camel] 03/07: Jenkinsfile.jdk12: Apply the same approach and ignore the .mavenrc from Jenkins node
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 81089ce8d26934924b20a7661c9207087a5356cc
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:42:46 2019 +0200
Jenkinsfile.jdk12: Apply the same approach and ignore the .mavenrc from
Jenkins node
---
Jenkinsfile.jdk12 | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile.jdk12 b/Jenkinsfile.jdk12
index f41a4d1b..2ff15b5 100644
--- a/Jenkinsfile.jdk12
+++ b/Jenkinsfile.jdk12
@@ -32,6 +32,10 @@ pipeline {
jdk JDK_NAME
}
+environment {
+MAVEN_SKIP_RC = true
+}
+
options {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
[camel] 05/07: Jenkinsfile.karaf.jdk11: Apply the same approach and ignore the .mavenrc from Jenkins node
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 213477de52eb81018e9f8d4a27e162f1fa334f4a
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:44:27 2019 +0200
Jenkinsfile.karaf.jdk11: Apply the same approach and ignore the .mavenrc
from Jenkins node
---
Jenkinsfile.karaf.jdk11 | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile.karaf.jdk11 b/Jenkinsfile.karaf.jdk11
index 52dc1a1..11497d2 100644
--- a/Jenkinsfile.karaf.jdk11
+++ b/Jenkinsfile.karaf.jdk11
@@ -39,6 +39,10 @@ pipeline {
jdk JDK_NAME
}
+environment {
+MAVEN_SKIP_RC = true
+}
+
options {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
[camel] 01/07: Jenkinsfile.daily: Apply the same approach and ignore the .mavenrc from Jenkins node
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ad56c6b4feade17d0339f8ecdfd8df787e49793a
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:39:28 2019 +0200
Jenkinsfile.daily: Apply the same approach and ignore the .mavenrc from
Jenkins node
---
Jenkinsfile.daily | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 86051db..301298c 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -35,6 +35,10 @@ pipeline {
cron('@daily')
}
+environment {
+MAVEN_SKIP_RC = true
+}
+
options {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
[camel] branch master updated (6be132f -> 661bb7b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 6be132f JenkinsFile: Removing debugging bits new ad56c6b Jenkinsfile.daily: Apply the same approach and ignore the .mavenrc from Jenkins node new e7fa6be Jenkinsfile.jdk11: Apply the same approach and ignore the .mavenrc from Jenkins node new 81089ce Jenkinsfile.jdk12: Apply the same approach and ignore the .mavenrc from Jenkins node new a281cf3 Jenkinsfile.karaf: Apply the same approach and ignore the .mavenrc from Jenkins node new 213477d Jenkinsfile.karaf.jdk11: Apply the same approach and ignore the .mavenrc from Jenkins node new 8e8517d Jenkinsfile.sb: Apply the same approach and ignore the .mavenrc from Jenkins node new 661bb7b Jenkinsfile.sb.jdk11: Apply the same approach and ignore the .mavenrc from Jenkins node The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Jenkinsfile.daily | 4 Jenkinsfile.jdk11 | 4 Jenkinsfile.jdk12 | 4 Jenkinsfile.karaf | 4 Jenkinsfile.karaf.jdk11 | 4 Jenkinsfile.sb | 4 Jenkinsfile.sb.jdk11| 4 7 files changed, 28 insertions(+)
[camel] branch master updated: JenkinsFile: Removing debugging bits
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 6be132f JenkinsFile: Removing debugging bits
6be132f is described below
commit 6be132fc31f4b62d22f2bab4fd3178a7253a1053
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:37:27 2019 +0200
JenkinsFile: Removing debugging bits
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8902553..5b904a9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
branch 'master'
}
steps {
-sh "sh -x ./mvnw $MAVEN_PARAMS -Pdeploy
-Dmaven.test.skip.exec=true clean deploy"
+sh "./mvnw $MAVEN_PARAMS -Pdeploy -Dmaven.test.skip.exec=true
clean deploy"
}
}
[camel] branch master updated: Jenkins: Lets skip .mavenrc config from node
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 4d639e0 Jenkins: Lets skip .mavenrc config from node
4d639e0 is described below
commit 4d639e07b17e174fb8c575572849fb9b3dafd81c
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:32:57 2019 +0200
Jenkins: Lets skip .mavenrc config from node
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ea4b386..8902553 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
}
environment {
-MAVEN_OPTS = ""
+MAVEN_SKIP_RC = true
}
options {
[camel] branch master updated: Run the maven commands with sh -x for debugging reason
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 e21294a Run the maven commands with sh -x for debugging reason
e21294a is described below
commit e21294a8aec3abf06598f9f785a9ce1b8327
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:28:30 2019 +0200
Run the maven commands with sh -x for debugging reason
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9f68cef..ea4b386 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
branch 'master'
}
steps {
-sh "-x ./mvnw $MAVEN_PARAMS -Pdeploy
-Dmaven.test.skip.exec=true clean deploy"
+sh "sh -x ./mvnw $MAVEN_PARAMS -Pdeploy
-Dmaven.test.skip.exec=true clean deploy"
}
}
[camel] branch master updated: Fix Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 c231712 Fix Jenkinsfile
c231712 is described below
commit c2317121aad9011da7e975f962c4b375c21214be
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:26:36 2019 +0200
Fix Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index cb037ce..9f68cef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
branch 'master'
}
steps {
-sh -x "./mvnw $MAVEN_PARAMS -Pdeploy
-Dmaven.test.skip.exec=true clean deploy"
+sh "-x ./mvnw $MAVEN_PARAMS -Pdeploy
-Dmaven.test.skip.exec=true clean deploy"
}
}
[camel] branch master updated: JenkinsFile add a bit more information while building
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 56f9b35 JenkinsFile add a bit more information while building
56f9b35 is described below
commit 56f9b3511b03129de3fc7ed74f31892652652306
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 12:23:57 2019 +0200
JenkinsFile add a bit more information while building
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7562de2..cb037ce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
branch 'master'
}
steps {
-sh "./mvnw $MAVEN_PARAMS -Pdeploy -Dmaven.test.skip.exec=true
clean deploy"
+sh -x "./mvnw $MAVEN_PARAMS -Pdeploy
-Dmaven.test.skip.exec=true clean deploy"
}
}
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35411 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated: Avoid the overriding of MAVEN options on Jenkins CI
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 0730040 Avoid the overriding of MAVEN options on Jenkins CI
0730040 is described below
commit 073004011304a66a8bbb4f90854189923bf313cd
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 11:49:08 2019 +0200
Avoid the overriding of MAVEN options on Jenkins CI
---
Jenkinsfile | 4
1 file changed, 4 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index fffa9b7..7562de2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,6 +31,10 @@ pipeline {
tools {
jdk JDK_NAME
}
+
+environment {
+MAVEN_OPTS = ""
+}
options {
buildDiscarder(
[camel-k] branch master updated: fix: Enable maven strict checksum policy on platform initialization
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 46317b5 fix: Enable maven strict checksum policy on platform
initialization
new f889687 Merge pull request #836 from
jamesnetherton/776-platform-strict-checksum
46317b5 is described below
commit 46317b528f8e375d84a6c970baa97b34eda3b2c4
Author: James Netherton
AuthorDate: Thu Jul 18 08:11:04 2019 +0100
fix: Enable maven strict checksum policy on platform initialization
fixes #776
---
.../v1alpha1/integrationplatform_types_support.go | 8 ++
pkg/cmd/install.go | 71 +-
pkg/controller/integrationplatform/initialize.go | 53 +++-
.../integrationplatform/initialize_test.go | 22 +++
pkg/util/maven/maven_settings.go | 68 +-
pkg/util/maven/maven_settings_test.go | 149 +
6 files changed, 300 insertions(+), 71 deletions(-)
diff --git a/pkg/apis/camel/v1alpha1/integrationplatform_types_support.go
b/pkg/apis/camel/v1alpha1/integrationplatform_types_support.go
index ff35966..3a5def0 100644
--- a/pkg/apis/camel/v1alpha1/integrationplatform_types_support.go
+++ b/pkg/apis/camel/v1alpha1/integrationplatform_types_support.go
@@ -76,6 +76,14 @@ func (in *IntegrationPlatform) Configurations()
[]ConfigurationSpec {
return in.Spec.Configuration
}
+// AddConfiguration --
+func (in *IntegrationPlatform) AddConfiguration(confType string, confValue
string) {
+ in.Spec.Configuration = append(in.Spec.Configuration, ConfigurationSpec{
+ Type: confType,
+ Value: confValue,
+ })
+}
+
// GetCondition returns the condition with the provided type.
func (in *IntegrationPlatformStatus) GetCondition(condType
IntegrationPlatformConditionType) *IntegrationPlatformCondition {
for i := range in.Conditions {
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 885fb0a..9f13bb6 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -31,9 +31,7 @@ import (
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/install"
- "github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/maven"
"github.com/apache/camel-k/pkg/util/watch"
"github.com/pkg/errors"
@@ -41,7 +39,6 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
func newCmdInstall(rootCmdOptions *RootCmdOptions) *cobra.Command {
@@ -212,62 +209,10 @@ func (o *installCmdOptions) install(_ *cobra.Command, _
[]string) error {
platform.Spec.Build.Timeout.Duration = d
}
- o.mavenSettings =
fmt.Sprintf("configmap:%s-maven-settings/settings.xml", platform.Name)
-
- settings := maven.NewSettings()
- repositories := make([]maven.Repository, 0,
len(o.mavenRepositories))
-
- for i, r := range o.mavenRepositories {
- repository := maven.NewRepository(r)
- if repository.ID == "" {
- repository.ID = fmt.Sprintf("repository-%03d",
i)
+ if len(o.mavenRepositories) > 0 {
+ for _, r := range o.mavenRepositories {
+ platform.AddConfiguration("repository", r)
}
-
- repositories = append(repositories, repository)
- }
-
- // Enables strict checksums for Maven central if not already
configured
- if !containsMvnCentral(repositories) {
- repository :=
maven.NewRepository("https://repo.maven.apache.org/maven2@id=central;)
- repositories = append([]maven.Repository{repository},
repositories...)
- }
-
- settings.Profiles = []maven.Profile{
- {
- ID: "maven-settings",
- Activation: maven.Activation{
- ActiveByDefault: true,
- },
- Repositories: repositories,
- PluginRepositories: repositories,
- },
- }
-
- data, err := util.EncodeXML(settings)
- if err != nil {
- return err
- }
-
- cm := corev1.ConfigMap{
- TypeMeta: metav1.TypeMeta{
- Kind: "ConfigMap",
-
[camel] branch master updated: Update jvm.config to print the configuration
This is an automated email from the ASF dual-hosted git repository. acosentino 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 437ba96 Update jvm.config to print the configuration 437ba96 is described below commit 437ba969314b1924bf59e58e153af2f429a863a1 Author: Andrea Cosentino AuthorDate: Thu Jul 18 11:39:36 2019 +0200 Update jvm.config to print the configuration --- .mvn/jvm.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index 547a0e6..769bfd4 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx3584m -Djava.awt.headless=true -XX:+UseG1GC -XX:+UseStringDeduplication +-Xmx3584m -Djava.awt.headless=true -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+PrintFlagsFinal
[camel] branch master updated: Upgrade Braintree to version 2.101.0
This is an automated email from the ASF dual-hosted git repository. acosentino 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 2e0b40f Upgrade Braintree to version 2.101.0 2e0b40f is described below commit 2e0b40f346e7a940a3213b3bc8815955932b9a47 Author: Andrea Cosentino AuthorDate: Thu Jul 18 11:29:08 2019 +0200 Upgrade Braintree to version 2.101.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 41fcf8b..a67971d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -99,7 +99,7 @@ 0.34 1.61 2.34.0 -2.99.0 +2.101.0 5.6.7 1.12 0.9.5.4
[camel] branch master updated: Polished
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 272ea94 Polished
272ea94 is described below
commit 272ea94f9e765355dd308b6ba8037e70e3fc92b7
Author: Claus Ibsen
AuthorDate: Thu Jul 18 10:53:39 2019 +0200
Polished
---
.../org/apache/camel/processor/CamelInternalProcessor.java | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 9f48f00..78753e1 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -248,7 +248,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
/**
* Strategy to determine if we should continue processing the {@link
Exchange}.
*/
-protected boolean continueProcessing(Exchange exchange) {
+private boolean continueProcessing(Exchange exchange) {
Object stop = exchange.getProperty(Exchange.ROUTE_STOP);
if (stop != null) {
boolean doStop =
exchange.getContext().getTypeConverter().convertTo(Boolean.class, stop);
@@ -350,7 +350,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
* @param policy the policy
* @return true to run
*/
-protected boolean isRoutePolicyRunAllowed(RoutePolicy policy) {
+boolean isRoutePolicyRunAllowed(RoutePolicy policy) {
if (policy instanceof StatefulService) {
StatefulService ss = (StatefulService) policy;
return ss.isRunAllowed();
@@ -395,9 +395,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
}
private static boolean isCamelStopping(CamelContext context) {
-if (context instanceof StatefulService) {
-StatefulService ss = (StatefulService) context;
-return ss.isStopping() || ss.isStopped();
+if (context != null) {
+return context.isStopping() || context.isStopped();
}
return false;
}
@@ -516,9 +515,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
@Override
public StopWatch before(Exchange exchange) throws Exception {
-StopWatch watch = new StopWatch();
debugger.beforeProcess(exchange, target, definition);
-return watch;
+return new StopWatch();
}
@Override
[camel] branch master updated: CAMEL-13759: camel3 - Debugger should not use intercept strategy but use internal processor advice as other similar features does.
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 2b49570 CAMEL-13759: camel3 - Debugger should not use intercept
strategy but use internal processor advice as other similar features does.
2b49570 is described below
commit 2b495707f6126fc62e7a77cd37a9680ff2658ee1
Author: Claus Ibsen
AuthorDate: Thu Jul 18 10:48:41 2019 +0200
CAMEL-13759: camel3 - Debugger should not use intercept strategy but use
internal processor advice as other similar features does.
---
.../camel/impl/engine/AbstractCamelContext.java| 7 --
.../camel/processor/CamelInternalProcessor.java| 35 ++
.../camel/processor/channel/DefaultChannel.java| 18 --
.../processor/interceptor/BacklogDebugger.java | 4 --
.../apache/camel/processor/interceptor/Debug.java | 74 --
.../processor/interceptor/DefaultDebugger.java | 4 +-
6 files changed, 48 insertions(+), 94 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index dc4f22e..89f3e6a 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -78,7 +78,6 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.impl.transformer.TransformerKey;
import org.apache.camel.impl.validator.ValidatorKey;
-import org.apache.camel.processor.interceptor.Debug;
import org.apache.camel.processor.interceptor.HandleFault;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
@@ -2459,12 +2458,6 @@ public abstract class AbstractCamelContext extends
ServiceSupport implements Ext
log.info("Delayer is enabled with: {} ms. on CamelContext: {}",
getDelayer(), getName());
}
-// register debugger
-if (getDebugger() != null) {
-log.info("Debugger: {} is enabled on CamelContext: {}",
getDebugger(), getName());
-addInterceptStrategy(new Debug(getDebugger()));
-}
-
// start management strategy before lifecycles are started
ManagementStrategy managementStrategy = getManagementStrategy();
startService(managementStrategy);
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 3651856..9f48f00 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -37,6 +37,7 @@ import org.apache.camel.processor.interceptor.BacklogDebugger;
import org.apache.camel.processor.interceptor.BacklogTracer;
import org.apache.camel.processor.interceptor.DefaultBacklogTracerEventMessage;
import org.apache.camel.spi.CamelInternalProcessorAdvice;
+import org.apache.camel.spi.Debugger;
import org.apache.camel.spi.InflightRepository;
import
org.apache.camel.spi.ManagementInterceptStrategy.InstrumentationProcessor;
import org.apache.camel.spi.MessageHistoryFactory;
@@ -499,6 +500,40 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
}
/**
+ * Advice to execute when using custom debugger.
+ */
+public static final class DebuggerAdvice implements
CamelInternalProcessorAdvice, Ordered {
+
+private final Debugger debugger;
+private final Processor target;
+private final NamedNode definition;
+
+public DebuggerAdvice(Debugger debugger, Processor target, NamedNode
definition) {
+this.debugger = debugger;
+this.target = target;
+this.definition = definition;
+}
+
+@Override
+public StopWatch before(Exchange exchange) throws Exception {
+StopWatch watch = new StopWatch();
+debugger.beforeProcess(exchange, target, definition);
+return watch;
+}
+
+@Override
+public void after(Exchange exchange, StopWatch stopWatch) throws
Exception {
+debugger.afterProcess(exchange, target, definition,
stopWatch.taken());
+}
+
+@Override
+public int getOrder() {
+// we want debugger just before calling the processor
+return Ordered.LOWEST;
+}
+}
+
+/**
* Advice to inject new {@link UnitOfWork} to the {@link Exchange} if
needed, and as well to ensure
* the {@link UnitOfWork} is done and stopped.
*/
diff --git
[camel] branch master updated: Upgrade Vertx to version 3.8.0
This is an automated email from the ASF dual-hosted git repository. acosentino 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 8797a9b Upgrade Vertx to version 3.8.0 8797a9b is described below commit 8797a9bdb1b68295398787e47794973a25f41544 Author: Andrea Cosentino AuthorDate: Thu Jul 18 10:44:51 2019 +0200 Upgrade Vertx to version 3.8.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2dae9bd..41fcf8b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -631,7 +631,7 @@ 1.7_6 2.0 2.0 -3.7.1 +3.8.0 0.7 3.6.0 0.8.0
[camel] branch master updated: Upgrade Wiremock to version 2.24.0
This is an automated email from the ASF dual-hosted git repository. acosentino 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 367a542 Upgrade Wiremock to version 2.24.0 367a542 is described below commit 367a5425748b92622027368457cb505916f19aae Author: Andrea Cosentino AuthorDate: Thu Jul 18 10:28:47 2019 +0200 Upgrade Wiremock to version 2.24.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3545ef5..2dae9bd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -637,7 +637,7 @@ 0.8.0 3.0.5.Final 0.9.4_5 -2.23.2 +2.24.0 4.4.1 5.2.1 1.6.3_1
[camel] 04/04: Camel-Solr: Restore Spring Boot integration test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 54e660fb1f4e44c92425fcc902952125fb7f9aa5
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 09:13:48 2019 +0200
Camel-Solr: Restore Spring Boot integration test
---
.../src/test/java/org/apache/camel/itest/springboot/CamelSolrTest.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSolrTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSolrTest.java
index b108ecf..9bcb04b 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSolrTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSolrTest.java
@@ -20,12 +20,9 @@ import
org.apache.camel.itest.springboot.util.ArquillianPackager;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-
-@Ignore
@RunWith(Arquillian.class)
public class CamelSolrTest extends AbstractSpringBootTestSupport {
[camel] 03/04: CAMEL-13765 - Camel-Solr: Upgrade Solr to 8.x
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 8e0610ae7659a4b565935636235f9b080d6f49a5 Author: Andrea Cosentino AuthorDate: Thu Jul 18 09:13:24 2019 +0200 CAMEL-13765 - Camel-Solr: Upgrade Solr to 8.x --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index ca3a705..3545ef5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -566,10 +566,10 @@ 1.24 1.1.4 2.6.3_1 -7.6.0_1 +8.1.1_1 -7.6.0 -[7,8) +8.1.1 +[8,9) 2.4.3 2.9.1 2.9.1_1
[camel] branch master updated (f4cf513 -> 54e660f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from f4cf513 more fixes for anchor not found errors new 07a8d8f CAMEL-13762 - Camel-Lucene: Upgrade Lucene to 8.x new 350ed40 CAMEL-13762 - Fixed CS new 8e0610a CAMEL-13765 - Camel-Solr: Upgrade Solr to 8.x new 54e660f Camel-Solr: Restore Spring Boot integration test The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../component/lucene/LuceneQueryProducer.java | 3 ++- .../camel/component/lucene/LuceneSearcher.java | 12 - .../processor/lucene/LuceneQueryProcessor.java | 30 ++ .../processor/lucene/LuceneQueryProcessorTest.java | 4 +-- parent/pom.xml | 12 - .../camel/itest/springboot/CamelSolrTest.java | 3 --- 6 files changed, 35 insertions(+), 29 deletions(-)
[camel] 01/04: CAMEL-13762 - Camel-Lucene: Upgrade Lucene to 8.x
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 07a8d8f413c29d1cb053cb195ac666f7bce3c6d9
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 08:41:50 2019 +0200
CAMEL-13762 - Camel-Lucene: Upgrade Lucene to 8.x
---
.../apache/camel/component/lucene/LuceneQueryProducer.java | 3 ++-
.../org/apache/camel/component/lucene/LuceneSearcher.java | 12 ++--
.../camel/processor/lucene/LuceneQueryProcessor.java | 14 +++---
.../camel/processor/lucene/LuceneQueryProcessorTest.java | 4 ++--
parent/pom.xml | 6 +++---
5 files changed, 24 insertions(+), 15 deletions(-)
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
index 5448e30..650816e 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
@@ -30,6 +30,7 @@ public class LuceneQueryProducer extends DefaultProducer {
Analyzer analyzer;
File indexDirectory;
int maxNumberOfHits;
+int totalHitsThreshold;
public LuceneQueryProducer(Endpoint endpoint, LuceneConfiguration config)
throws Exception {
super(endpoint);
@@ -60,7 +61,7 @@ public class LuceneQueryProducer extends DefaultProducer {
if (phrase != null) {
searcher.open(indexDirectory, analyzer);
-hits = searcher.search(phrase, maxNumberOfHits,
config.getLuceneVersion(), isReturnLuceneDocs);
+hits = searcher.search(phrase, maxNumberOfHits,
totalHitsThreshold, config.getLuceneVersion(), isReturnLuceneDocs);
} else {
throw new IllegalArgumentException("SearchPhrase for
LucenePhraseQuerySearcher not set. Set the Header value: QUERY");
}
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
index b3309d7..25a0f80 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
@@ -58,14 +58,14 @@ public class LuceneSearcher {
analyzer.close();
}
-public Hits search(String searchPhrase, int maxNumberOfHits) throws
Exception {
-return search(searchPhrase, maxNumberOfHits,
LuceneConstants.LUCENE_VERSION, false);
+public Hits search(String searchPhrase, int maxNumberOfHits, int
totalHitsThreshold) throws Exception {
+return search(searchPhrase, maxNumberOfHits, totalHitsThreshold,
LuceneConstants.LUCENE_VERSION, false);
}
-public Hits search(String searchPhrase, int maxNumberOfHits, Version
luceneVersion, boolean returnLuceneDocs) throws Exception {
+public Hits search(String searchPhrase, int maxNumberOfHits, int
totalHitsThreshold, Version luceneVersion, boolean returnLuceneDocs) throws
Exception {
Hits searchHits = new Hits();
-int numberOfHits = doSearch(searchPhrase, maxNumberOfHits,
luceneVersion);
+int numberOfHits = doSearch(searchPhrase, maxNumberOfHits,
totalHitsThreshold, luceneVersion);
searchHits.setNumberOfHits(numberOfHits);
for (ScoreDoc hit : hits) {
@@ -83,12 +83,12 @@ public class LuceneSearcher {
return searchHits;
}
-private int doSearch(String searchPhrase, int maxNumberOfHits, Version
luceneVersion) throws NullPointerException, ParseException, IOException {
+private int doSearch(String searchPhrase, int maxNumberOfHits, int
totalHitsThreshold, Version luceneVersion) throws NullPointerException,
ParseException, IOException {
LOG.trace("*** Search Phrase: {} ***", searchPhrase);
QueryParser parser = new QueryParser("contents", analyzer);
Query query = parser.parse(searchPhrase);
-TopScoreDocCollector collector =
TopScoreDocCollector.create(maxNumberOfHits);
+TopScoreDocCollector collector =
TopScoreDocCollector.create(maxNumberOfHits, totalHitsThreshold);
indexSearcher.search(query, collector);
hits = collector.topDocs().scoreDocs;
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/LuceneQueryProcessor.java
b/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/LuceneQueryProcessor.java
index f312846..eeebb45 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/LuceneQueryProcessor.java
+++
[camel] 02/04: CAMEL-13762 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 350ed40e0fefd8506e483df686e5a1b2a60419eb
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 08:43:46 2019 +0200
CAMEL-13762 - Fixed CS
---
.../processor/lucene/LuceneQueryProcessor.java | 28 +++---
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/LuceneQueryProcessor.java
b/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/LuceneQueryProcessor.java
index eeebb45..e13ffac 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/LuceneQueryProcessor.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/LuceneQueryProcessor.java
@@ -32,17 +32,17 @@ public class LuceneQueryProcessor implements Processor {
private IndexSearcher indexSearcher;
private LuceneSearcher searcher;
private String searchPhrase;
-private int maxNumberOfHits;
+private int maxNumberOfHits;
private int totalHitsThreshold;
private Version luceneVersion;
-
+
public LuceneQueryProcessor(String indexDirectoryPath, Analyzer analyzer,
String defaultSearchPhrase, int maxNumberOfHits, int totalHitsThreshold) {
this.setAnalyzer(analyzer);
this.setIndexDirectory(new File(indexDirectoryPath));
this.setSearchPhrase(defaultSearchPhrase);
this.setMaxNumberOfHits(maxNumberOfHits);
}
-
+
public void process(Exchange exchange) throws Exception {
Hits hits;
@@ -56,9 +56,9 @@ public class LuceneQueryProcessor implements Processor {
hits = searcher.search(phrase, maxNumberOfHits,
totalHitsThreshold, luceneVersion, isReturnLuceneDocs);
} else {
throw new IllegalArgumentException("SearchPhrase for
LuceneQueryProcessor not set. Set the Header value: QUERY");
-}
-
-exchange.getIn().setBody(hits);
+}
+
+exchange.getIn().setBody(hits);
}
public Analyzer getAnalyzer() {
@@ -100,20 +100,20 @@ public class LuceneQueryProcessor implements Processor {
public void setMaxNumberOfHits(int maxNumberOfHits) {
this.maxNumberOfHits = maxNumberOfHits;
}
-
+
public void setLuceneVersion(Version luceneVersion) {
this.luceneVersion = luceneVersion;
}
-
+
public Version getLuceneVersion() {
return luceneVersion;
}
- public int getTotalHitsThreshold() {
- return totalHitsThreshold;
- }
+public int getTotalHitsThreshold() {
+return totalHitsThreshold;
+}
- public void setTotalHitsThreshold(int totalHitsThreshold) {
- this.totalHitsThreshold = totalHitsThreshold;
- }
+public void setTotalHitsThreshold(int totalHitsThreshold) {
+this.totalHitsThreshold = totalHitsThreshold;
+}
}
[camel] branch camel-2.x updated: Fix CS
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 59e6536 Fix CS
59e6536 is described below
commit 59e65362878bf0ec01643f39280b2345d752def7
Author: Tadayoshi Sato
AuthorDate: Thu Jul 18 16:55:33 2019 +0900
Fix CS
---
.../camel/component/undertow/UndertowHttpStreamingTest.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
index de88152..e01a070 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
@@ -48,8 +48,8 @@ public class UndertowHttpStreamingTest extends
BaseUndertowTest {
mock.expectedBodiesReceived(expectedLength);
Exchange response = template.send(
-"undertow:http://localhost:{{port}}?useStreaming=true;,
-e -> produceStream(e));
+"undertow:http://localhost:{{port}}?useStreaming=true;,
+e -> produceStream(e));
consumeStream(response);
long length = response.getIn().getBody(Long.class).longValue();
@@ -65,8 +65,8 @@ public class UndertowHttpStreamingTest extends
BaseUndertowTest {
mock.expectedBodiesReceived(12);
Exchange response = template.send(
-"undertow:http://localhost:{{port}}?useStreaming=true;,
-e -> { e.getIn().setBody("Hello Camel!"); });
+"undertow:http://localhost:{{port}}?useStreaming=true;,
+e -> e.getIn().setBody("Hello Camel!"));
consumeStream(response);
long length = response.getIn().getBody(Long.class).longValue();
[camel] 01/02: incorect paths fixed in faq directory
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit dd18f3bf0e4c3fbaf94ab65f804ecf10c44470a2 Author: nayananga@acerubuntu18.04 AuthorDate: Thu Jul 18 10:57:07 2019 +0530 incorect paths fixed in faq directory --- .../pages/faq/can-i-get-commercial-support.adoc| 2 +- .../pages/faq/does-camel-work-on-ibms-jdk.adoc | 2 +- ...ption-javaxnamingnoinitialcontextexception.adoc | 4 +-- .../faq/exception-orgxmlsaxsaxparseexception.adoc | 2 +- ...an-i-create-a-custom-component-or-endpoint.adoc | 6 ++-- .../pages/faq/how-can-i-get-the-source-code.adoc | 2 +- .../faq/how-can-i-stop-a-route-from-a-route.adoc | 16 +- .../pages/faq/how-do-i-become-a-committer.adoc | 6 ++-- .../ROOT/pages/faq/how-do-i-compile-the-code.adoc | 2 +- .../pages/faq/how-do-i-configure-endpoints.adoc| 10 +++--- ...-endpoints-without-the-value-being-encoded.adoc | 2 +- ...ximum-endpoint-cache-size-for-camelcontext.adoc | 6 ++-- .../ROOT/pages/faq/how-do-i-debug-my-route.adoc| 6 ++-- ...en-consuming-for-example-from-a-ftp-server.adoc | 2 +- ...how-do-i-import-rests-from-other-xml-files.adoc | 2 +- ...ow-do-i-import-routes-from-other-xml-files.adoc | 2 +- ...ow-do-i-make-my-jms-endpoint-transactional.adoc | 4 +-- .../pages/faq/how-do-i-restart-camelcontext.adoc | 4 +-- ...-contexttestsupport-class-in-my-unit-tests.adoc | 4 +-- ...ify-time-period-in-a-human-friendly-syntax.adoc | 2 +- ...h-method-to-use-when-using-beans-in-routes.adoc | 2 +- ...spring-property-placeholder-with-camel-xml.adoc | 2 +- .../how-do-i-use-uris-with-parameters-in-xml.adoc | 4 +-- .../pages/faq/how-does-camel-compare-to-mule.adoc | 6 ++-- .../how-does-camel-compare-to-servicemix-eip.adoc | 4 +-- .../faq/how-does-camel-compare-to-servicemix.adoc | 10 +++--- .../faq/how-does-camel-compare-to-synapse.adoc | 12 ...how-does-camel-look-up-beans-and-endpoints.adoc | 16 +- .../faq/how-does-camel-work-with-activemq.adoc | 6 ++-- .../faq/how-does-camel-work-with-servicemix.adoc | 6 ++-- .../ROOT/pages/faq/how-does-camel-work.adoc| 2 +- .../faq/how-does-the-camel-api-compare-to.adoc | 4 +-- ...hould-i-invoke-my-pojos-or-spring-services.adoc | 4 +-- ...kage-applications-using-camel-and-activemq.adoc | 4 +-- ...-avoid-sending-some-or-all-message-headers.adoc | 2 +- .../pages/faq/how-to-use-a-dynamic-uri-in-to.adoc | 6 ++-- ...f-i-use-servicemix-when-should-i-use-camel.adoc | 4 +-- .../ROOT/pages/faq/is-camel-ioc-friendly.adoc | 14 - .../modules/ROOT/pages/faq/is-there-an-ide.adoc| 8 ++--- .../ROOT/pages/faq/running-camel-standalone.adoc | 16 +- ...-activemq-broker-or-in-another-application.adoc | 2 +- .../ROOT/pages/faq/using-camel-core-testsjar.adoc | 2 +- .../using-getin-or-getout-methods-on-exchange.adoc | 18 +-- .../ROOT/pages/faq/what-are-the-dependencies.adoc | 2 +- .../modules/ROOT/pages/faq/what-is-a-router.adoc | 10 +++--- .../modules/ROOT/pages/faq/what-is-camel.adoc | 36 +++--- .../pages/faq/what-platforms-are-supported.adoc| 2 +- ...se-when-or-otherwise-in-a-java-camel-route.adoc | 10 +++--- .../faq/why-cant-i-use-sign-in-my-password.adoc| 2 +- ...use-too-many-threads-with-producertemplate.adoc | 6 ++-- ...-file-consumer-use-the-camel-error-handler.adoc | 12 ...ge-with-error-handler-not-work-as-expected.adoc | 8 ++--- .../modules/ROOT/pages/faq/why-the-name-camel.adoc | 4 +-- 53 files changed, 166 insertions(+), 166 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc b/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc index f0d3997..18a0458 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc @@ -1,4 +1,4 @@ [[CanIgetcommercialsupport-CanIgetcommercialsupport]] === Can I get commercial support? -Absolutely, see our xref:../support.adoc[Support] page for more details. +Absolutely, see our xref:support.adoc[Support] page for more details. diff --git a/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc b/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc index 65b2e55..66a5d81 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc @@ -27,6 +27,6 @@ camel-spring on another JDK (preferably a Sun JDK). Ruby scripting on IBM's JDK works for Camel 2.0 and onward. For earlier versions you'll need to use one of the other -xref:../scripting-languages.adoc[Scripting Languages]. See +xref:scripting-languages.adoc[Scripting Languages]. See
[camel] branch master updated (824c52d -> f4cf513)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 824c52d CAMEL-13761: Update javadoc about startup listener new dd18f3b incorect paths fixed in faq directory new f4cf513 more fixes for anchor not found errors The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel-cxf/src/main/docs/cxf-component.adoc | 2 +- .../src/main/docs/micrometer-component.adoc| 2 +- .../modules/ROOT/pages/cxf-component.adoc | 2 +- .../modules/ROOT/pages/micrometer-component.adoc | 2 +- .../pages/faq/can-i-get-commercial-support.adoc| 2 +- .../pages/faq/does-camel-work-on-ibms-jdk.adoc | 2 +- ...ption-javaxnamingnoinitialcontextexception.adoc | 4 +-- .../faq/exception-orgxmlsaxsaxparseexception.adoc | 2 +- ...an-i-create-a-custom-component-or-endpoint.adoc | 6 ++-- .../pages/faq/how-can-i-get-the-source-code.adoc | 2 +- .../faq/how-can-i-stop-a-route-from-a-route.adoc | 16 +- .../pages/faq/how-do-i-become-a-committer.adoc | 6 ++-- .../ROOT/pages/faq/how-do-i-compile-the-code.adoc | 2 +- .../pages/faq/how-do-i-configure-endpoints.adoc| 10 +++--- ...-endpoints-without-the-value-being-encoded.adoc | 2 +- ...ximum-endpoint-cache-size-for-camelcontext.adoc | 6 ++-- .../ROOT/pages/faq/how-do-i-debug-my-route.adoc| 6 ++-- ...en-consuming-for-example-from-a-ftp-server.adoc | 2 +- ...how-do-i-import-rests-from-other-xml-files.adoc | 2 +- ...ow-do-i-import-routes-from-other-xml-files.adoc | 2 +- ...ow-do-i-make-my-jms-endpoint-transactional.adoc | 4 +-- .../pages/faq/how-do-i-restart-camelcontext.adoc | 4 +-- ...-contexttestsupport-class-in-my-unit-tests.adoc | 4 +-- ...ify-time-period-in-a-human-friendly-syntax.adoc | 2 +- ...h-method-to-use-when-using-beans-in-routes.adoc | 2 +- ...spring-property-placeholder-with-camel-xml.adoc | 2 +- .../how-do-i-use-uris-with-parameters-in-xml.adoc | 4 +-- .../pages/faq/how-does-camel-compare-to-mule.adoc | 6 ++-- .../how-does-camel-compare-to-servicemix-eip.adoc | 4 +-- .../faq/how-does-camel-compare-to-servicemix.adoc | 10 +++--- .../faq/how-does-camel-compare-to-synapse.adoc | 12 ...how-does-camel-look-up-beans-and-endpoints.adoc | 16 +- .../faq/how-does-camel-work-with-activemq.adoc | 6 ++-- .../faq/how-does-camel-work-with-servicemix.adoc | 6 ++-- .../ROOT/pages/faq/how-does-camel-work.adoc| 2 +- .../faq/how-does-the-camel-api-compare-to.adoc | 4 +-- ...hould-i-invoke-my-pojos-or-spring-services.adoc | 4 +-- ...kage-applications-using-camel-and-activemq.adoc | 4 +-- ...-avoid-sending-some-or-all-message-headers.adoc | 2 +- .../pages/faq/how-to-use-a-dynamic-uri-in-to.adoc | 6 ++-- ...f-i-use-servicemix-when-should-i-use-camel.adoc | 4 +-- .../ROOT/pages/faq/is-camel-ioc-friendly.adoc | 14 - .../modules/ROOT/pages/faq/is-there-an-ide.adoc| 8 ++--- .../ROOT/pages/faq/running-camel-standalone.adoc | 16 +- ...-activemq-broker-or-in-another-application.adoc | 2 +- .../ROOT/pages/faq/using-camel-core-testsjar.adoc | 2 +- .../using-getin-or-getout-methods-on-exchange.adoc | 18 +-- .../ROOT/pages/faq/what-are-the-dependencies.adoc | 2 +- .../modules/ROOT/pages/faq/what-is-a-router.adoc | 10 +++--- .../modules/ROOT/pages/faq/what-is-camel.adoc | 36 +++--- .../pages/faq/what-platforms-are-supported.adoc| 2 +- ...se-when-or-otherwise-in-a-java-camel-route.adoc | 10 +++--- .../faq/why-cant-i-use-sign-in-my-password.adoc| 2 +- ...use-too-many-threads-with-producertemplate.adoc | 6 ++-- ...-file-consumer-use-the-camel-error-handler.adoc | 12 ...ge-with-error-handler-not-work-as-expected.adoc | 8 ++--- .../modules/ROOT/pages/faq/why-the-name-camel.adoc | 4 +-- 57 files changed, 170 insertions(+), 170 deletions(-)
[camel] 02/02: more fixes for anchor not found errors
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4cf51358ef375c62ba680f2781660ae22e47685
Author: nayananga@acerubuntu18.04
AuthorDate: Thu Jul 18 12:03:16 2019 +0530
more fixes for anchor not found errors
---
components/camel-cxf/src/main/docs/cxf-component.adoc | 2 +-
components/camel-micrometer/src/main/docs/micrometer-component.adoc | 2 +-
docs/components/modules/ROOT/pages/cxf-component.adoc | 2 +-
docs/components/modules/ROOT/pages/micrometer-component.adoc| 2 +-
...-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc
b/components/camel-cxf/src/main/docs/cxf-component.adoc
index c4c5804..38f3e9f 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -24,7 +24,7 @@ hosted in CXF.
<>
*** <>
<>
- <>
+ Changes since Release 2.0
** <>
** <>
** <>
diff --git
a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
index 164f4df..490c672 100644
--- a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
+++ b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
@@ -196,7 +196,7 @@ class MyBean extends RouteBuilder {
Each meter has type and name. Supported types are
xref:#MicrometerComponent-counter[counter],
xref:#MicrometerComponent-summary[distribution summary] and
-xref:#MetricsComponent-timer[timer]. If no type is provided then a counter is
used by default.
+timer. If no type is provided then a counter is used by default.
The meter name is a string that is evaluated as `Simple` expression. In
addition to using the `CamelMetricsName`
header (see below), this allows to select the meter depending on exchange data.
diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc
b/docs/components/modules/ROOT/pages/cxf-component.adoc
index c4c5804..38f3e9f 100644
--- a/docs/components/modules/ROOT/pages/cxf-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxf-component.adoc
@@ -24,7 +24,7 @@ hosted in CXF.
<>
*** <>
<>
- <>
+ Changes since Release 2.0
** <>
** <>
** <>
diff --git a/docs/components/modules/ROOT/pages/micrometer-component.adoc
b/docs/components/modules/ROOT/pages/micrometer-component.adoc
index 164f4df..490c672 100644
--- a/docs/components/modules/ROOT/pages/micrometer-component.adoc
+++ b/docs/components/modules/ROOT/pages/micrometer-component.adoc
@@ -196,7 +196,7 @@ class MyBean extends RouteBuilder {
Each meter has type and name. Supported types are
xref:#MicrometerComponent-counter[counter],
xref:#MicrometerComponent-summary[distribution summary] and
-xref:#MetricsComponent-timer[timer]. If no type is provided then a counter is
used by default.
+timer. If no type is provided then a counter is used by default.
The meter name is a string that is evaluated as `Simple` expression. In
addition to using the `CamelMetricsName`
header (see below), this allows to select the meter depending on exchange data.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
index 83393b5..fcb3b19 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
@@ -4,7 +4,7 @@
There could be several reasons why the xref:file-component.adoc[File] consumer
is
not picking up files. For example it may not run at all, or it cannot
acquire a read lock on the file.
-xref:faq.adoc#logging-questions[Check the logs] for any exceptions or other
+xref:faq.adoc#FAQ-LoggingQuestions[Check the logs] for any exceptions or other
informative messages. You can
xref:how-do-i-enable-debug-logging.adoc[turn on DEBUG logging] at
`org.apache.camel.component.file` to see more detail.
[camel] branch master updated: CAMEL-13761: Update javadoc about startup listener
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 824c52d CAMEL-13761: Update javadoc about startup listener
824c52d is described below
commit 824c52d66322e18e22ff4bf4325dcf4cb7a96087
Author: Claus Ibsen
AuthorDate: Thu Jul 18 09:27:12 2019 +0200
CAMEL-13761: Update javadoc about startup listener
---
.../src/main/java/org/apache/camel/StartupListener.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/StartupListener.java
b/core/camel-api/src/main/java/org/apache/camel/StartupListener.java
index ee33bd7..d7efbe3 100644
--- a/core/camel-api/src/main/java/org/apache/camel/StartupListener.java
+++ b/core/camel-api/src/main/java/org/apache/camel/StartupListener.java
@@ -19,13 +19,16 @@ package org.apache.camel;
/**
* Allows objects to be notified when {@link CamelContext} has almost done all
work when starting.
*
- * This can be used to perform any custom work when the entire {@link
CamelContext} has been initialized and almost
- * started. For example this ensures that all Camel routes have been started
and are up and running, before this callback
- * is invoked.
- *
* The state of {@link CamelContext} may still be in starting when
this callback is invoked, this is by design.
* The callback is invoked during the routes startup procedure when starting
{@link CamelContext}.
*
+ * This can be used to perform any custom work when the entire {@link
CamelContext} has been initialized and almost
+ * started. This callback is invoked twice during starting the Camel routes,
once before the route consumers are started,
+ * and once again after the route consumer has just been started. This is by
design to allow Camel components
+ * to react accordingly and for example to register custom startup listeners
during starting consumers.
+ *
+ * If you want to have only one callback after the route consumers has been
fully started then use the {@link ExtendedStartupListener} instead.
+ *
* For example the QuartzComponent leverages this to ensure the Quartz
scheduler does not start until after all the
* Camel routes and services have already been started.
*
[camel] branch master updated: Camel-Undertow: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 9523d4d Camel-Undertow: Fixed CS
9523d4d is described below
commit 9523d4d4416380ef8fcfba91fbd5e28f5d5b3bde
Author: Andrea Cosentino
AuthorDate: Thu Jul 18 08:12:50 2019 +0200
Camel-Undertow: Fixed CS
---
.../camel/component/undertow/UndertowHttpStreamingTest.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
index a650495..c35668f 100644
---
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
@@ -48,8 +48,8 @@ public class UndertowHttpStreamingTest extends
BaseUndertowTest {
mock.expectedBodiesReceived(expectedLength);
Exchange response = template.send(
-"undertow:http://localhost:{{port}}?useStreaming=true;,
-e -> produceStream(e));
+"undertow:http://localhost:{{port}}?useStreaming=true;,
+e -> produceStream(e));
consumeStream(response);
long length = response.getIn().getBody(Long.class).longValue();
@@ -65,8 +65,8 @@ public class UndertowHttpStreamingTest extends
BaseUndertowTest {
mock.expectedBodiesReceived(12);
Exchange response = template.send(
-"undertow:http://localhost:{{port}}?useStreaming=true;,
-e -> { e.getIn().setBody("Hello Camel!"); });
+"undertow:http://localhost:{{port}}?useStreaming=true;,
+e -> e.getIn().setBody("Hello Camel!"));
consumeStream(response);
long length = response.getIn().getBody(Long.class).longValue();
