camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/3] camel git commit: CAMEL-11695: Add 'security' label to the config properties
Date Fri, 08 Sep 2017 08:44:36 GMT
CAMEL-11695: Add 'security' label to the config properties


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dccc8863
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dccc8863
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dccc8863

Branch: refs/heads/master
Commit: dccc88632ca6b0f9b08cff5df5cc451275fc9890
Parents: 687ec7b
Author: Dmitry Volodin <dmvolod@gmail.com>
Authored: Fri Sep 8 10:42:31 2017 +0300
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Fri Sep 8 10:43:52 2017 +0200

----------------------------------------------------------------------
 .../src/main/docs/grpc-component.adoc           | 20 ++++++++++----------
 .../camel/component/grpc/GrpcConfiguration.java | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dccc8863/components/camel-grpc/src/main/docs/grpc-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-grpc/src/main/docs/grpc-component.adoc b/components/camel-grpc/src/main/docs/grpc-component.adoc
index 5c9e90d..60ee8da 100644
--- a/components/camel-grpc/src/main/docs/grpc-component.adoc
+++ b/components/camel-grpc/src/main/docs/grpc-component.adoc
@@ -54,18 +54,8 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
 | Name | Description | Default | Type
-| **authenticationType** (common) | Authentication method type in advance to the SSL/TLS
negotiation | NONE | GrpcAuthType
 | **flowControlWindow** (common) | The HTTP/2 flow control window size (MiB) | 1048576 |
int
-| **jwtIssuer** (common) | JSON Web Token issuer |  | String
-| **jwtSecret** (common) | JSON Web Token secret |  | String
-| **jwtSubject** (common) | JSON Web Token subject |  | String
-| **keyCertChainResource** (common) | The X.509 certificate chain file resource in PEM format
link |  | String
-| **keyPassword** (common) | The PKCS8 private key file password |  | String
-| **keyResource** (common) | The PKCS8 private key file resource in PEM format link |  |
String
 | **maxMessageSize** (common) | The maximum message size allowed to be received/sent (MiB)
| 4194304 | int
-| **negotiationType** (common) | Identifies the security negotiation type used for HTTP/2
communication | PLAINTEXT | NegotiationType
-| **serviceAccountResource** (common) | Service Account key file in JSON format resource
link supported by the Google Cloud SDK |  | String
-| **trustCertCollectionResource** (common) | The trusted certificates collection file resource
in PEM format for verifying the remote endpoint's certificate |  | String
 | **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the Camel routing
Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming
messages or the likes will now be processed as a message and handled by the routing Error
Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions that will be logged at WARN or ERROR level and ignored. | false | boolean
 | **consumerStrategy** (consumer) | This option specifies the top-level strategy for processing
service requests and responses in streaming mode. If an aggregation strategy is selected all
requests will be accumulated in the list then transferred to the flow and the accumulated
responses will be sent to the sender. If a propagation strategy is selected request is sent
to the stream and the response will be immediately sent back to the sender. | PROPAGATION
| GrpcConsumerStrategy
 | **forwardOnCompleted** (consumer) | Determines if onCompleted events should be pushed to
the Camel route. | false | boolean
@@ -78,6 +68,16 @@ with the following path and query parameters:
 | **streamRepliesTo** (producer) | When using STREAMING client mode it indicates the endpoint
where responses should be forwarded. |  | String
 | **userAgent** (producer) | The user agent header passed to the server |  | String
 | **synchronous** (advanced) | Sets whether synchronous processing should be strictly used
or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| **authenticationType** (security) | Authentication method type in advance to the SSL/TLS
negotiation | NONE | GrpcAuthType
+| **jwtIssuer** (security) | JSON Web Token issuer |  | String
+| **jwtSecret** (security) | JSON Web Token secret |  | String
+| **jwtSubject** (security) | JSON Web Token subject |  | String
+| **keyCertChainResource** (security) | The X.509 certificate chain file resource in PEM
format link |  | String
+| **keyPassword** (security) | The PKCS8 private key file password |  | String
+| **keyResource** (security) | The PKCS8 private key file resource in PEM format link | 
| String
+| **negotiationType** (security) | Identifies the security negotiation type used for HTTP/2
communication | PLAINTEXT | NegotiationType
+| **serviceAccountResource** (security) | Service Account key file in JSON format resource
link supported by the Google Cloud SDK |  | String
+| **trustCertCollectionResource** (security) | The trusted certificates collection file resource
in PEM format for verifying the remote endpoint's certificate |  | String
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/dccc8863/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
index 6b2ce6c..169dd6d 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
@@ -45,34 +45,34 @@ public class GrpcConfiguration {
     @UriParam(label = "producer")
     private String method;
             
-    @UriParam(defaultValue = "PLAINTEXT")
+    @UriParam(label = "security", defaultValue = "PLAINTEXT")
     private NegotiationType negotiationType = NegotiationType.PLAINTEXT;
     
-    @UriParam(defaultValue = "NONE")
+    @UriParam(label = "security", defaultValue = "NONE")
     private GrpcAuthType authenticationType = GrpcAuthType.NONE;
     
-    @UriParam
+    @UriParam(label = "security")
     private String serviceAccountResource;
     
-    @UriParam(secret = true)
+    @UriParam(label = "security", secret = true)
     private String jwtSecret;
     
-    @UriParam
+    @UriParam(label = "security")
     private String jwtIssuer;
     
-    @UriParam
+    @UriParam(label = "security")
     private String jwtSubject;
     
-    @UriParam
+    @UriParam(label = "security")
     private String keyCertChainResource;
     
-    @UriParam
+    @UriParam(label = "security")
     private String keyResource;
     
-    @UriParam(secret = true)
+    @UriParam(label = "security", secret = true)
     private String keyPassword;
     
-    @UriParam
+    @UriParam(label = "security")
     private String trustCertCollectionResource;
 
     @UriParam(label = "producer", defaultValue = "SIMPLE")


Mime
View raw message