You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/08 06:07:34 UTC
[camel] 02/03: CAMEL-15478: camel-google-sheets uses javasource
parser instead of javadoc for generating api component source code.
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 cdb69e2489082b4d15f0ae98edf5f49b9f61e800
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Sep 8 08:06:23 2020 +0200
CAMEL-15478: camel-google-sheets uses javasource parser instead of javadoc for generating api component source code.
---
components/camel-google-sheets/pom.xml | 27 +++++++++-------------
.../SheetsSpreadsheetsEndpointConfiguration.java | 6 ++---
...etsSpreadsheetsValuesEndpointConfiguration.java | 14 +++++------
.../component/google/sheets/google-sheets.json | 4 ++--
.../google/sheets/stream/google-sheets-stream.json | 4 ++--
.../src/main/docs/google-sheets-component.adoc | 20 ++++++++--------
.../main/docs/google-sheets-stream-component.adoc | 20 ++++++++--------
7 files changed, 45 insertions(+), 50 deletions(-)
diff --git a/components/camel-google-sheets/pom.xml b/components/camel-google-sheets/pom.xml
index 3c67db2..8ce7a52 100644
--- a/components/camel-google-sheets/pom.xml
+++ b/components/camel-google-sheets/pom.xml
@@ -86,10 +86,6 @@
<artifactId>camel-support</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-util</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>${google-api-client-version}</version>
@@ -110,15 +106,6 @@
<version>${google-api-services-sheets-version}</version>
</dependency>
- <!-- Component API javadoc in provided scope to read API signatures -->
- <dependency>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-sheets</artifactId>
- <version>${google-api-services-sheets-version}</version>
- <type>javadoc</type>
- <scope>provided</scope>
- </dependency>
-
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -135,7 +122,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -195,13 +181,13 @@
<api>
<apiName>spreadsheets</apiName>
<proxyClass>com.google.api.services.sheets.v4.Sheets$Spreadsheets</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>data</apiName>
<proxyClass>com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values
</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
</apis>
<substitutions>
@@ -262,6 +248,15 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <!-- Component to read API signatures -->
+ <dependency>
+ <groupId>com.google.apis</groupId>
+ <artifactId>google-api-services-sheets</artifactId>
+ <version>${google-api-services-sheets-version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<!-- we need to generate additional configurer classes -->
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
index 6b947f1..ec74277 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
@@ -16,11 +16,11 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class SheetsSpreadsheetsEndpointConfiguration extends GoogleSheetsConfiguration {
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest")
private com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest batchUpdateSpreadsheetRequest;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.Spreadsheet")
private com.google.api.services.sheets.v4.model.Spreadsheet content;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest")
private com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest getSpreadsheetByDataFilterRequest;
@UriParam(description = "The spreadsheet to apply the updates to")
private String spreadsheetId;
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
index 7d47edd..29a2e6b 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
@@ -16,23 +16,23 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class SheetsSpreadsheetsValuesEndpointConfiguration extends GoogleSheetsConfiguration {
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.BatchClearValuesRequest")
private com.google.api.services.sheets.v4.model.BatchClearValuesRequest batchClearValuesRequest;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.BatchGetValuesByDataFilterRequest")
private com.google.api.services.sheets.v4.model.BatchGetValuesByDataFilterRequest batchGetValuesByDataFilterRequest;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.BatchUpdateValuesByDataFilterRequest")
private com.google.api.services.sheets.v4.model.BatchUpdateValuesByDataFilterRequest batchUpdateValuesByDataFilterRequest;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.BatchUpdateValuesRequest")
private com.google.api.services.sheets.v4.model.BatchUpdateValuesRequest batchUpdateValuesRequest;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.ClearValuesRequest")
private com.google.api.services.sheets.v4.model.ClearValuesRequest clearValuesRequest;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest")
private com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest content;
@UriParam(description = "The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table.")
private String range;
@UriParam(description = "The ID of the spreadsheet to update")
private String spreadsheetId;
- @UriParam(description = "The")
+ @UriParam(description = "The com.google.api.services.sheets.v4.model.ValueRange")
private com.google.api.services.sheets.v4.model.ValueRange values;
public com.google.api.services.sheets.v4.model.BatchClearValuesRequest getBatchClearValuesRequest() {
diff --git a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
index fa290b5..8cf82fe 100644
--- a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
+++ b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
@@ -68,7 +68,7 @@
"refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expir [...]
},
"apiProperties": {
- "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter Request", "group": "common", "label": "", "required": false, "typ [...]
- "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.g [...]
+ "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchClearValuesRequest" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter R [...]
+ "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common" [...]
}
}
diff --git a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
index bde6d10..39aae66 100644
--- a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
+++ b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
@@ -80,7 +80,7 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
},
"apiProperties": {
- "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter Request", "group": "consumer", "label": "", "required": false, [...]
- "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "c [...]
+ "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchClearValuesRequest" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter [...]
+ "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consu [...]
}
}
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
index 2d3fa3c..bce6aae 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
@@ -164,15 +164,15 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *batchClearValuesRequest* | The | BatchClearValuesRequest
-| *batchGetValuesByDataFilter Request* | The | BatchGetValuesByDataFilterRequest
-| *batchUpdateValuesByDataFilter Request* | The | BatchUpdateValuesByDataFilterRequest
-| *batchUpdateValuesRequest* | The | BatchUpdateValuesRequest
-| *clearValuesRequest* | The | ClearValuesRequest
-| *content* | The | BatchClearValuesByDataFilterRequest
+| *batchClearValuesRequest* | The com.google.api.services.sheets.v4.model.BatchClearValuesRequest | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* | The com.google.api.services.sheets.v4.model.BatchGetValuesByDataFilterRequest | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* | The com.google.api.services.sheets.v4.model.BatchUpdateValuesByDataFilterRequest | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* | The com.google.api.services.sheets.v4.model.BatchUpdateValuesRequest | BatchUpdateValuesRequest
+| *clearValuesRequest* | The com.google.api.services.sheets.v4.model.ClearValuesRequest | ClearValuesRequest
+| *content* | The com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest | BatchClearValuesByDataFilterRequest
| *range* | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. | String
| *spreadsheetId* | The ID of the spreadsheet to update | String
-| *values* | The | ValueRange
+| *values* | The com.google.api.services.sheets.v4.model.ValueRange | ValueRange
|===
@@ -181,9 +181,9 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *batchUpdateSpreadsheetRequest* | The | BatchUpdateSpreadsheetRequest
-| *content* | The | Spreadsheet
-| *getSpreadsheetByDataFilter Request* | The | GetSpreadsheetByDataFilterRequest
+| *batchUpdateSpreadsheetRequest* | The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
+| *content* | The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
+| *getSpreadsheetByDataFilter Request* | The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
| *spreadsheetId* | The spreadsheet to apply the updates to | String
|===
// endpoint options: END
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index 0cbbd91..2ab2839 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -165,15 +165,15 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *batchClearValuesRequest* | The | BatchClearValuesRequest
-| *batchGetValuesByDataFilter Request* | The | BatchGetValuesByDataFilterRequest
-| *batchUpdateValuesByDataFilter Request* | The | BatchUpdateValuesByDataFilterRequest
-| *batchUpdateValuesRequest* | The | BatchUpdateValuesRequest
-| *clearValuesRequest* | The | ClearValuesRequest
-| *content* | The | BatchClearValuesByDataFilterRequest
+| *batchClearValuesRequest* | The com.google.api.services.sheets.v4.model.BatchClearValuesRequest | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* | The com.google.api.services.sheets.v4.model.BatchGetValuesByDataFilterRequest | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* | The com.google.api.services.sheets.v4.model.BatchUpdateValuesByDataFilterRequest | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* | The com.google.api.services.sheets.v4.model.BatchUpdateValuesRequest | BatchUpdateValuesRequest
+| *clearValuesRequest* | The com.google.api.services.sheets.v4.model.ClearValuesRequest | ClearValuesRequest
+| *content* | The com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest | BatchClearValuesByDataFilterRequest
| *range* | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. | String
| *spreadsheetId* | The ID of the spreadsheet to update | String
-| *values* | The | ValueRange
+| *values* | The com.google.api.services.sheets.v4.model.ValueRange | ValueRange
|===
@@ -182,9 +182,9 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *batchUpdateSpreadsheetRequest* | The | BatchUpdateSpreadsheetRequest
-| *content* | The | Spreadsheet
-| *getSpreadsheetByDataFilter Request* | The | GetSpreadsheetByDataFilterRequest
+| *batchUpdateSpreadsheetRequest* | The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
+| *content* | The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
+| *getSpreadsheetByDataFilter Request* | The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
| *spreadsheetId* | The spreadsheet to apply the updates to | String
|===
// endpoint options: END