[camel] branch master updated (1b336a9 -> 4658e56)

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (1b336a9 -> 4658e56)

davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 1b336a9  Polished
     new 385ba74  Remove not used cruft from camel-lucene
     new 0c97364  CAMEL-14565: Add docs for missing option
     new 2baaa8a  CAMEL-14565: Add docs for missing option
     new 4658e56  CAMEL-14565: Add docs for missing option

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/LuceneConfiguration.java      | 44 +++++-----------------
 .../camel/component/lucene/LuceneConstants.java    | 23 -----------
 .../component/lucene/LuceneQueryProducer.java      |  4 +-
 .../camel/component/lucene/LuceneSearcher.java     |  9 ++---
 .../processor/lucene/LuceneQueryProcessor.java     | 13 +------
 .../lucene/LuceneIndexAndQueryProducerTest.java    |  7 +---
 .../component/mail/MailEndpointConfigurer.java     |  2 +
 .../org/apache/camel/component/mail/imap.json      |  1 +
 .../org/apache/camel/component/mail/imaps.json     |  1 +
 .../org/apache/camel/component/mail/pop3.json      |  1 +
 .../org/apache/camel/component/mail/pop3s.json     |  1 +
 .../org/apache/camel/component/mail/smtp.json      |  1 +
 .../org/apache/camel/component/mail/smtps.json     |  1 +
 .../camel-mail/src/main/docs/mail-component.adoc   |  3 +-
 .../camel/component/mail/MailConfiguration.java    |  7 ++--
 .../component/nagios/NagiosConfiguration.java      |  6 +--
 .../camel/component/nagios/NagiosEndpoint.java     |  4 +-
 .../component/nagios/NagiosEventNotifier.java      |  2 +-
 .../engine/ReactiveStreamsEngineConfiguration.java |  5 +++
 19 files changed, 41 insertions(+), 94 deletions(-)
 delete mode 100644 components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java

Reply | Threaded
Open this post in threaded view
|

[camel] 01/04: Remove not used cruft from camel-lucene

davsclaus-2
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

commit 385ba74e32106c3086aa1617db9208e96e222e58
Author: Claus Ibsen <[hidden email]>
AuthorDate: Sat Feb 15 10:29:29 2020 +0100

    Remove not used cruft from camel-lucene
---
 .../component/lucene/LuceneConfiguration.java      | 44 +++++-----------------
 .../camel/component/lucene/LuceneConstants.java    | 23 -----------
 .../component/lucene/LuceneQueryProducer.java      |  4 +-
 .../camel/component/lucene/LuceneSearcher.java     |  9 ++---
 .../processor/lucene/LuceneQueryProcessor.java     | 13 +------
 .../lucene/LuceneIndexAndQueryProducerTest.java    |  7 +---
 6 files changed, 18 insertions(+), 82 deletions(-)

diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
index 17164ad..831d042 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
@@ -27,13 +27,11 @@ import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.util.Version;
 
 @UriParams
 public class LuceneConfiguration {
-    private URI uri;
-    private String authority;
-    private Version luceneVersion = LuceneConstants.LUCENE_VERSION;
+    private transient URI uri;
+    private transient String authority;
 
     @UriPath @Metadata(required = true)
     private String host;
@@ -61,10 +59,10 @@ public class LuceneConfiguration {
         if (!protocol.equalsIgnoreCase("lucene")) {
             throw new IllegalArgumentException("Unrecognized Lucene protocol: " + protocol + " for uri: " + uri);
         }
-        setUri(uri);
-        setAuthority(uri.getAuthority());
+        this.uri = uri;
+        this.authority = uri.getAuthority();
         if (!isValidAuthority()) {
-            throw new URISyntaxException(uri.toASCIIString(),
+            throw new URISyntaxException(uri.toASCIIString(),
                     "Incorrect URI syntax and/or Operation specified for the Lucene endpoint."
                     + " Please specify the syntax as \"lucene:[Endpoint Name]:[Operation]?[Query]\"");
         }
@@ -87,15 +85,15 @@ public class LuceneConfiguration {
     }
     
     private boolean isValidAuthority() throws URISyntaxException {
-        if ((!authority.contains(":"))
-            || ((authority.split(":")[0]) == null)  
+        if ((!authority.contains(":"))
+            || ((authority.split(":")[0]) == null)
             || ((!authority.split(":")[1].equalsIgnoreCase("insert")) && (!authority.split(":")[1].equalsIgnoreCase("query")))) {
             return false;
         }
         return true;
-        
+
     }
-    
+
     private String retrieveTokenFromAuthority(String token) throws URISyntaxException {
         String retval;
         
@@ -107,14 +105,6 @@ public class LuceneConfiguration {
         return retval;
     }
 
-    public URI getUri() {
-        return uri;
-    }
-
-    public void setUri(URI uri) {
-        this.uri = uri;
-    }
-
     public String getHost() {
         return host;
     }
@@ -137,14 +127,6 @@ public class LuceneConfiguration {
         this.operation = operation;
     }
 
-    public String getAuthority() {
-        return authority;
-    }
-
-    public void setAuthority(String authority) {
-        this.authority = authority;
-    }
-
     public File getSrcDir() {
         return srcDir;
     }
@@ -190,13 +172,5 @@ public class LuceneConfiguration {
     public void setMaxHits(int maxHits) {
         this.maxHits = maxHits;
     }
-    
-    public void setLuceneVersion(Version luceneVersion) {
-        this.luceneVersion = luceneVersion;
-    }
 
-    public Version getLuceneVersion() {
-        return luceneVersion;
-    }
-    
 }
diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
deleted file mode 100644
index 31e8a4b..0000000
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.lucene;
-
-import org.apache.lucene.util.Version;
-
-public interface LuceneConstants {
-    Version LUCENE_VERSION = Version.LUCENE_7_2_1;
-}
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 293d0c8..15a8655 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
@@ -58,11 +58,11 @@ public class LuceneQueryProducer extends DefaultProducer {
         
         String phrase = exchange.getIn().getHeader("QUERY", String.class);
         String returnLuceneDocs = exchange.getIn().getHeader("RETURN_LUCENE_DOCS", String.class);
-        boolean isReturnLuceneDocs = (returnLuceneDocs != null && returnLuceneDocs.equalsIgnoreCase("true")) ? true : false;
+        boolean isReturnLuceneDocs = returnLuceneDocs != null && returnLuceneDocs.equalsIgnoreCase("true");
 
         if (phrase != null) {
             searcher.open(indexDirectory, analyzer);
-            hits = searcher.search(phrase, maxNumberOfHits, totalHitsThreshold, config.getLuceneVersion(), isReturnLuceneDocs);
+            hits = searcher.search(phrase, maxNumberOfHits, totalHitsThreshold, 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 25a0f80..d06f7ad 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
@@ -32,7 +32,6 @@ import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TopScoreDocCollector;
 import org.apache.lucene.store.NIOFSDirectory;
-import org.apache.lucene.util.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,13 +58,13 @@ public class LuceneSearcher {
     }
     
     public Hits search(String searchPhrase, int maxNumberOfHits, int totalHitsThreshold) throws Exception {
-        return search(searchPhrase, maxNumberOfHits, totalHitsThreshold, LuceneConstants.LUCENE_VERSION, false);
+        return search(searchPhrase, maxNumberOfHits, totalHitsThreshold, false);
     }
 
-    public Hits search(String searchPhrase, int maxNumberOfHits, int totalHitsThreshold, Version luceneVersion, boolean returnLuceneDocs) throws Exception {
+    public Hits search(String searchPhrase, int maxNumberOfHits, int totalHitsThreshold, boolean returnLuceneDocs) throws Exception {
         Hits searchHits = new Hits();
 
-        int numberOfHits = doSearch(searchPhrase, maxNumberOfHits, totalHitsThreshold, luceneVersion);
+        int numberOfHits = doSearch(searchPhrase, maxNumberOfHits, totalHitsThreshold);
         searchHits.setNumberOfHits(numberOfHits);
 
         for (ScoreDoc hit : hits) {
@@ -83,7 +82,7 @@ public class LuceneSearcher {
         return searchHits;
     }
                 
-    private int doSearch(String searchPhrase, int maxNumberOfHits, int totalHitsThreshold, Version luceneVersion) throws NullPointerException, ParseException, IOException {
+    private int doSearch(String searchPhrase, int maxNumberOfHits, int totalHitsThreshold) throws NullPointerException, ParseException, IOException {
         LOG.trace("*** Search Phrase: {} ***", searchPhrase);
 
         QueryParser parser = new QueryParser("contents", analyzer);
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 3a78605..6cde4aa 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
@@ -34,7 +34,6 @@ public class LuceneQueryProcessor implements Processor {
     private String searchPhrase;
     private int maxNumberOfHits;
     private int totalHitsThreshold;
-    private Version luceneVersion;
 
     public LuceneQueryProcessor(String indexDirectoryPath, Analyzer analyzer, String defaultSearchPhrase, int maxNumberOfHits, int totalHitsThreshold) {
         this.setAnalyzer(analyzer);
@@ -49,12 +48,12 @@ public class LuceneQueryProcessor implements Processor {
 
         String phrase = exchange.getIn().getHeader("QUERY", String.class);
         String returnLuceneDocs = exchange.getIn().getHeader("RETURN_LUCENE_DOCS", String.class);
-        boolean isReturnLuceneDocs = (returnLuceneDocs != null && returnLuceneDocs.equalsIgnoreCase("true")) ? true : false;
+        boolean isReturnLuceneDocs = returnLuceneDocs != null && returnLuceneDocs.equalsIgnoreCase("true");
 
         if (phrase != null) {
             searcher = new LuceneSearcher();
             searcher.open(indexDirectory, analyzer);
-            hits = searcher.search(phrase, maxNumberOfHits, totalHitsThreshold, luceneVersion, isReturnLuceneDocs);
+            hits = searcher.search(phrase, maxNumberOfHits, totalHitsThreshold, isReturnLuceneDocs);
         } else {
             throw new IllegalArgumentException("SearchPhrase for LuceneQueryProcessor not set. Set the Header value: QUERY");
         }
@@ -102,14 +101,6 @@ public class LuceneQueryProcessor implements Processor {
         this.maxNumberOfHits = maxNumberOfHits;
     }
 
-    public void setLuceneVersion(Version luceneVersion) {
-        this.luceneVersion = luceneVersion;
-    }
-
-    public Version getLuceneVersion() {
-        return luceneVersion;
-    }
-
     public int getTotalHitsThreshold() {
         return totalHitsThreshold;
     }
diff --git a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
index cbcf22b..efbd8e6 100644
--- a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
+++ b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
@@ -210,12 +210,7 @@ public class LuceneIndexAndQueryProducerTest extends CamelTestSupport {
                 from("direct:next").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         Hits hits = exchange.getIn().getBody(Hits.class);
-                        try {
-                            printResults(hits);
-                        } catch (Exception e) {
-                            LOG.error(e.getMessage());
-                            exchange.getOut().setBody(null);
-                        }
+                        printResults(hits);
                     }
 
                     private void printResults(Hits hits) throws Exception {

Reply | Threaded
Open this post in threaded view
|

[camel] 02/04: CAMEL-14565: Add docs for missing option

davsclaus-2
In reply to this post by davsclaus-2
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

commit 0c9736400b21e853e09857ec139a4afc22536695
Author: Claus Ibsen <[hidden email]>
AuthorDate: Sat Feb 15 10:34:03 2020 +0100

    CAMEL-14565: Add docs for missing option
---
 .../java/org/apache/camel/component/nagios/NagiosConfiguration.java | 6 +-----
 .../main/java/org/apache/camel/component/nagios/NagiosEndpoint.java | 4 ++--
 .../java/org/apache/camel/component/nagios/NagiosEventNotifier.java | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
index 5277eb1..bc58342 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
@@ -68,7 +68,7 @@ public class NagiosConfiguration implements Cloneable {
         }
     }
 
-    public synchronized NagiosSettings getNagiosSettings() {
+    public synchronized NagiosSettings getOrCreateNagiosSettings() {
         if (nagiosSettings == null) {
 
             // validate parameters
@@ -90,10 +90,6 @@ public class NagiosConfiguration implements Cloneable {
         return nagiosSettings;
     }
 
-    public void setNagiosSettings(NagiosSettings nagiosSettings) {
-        this.nagiosSettings = nagiosSettings;
-    }
-
     public String getHost() {
         return host;
     }
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
index 62e4fd2..a00170a 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
@@ -92,10 +92,10 @@ public class NagiosEndpoint extends DefaultEndpoint {
 
         if (sender == null) {
             if (isSendSync()) {
-                sender = new NagiosPassiveCheckSender(getConfiguration().getNagiosSettings());
+                sender = new NagiosPassiveCheckSender(getConfiguration().getOrCreateNagiosSettings());
             } else {
                 // use a non blocking sender
-                sender = new NonBlockingNagiosPassiveCheckSender(getConfiguration().getNagiosSettings());
+                sender = new NonBlockingNagiosPassiveCheckSender(getConfiguration().getOrCreateNagiosSettings());
             }
         }
     }
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
index f1b8807..dbebece 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
@@ -131,7 +131,7 @@ public class NagiosEventNotifier extends EventNotifierSupport {
     @Override
     protected void doStart() throws Exception {
         if (nagiosSettings == null) {
-            nagiosSettings = configuration.getNagiosSettings();
+            nagiosSettings = configuration.getOrCreateNagiosSettings();
         }
         if (sender == null) {
             sender = new NagiosPassiveCheckSender(nagiosSettings);

Reply | Threaded
Open this post in threaded view
|

[camel] 03/04: CAMEL-14565: Add docs for missing option

davsclaus-2
In reply to this post by davsclaus-2
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

commit 2baaa8a417d47b353a9bb4574e9950517e533198
Author: Claus Ibsen <[hidden email]>
AuthorDate: Sat Feb 15 10:38:43 2020 +0100

    CAMEL-14565: Add docs for missing option
---
 .../org/apache/camel/component/mail/MailEndpointConfigurer.java    | 2 ++
 .../generated/resources/org/apache/camel/component/mail/imap.json  | 1 +
 .../generated/resources/org/apache/camel/component/mail/imaps.json | 1 +
 .../generated/resources/org/apache/camel/component/mail/pop3.json  | 1 +
 .../generated/resources/org/apache/camel/component/mail/pop3s.json | 1 +
 .../generated/resources/org/apache/camel/component/mail/smtp.json  | 1 +
 .../generated/resources/org/apache/camel/component/mail/smtps.json | 1 +
 components/camel-mail/src/main/docs/mail-component.adoc            | 3 ++-
 .../java/org/apache/camel/component/mail/MailConfiguration.java    | 7 ++++---
 9 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointConfigurer.java b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointConfigurer.java
index 8c4b295..e71bde7 100644
--- a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointConfigurer.java
+++ b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointConfigurer.java
@@ -85,6 +85,8 @@ public class MailEndpointConfigurer extends PropertyConfigurerSupport implements
         case "ignoreUnsupportedCharset": target.getConfiguration().setIgnoreUnsupportedCharset(property(camelContext, boolean.class, value)); return true;
         case "ignoreurischeme":
         case "ignoreUriScheme": target.getConfiguration().setIgnoreUriScheme(property(camelContext, boolean.class, value)); return true;
+        case "javamailproperties":
+        case "javaMailProperties": target.getConfiguration().setJavaMailProperties(property(camelContext, java.util.Properties.class, value)); return true;
         case "session": target.getConfiguration().setSession(property(camelContext, javax.mail.Session.class, value)); return true;
         case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
         case "useinlineattachments":
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json
index 4811b29..a10c8bd 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json
@@ -72,6 +72,7 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers." },
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported th [...]
+    "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for this method." },
     "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json
index 3b9f4ce..b2f1b2b 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json
@@ -72,6 +72,7 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers." },
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported th [...]
+    "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for this method." },
     "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json
index 97ffae5..8bd26cb 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json
@@ -72,6 +72,7 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers." },
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported th [...]
+    "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for this method." },
     "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json
index fc33212..b1a51c6 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json
@@ -72,6 +72,7 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers." },
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported th [...]
+    "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for this method." },
     "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json
index 1f4855d..9aec26b 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json
@@ -72,6 +72,7 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers." },
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported th [...]
+    "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for this method." },
     "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json
index d8a387c..d76f46c 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json
@@ -72,6 +72,7 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers." },
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported th [...]
+    "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for this method." },
     "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index 72f5f96..1f3fd34 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -135,7 +135,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (64 parameters):
+=== Query Parameters (65 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -181,6 +181,7 @@ with the following path and query parameters:
 | *headerFilterStrategy* (advanced) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers. |  | HeaderFilterStrategy
 | *ignoreUnsupportedCharset* (advanced) | Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported then charset=XXX (where XXX represents the unsupported charset) is removed from the content-type and it relies on the platform default instead. | false | boolean
 | *ignoreUriScheme* (advanced) | Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported then charset=XXX (where XXX represents the unsupported charset) is removed from the content-type and it relies on the platform default instead. | false | boolean
+| *javaMailProperties* (advanced) | Sets the java mail options. Will clear any default properties and only use the properties provided for this method. |  | Properties
 | *session* (advanced) | Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some other resource, such as a JavaEE container. When using a custom mail session, then the hostname and port from the mail session will be used (if configured on the session). |  | Session
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *useInlineAttachments* (advanced) | Whether to use disposition inline or attachment. | false | boolean
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index abb8dc7..f82864d 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -40,9 +40,8 @@ import org.apache.camel.util.ObjectHelper;
 @UriParams
 public class MailConfiguration implements Cloneable {
 
-    private ClassLoader applicationClassLoader;
-    private Properties javaMailProperties;
-    private Map<Message.RecipientType, String> recipients = new HashMap<>();
+    private transient ClassLoader applicationClassLoader;
+    private transient Map<Message.RecipientType, String> recipients = new HashMap<>();
 
     // protocol is implied by component name so it should not be in UriPath
     private String protocol;
@@ -114,6 +113,8 @@ public class MailConfiguration implements Cloneable {
     private Properties additionalJavaMailProperties;
     @UriParam(label = "advanced")
     private AttachmentsContentTransferEncodingResolver attachmentsContentTransferEncodingResolver;
+    @UriParam(label = "advanced")
+    private Properties javaMailProperties;
 
     public MailConfiguration() {
     }

Reply | Threaded
Open this post in threaded view
|

[camel] 04/04: CAMEL-14565: Add docs for missing option

davsclaus-2
In reply to this post by davsclaus-2
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

commit 4658e561dd72760c9035de836650a787d84ba798
Author: Claus Ibsen <[hidden email]>
AuthorDate: Sat Feb 15 10:45:42 2020 +0100

    CAMEL-14565: Add docs for missing option
---
 .../reactive/streams/engine/ReactiveStreamsEngineConfiguration.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/ReactiveStreamsEngineConfiguration.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/ReactiveStreamsEngineConfiguration.java
index fe62f66..0418f10 100644
--- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/ReactiveStreamsEngineConfiguration.java
+++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/engine/ReactiveStreamsEngineConfiguration.java
@@ -16,13 +16,18 @@
  */
 package org.apache.camel.component.reactive.streams.engine;
 
+import org.apache.camel.spi.Metadata;
+
 /**
  * Configuration parameters for the Camel internal reactive-streams engine.
  */
 public class ReactiveStreamsEngineConfiguration implements Cloneable {
 
+    @Metadata(defaultValue = "CamelReactiveStreamsWorker", description = "The name of the thread pool used by the reactive streams internal engine.")
     private String threadPoolName = "CamelReactiveStreamsWorker";
+    @Metadata(description = "The minimum number of threads used by the reactive streams internal engine.")
     private int threadPoolMinSize;
+    @Metadata(defaultValue = "10", description = "The maximum number of threads used by the reactive streams internal engine.")
     private int threadPoolMaxSize = 10;
 
     public ReactiveStreamsEngineConfiguration() {