Compare commits

..

106 Commits

Author SHA1 Message Date
wang wei
255e6d6c9c fix(TDI-50584): job failed to generate code after installing R2023-11 (#9321) 2023-11-27 17:55:53 +08:00
wang wei
ba0902b8f7 fix(TDI-50538): [JDBC TCK]: close db connection for osgi env safely (#9285) 2023-11-16 16:56:29 +08:00
hcyi
0bf9432753 fix(TUP-40885):Workday metadata found metadata UI show issue whcih (#9279)
related to UIScope function
2023-11-15 20:28:50 +08:00
kjwang
a64f3a269a Fix TDQ-21560 import an existing project of R2023-10 or older, open (#9267)
* Fix TDQ-21560 import an existing project of R2023-10 or older, open
analysis lost its JDBC connection
https://jira.talendforge.org/browse/TDQ-21560

* Add more fix

* Add more fix
2023-11-14 19:03:23 +08:00
kjwang
206b82f8c9 TUP-40862 NPE show when select connection from component list for (#9266)
* TUP-40862 NPE show when select connection from component list for
migrated jdbc context jobs
https://jira.talendforge.org/browse/TUP-40862
2023-11-14 17:28:07 +08:00
mhryb
7adfc08eec fix(TDI-50516): fix include header (#9261) 2023-11-13 15:32:09 +02:00
kjwang
fbd03b27ff Kjwang/fix tup 40710 tck jdbc dynamic setting view prepare r11 (#9262) (#9263)
* Fix TUP-40710 TCK-JDBC Dynamic setting view
https://jira.talendforge.org/browse/TUP-40710

* Fix TUP-40710 TCK-JDBC Dynamic setting view
https://jira.talendforge.org/browse/TUP-40710

* Fix jdbc connection/close component id error

* TUP-40710 TCK-JDBC Dynamic setting view
https://jira.talendforge.org/browse/TUP-40710

* more fix

* fix the NPE as the strange tcompv0 model response for empty table

* Fix die on error for jdbc row

* TUP-40792 migration issue for tCompv0 to tck jdbc with Dynamic setting
(Fix update invalid value from repository)

* kjwang/Fix_TUP-40710_TCK-JDBC_Dynamic_setting_view

* more fix

* more fix

* improve performance

* Fix one convert error

* Correct Component Name

---------

Co-authored-by: wwang <wwang@talend.com>
2023-11-13 17:17:06 +08:00
wang wei
1ddca53d50 fix(TDI-50467): [JDBC TCK]: migrate label view (#9218) 2023-11-09 17:13:44 +08:00
sbliu
76dbc39e66 fix(TUP-40478) encode file path for classloader url (#9202)
* fix(TUP-40478) encode file path for classloader url

* fix problem that cannot run job when path contains special character
2023-11-09 11:47:35 +08:00
Chao MENG
01e79e7a7e fix(TUP-40317): Metadata based Hadoop cluster Repository type is showing (#9146)
inconsistent grey out UI for Runtime mode.
https://jira.talendforge.org/browse/TUP-40317
2023-11-09 11:07:58 +08:00
Dmytro Sylaiev
02fb11dcd4 fix(TDI-50296): Add checkbox to bring old behavior (#9156)
* fix(TDI-50296): Add checkbox to bring old behavior

* fix(TDI-50296): Fix component breaking bcs of case
2023-11-08 12:17:25 +02:00
kjwang
f45cc4154d Fix TUP-40766 NPE show in error log when close Choose context wizard (#9242)
Fix TUP-40766 NPE show in error log when close Choose context wizard
https://jira.talendforge.org/browse/TUP-40766
2023-11-08 17:37:48 +08:00
wang wei
fdaea4bbf0 fix(TCOMP-2552): support custom connection/close component icon for tck connector in studio(#9245) 2023-11-08 16:05:23 +08:00
hzhao
791fba4e55 feat(TUP-36963):Display Row Number is zero when import (#9232) 2023-11-08 15:51:07 +08:00
mhryb
7fb59d7f0e fix(TDI-50483): fix tPostgresPlusOutputBulk component migration (#9235) 2023-11-08 09:46:41 +02:00
kjwang
d37214d277 Fix:TUP-40760 SingleStore: Mapping file Field is yellow and read-only on (#9237)
Fix:TUP-40760 SingleStore: Mapping file Field is yellow and read-only on DB wizard after migration
https://jira.talendforge.org/browse/TUP-40760
2023-11-08 11:38:56 +08:00
sbliu
a58d7c9d1c fix(TUP-39867) Studio 8.0.1 with R2023-05 version in Guess option (#9221) 2023-11-08 11:31:20 +08:00
Jane Ding
e05a70073e Add localized files (#9231) (#9233)
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-11-07 09:52:11 +08:00
Jill Yan
bebe81ef37 APPINT-35964 remove usless migration task (#9226) 2023-11-06 19:27:41 +08:00
jiezhang-tlnd
24ddd70b72 Jzhang/80/tup 40311 (#9167)
* feat(TUP-40311)[Refactor] Unify tPostgresPlus component to reuse
tPostgres

* remove posgresplus

* add migration

* code format

* migration for JobSettings

* code format

* Update ChangeToPostgresInJobSettingsMigrationTask.java

update date

* Update ReplacePostgresPlusConnectionByPostgresConnectionMigrationTask.java

update migration date

* update migration

* dd migration for project setting

* update migratin for project setting

* update migration for project setting
2023-11-06 10:40:35 +08:00
mhryb
a0ba4fa179 feat(TDI-49775): add support application default credentials (#9220)
* feat(TDI-49775): add support application default credentials
2023-11-03 12:20:17 +02:00
mhryb
8878b983c4 feat(TDI-50282): unify tPostgresPlus component to reuse tPostgres (#9169)
* feat(TDI-50282): unify tPostgresPlus component to reuse tPostgres
2023-11-03 11:11:56 +02:00
Jane Ding
1b6e82c73d Add localized files (#9215)
* Add localized files (#9209)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9210)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-11-02 20:25:46 +08:00
mhryb
8a35240fc1 Mhryb/tdi 49775 add support application default credentials 8.0 (#9211)
* feat(TDI-49775): add support application default credentials
2023-11-02 14:25:19 +02:00
Oleksandr Zhelezniak
238bf1c36f fix(TDI-50348): NB_LINE 0 for empty sheet (#9171)
*  tFileInputExcel for empty sheet will be zero instead of 0
2023-11-02 13:08:52 +02:00
kjwang
81267113c4 Kjwang/feat tup 39096 new tck jdbc integrate (#8917)
* Use local component file

* Add new jdbc plugin

* Fix build issue

* Fix build issue

* Improve the code

* Improve the code

* Add i18n

* Improve the code

* TUP-39075 Handle the d&d of metadata tables/queries to DI/BD/APPINT jobs
after JDBC TCK integration

* Fix table name parameter issue

* Fix dnd query node issues

* Improve the code

* Fix spark job dnd issue

* Fix tck jdbc dnd issue

* feat(TUP-38956):Change the repository Db Connections display to prepare
for TCK JDBC integration

* Fix new jdbc node context menu issue

* feat(TUP-39078):Make the TCK JDBC work with db unified system.

* feat(TUP-39078):Make the TCK JDBC work with db unified system.

* TUP-39525 Save and Load TCK connection items from metadata/connections
instead of tacokit folder in project

* TUP-39525 Save and Load TCK connection items from metadata/connections
instead of tacokit folder in project

* TUP-39525 Save and Load TCK connection items from metadata/connections
instead of tacokit folder in project

* Improve context menu

* Support edit new jdbc schema

* fix(TUP-39575):Implement new jdbc mapping file field list in new jdbc
wizard.

* feat(TUP-38956):integrate tck jdbc and snowflake to db connections

* fix(TUP-35088):Stats&logs with TCK JDBC.

* feat(TUP-38956):fix repository connection select and import dialog for
tck jdbc and snowflake

* TUP-35524 JDBC repository metadata migration
https://jira.talendforge.org/browse/TUP-35524

* TUP-39577 Make data view function can work with new jdbc connection and
input component
https://jira.talendforge.org/browse/TUP-39577

* fix(TUP-35088):Stats&logs with TCK JDBC.

* fix(TUP-39460):Hide specific parameters for tck connectors on wizard.

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside on "Query" field (#8959)

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside
on "Query" field
https://jira.talendforge.org/browse/TUP-39073

* fix(TUP-39460):Hide specific parameters for tck connectors on wizard.

* feat(TUP-39078):Make the TCK JDBC work with db unified system.

* Improve migration task

* Fix a error

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside (#8964)

on "Query" field
https://jira.talendforge.org/browse/TUP-39073

* Fix data viewer issues

* fix(TUP-35088):Stats&logs with TCK JDBC.

* Improve context menu

* Fix a error

* feat(TUP-39074):Implicit context load with TCK JDBC

* Improve the code fix possible issues

* feat(TUP-39074):improve for Implicit context load with TCK JDBC

* feat(TUP-39074):improve for Implicit context load with TCK JDBC

* feat(TUP-39074):improve for Implicit context load with TCK JDBC

* Fix a error when crete tck jdbc connection

* Fix tck jdbc error

* feat(TUP-39080):Delta lake/Single store move from tcompv0 JDBC to TCK

* feat(TUP-39080):remove quotes

* Kjwang/feat tup 39096 new tck jdbc integrate with tup 25445 (#9012)

* feat(TUP-25445)acokit support context in repository metadata
https://jira.talendforge.org/browse/TUP-25445

* Fix jdbc driver issue on context mode

* feat(TUP-39080):fix connection and remove quotes

* feat(TUP-39076):[JDBC TCK]: support schema based table field

* Fix TUP-39910 duplicate "Read Queries" under saved queries' node
https://jira.talendforge.org/browse/TUP-39910

* fix(TUP-39096): rename jdbc (#9018)

* rename family name from JDBCNew to JDBC

* rename family name from JDBCNew to JDBC

* Test jdbc migration rename -- KK

* Test jdbc migration rename -- KK

---------

Co-authored-by: kjwang-talend <kjwang@talend.com>

* Remove used code

* feat(TUP-39076):improve for Support PREV_COLUMN_LIST / NEXT_COLUMN_LIST
and BaseOnSchema

* Fix TUP-40043 Tacokit (#9044)

* Hcyi/add localized files 2023 8 11 (#9034)

* Add localized files (#9033)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9032)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9031)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>

* fix(TDI-50002):CVE snappy-java (#8972)

* fix(TDI-50002):CVE snappy-java

* fix mvn url

* fix(TDI-50099): add commons logging bridge S3 (#8986)

* Fix TUP-40043 Tacokit widget restore to editable if revert context
https://jira.talendforge.org/browse/TUP-40043

* Fix TUP-40043 Tacokit widget restore to editable if revert context
https://jira.talendforge.org/browse/TUP-40043

---------

Co-authored-by: hcyi <hcyi@talend.com>
Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: pyzhou <pyzhou@talend.com>
Co-authored-by: Oleksandr Zhelezniak <66320870+ozhelezniak-talend@users.noreply.github.com>

* fix(TUP-39914):Database is empty when d&d Delta Lake and SingleStore as
tDBInput into job

* Fix table controller can't restore to editable if revert context
Improve query guess command

* fix(TUP-35088):fix a bug since rename jdbc components.

* TUP-40043 Tacokit widget can't restore to editable if revert context

* fix javajet after db uniform change which make component cid to tdbxxx

* TUP-40043 Tacokit widget can't restore to editable if revert context

* Fix can't retrieve table issue for the button beside Table field

* fix(TUP-40141):Snowflake node is not shown after importing

* Fix workday context issue

* feat(TUP-39967):"Query Type" and "Guess Query" for TCK JDBC

* TUP-40142 Tacokit JDBC - can not list connection parameters when export
as context using existed context
https://jira.talendforge.org/browse/TUP-40142

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside (#9068)

on "Query" field
https://jira.talendforge.org/browse/TUP-39073

* fix(TUP-40112):Add File/Directory widget for TCK components.

* fix(TUP-40144):new jdbc node is not shown in import wizard

* fix(TUP-40065):clean up all entrance of tcompv0 jdbc connector

* Fix TUP-39995 [bug] Guess schema fail for single store when use context
https://jira.talendforge.org/browse/TUP-39995

* Fix TUP-40124 TCK JDBC : list table do not work if use existing
connection
https://jira.talendforge.org/browse/TUP-40124

* Fix TUP-39944 [bug] Context can't load the correct driver class
https://jira.talendforge.org/browse/TUP-39944

* Fix TUP-39944 [bug] Context can't load the correct driver class
https://jira.talendforge.org/browse/TUP-39944

* Fix TUP-40197 [bug] select "Record type" failed after export to context
https://jira.talendforge.org/browse/TUP-40197

* Fix TUP-40197 [bug] select "Record type" failed after export to contexte

* Fix TUP-40124 TCK JDBC : list table do not work if use existing
connection

* TUP-40199 [bug] d&d netsuite from repository to job, can't load Version
and context not added also
https://jira.talendforge.org/browse/TUP-40199

* Fix TUP-40209 [bug] need remove Export to context for all tck dataset
https://jira.talendforge.org/browse/TUP-40209

* Update version for test

* support mapping file change apply

* Update for test

* fix(TUP-40230):[bug] isShow api return wrong result, that make code
generated wrong.

* add missing plugins

* fix(TUP-40060):[bug] Components list not correct when d&d SingleStore
connection/table into job

* fix(TUP-40212):[Bug] When drag jdbc metadata to job, there should be no
"tCreateTable" in component list.

* Fix TUP-39989 [bug] missing jar "mariadb-java-client" pop up when click
edit query button in job for singleStore context
https://jira.talendforge.org/browse/TUP-39989

* fix(TUP-40193):[Bug] Imported jdbc zip do not upgrade to the new tck
jdbc ok.

* Fix NPE error

* Fix TUP-40255 TCK JDBC connection when getName() is null
https://jira.talendforge.org/browse/TUP-40255

* TUP-40199 [bug] d&d netsuite from repository to job, can't load Version
and context not added also
https://jira.talendforge.org/browse/TUP-40199

* Fix TUP-40221 [bug] context not add into job when d&d dataset into job
https://jira.talendforge.org/browse/TUP-40221

* fix(TUP-39989):[bug] missing jar "mariadb-java-client" pop up when click (#9094)

fix(TUP-39989):[bug] missing jar "mariadb-java-client" pop up when click edit query button in job for singleStore context
null jar issue when not using context
https://jira.talendforge.org/browse/TUP-39989

* fix(TUP-40089):[bug] migration issue for stats&logs and Implicit
context.

* fix(TUP-40256):[bug] can not use unified tDBconnection and tDBClose for
Delta Lake and SingleSotre

* Fix TUP-40271
[JDBC TCK] tJDBCInput Guess query not escape for some DBs so job cannot
run
https://jira.talendforge.org/browse/TUP-40271

* Fix TUP-40224 [Bug]JDBC connection from 611 studio can not check pass
after import in lasted patch studio.

* schema guess issue fix

* allow set \r, \n and \r\n as parameter for tacokit

* fix(TUP-40282):tck jdbc components init failed in tuj

* fix(TUP-40287):should not show the cloud ui in studio.

* TUP-40296 The prompt function of JDBC connection not work
https://jira.talendforge.org/browse/TUP-40296

* fix(TUP-40256):[bug] can not use unified tDBconnection and tDBClose for
Delta Lake and SingleSotre

* fix(TUP-35447):[JDBC TCK]: Proxy not working when use guess schema.

* Fix junit error

* fix(TUP-40086):[bug] redundant page in jdbc creation wizard.

* Fix junit error

* build dist jar output

* Fix TUP-40306

[bug] after migrate, tjdbccomponent “auto commit” choice changed and run
job failed.

* fix(TUP-40192):[Bug] tJDBCinput>save the property to metadata can not
work.

* fix(TUP-40192):[Bug] tJDBCinput>save the property to metadata can not
work.

* fix(TUP-40316):[bug] schema of snowflake will not display under
snowflake node unless we do a refresh.

* Fix TUP-40372 [bug] ApacheKudu can't edit the parameter after revert
context

* Fix TUP-40371 [bug] ApacheKudu not change to context mode after the
metadata export to context in repository

* add dist jar

* Fix TUP-40383 [bug] context can't add for new created dataset after
export to context

* fix(TUP-40375):Additional jdbc components shouldn't be in the DND list
for JDBC metadata

* migration fix for tdeltalake and tsinglestore except tsinglestorebulk
components

* migration fix for tsinglestore bulk components

* fix(TUP-40410):[bug] Delta Lake and SingleStore can't select connection
when check "Use an existing connection"

* fix(TDI-50321): [JDBC TCK] tJDBCOutput Guess schema fail when there is
other subjob before output component and linked

* bug(TUP-40448):tJDBCConnection can't show 'Share DB connection name'
after checking 'Use or register a shared DB Connection'.

* fix(TDI-50384): The code generation of Table widget is wrong in the TCK
connectors

* fix(TDI-50289): schema change to build-in after migration

* fix(TDI-50394): [JDBC TCK] tSingleStoreInput cannot read data which just
load to server when running the whole job

* fix(TDI-50321): [JDBC TCK] tJDBCOutput Guess schema fail when there is
other subjob before output component and linked

* fix(TUP-40532):[JDBC TCK] Waring shown Schema`s DB type not correct
after importing old tujs

* more fix

* fix(TUP-40485):[JDBC TCK] No default parameter values for singlestore
and deltalake

* TUP-40566 TCK JDBC driver issue in context mode
https://jira.talendforge.org/browse/TUP-40566

* fix(TUP-40530):[JDBC TCK] Missing "Enable parallel execution" for
tDeltalakeOutput and tSingleStoreOutput.

* fix(TUP-40376):[JDBC TCK] Connection is missing when D&D SP to workspace

* Fix TUP-40293 [bug] Can't select table for some db after "import an
existing project"
https://jira.talendforge.org/browse/TUP-40293

* TUP-40566 TCK JDBC driver issue in context mode (Fix sql builder issue
with context) https://jira.talendforge.org/browse/TUP-40566

* fix(TUP-40485):[JDBC TCK] No default parameter values for singlestore
and deltalake

* Fix migration issue that resource was released

* Improve the code fix possible issue

* Fix TUP-40560 Only export simple fields with text controller to context
mode on TCK metadata
https://jira.talendforge.org/browse/TUP-40560

* fix(TCOMP-2552): support custom connection/close component icon for tck
connector in studio

* fix(TDI-50432): [JDBC TCK] The code generation of DB column is wrong for
JDBC TCK Connecotrs

* fix(TUP-40277):[Bug] tjdbcinput>component view: guess query type and
schema display issue.

* fix(TUP-40277):[Bug] tjdbcinput>component view: guess query type and
schema display issue.

* fix(TUP-40307):[bug] when export job, sap node and FakeGenericNode
display at the top of the repository list.

* fix(TDI-50433): [801 temp]Fail to send request to REST serivce with
tDBouput component

* Fix junit error part 1 (#9192)

* Fix junit error part 1

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside
on "Query" field
https://jira.talendforge.org/browse/TUP-39073

Co-authored-by: jding-tlnd <jding@talend.com>

* Fix a error

* fix(TUP-40657):Unable to import
BugTDI29716_tJDBCOutput_statusCatcherHung well.

* fix(TDI-50439): The code generation of the TCK connector's end part is
wrong if the TCK connector follows other Subjob with OnComponent* line

* fix(TDI-50432): [JDBC TCK] The code generation of DB column is wrong for
JDBC TCK Connecotrs

* Fix  TUP-40662 [Bug] NPE when click Edit queries for snowflake
connection
https://jira.talendforge.org/browse/TUP-40662

* fix(TUP-40396):[JDBC][TCK] If the JDBC component is dragged and dropped
from Metadata, the UI setting will be readonly after the first running

* fix(TUP-40616):[bug] "Update from repository connection" shows empty
filled parameters

* Fix TUP-40699 [bug] icon on import items pages not update
https://jira.talendforge.org/browse/TUP-40699

* fix(TUP-40616):[bug] "Update from repository connection" shows empty
filled parameters

* fix(TDI-50433): [801 temp]Fail to send request to REST serivce with
tDBouput component

* Revert "fix(TDI-50433): [801 temp]Fail to send request to REST serivce with tDBouput component"

This reverts commit e51f948146.

* fix(TDI-50459): [JDBC TCK]: Iterate line can't link to
tjdbcrow/tjdbcsp/tjdbccommit/tjdbcrollback/tjdbcclose components

* fix(TDI-50433): [801 temp]Fail to send request to REST serivce with
tDBouput component

---------

Co-authored-by: Zhiwei Xue <zwxue@talend.com>
Co-authored-by: Hongchun Yi <hcyi@talend.com>
Co-authored-by: Jane Ding <jding@talend.com>
Co-authored-by: wang wei <wwang@talend.com>
Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: pyzhou <pyzhou@talend.com>
Co-authored-by: Oleksandr Zhelezniak <66320870+ozhelezniak-talend@users.noreply.github.com>
Co-authored-by: msjian <msjian@talend.com>
2023-11-02 17:58:08 +08:00
Jane Ding
3f1f9495a3 fix(TUP-36082):DetectCVE in Studio (#9170)
* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082
2023-11-02 17:54:01 +08:00
pyzhou
06c87d8edf feat(TDI-49973):tSchemaCompliance check string by byte length (#9140)
* feat(TDI-49973):tSchemaCompliance check string by byte length

* remove useless code
2023-10-30 16:37:06 +08:00
jzhao
f3f79aea29 fix(TDI-50291):tCyberarkInput output line optional (#9157) 2023-10-30 09:15:18 +08:00
Jane Ding
8640719bd5 Add localized files (#9198)
* Add localized files (#9197)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9196)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-10-26 17:02:21 +08:00
Oleksandr Zhelezniak
2c1e96eca2 fix(TDI-50379): VerifyError with GoogleCredentials (#9159) 2023-10-26 10:55:47 +03:00
Oleksandr Zhelezniak
0013730512 fix(TDI-50347): tPop perf improvement (#9135)
* use bufferedOutputStream before writing into the file
2023-10-26 10:48:45 +03:00
zshen-talend
735e374149 fix(TBD-15665): make sure tHadoopConfManager support with java 11 (#9180) 2023-10-25 10:34:22 +08:00
Jane Ding
8415bd7cc9 fix(TUP-40295):Testcases with resource contexts fail when building job (#9145)
* fix(TUP-40295):Testcases with resource contexts fail when building job
in Studio
https://jira.talendforge.org/browse/TUP-40295

* fix(TUP-40295):Testcases with resource contexts fail when building job
in Studio
https://jira.talendforge.org/browse/TUP-40295
2023-10-24 19:29:36 +08:00
Jane Ding
5afb158f40 Add localized files (#9179)
* Add localized files (#9175)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9176)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9178)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-10-20 14:53:45 +08:00
Oleksandr Zhelezniak
d19115a92e fix(TDI-50358): tGSPut can escape chars in filename (#9152)
* tGSPut can escape chars in filename
* change field label
2023-10-19 09:43:32 +03:00
Jane Ding
0fac5f128f Add localized files (#9162) (#9174)
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-10-17 22:12:46 +08:00
Jane Ding
cd2debb8fe feat(TUP-39889):tJira and tSplunk migration to TCK (#9126)
* feat(TUP-39889):tJira and tSplunk migration to TCK
https://jira.talendforge.org/browse/TUP-39889

* feat(TUP-39889):tJira and tSplunk migration to TCK
https://jira.talendforge.org/browse/TUP-39889

* feat(TUP-39889):tJira and tSplunk migration to TCK
https://jira.talendforge.org/browse/TUP-39889

* feat(TUP-39889):tJira and tSplunk migration to TCK
https://jira.talendforge.org/browse/TUP-39889

* feat(TUP-39889):tJira and tSplunk migration to TCK
https://jira.talendforge.org/browse/TUP-39889

* feat(TUP-39889):tJira and tSplunk migration to TCK
https://jira.talendforge.org/browse/TUP-39889
2023-10-12 16:49:20 +08:00
Dmytro Sylaiev
cce55fd50c feat(TDI-49883): Add splunk migration (#8976)
* feat(TDI-50082): Add tcompv0 tck migration jira

* feat(TDI-50082): Add abstraction for tcompv0 migration

* feat(TDI-50082): Improve migration for bool and numbers

* feat(TDI-50082): Additional improvements

* Remove PROPERTIES node

* Remove useless code

* feat(TDI-49883): Add splunk migration

* feat(TDI-50082): Fix missing jql after migration

* feat(TDI-50082): Improve the migration to sanitize jql

* Migrate deleteSubtask checkbox

* feat(TDI-49883): Add new checkbox to migration

* feat(TDI-49883): Fix the migration

* after removing explicit batch properties we need to change a migration

* feat(TDI-49883): Remove checkbox from migration
2023-10-12 11:45:35 +03:00
Dmytro Sylaiev
15d5cb8534 feat(TDI-50082): Add tcompv0 tck migration jira (#8973)
* feat(TDI-50082): Add tcompv0 tck migration jira

* feat(TDI-50082): Add abstraction for tcompv0 migration

* feat(TDI-50082): Improve migration for bool and numbers

* feat(TDI-50082): Additional improvements

* Remove PROPERTIES node

* Remove useless code

* feat(TDI-50082): Fix missing jql after migration

* feat(TDI-50082): Improve the migration to sanitize jql

* Migrate deleteSubtask checkbox
2023-10-12 11:44:38 +03:00
vyu-talend
6fd3096f1e feat(TDI-46913):enable SSL in Oracle19c. (#9083)
* feat(TDI-46913):enable SSL in Oracle19c.

* feat(TDI-46913):fix mvn path error.
2023-10-12 02:38:33 -05:00
hzhao
6c4fb6eeb4 feat(TUP-40373): Update license agreement with the Qlik one (#9154)
* feat(TUP-40373): Update license agreement with the Qlik one

* feat(TUP-40373): dispose image and font / change url

* feat(TUP-40373): adjust for windows and linux
2023-10-12 14:49:05 +08:00
sbliu
d8e56c0821 fix(TUP-40042) fix problem 'sync validation action (TCK) doesn't work properly' (#9142) 2023-10-12 10:30:44 +08:00
Zhiwei Xue
58308e99f9 feat(TUP-40401):Enable Java 17 support (#9144) 2023-10-11 16:28:10 +08:00
apoltavtsev
290f738f89 APPINT-35122: Sync projects timestamp with patch build (#9149) 2023-10-09 19:47:43 +02:00
hcyi
f974cb0dc2 fix(TUP-40299):update message (#9124) 2023-10-09 10:06:15 +08:00
jzhao
b0a3cbc10b fix( TDI-49427):ServiceNow connector ignores proxy set globally in the job(#9110) 2023-10-08 11:21:14 +08:00
Jane Ding
466b3b9168 Add localized files (#9138)
* Add localized files (#9128)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9129)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9130)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9136)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
2023-10-07 11:38:54 +08:00
Jane Ding
80b698e8d1 feat(TUP-38803):[tELTPostgresMap7.3.1]The fields are not separated by (#9108)
* feat(TUP-38803):[tELTPostgresMap7.3.1]The fields are not separated by
comma when adding a group clause by in component tELTPostgresMap
https://jira.talendforge.org/browse/TUP-38803

* feat(TUP-38803):[tELTPostgresMap7.3.1]The fields are not separated by
comma when adding a group clause by in component tELTPostgresMap
https://jira.talendforge.org/browse/TUP-38803

* feat(TUP-38803):[tELTPostgresMap7.3.1]The fields are not separated by
comma when adding a group clause by in component tELTPostgresMap
https://jira.talendforge.org/browse/TUP-38803
2023-10-07 11:31:00 +08:00
sponomarova
79d60a2a8c Fix/tbd 15544 (#9077) 2023-10-05 18:44:40 +03:00
bhe-talendbj
a2ca6d172f fix(TUP-35626): Cannot retrieve module or table when password include "\" (#9097)
* fix(TUP-35626): return the password as it is, do not unescape password

* fix(TUP-35626): return the password as it is, do not unescape password

* fix(TUP-35626): minize impact

* fix(TUP-35626): minize impact

* fix(TUP-35626): escape special characters

* fix(TUP-35626): escape double quotes only
2023-09-28 21:31:30 +08:00
Jill Yan
28e78735b3 Jill/m80/appint-35870 (#9115)
* APPINT-35870 isEmpty can not filter a empty collection

* APPINT-35870 not collect datasource for deactived node

* Revert "APPINT-35870 isEmpty can not filter a empty collection"

This reverts commit 81a34e866a.

* APPINT-35870 not collect datasource for deactived node
2023-09-28 16:39:08 +08:00
Abdulhamid Rashankar
6744f0bb9e APPINT-35812: publishing a service as a release try to create twice the release (#9050) 2023-09-28 07:42:43 +02:00
apoltavtsev
0a422f524d APPINT-18113: Sync parameters of cKafka component (#9045)
* Update EmfComponent.java

* Update ElementParameter.java

* Update TextController.java

* Update TableController.java

* Update TableController.java

* Update TextController.java

* Update AbstractElementPropertySectionController.java

* Update TableController.java

* Update ColumnListController.java

* Update ComboController.java
2023-09-27 09:51:17 +02:00
pyzhou
d919f0ca6c fix(TDI-49606):tRunJob change label (#9125) 2023-09-27 14:54:03 +08:00
zyuan-talend
1f3a7ecde8 fix(TUP-40251): remove not used studio only org.talend.libraries. (#9111) 2023-09-26 16:53:29 +08:00
sbliu
07d3021d7a fix(TUP-38273) recovery the change for tcompv0 plugin (#9122) 2023-09-25 19:50:00 +08:00
sbliu
6aa673aff4 fix(TUP-38273) upgrade avro, replace org.apache.servicemix.bundles.avro with higer version 1.11.2 of avro bundle (#9004)
* fix(TUP-38273) upgrade avro, replace org.apache.servicemix.bundles.avro with higer version 1.11.2 of avro bundle (#8951)

* replace org.apache.servicemix.bundles.avro with avro bundle with higher version 1.11.2

* replace org.apache.servicemix.bundles.avro with avro for jetbean classpath

* set validate defaults to false to compatible with previous avro

* adapt for avro upgrade in case defaultvalue issue

* setValidateDefaults false to disable check default value

* update talend-codegen-utils 0.34.0 to 0.35.0
# Conflicts:
#	main/plugins/org.talend.designer.core.generic/META-INF/MANIFEST.MF
#	main/plugins/org.talend.designer.core/META-INF/MANIFEST.MF
#	main/plugins/org.talend.repository.generic/META-INF/MANIFEST.MF

* fix(TDI-49492): disable default value check (#8975)

* fix(TDI-49492): upgrade jackson to 2.14.3 (#8995)

* fix(TUP-38273) fix unit test failure caused by crypto-utils version not match (#9000)

* upgrade jackson for bigquery metadata

---------

Co-authored-by: wang wei <wwang@talend.com>
2023-09-25 14:50:33 +08:00
Jane Ding
64a73f19e7 Add localized files (#9116) (#9118)
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-09-21 18:58:09 +08:00
jiezhang-tlnd
af2df9217f chore(TUP-38631)CVE-2022-1471, snakeyaml:1.32-1.33 (#9074) 2023-09-21 17:15:10 +08:00
Jane Ding
13e54313da Add localized files (#9114)
* Add localized files (#9103)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9104)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9105)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
2023-09-20 16:33:31 +08:00
pyzhou
47c46997e4 feat(TDI-49606): tRunjob load context from file (#9069)
* feat(TDI-49606):tRunjob load context through tmp file

* encrypt pass

* remove test code

* add error message

* change logic

* delete tmp file

* compile error
2023-09-19 09:20:34 +08:00
mhryb
fc4d3dced3 fix(TDI-50060): add support of id_Date type in tFileInputPositional (#9039) 2023-09-15 17:39:57 +03:00
Oleksandr Zhelezniak
2ecfd9721a fix(TDI-49941): bump guava 32.1.2-jre (#9067) 2023-09-14 11:31:47 +08:00
apoltavtsev
87e2f6d579 APPINT-35898: Resolved ClassNotFound during Routelet deployment (#9101) 2023-09-13 21:01:07 +02:00
apoltavtsev
f7fafdfafe APPINT-35807: Compilation level for dependencies calculation is corre… (#9102) 2023-09-13 21:00:42 +02:00
Jill Yan
1a7d627354 Jill m80/APPINT-35837 (#9099)
* APPINT-35837 Correct dynamic settings

* APPINT-35837 Correct dynamic settings
2023-09-13 15:24:16 +08:00
Oleksandr Zhelezniak
f8a0cdcb02 chore(TDI-49822): change trove name (#9053) 2023-09-07 15:21:08 +03:00
Jane Ding
8aeae703e0 Add localized files (#9091)
* Add localized files (#9086)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9087)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9090)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
2023-09-07 17:52:41 +08:00
hcyi
1493c8b5db feat(TUP-38042):Improve context view display. (#8997)
* feat(TUP-38042):Improve context view display.

* feat(TUP-38042):Improve context view display.

* feat(TUP-38042):update context message and improve for GUI

* feat(TUP-38042):TUP-40126 [bug] "Enable prompt" still use old settings
after migration

* feat(TUP-38042):TUP-40178 [bug] UI Problems

* feat(TUP-38042):TUP-40126 [bug] "Enable prompt" still use old settings
after migration

* feat(TUP-38042):TUP-40126 [bug] "Enable prompt" still use old settings
after migration

* feat(TUP-38042):TUP-40126 [bug] "Enable prompt" still use old settings
after migration
2023-09-07 11:01:36 +08:00
Jane Ding
b9175d5539 fix(TUP-40217):Update checkbox linked to allow internal (#9084)
https://jira.talendforge.org/browse/TUP-40217
2023-09-06 17:55:01 +08:00
zyuan-talend
23cc5b5294 fix(TUP-39605): Cleanup Exchange related code. (#9076) 2023-09-06 16:32:06 +08:00
apoltavtsev
32e2da5e46 APINT-35122: Solve CI Build problems when using child jobs and routelets 2023-09-06 08:50:33 +02:00
Wei Hua
bf60d556f6 APPINT-35853 Spring-security-config:5.7.8 | CVE-2023-34034 (#9072)
* APPINT-35853 Spring-security-config:5.7.8 | CVE-2023-34034

* update micrometer-registry-prometheus version
2023-09-06 12:08:05 +08:00
pyzhou
c03753ed3b Revert "Revert "fix(TDI-50218): fix tFileInputExcel NPE (#9063)""
This reverts commit e6db20eb6b.
2023-09-06 11:00:34 +08:00
Chao MENG
2e95175cf5 fix(TUP-40189): Remove plugin org.talend.libraries.hadoop.mapr.5.0.0 (#9080)
https://jira.talendforge.org/browse/TUP-40189
2023-09-06 10:31:50 +08:00
pyzhou
e6db20eb6b Revert "fix(TDI-50218): fix tFileInputExcel NPE (#9063)"
This reverts commit e7bf6903e0.
2023-09-06 08:45:18 +08:00
vyu-talend
3740aa7555 Revert "feat(TDI-46913):enable SSL in Oracle19c."
This reverts commit f60f9b8556.
2023-09-05 18:52:38 +08:00
vyu-talend
f60f9b8556 feat(TDI-46913):enable SSL in Oracle19c. 2023-09-05 18:47:30 +08:00
Jane Ding
b9284fb195 Add localized files (#9075) (#9082)
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-09-05 16:48:47 +08:00
Oleksandr Zhelezniak
2be2aca776 fix(TDI-50240): allow standalone to have connection (#9071)
* specieal treatment for Rollback and Commit standalone components
2023-09-05 11:34:50 +03:00
pyzhou
e7bf6903e0 fix(TDI-50218): fix tFileInputExcel NPE (#9063)
# Conflicts:
#	main/plugins/org.talend.libraries.excel/META-INF/MANIFEST.MF
2023-09-05 16:05:55 +08:00
pyzhou
217b2066a2 fix(TDI-50199): compile error tGSGet (#9047) 2023-09-05 09:51:23 +08:00
Chao MENG
7c08e6236b fix(TUP-40028): Update wording in Error and Warning tooltip (#9064)
* fix(TUP-40028): Update wording in Error and Warning tooltip
https://jira.talendforge.org/browse/TUP-40028

* fix(TUP-40028): Update wording in Error and Warning tooltip
https://jira.talendforge.org/browse/TUP-40028
2023-09-01 18:00:38 +08:00
Jane Ding
a140559eb0 Add localized files (#9066) (#9070)
Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-09-01 17:09:53 +08:00
mhryb
5fd368e8da feat(TDI-50102): upgrade jdbc drivers for Postgresql, deprecate pre V9 (#9021) 2023-09-01 10:56:02 +03:00
mhryb
dd13213130 feat(TDI-48193): enable LOCAL_FILE by default in PostgreSQL bulk components (#9016) 2023-08-31 18:16:12 +03:00
mhryb
6def4544bc feat(TDI-50100): add use existing connections in tPostgresqlOutputBulkExec (#9022) 2023-08-31 18:07:05 +03:00
Dmytro Sylaiev
7a5d67f917 chore(TDI-49999): Update nimbus-jose in tdi-se (#8978)
* update talend-mscrm for crm in se
2023-08-31 10:27:43 +03:00
sbliu
cb5e3ee0f2 feat(TUP-39758) upgrade jdbc drivers for Postgresql, deprecate pre V9 (#9048) 2023-08-30 17:42:05 +08:00
Jane Ding
e3d4a2572b Add localized files (#9062)
* Add localized files (#9059)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9060)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-08-30 10:54:17 +08:00
Jill Yan
a4b963cea5 Jill/m80/appint-35837 (#9055)
* APPINT-35837 Correct dynamic settings

* APPINT-35837 Correct dynamic settings
2023-08-30 09:27:49 +08:00
Oleksandr Zhelezniak
c30e472013 fix(TDI-50094): remove commit from input (#8982) 2023-08-18 09:54:21 +03:00
Jill Yan
2c9f2f1588 APPINT-35834 add rhino in osgi-exclude (#9042) 2023-08-17 14:10:33 +08:00
Oleksandr Zhelezniak
0dd7f8768b fix(TDI-50099): add commons logging bridge S3 (#8986) 2023-08-14 13:40:37 +03:00
pyzhou
306a8f9acb fix(TDI-50002):CVE snappy-java (#8972)
* fix(TDI-50002):CVE snappy-java

* fix mvn url
2023-08-14 14:27:26 +08:00
hcyi
9d9ff25810 Hcyi/add localized files 2023 8 11 (#9034)
* Add localized files (#9033)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9032)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9031)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
2023-08-11 10:21:56 +08:00
zyuan-talend
dc411f2ae9 fix(TUP-39924): plexus-archiver:3.6.0/4.2.0/4.2.1/4.2.2 | (#9015)
CVE-2023-37460.
2023-08-10 16:36:29 +08:00
Jane Ding
1dca9cefa0 fix(TUP-39968):BigQuery components grouped with MDM components (#9024)
https://jira.talendforge.org/browse/TUP-39968
2023-08-10 14:51:20 +08:00
jiezhang-tlnd
4462619833 fix junit (#9029) 2023-08-10 14:23:12 +08:00
jiezhang-tlnd
98973f34fa feat(TUP-39961)Set visible to false for tDBCDC and tDBCDCOutput (#9019)
* feat(TUP-39961)Set visible to false for tDBCDC and tDBCDCOutput
component
https://jira.talendforge.org/browse/TUP-39961

* delete CDC

* fix junit
2023-08-10 10:31:18 +08:00
Laurent BOURGEOIS
7b8faa1f7f Disable jar overwrite (#8965) 2023-08-09 10:34:18 +02:00
wang wei
9a5f894828 fix(TDI-42055): tSetDynamicSchema to be reused in tFileInputDelimited (#8940) 2023-08-09 09:32:27 +08:00
Jane Ding
0f19086ebb feat(TUP-39065):Implement secured credential storage in Studio for Nexus (#8993)
credentials.
https://jira.talendforge.org/browse/TUP-39065
2023-08-09 09:23:20 +08:00
zyuan-talend
a36783bb22 feat(TUP-38945):upgrade oracle jdbc driver. (#9005) 2023-08-04 18:50:10 +08:00
AlixMetivier
ebf6d6e3ca fix(TBD-15413): Hive in DI for dataproc (#8987) 2023-08-04 09:34:26 +02:00
782 changed files with 11827 additions and 14663 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.talend.studio.components.tcompv0.jira.feature</name>
<name>org.talend.studio.components.tck.jdbc.feature</name>
<comment></comment>
<projects>
</projects>

View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.studio.components.tck.jdbc.feature"
label="JDBC"
version="8.0.1.qualifier">
<description url="http://www.example.com/description">
JDBC
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
JDBC
Copyright (c) 2006-2021 Talend Inc. - www.talend.com
All rights reserved.
This product includes software developed at
GlassFish Community (https://glassfish.dev.java.net)
Licensed under the CDDL,GPL-2.0-only license.
This product includes software developed at
The Apache Software Foundation (http://jakarta.apache.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML
Licensed under the Apache-2.0 license.
</license>
<requires>
<import plugin="org.talend.designer.maven.repo.tck"/>
<import plugin="org.talend.studio.components.tck.jdbc"/>
</requires>
</feature>

View File

@@ -7,6 +7,6 @@
<version>8.0.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
<artifactId>org.talend.studio.components.tck.jdbc.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,23 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.talend.studio.components.tcompv0.splunk.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.talend.studio.components.tck.jira.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

View File

@@ -0,0 +1,2 @@
bin.includes = feature.xml,\
p2.inf

View File

@@ -1,102 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.studio.components.tcompv0.jira.feature"
label="Jira"
version="8.0.1.qualifier">
<description url="http://www.example.com/description">
Jira component
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
Jira component
Copyright (c) 2006-2021 Talend Inc. - www.talend.com
All rights reserved.
This product includes software developed at
OPS4J - Open Participation Software for Java
Licensed under the Apache-2.0 license.
This product includes software developed at
GlassFish Community (https://glassfish.dev.java.net)
Licensed under the CDDL,GPL-2.0-only license.
This product includes software developed at
The Apache Software Foundation (http://jakarta.apache.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML
Licensed under the Apache-2.0 license.
This product includes software developed at
OSGi Alliance (http://www.osgi.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
Joda.org (http://www.joda.org)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML (http://fasterxml.com)
Licensed under the JSON license.
This product includes software developed at
Google, Inc.
Licensed under the Apache-2.0 license.
This product includes software developed at
AddThis
Licensed under the Apache-2.0 license.
This product includes software developed at
SLF4J.ORG
Licensed under the MIT license.
This product includes software developed at
SLF4J.ORG
Licensed under the X11 license.
This product includes software developed at
JUnit
Licensed under the EPL-1.0 license.
This product includes software developed at
Seam Framework
Licensed under the Apache-2.0 license.
</license>
<requires>
<import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin
id="org.talend.studio.components.tcompv0.jira"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.components.jira"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.studio.components.tck.jira.feature"
label="Jira"
version="8.0.1.qualifier">
<description url="http://www.example.com/description">
Jira component
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
Jira component
Copyright (c) 2006-2021 Talend Inc. - www.talend.com
All rights reserved.
This product includes software developed at
OPS4J - Open Participation Software for Java
Licensed under the Apache-2.0 license.
This product includes software developed at
GlassFish Community (https://glassfish.dev.java.net)
Licensed under the CDDL,GPL-2.0-only license.
This product includes software developed at
The Apache Software Foundation (http://jakarta.apache.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML
Licensed under the Apache-2.0 license.
This product includes software developed at
OSGi Alliance (http://www.osgi.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
Joda.org (http://www.joda.org)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML (http://fasterxml.com)
Licensed under the JSON license.
This product includes software developed at
Google, Inc.
Licensed under the Apache-2.0 license.
This product includes software developed at
AddThis
Licensed under the Apache-2.0 license.
This product includes software developed at
SLF4J.ORG
Licensed under the MIT license.
This product includes software developed at
SLF4J.ORG
Licensed under the X11 license.
This product includes software developed at
JUnit
Licensed under the EPL-1.0 license.
This product includes software developed at
Seam Framework
Licensed under the Apache-2.0 license.
</license>
<requires>
<import plugin="org.talend.designer.maven.repo.tck" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.talend.designer.maven.repo.tcksdk" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.talend.studio.components.tck.jira"/>
</requires>
</feature>

View File

@@ -0,0 +1,4 @@
properties.0.name=TALEND_COMPONENT_tJIRAInput
properties.0.value=
properties.1.name=TALEND_COMPONENT_tJIRAOutput
properties.1.value=

View File

@@ -7,6 +7,6 @@
<version>8.0.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
<artifactId>org.talend.studio.components.tck.jira.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.talend.studio.components.tck.splunk.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

View File

@@ -0,0 +1,2 @@
bin.includes = feature.xml,\
p2.inf

View File

@@ -1,102 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.studio.components.tcompv0.splunk.feature"
label="Splunk"
version="8.0.1.qualifier">
<description url="http://www.example.com/description">
Splunk component
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
Splunk component
Copyright (c) 2006-2021 Talend Inc. - www.talend.com
All rights reserved.
This product includes software developed at
OPS4J - Open Participation Software for Java
Licensed under the Apache-2.0 license.
This product includes software developed at
GlassFish Community (https://glassfish.dev.java.net)
Licensed under the CDDL,GPL-2.0-only license.
This product includes software developed at
The Apache Software Foundation (http://jakarta.apache.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML
Licensed under the Apache-2.0 license.
This product includes software developed at
OSGi Alliance (http://www.osgi.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
Joda.org (http://www.joda.org)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML (http://fasterxml.com)
Licensed under the JSON license.
This product includes software developed at
Google, Inc.
Licensed under the Apache-2.0 license.
This product includes software developed at
AddThis
Licensed under the Apache-2.0 license.
This product includes software developed at
SLF4J.ORG
Licensed under the MIT license.
This product includes software developed at
SLF4J.ORG
Licensed under the X11 license.
This product includes software developed at
JUnit
Licensed under the EPL-1.0 license.
This product includes software developed at
Seam Framework
Licensed under the Apache-2.0 license.
</license>
<requires>
<import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin
id="org.talend.studio.components.tcompv0.splunk"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.components.splunk"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.studio.components.tck.splunk.feature"
label="Splunk"
version="8.0.1.qualifier">
<description url="http://www.example.com/description">
Splunk component
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
Splunk component
Copyright (c) 2006-2021 Talend Inc. - www.talend.com
All rights reserved.
This product includes software developed at
OPS4J - Open Participation Software for Java
Licensed under the Apache-2.0 license.
This product includes software developed at
GlassFish Community (https://glassfish.dev.java.net)
Licensed under the CDDL,GPL-2.0-only license.
This product includes software developed at
The Apache Software Foundation (http://jakarta.apache.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML
Licensed under the Apache-2.0 license.
This product includes software developed at
OSGi Alliance (http://www.osgi.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
Joda.org (http://www.joda.org)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML (http://fasterxml.com)
Licensed under the JSON license.
This product includes software developed at
Google, Inc.
Licensed under the Apache-2.0 license.
This product includes software developed at
AddThis
Licensed under the Apache-2.0 license.
This product includes software developed at
SLF4J.ORG
Licensed under the MIT license.
This product includes software developed at
SLF4J.ORG
Licensed under the X11 license.
This product includes software developed at
JUnit
Licensed under the EPL-1.0 license.
This product includes software developed at
Seam Framework
Licensed under the Apache-2.0 license.
</license>
<requires>
<import plugin="org.talend.designer.maven.repo.tck" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.talend.designer.maven.repo.tcksdk" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.talend.studio.components.tck.splunk"/>
</requires>
</feature>

View File

@@ -0,0 +1,2 @@
properties.0.name=TALEND_COMPONENT_tSplunkEventCollector
properties.0.value=

View File

@@ -7,6 +7,6 @@
<version>8.0.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>
<packaging>eclipse-plugin</packaging>
<artifactId>org.talend.studio.components.tck.splunk.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1 +0,0 @@
bin.includes = feature.xml

View File

@@ -17,14 +17,14 @@
</license>
<requires>
<import feature="org.talend.studio.components.tck.jira.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tck.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.netsuite.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.googledrive.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.marketo.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.azurestorage.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.snowflake.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.jira.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.salesforce.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.esb.tooling.ws.consumer.feature" version="0.0.0" match="greaterOrEqual"/>
<import plugin="biz.aQute.bnd.annotation" version="0.0.0" match="greaterOrEqual"/>
@@ -84,7 +84,7 @@
unpack="false"/>
<plugin
id="org.talend.components.jira"
id="org.talend.studio.components.tck.jira"
download-size="0"
install-size="0"
version="0.0.0"
@@ -119,7 +119,7 @@
unpack="false"/>
<plugin
id="org.talend.components.splunk"
id="org.talend.studio.components.tck.splunk"
download-size="0"
install-size="0"
version="0.0.0"
@@ -158,7 +158,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.designer.filemultischemas"
download-size="0"
@@ -242,12 +242,18 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
<plugin
id="org.talend.designer.esb.components.rs.consumer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.studio.components.tck.jdbc"
download-size="0"
install-size="0"
version="0.0.0"/>
</feature>

View File

@@ -30,7 +30,6 @@
<plugin id="org.talend.libraries.excel" download-size="0" install-size="0" version="0.0.0"/>
<plugin id="org.talend.libraries.groovy" download-size="0" install-size="0" version="0.0.0"/>
<plugin id="org.talend.libraries.guava" download-size="0" install-size="0" version="0.0.0"/>
<plugin id="org.talend.libraries.hadoop.mapr.5.0.0" download-size="0" install-size="0" version="0.0.0"/>
<plugin id="org.talend.libraries.jackson" download-size="0" install-size="0" version="0.0.0"/>
<plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.libraries.javacsv"/>
<plugin id="org.talend.libraries.jax" download-size="0" install-size="0" version="0.0.0"/>

View File

@@ -87,12 +87,12 @@
"tIngresConnection",
"tInterbaseConnection",
"tJDBCConnection",
"JDBCConnection",
"tMSSqlConnection",
"tMysqlConnection",
"tNetezzaConnection",
"tOracleConnection",
"tParAccelConnection",
"tPostgresPlusConnection",
"tPostgresqlConnection",
"tRedshiftConnection",
"tSQLiteConnection",
@@ -786,7 +786,7 @@
//print info and job continue to run, for case: context_param is not empty.
System.err.println("Could not find the context " + contextStr);
}
if(!context_param.isEmpty()) {
context.putAll(context_param);
//set types for params from parentJobs
@@ -1870,6 +1870,31 @@ if (execStat) {
context_param.put(keyValue.substring(0, index), keyValue.substring(index + 1) );
}
}
} else if (arg.startsWith("--context_file")) {
String keyValue = arg.substring(15);
String filePath = new String(java.util.Base64.getDecoder().decode(keyValue));
java.nio.file.Path contextFile = java.nio.file.Paths.get(filePath);
try (java.io.BufferedReader reader = java.nio.file.Files.newBufferedReader(contextFile)) {
String line;
while ((line = reader.readLine()) != null) {
int index = -1;
if ( (index = line.indexOf('=')) > -1) {
if (line.startsWith("--context_param")) {
if ("id_Password".equals(context_param.getContextType(line.substring(16, index)))) {
context_param.put(line.substring(16, index), routines.system.PasswordEncryptUtil.decryptPassword(
line.substring(index + 1)));
} else {
context_param.put(line.substring(16, index), line.substring(index + 1));
}
}else {//--context_type
context_param.setContextType(line.substring(15, index), line.substring(index + 1));
}
}
}
} catch (java.io.IOException e) {
System.err.println("Could not load the context file: " + filePath);
e.printStackTrace();
}
} else if (arg.startsWith("--log4jLevel=")) {
log4jLevel = arg.substring(13);
} else if (arg.startsWith("--audit.enabled") && arg.contains("=")) {//for trunjob call

View File

@@ -138,7 +138,7 @@
SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> = new SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>();
props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
new org.apache.avro.Schema.Parser().parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
new org.apache.avro.Schema.Parser().setValidateDefaults(false).parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
<%
} else if (!(value instanceof String) || !((String)value).equals("")) {
%>

View File

@@ -224,7 +224,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
<% if (column.getOriginalDbColumnName() == null) { %>
return null;
<% } else { %>
return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getOriginalDbColumnName()))%>";
return "<%=TalendTextUtils.escapeJavaText(column.getOriginalDbColumnName())%>";
<% } %>
}

View File

@@ -599,6 +599,13 @@ public class CodeGenerator implements ICodeGenerator {
} else {
// if (!isIterate) {
if (isTacokitProcessor(node)) {
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
}
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.END, incomingName, typeGen));
// }
if (node.getComponent() instanceof Component) {
@@ -629,12 +636,6 @@ public class CodeGenerator implements ICodeGenerator {
}
}
if (isTacokitProcessor(node)) {
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
}
codeComponent.append(generatesTreeCode(subProcess, node, part, typeGen));
// if (isIterate) {
// codeComponent.append(generateComponentCode(node,
@@ -655,11 +656,14 @@ public class CodeGenerator implements ICodeGenerator {
return codeComponent;
}
private static final String TACOKIT_PROCESSOR_CODE_DIR = "tacokit/jet_stub/generic/processor";
private boolean isTacokitProcessor(final INode node) {
return "org.talend.sdk.component.studio.ComponentModel".equals(node.getComponent().getClass().getName())
&& !NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty(); //has input data
final String componentModelClass = node.getComponent().getClass().getName();
return ("org.talend.sdk.component.studio.ComponentModel".equals(componentModelClass) || "org.talend.sdk.component.studio.AdditionalJDBCComponentModel".equals(componentModelClass))
&& (!NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty() || TACOKIT_PROCESSOR_CODE_DIR.equals(node.getComponent().getTemplateFolder()));
}
private StringBuffer generateSeperateEndCode(NodesSubTree subProcess, INode node, String incomingName, ETypeGen typeGen)
throws CodeGeneratorException {
StringBuffer codeComponent = new StringBuffer();

View File

@@ -59,7 +59,9 @@ import org.talend.core.model.components.IComponentsFactory;
import org.talend.core.model.components.IComponentsHandler;
import org.talend.core.model.components.filters.ComponentsFactoryProviderManager;
import org.talend.core.model.components.filters.IComponentFactoryFilter;
import org.talend.core.runtime.services.IGenericService;
import org.talend.core.runtime.util.ComponentsLocationProvider;
import org.talend.core.service.ITCKUIService;
import org.talend.core.ui.IJobletProviderService;
import org.talend.core.ui.ISparkJobletProviderService;
import org.talend.core.ui.ISparkStreamingJobletProviderService;
@@ -73,6 +75,7 @@ import org.talend.designer.core.model.components.EmfComponent;
import org.talend.designer.core.model.process.AbstractProcessProvider;
import org.talend.designer.core.model.process.GenericProcessProvider;
import org.talend.designer.core.ui.editor.jobletcontainer.JobletUtil;
import org.talend.designer.core.utils.UnifiedComponentUtil;
/**
* Component factory that look for each component and load their information. <br/>
@@ -231,7 +234,15 @@ public class ComponentsFactory implements IComponentsFactory {
if (StringUtils.isEmpty(componentName)) {
continue;
}
if (IGenericService.getService().isTcompv0(component)
&& (UnifiedComponentUtil.isAdditionalJDBCComponent(component.getName())
|| component.getName().contains(ITCKUIService.get().getTCKJDBCType().getLabel()))) {
continue;
}
String componentNameLowerCase = componentName.toLowerCase();
if (componentNameLowerCase.startsWith(ITCKUIService.get().getTCKJDBCType().getLabel().toLowerCase())) {
componentNameLowerCase = "t" + componentNameLowerCase;
}
Map<String, Set<IComponent>> map = componentNameMap.get(componentNameLowerCase);
if (map == null) {
map = new HashMap<String, Set<IComponent>>();

View File

@@ -378,7 +378,7 @@ public class TalendJetEmitter extends JETEmitter {
// Construct a proper URL for relative lookup.
//
URL url = new File(project.getLocation() + "/" + "runtime" + "/") //$NON-NLS-1$ //$NON-NLS-2$
.toURL();
.toURI().toURL();
URLClassLoader theClassLoader = new URLClassLoader(new URL[] { url }, jetEmitter.classLoader);
Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") //$NON-NLS-1$ //$NON-NLS-2$
+ jetCompiler.getSkeleton().getClassName());
@@ -633,7 +633,7 @@ public class TalendJetEmitter extends JETEmitter {
final IWorkspace workspace = ResourcesPlugin.getWorkspace();
IProject project = workspace.getRoot().getProject(projectName);
URL url = new File(project.getLocation() + "/runtime").toURL(); //$NON-NLS-1$
URL url = new File(project.getLocation() + "/runtime").toURI().toURL(); //$NON-NLS-1$
currentClassLoader = jetbean.getClassLoader();
theClassLoader = new URLClassLoader(new URL[] { url }, jetbean.getClassLoader());
}

View File

@@ -564,7 +564,7 @@ public final class CodeGeneratorEmittersPoolFactory {
JetBean jetBean = new JetBean(componentsPath, templateURI, "component", component.getVersion(), //$NON-NLS-1$
"", codePart.getName());//$NON-NLS-1$
addCommonLibs(jetBean);
jetBean.addClassPath("AVRO", "org.apache.servicemix.bundles.avro"); //$NON-NLS-1$ //$NON-NLS-2$
jetBean.addClassPath("AVRO", "avro"); //$NON-NLS-1$ //$NON-NLS-2$
for (String pluginDependency : component.getPluginDependencies()) {
jetBean.addClassPath(pluginDependency.toUpperCase().replaceAll("\\.", "_") + "_LIBRARIES", pluginDependency); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

View File

@@ -7,11 +7,11 @@
<groupId>org.talend.libraries</groupId>
<artifactId>talend-codegen-utils</artifactId>
<!-- release for revert version of library -->
<version>0.34.0</version>
<version>0.35.0</version>
<packaging>jar</packaging>
<properties>
<avro.version>1.8.0</avro.version>
<avro.version>1.11.2</avro.version>
<components.version>0.37.17</components.version>
<daikon.version>7.0.5</daikon.version>
<hamcrest.version>1.3</hamcrest.version>

View File

@@ -12,6 +12,7 @@
// ============================================================================
package org.talend.codegen;
import org.apache.avro.AvroTypeException;
import org.apache.avro.Schema;
import org.talend.daikon.avro.AvroUtils;
@@ -39,4 +40,12 @@ public final class DynamicFieldUtils {
return AvroUtils.isIncludeAllFields(schema)
? Integer.valueOf(schema.getProp(DiSchemaConstants.TALEND6_DYNAMIC_COLUMN_POSITION)) : NO_DYNAMIC_FIELD;
}
public static Schema.Field cloneAvroField(Schema.Field origin) {
try {
return new Schema.Field(origin.name(), origin.schema(), origin.doc(), origin.defaultVal());
} catch (AvroTypeException e) {
return new Schema.Field(origin.name(), origin.schema(), origin.doc(), null);
}
}
}

View File

@@ -37,6 +37,7 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.SchemaParseException;
import org.talend.codegen.DiSchemaConstants;
import org.talend.codegen.DynamicFieldUtils;
import org.talend.daikon.avro.AvroUtils;
import org.talend.daikon.avro.LogicalTypeUtils;
import org.talend.daikon.avro.NameUtil;
@@ -374,7 +375,7 @@ public class IncomingSchemaEnforcer {
* @return field copy
*/
private Field copyField(Field original) {
Field copy = new Schema.Field(original.name(), original.schema(), original.doc(), original.defaultVal());
Field copy = DynamicFieldUtils.cloneAvroField(original);
for (Map.Entry<String, Object> e : original.getObjectProps().entrySet()) {
copy.addProp(e.getKey(), e.getValue());
}

View File

@@ -24,6 +24,7 @@ import org.apache.avro.Schema;
import org.apache.avro.Schema.Field;
import org.apache.avro.generic.IndexedRecord;
import org.talend.codegen.DiSchemaConstants;
import org.talend.codegen.DynamicFieldUtils;
import org.talend.daikon.avro.AvroUtils;
/**
@@ -166,8 +167,7 @@ public class OutgoingDynamicSchemaEnforcer extends OutgoingSchemaEnforcer {
// List<Integer> dynamicFieldsIndexes = indexMapper.computeDynamicFieldsIndexes();
for (int index : dynamicFieldsIndexes) {
Field dynamicField = runtimeFields.get(index);
Field dynamicFieldCopy = new Schema.Field(dynamicField.name(), dynamicField.schema(), dynamicField.doc(),
dynamicField.defaultVal());
Field dynamicFieldCopy = DynamicFieldUtils.cloneAvroField(dynamicField);
Map<String, Object> fieldProperties = dynamicField.getObjectProps();
for (Map.Entry<String, Object> entry : fieldProperties.entrySet()) {
Object propValue = entry.getValue();

View File

@@ -50,7 +50,7 @@
<IMPORT NAME="ApacheCommonsCollection32" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED="true" BundleID=""/>
<IMPORT NAME="Jboss_Marshalling" MODULE="jboss-marshalling-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final" REQUIRED="true"/>
<IMPORT NAME="Jboss_River" MODULE="jboss-marshalling-river-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling-river/2.0.12.Final" REQUIRED="true"/>
<IMPORT NAME="Trove" MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0" REQUIRED="true"/>
<IMPORT NAME="Trove" MODULE="trove-1.0.2.jar" MVN="mvn:trove/trove/1.0.2" REQUIRED="true"/>
<IMPORT NAME="reload4j-1.2.22" MODULE="reload4j-1.2.22.jar" MVN="mvn:ch.qos.reload4j/reload4j/1.2.22" REQUIRED="true" BundleID=""/>
</IMPORTS>
</CODEGENERATION>

View File

@@ -59,7 +59,7 @@
/>
<IMPORT
NAME="Trove"
MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0"
MODULE="trove-1.0.2.jar" MVN="mvn:trove/trove/1.0.2"
REQUIRED="true"
/>
<IMPORT

View File

@@ -240,14 +240,14 @@
<IMPORT NAME="jmespath-java-1.12.315.jar" MODULE="jmespath-java-1.12.315.jar"
MVN="mvn:com.amazonaws/jmespath-java/1.12.315"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.13.4.2.jar" MODULE="jackson-databind-2.13.4.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
<IMPORT NAME="jackson-databind-2.14.3.jar" MODULE="jackson-databind-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.13.4.jar" MODULE="jackson-annotations-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
<IMPORT NAME="jackson-annotations-2.14.3.jar" MODULE="jackson-annotations-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

View File

@@ -567,14 +567,14 @@
<IMPORT NAME="jmespath-java-1.12.315.jar" MODULE="jmespath-java-1.12.315.jar"
MVN="mvn:com.amazonaws/jmespath-java/1.12.315"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.13.4.2.jar" MODULE="jackson-databind-2.13.4.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
<IMPORT NAME="jackson-databind-2.14.3.jar" MODULE="jackson-databind-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.13.4.jar" MODULE="jackson-annotations-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
<IMPORT NAME="jackson-annotations-2.14.3.jar" MODULE="jackson-annotations-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

View File

@@ -297,14 +297,14 @@
<IMPORT NAME="jmespath-java-1.12.315.jar" MODULE="jmespath-java-1.12.315.jar"
MVN="mvn:com.amazonaws/jmespath-java/1.12.315"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.13.4.2.jar" MODULE="jackson-databind-2.13.4.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
<IMPORT NAME="jackson-databind-2.14.3.jar" MODULE="jackson-databind-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.13.4.jar" MODULE="jackson-annotations-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
<IMPORT NAME="jackson-annotations-2.14.3.jar" MODULE="jackson-annotations-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

View File

@@ -357,14 +357,14 @@
<IMPORT NAME="jmespath-java-1.12.315.jar" MODULE="jmespath-java-1.12.315.jar"
MVN="mvn:com.amazonaws/jmespath-java/1.12.315"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.13.4.2.jar" MODULE="jackson-databind-2.13.4.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
<IMPORT NAME="jackson-databind-2.14.3.jar" MODULE="jackson-databind-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.13.4.jar" MODULE="jackson-annotations-2.13.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
<IMPORT NAME="jackson-annotations-2.14.3.jar" MODULE="jackson-annotations-2.14.3.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

View File

@@ -383,9 +383,9 @@
<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -395,7 +395,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.30.2.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.30.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -206,9 +206,9 @@
<IMPORT NAME="slf4j-reload4j-1.7.34.jar" MODULE="slf4j-reload4j-1.7.34.jar" MVN="mvn:org.slf4j/slf4j-reload4j/1.7.34" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
@@ -218,7 +218,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.30.2.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.30.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -266,9 +266,9 @@
<IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -278,7 +278,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.30.2.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.30.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -337,9 +337,9 @@
<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -349,7 +349,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.30.2.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.30.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -322,9 +322,9 @@
<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -334,7 +334,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.30.2.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.30.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -197,21 +197,30 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
/* ----END-CREATING-CLIENT (OAuth 2.0)---- */
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
/* ----START-CREATING-CLIENT (Cloud API)---- */
<% // Fix verifyError for a huge file TDI-50379 %>
class BigQueryBuilder_<%=cid%> {
public com.google.cloud.bigquery.BigQuery newBigQuery() throws java.io.IOException {
com.google.auth.oauth2.GoogleCredentials credentials_<%=cid%>;
<%if ("APPLICATION_DEFAULT_CREDENTIALS".equals(authMode)) { %>
credentials_<%=cid%> = com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
<%} else { %>
java.io.File credentialsFile_<%=cid%> = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream_<%=cid%> = new java.io.FileInputStream(credentialsFile_<%=cid%>)) {
credentials_<%=cid%> = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream_<%=cid%>);
}
<%}%>
com.google.auth.oauth2.GoogleCredentials credentials_<%=cid%>;
java.io.File credentialsFile_<%=cid%> = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream_<%=cid%> = new java.io.FileInputStream(credentialsFile_<%=cid%>)) {
credentials_<%=cid%> = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream_<%=cid%>);
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder_<%=cid%> = com.google.cloud.bigquery.BigQueryOptions.newBuilder().setCredentials(credentials_<%=cid%>).setProjectId(<%=projectId%>);
<% if( "true".equals(ElementParameterParser.getValue(node, "__USE_REGION_ENDPOINT__")) ){ %>
bigQueryOptionsBuilder_<%=cid%>.setHost( <%= ElementParameterParser.getValue(node, "__REGION_ENDPOINT_BQ__")%> );
<% } %>
return bigQueryOptionsBuilder_<%=cid%>.build().getService();
}
}
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder_<%=cid%> = com.google.cloud.bigquery.BigQueryOptions.newBuilder().setCredentials(credentials_<%=cid%>).setProjectId(<%=projectId%>);
<% if( "true".equals(ElementParameterParser.getValue(node, "__USE_REGION_ENDPOINT__")) ){ %>
bigQueryOptionsBuilder_<%=cid%>.setHost( <%= ElementParameterParser.getValue(node, "__REGION_ENDPOINT_BQ__")%> );
<% } %>
com.google.cloud.bigquery.BigQuery bigquery_<%=cid%> = bigQueryOptionsBuilder_<%=cid%>.build().getService();
com.google.cloud.bigquery.BigQuery bigquery_<%=cid%> = new BigQueryBuilder_<%=cid%>().newBigQuery();
/* ----END-CREATING-CLIENT (Cloud API)---- */
@@ -244,7 +253,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
/* ----END-CREATING-CLIENT (OAuth based Token)---- */
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
boolean bulkFileAlreadyExists = ElementParameterParser.getBooleanValue(node, "__BULK_FILE_ALREADY_EXIST__");
String accessKey = ElementParameterParser.getValue(node, "__GS_ACCESS_KEY__");
@@ -662,7 +671,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
}
/* ----END-CREATING-JOB (OAuth 2.0)---- */
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
/* ----START-CREATING-JOB (Cloud API)---- */
com.google.cloud.bigquery.TableId tableId_<%=cid%> = com.google.cloud.bigquery.TableId.of(<%=projectId%>, <%=dataset%>, <%=table%>);
@@ -869,6 +878,6 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
/* ----END-CREATING-JOB (Cloud API)---- */
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>

View File

@@ -45,7 +45,8 @@
<PARAMETER NAME="AUTH_MODE" FIELD="CLOSED_LIST" NUM_ROW="3" REQUIRED="true" GROUP="AUTHENTICATION" REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT" />
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -175,6 +176,7 @@
>
<ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
<ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
<ITEM NAME="GS_APPLICATION_DEFAULT_CREDENTIALS" VALUE="GS_APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -247,7 +249,7 @@
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_GS"
@@ -255,7 +257,7 @@
NUM_ROW="5"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://storage.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_BQ"
@@ -263,7 +265,7 @@
NUM_ROW="6"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="TOKEN_NAME" FIELD="FILE" NUM_ROW="8"
@@ -299,45 +301,45 @@
<IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
<IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED="true" />
<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
<IMPORT NAME="guava-32.1.2-jre.jar" MODULE="guava-32.1.2-jre.jar" MVN="mvn:com.google.guava/guava/32.1.2-jre" REQUIRED="true" />
<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED="true" />
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED="true" />
<!-- REQUIRED FOR GOOGLE STORAGE -->
<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0" REQUIRED="true" />
<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
<IMPORT NAME="httpclient-4.5.13" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED="true" />
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<!-- TODO remove it -->
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_MODE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<!-- Transitive dependencies of google-cloud-storage -->
<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED="true" />
<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-3.19.6" MODULE="protobuf-java-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.19.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-3.19.6" MODULE="protobuf-java-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.19.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED="true" />
<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED="true" />
<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED="true" />
<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-util-3.19.6" MODULE="protobuf-java-util-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.19.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-util-3.19.6" MODULE="protobuf-java-util-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.19.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id
@@ -38,6 +39,7 @@ DIE_ON_ERROR.NAME=Die on error
AUTH_TYPE.NAME=Credential type
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
GS_SERVICE_ACCOUNT_KEY.NAME=Service account key
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
GS_ACCESS_TOKEN.NAME=OAuth Access Token
AUTH_TYPE.ITEM.TOKEN=OAuth Access Token
JOBID.NAME=BigQuery JobId

View File

@@ -47,3 +47,5 @@ REGION_ENDPOINT_GROUP.NAME=Point de terminaison personnalis\u00E9
USE_REGION_ENDPOINT.NAME=Utiliser un point de terminaison personnalis\u00E9
REGION_ENDPOINT_GS.NAME=URL de l'API priv\u00E9e Google Storage
REGION_ENDPOINT_BQ.NAME=URL de l'API priv\u00E9e Google BigQuery
PROPERTY.NAME=Type de propri\u00E9t\u00E9

View File

@@ -47,3 +47,5 @@ REGION_ENDPOINT_GROUP.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A
USE_REGION_ENDPOINT.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528
REGION_ENDPOINT_GS.NAME=Google Storage Private API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery Private API URL
PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7

View File

@@ -47,3 +47,5 @@ REGION_ENDPOINT_GROUP.NAME=\u81EA\u5B9A\u4E49\u7AEF\u70B9
USE_REGION_ENDPOINT.NAME=\u4F7F\u7528\u81EA\u5B9A\u4E49\u7AEF\u70B9
REGION_ENDPOINT_GS.NAME=Google Storage \u79C1\u6709 API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery \u79C1\u6709 API URL
PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B

View File

@@ -14,10 +14,14 @@ class ServiceAccountBigQueryUtil_<%=cid%> {
return bigQuery;
}
com.google.auth.oauth2.GoogleCredentials credentials;
java.io.File credentialsFile = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream = new java.io.FileInputStream(credentialsFile)) {
credentials = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream);
}
<% if(authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) { %>
credentials = com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
<% } else { %>
java.io.File credentialsFile = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream = new java.io.FileInputStream(credentialsFile)) {
credentials = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream);
}
<% } %>
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder = com.google.cloud.bigquery.BigQueryOptions.newBuilder()
.setCredentials(credentials)

View File

@@ -295,7 +295,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
%>
//Dynamic end
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
<%@ include file="@{org.talend.designer.components.localprovider}/components/tBigQueryInput/ServiceAccountBigQueryHelper.javajet"%>
@@ -390,7 +390,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
//Dynamic end
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
if (authMode.equals("OAUTH") || authMode.equals("TOKEN")) {
@@ -441,14 +441,14 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
Object value_<%=cid%> = null;
nb_line_<%=cid%> ++;
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
for (com.google.cloud.bigquery.FieldValueList field_<%=cid %> : result_<%=cid%>.iterateAll()) {
Object value_<%=cid%>;
nb_line_<%=cid%> ++;
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>
int fieldsCount_<%=cid %> = field_<%=cid %>.size();
@@ -500,12 +500,12 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
%>
value_<%=cid%> = field_<%=cid %>.get(column_index_<%=cid%>).getV();
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
value_<%=cid%> = field_<%=cid %>.get(column_index_<%=cid%>).getValue();
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>
if(com.google.api.client.util.Data.isNull(value_<%=cid%>)) value_<%=cid%> = null;

View File

@@ -26,7 +26,7 @@ imports="
}
}
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
}
if (child_statistics_<%=cid%> != null) {
@@ -35,7 +35,7 @@ imports="
//}
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\" or \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
log4jFileUtil.retrievedDataNumberInfo(node);
// Else job has finished successfully with the results. Finish }.

View File

@@ -62,7 +62,8 @@
<PARAMETER NAME="AUTH_MODE" FIELD="CLOSED_LIST" NUM_ROW="3" REQUIRED="true" GROUP="AUTHENTICATION" REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT" />
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -188,7 +189,7 @@
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_BQ"
@@ -196,7 +197,7 @@
NUM_ROW="6"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="TOKEN_NAME" FIELD="FILE" NUM_ROW="8"
@@ -246,28 +247,28 @@
<IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
<IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED="true" />
<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
<IMPORT NAME="guava-32.1.2-jre.jar" MODULE="guava-32.1.2-jre.jar" MVN="mvn:com.google.guava/guava/32.1.2-jre" REQUIRED="true" />
<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED="true" />
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED="true" />
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<!-- TODO remove it -->
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED="true" />
<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED="true" />
<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED="true" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id

View File

@@ -35,3 +35,5 @@ REGION_ENDPOINT_GROUP.NAME=Point de terminaison personnalis\u00E9
USE_REGION_ENDPOINT.NAME=Utiliser un point de terminaison personnalis\u00E9
REGION_ENDPOINT_GS.NAME=URL de l'API priv\u00E9e Google Storage
REGION_ENDPOINT_BQ.NAME=URL de l'API priv\u00E9e Google BigQuery
PROPERTY.NAME=Type de propri\u00E9t\u00E9

View File

@@ -35,3 +35,5 @@ REGION_ENDPOINT_GROUP.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A
USE_REGION_ENDPOINT.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528
REGION_ENDPOINT_GS.NAME=Google Storage Private API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery Private API URL
PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7

View File

@@ -35,3 +35,5 @@ REGION_ENDPOINT_GROUP.NAME=\u81EA\u5B9A\u4E49\u7AEF\u70B9
USE_REGION_ENDPOINT.NAME=\u4F7F\u7528\u81EA\u5B9A\u4E49\u7AEF\u70B9
REGION_ENDPOINT_GS.NAME=Google Storage \u79C1\u6709 API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery \u79C1\u6709 API URL
PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B

View File

@@ -58,7 +58,8 @@
<PARAMETER NAME="AUTH_MODE" FIELD="CLOSED_LIST" NUM_ROW="15" REQUIRED="true" GROUP="AUTHENTICATION" REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT" />
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -186,6 +187,7 @@
SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')">
<ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
<ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
<ITEM NAME="GS_APPLICATION_DEFAULT_CREDENTIALS" VALUE="GS_APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -253,10 +255,10 @@
NAME="USE_REGION_ENDPOINT"
FIELD="CHECK"
NUM_ROW="4"
EQUIRED="true"
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER
@@ -265,7 +267,7 @@
NUM_ROW="5"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://storage.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER
@@ -275,7 +277,7 @@
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="TOKEN_NAME" FIELD="FILE" NUM_ROW="8"
@@ -301,7 +303,7 @@
<DEFAULT>","</DEFAULT>
</PARAMETER>
<PARAMETER NAME="DROP" FIELD="CHECK" REQUIRED="true" NUM_ROW="33" SHOW_IF="AUTH_MODE == 'SERVICEACCOUNT'">
<PARAMETER NAME="DROP" FIELD="CHECK" REQUIRED="true" NUM_ROW="33" SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')">
<DEFAULT>false</DEFAULT>
</PARAMETER>

View File

@@ -19,6 +19,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id
@@ -49,6 +50,7 @@ CHECK_DISK_SPACE.NAME=Check disk space
DIE_ON_ERROR.NAME=Die on error
AUTH_TYPE.NAME=Credential type
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_TYPE.ITEM.TOKEN=OAuth Access Token
GS_SERVICE_ACCOUNT_KEY.NAME=Service account key
GS_ACCESS_TOKEN.NAME=OAuth Access Token

View File

@@ -62,3 +62,5 @@ REGION_ENDPOINT_GROUP.NAME=Point de terminaison personnalis\u00E9
USE_REGION_ENDPOINT.NAME=Utiliser un point de terminaison personnalis\u00E9
REGION_ENDPOINT_GS.NAME=URL de l'API priv\u00E9e Google Storage
REGION_ENDPOINT_BQ.NAME=URL de l'API priv\u00E9e Google BigQuery
PROPERTY.NAME=Type de propri\u00E9t\u00E9

View File

@@ -62,3 +62,5 @@ REGION_ENDPOINT_GROUP.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A
USE_REGION_ENDPOINT.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528
REGION_ENDPOINT_GS.NAME=Google Storage Private API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery Private API URL
PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7

View File

@@ -62,3 +62,5 @@ REGION_ENDPOINT_GROUP.NAME=\u81EA\u5B9A\u4E49\u7AEF\u70B9
USE_REGION_ENDPOINT.NAME=\u4F7F\u7528\u81EA\u5B9A\u4E49\u7AEF\u70B9
REGION_ENDPOINT_GS.NAME=Google Storage \u79C1\u6709 API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery \u79C1\u6709 API URL
PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B

View File

@@ -179,13 +179,17 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee.getMessage());
BigQueryUtil_<%=cid%> bigQueryUtil_<%=cid%> = new BigQueryUtil_<%=cid%>(PROJECT_ID_<%=cid%>, bigqueryclient_<%=cid%>, <% if (authMode.equals("OAUTH")) { %> tokenFile_<%=cid%> <% } else { %> null <%}%>);
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
com.google.auth.oauth2.GoogleCredentials credentials_<%=cid%>;
<% if(authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) { %>
credentials_<%=cid%> = com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
<% } else { %>
java.io.File credentialsFile_<%=cid%> = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream_<%=cid%> = new java.io.FileInputStream(credentialsFile_<%=cid%>)) {
credentials_<%=cid%> = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream_<%=cid%>);
}
<% } %>
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder_<%=cid%> = com.google.cloud.bigquery.BigQueryOptions.newBuilder().setCredentials(credentials_<%=cid%>).setProjectId(<%=projectId%>);
<% if( "true".equals(ElementParameterParser.getValue(node, "__USE_REGION_ENDPOINT__")) ){ %>
@@ -195,6 +199,6 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee.getMessage());
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\" or \"OAUTH\", but it is " + authMode);
}
%>

View File

@@ -50,6 +50,7 @@
REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT"/>
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH"/>
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
@@ -156,7 +157,7 @@
NUM_ROW="4"
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_BQ"
@@ -164,7 +165,7 @@
NUM_ROW="6"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
@@ -223,28 +224,28 @@
<IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
<IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED="true" />
<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true"/>
<IMPORT NAME="guava-32.1.2-jre.jar" MODULE="guava-32.1.2-jre.jar" MVN="mvn:com.google.guava/guava/32.1.2-jre" REQUIRED="true"/>
<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED="true"/>
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED="true"/>
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<!-- TODO remove it -->
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED="true" />
<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED="true" />
<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED="true" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -78,7 +78,7 @@
insert_jobs_<%=cid%> = java.util.Collections.singletonList(insert_<%=cid%>);
}
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
com.google.cloud.bigquery.QueryJobConfiguration queryConfiguration_<%=cid%> = com.google.cloud.bigquery.QueryJobConfiguration.newBuilder(<%=query%>).setUseLegacySql(<%=useLegacySql%>).build();
com.google.cloud.bigquery.JobId jobId_<%=cid%> = com.google.cloud.bigquery.JobId.of(java.util.UUID.randomUUID().toString());
@@ -143,7 +143,7 @@
%>
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
List< ? extends IConnection> conns = node.getOutgoingSortedConnections();
@@ -184,7 +184,7 @@
Object value_<%=cid%> = null;
nb_line_<%=cid%> ++;
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
long nb_line_<%=cid%> = 0;
for (com.google.cloud.bigquery.Job job_iterable_<%=cid%> : childJobs_<%=cid%>) {
@@ -202,7 +202,7 @@
nb_line_<%=cid%> ++;
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
List<IMetadataTable> metadatas = node.getMetadataList();
@@ -228,12 +228,12 @@
%>
value_<%=cid%> = field_<%=cid %>.get(<%=i%>).getV();
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
value_<%=cid%> = field_<%=cid %>.get(<%=i%>).getValue();
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>
if(com.google.api.client.util.Data.isNull(value_<%=cid%>)) value_<%=cid%> = null;

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id

View File

@@ -32,3 +32,5 @@ REGION_ENDPOINT_GROUP.NAME=Point de terminaison personnalis\u00E9
USE_REGION_ENDPOINT.NAME=Utiliser un point de terminaison personnalis\u00E9
REGION_ENDPOINT_GS.NAME=URL de l'API priv\u00E9e Google Storage
REGION_ENDPOINT_BQ.NAME=URL de l'API priv\u00E9e Google BigQuery
PROPERTY.NAME=Type de propri\u00E9t\u00E9

View File

@@ -32,3 +32,5 @@ REGION_ENDPOINT_GROUP.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A
USE_REGION_ENDPOINT.NAME=\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u3092\u4F7F\u7528
REGION_ENDPOINT_GS.NAME=Google Storage Private API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery Private API URL
PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7

View File

@@ -32,3 +32,5 @@ REGION_ENDPOINT_GROUP.NAME=\u81EA\u5B9A\u4E49\u7AEF\u70B9
USE_REGION_ENDPOINT.NAME=\u4F7F\u7528\u81EA\u5B9A\u4E49\u7AEF\u70B9
REGION_ENDPOINT_GS.NAME=Google Storage \u79C1\u6709 API URL
REGION_ENDPOINT_BQ.NAME=Google BigQuery \u79C1\u6709 API URL
PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B

View File

@@ -31,20 +31,20 @@ imports="
}
}
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
}
}
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\"or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\" or \"OAUTH\"or \"TOKEN\", but it is " + authMode);
}
log4jFileUtil.retrievedDataNumberInfo(node);
}
}
}
if (authMode.equals("SERVICEACCOUNT")) {
if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
if (job_<%=cid%>.getStatistics().getNumChildJobs() != null) {
globalMap.put("<%=cid%>_STATISTICS_CHILD", childJobs_<%=cid%>.stream()

View File

@@ -72,13 +72,13 @@
MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
REQUIRED="true" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-databind"
MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations"
MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED="true" />
<IMPORT NAME="apache-http-client"
MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

View File

@@ -127,13 +127,13 @@
MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-databind"
MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-annotations"
MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="apache-http-client"
MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

View File

@@ -88,13 +88,13 @@
MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-databind"
MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-annotations"
MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="apache-http-client"
MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

View File

@@ -98,13 +98,13 @@
MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-databind"
MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-annotations"
MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="apache-http-client"
MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

View File

@@ -106,13 +106,13 @@
MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-databind"
MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-annotations"
MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="apache-http-client"
MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

View File

@@ -109,13 +109,13 @@
MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-databind"
MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2"
MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-annotations"
MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="apache-http-client"
MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

View File

@@ -168,7 +168,7 @@ COMPATIBILITY="ALL"
<IMPORT NAME="sts" MODULE="sts-2.5.0.jar" MVN="mvn:org.apache.jclouds.api/sts/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-core" MODULE="jclouds-core-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-core/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava" MODULE="guava-32.1.2-jre.jar" MVN="mvn:com.google.guava/guava/32.1.2-jre" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="failureaccess" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="listenablefuture" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr305" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>

View File

@@ -77,7 +77,7 @@ COMPATIBILITY="ALL"
<IMPORT NAME="sts" MODULE="sts-2.5.0.jar" MVN="mvn:org.apache.jclouds.api/sts/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-core" MODULE="jclouds-core-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-core/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava" MODULE="guava-32.1.2-jre.jar" MVN="mvn:com.google.guava/guava/32.1.2-jre" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="failureaccess" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="listenablefuture" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr305" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>

View File

@@ -49,7 +49,6 @@
<ITEM NAME="MYSQL" VALUE="MYSQL" />
<ITEM NAME="DBORACLE" VALUE="DBORACLE" />
<ITEM NAME="PARACCEL" VALUE="PARACCEL" />
<ITEM NAME="POSTGREPLUS" VALUE="POSTGREPLUS" />
<ITEM NAME="POSTGRE" VALUE="POSTGRE" />
<ITEM NAME="SQLITE" VALUE="SQLITE" />
<ITEM NAME="SYBASE" VALUE="SYBASE" />
@@ -63,7 +62,7 @@
<PARAMETER
NAME="CONNECTION_AS400"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tAS400Connection|tJDBCConnection$"
FILTER="REGEXP:^tAS400Connection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='AS400'"
@@ -73,7 +72,7 @@
<PARAMETER
NAME="CONNECTION_DB2"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tDB2Connection|tJDBCConnection$"
FILTER="REGEXP:^tDB2Connection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='DB2'"
@@ -83,7 +82,7 @@
<PARAMETER
NAME="CONNECTION_FIREBIRD"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tFirebirdConnection|tJDBCConnection$"
FILTER="REGEXP:^tFirebirdConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='FIREBIRD'"
@@ -93,7 +92,7 @@
<PARAMETER
NAME="CONNECTION_GREENPLUM"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tGreenplumConnection|tJDBCConnection$"
FILTER="REGEXP:^tGreenplumConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='GREENPLUM'"
@@ -103,7 +102,7 @@
<PARAMETER
NAME="CONNECTION_HIVE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tHiveConnection|tJDBCConnection$"
FILTER="REGEXP:^tHiveConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='HIVE'"
@@ -113,7 +112,7 @@
<PARAMETER
NAME="CONNECTION_INGRES"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tIngresConnection|tJDBCConnection$"
FILTER="REGEXP:^tIngresConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='INGRES'"
@@ -123,7 +122,7 @@
<PARAMETER
NAME="CONNECTION_INTERBASE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tInterbaseConnection|tJDBCConnection$"
FILTER="REGEXP:^tInterbaseConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='INTERBASE'"
@@ -133,7 +132,7 @@
<PARAMETER
NAME="CONNECTION_MSSQL"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tMSSqlConnection|tJDBCConnection$"
FILTER="REGEXP:^tMSSqlConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='MSSQL'"
@@ -143,7 +142,7 @@
<PARAMETER
NAME="CONNECTION_MYSQL"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tMysqlConnection|tJDBCConnection$"
FILTER="REGEXP:^tMysqlConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='MYSQL'"
@@ -153,7 +152,7 @@
<PARAMETER
NAME="CONNECTION_DBORACLE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tOracleConnection|tJDBCConnection$"
FILTER="REGEXP:^tOracleConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='DBORACLE'"
@@ -163,27 +162,17 @@
<PARAMETER
NAME="CONNECTION_PARACCEL"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tParAccelConnection|tJDBCConnection$"
FILTER="REGEXP:^tParAccelConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='PARACCEL'"
/>
<!-- Postgreplus -->
<PARAMETER
NAME="CONNECTION_POSTGREPLUS"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tPostgresPlusConnection|tJDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='POSTGREPLUS'"
/>
/>
<!-- PostgreSQL -->
<PARAMETER
NAME="CONNECTION_POSTGRE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tPostgresqlConnection|tJDBCConnection$"
FILTER="REGEXP:^tPostgresqlConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='POSTGRE'"
@@ -193,7 +182,7 @@
<PARAMETER
NAME="CONNECTION_SQLITE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tSQLiteConnection|tJDBCConnection$"
FILTER="REGEXP:^tSQLiteConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='SQLITE'"
@@ -203,7 +192,7 @@
<PARAMETER
NAME="CONNECTION_SYBASE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tSybaseConnection|tJDBCConnection$"
FILTER="REGEXP:^tSybaseConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='SYBASE'"
@@ -213,7 +202,7 @@
<PARAMETER
NAME="CONNECTION_TERADATA"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tTeradataConnection|tJDBCConnection$"
FILTER="REGEXP:^tTeradataConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='TERADATA'"
@@ -223,7 +212,7 @@
<PARAMETER
NAME="CONNECTION_VERTICA"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tVerticaConnection|tJDBCConnection$"
FILTER="REGEXP:^tVerticaConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='VERTICA'"
@@ -247,7 +236,6 @@
<DEFAULT IF="DBTYPE=='MYSQL'">mysql_id</DEFAULT>
<DEFAULT IF="DBTYPE=='DBORACLE'">oracle_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGRE'">postgres_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGREPLUS'">postgresplus_id</DEFAULT>
<DEFAULT IF="DBTYPE=='SQLITE'">sqlite_id</DEFAULT>
<DEFAULT IF="DBTYPE=='PARACCEL'">paraccel_id</DEFAULT>
<DEFAULT IF="DBTYPE=='SYBASE'">sybase_id</DEFAULT>

View File

@@ -46,9 +46,9 @@
or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='INTERBASE' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='SQLITE' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='ACCESS' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true')or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='REDSHIFT' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SNOWFLAKE' and USE_EXISTING_CONNECTION == 'true')"
or (DBTYPE=='ACCESS' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='REDSHIFT' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='SNOWFLAKE' and USE_EXISTING_CONNECTION == 'true')"
/>
<PARAMETER
@@ -74,7 +74,6 @@
<ITEM NAME="NETEZZA" VALUE="NETEZZA"/>
<ITEM NAME="ODBC" VALUE="ODBC"/>
<ITEM NAME="DBORACLE" VALUE="DBORACLE"/>
<ITEM NAME="POSTGREPLUS" VALUE="POSTGREPLUS"/>
<ITEM NAME="POSTGRE" VALUE="POSTGRE"/>
<ITEM NAME="REDSHIFT" VALUE="REDSHIFT"/>
<ITEM NAME="SNOWFLAKE" VALUE="SNOWFLAKE"/>
@@ -109,7 +108,7 @@
<PARAMETER NAME="USE_EXISTING_CONNECTION" FIELD="CHECK" NUM_ROW="30"
SHOW_IF="(DBTYPE=='MSSQL') or (DBTYPE=='MYSQL') or (DBTYPE=='DBORACLE') or (DBTYPE=='POSTGRE')
or (DBTYPE=='POSTGREPLUS') or (DBTYPE=='TERADATA') or (DBTYPE=='NETEZZA') or (DBTYPE=='AS400')
or (DBTYPE=='TERADATA') or (DBTYPE=='NETEZZA') or (DBTYPE=='AS400')
or (DBTYPE=='DB2') or (DBTYPE=='FIREBIRD') or (DBTYPE=='INFORMIX') or (DBTYPE=='INGRES')
or (DBTYPE=='SQLITE') or (DBTYPE=='SYBASE') or (DBTYPE=='ACCESS') or (DBTYPE=='GREENPLUM') or (DBTYPE=='VERTICA')
or (DBTYPE=='EXASOL') or (DBTYPE=='REDSHIFT') or (DBTYPE=='SNOWFLAKE')">
@@ -121,7 +120,7 @@
NOT_SHOW_IF="(DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE == 'ODBC') or (DBTYPE == 'JAVADB' and FRAMEWORK_TYPE=='EMBEDED')
or (DBTYPE == 'HSQLDB' and RUNNING_MODE == 'HSQLDB_INPROGRESS_PERSISTENT') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
@@ -138,7 +137,7 @@
NOT_SHOW_IF="(DBTYPE=='FIREBIRD') or (DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE == 'HSQLDB')
or (DBTYPE == 'JAVADB') or (DBTYPE == 'ODBC') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
@@ -174,7 +173,7 @@
REPOSITORY_VALUE="USERNAME" REQUIRED="true"
NOT_SHOW_IF="(DBTYPE=='SQLITE') or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
@@ -190,7 +189,7 @@
REPOSITORY_VALUE="PASSWORD" REQUIRED="true"
NOT_SHOW_IF="(DBTYPE=='SQLITE') or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
@@ -211,7 +210,7 @@
NOT_SHOW_IF="(DBTYPE=='AS400') or (DBTYPE=='FIREBIRD') or (DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE=='TERADATA')
or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE == 'JAVADB' and FRAMEWORK_TYPE=='EMBEDED') or (DBTYPE == 'ODBC')
or (DBTYPE == 'HSQLDB' and RUNNING_MODE == 'HSQLDB_INPROGRESS_PERSISTENT')
or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
@@ -229,7 +228,7 @@
FIELD="TEXT"
NUM_ROW="70"
REPOSITORY_VALUE="SCHEMA"
SHOW_IF="(DBTYPE=='DBORACLE' or DBTYPE=='POSTGRE' or DBTYPE=='POSTGREPLUS' or DBTYPE=='INFORMIX' or DBTYPE=='DB2' or DBTYPE=='GREENPLUM' or DBTYPE=='VERTICA' or DBTYPE=='MSSQL' or DBTYPE=='SYBASE'
SHOW_IF="(DBTYPE=='DBORACLE' or DBTYPE=='POSTGRE' or DBTYPE=='INFORMIX' or DBTYPE=='DB2' or DBTYPE=='GREENPLUM' or DBTYPE=='VERTICA' or DBTYPE=='MSSQL' or DBTYPE=='SYBASE'
or DBTYPE=='EXASOL' or DBTYPE=='REDSHIFT' or DBTYPE=='SNOWFLAKE')
and (USE_EXISTING_CONNECTION == 'false')"
>
@@ -543,7 +542,7 @@
FIELD="CLOSED_LIST"
NUM_ROW="50"
REPOSITORY_VALUE="DB_VERSION"
SHOW_IF="((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) and (USE_EXISTING_CONNECTION == 'false')">
SHOW_IF="(DBTYPE=='POSTGRE') and (USE_EXISTING_CONNECTION == 'false')">
<ITEMS DEFAULT="V9_X">
<ITEM NAME="PRIOR_TO_V9" VALUE="PRIOR_TO_V9" />
<ITEM NAME="V9_X" VALUE="V9_X" />
@@ -560,17 +559,6 @@
</PARAMETER>
<!--Postgre configuration end-->
<!--PostgrePlus configuration start-->
<PARAMETER
NAME="CONNECTION_POSTGREPLUS"
FIELD="COMPONENT_LIST"
FILTER="tPostgresPlusConnection"
REQUIRED="true"
NUM_ROW="30"
SHOW_IF="(DBTYPE=='POSTGREPLUS') and (USE_EXISTING_CONNECTION == 'true')"
/>
<!--PostgrePlus configuration end-->
<!--SQLite configuration start-->
<PARAMETER
NAME="CONNECTION_SQLITE"
@@ -739,7 +727,6 @@
<DEFAULT IF="DBTYPE=='MYSQL'">mysql_id</DEFAULT>
<DEFAULT IF="DBTYPE=='DBORACLE'">oracle_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGRE'">postgres_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGREPLUS'">postgresplus_id</DEFAULT>
<DEFAULT IF="DBTYPE=='SQLITE'">sqlite_id</DEFAULT>
<DEFAULT IF="DBTYPE=='TERADATA'">teradata_id</DEFAULT>
<DEFAULT IF="DBTYPE=='NETEZZA'">netezza_id</DEFAULT>
@@ -850,9 +837,9 @@
<IMPORT NAME="Driver-MSSQL-prop" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
@@ -860,7 +847,7 @@
<IMPORT NAME="asm" MODULE="asm-9.5.jar" MVN="mvn:org.ow2.asm/asm/9.5" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.30.2.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.30.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="Driver-MYSQL5" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='MYSQL') and (DB_MYSQL_VERSION=='MYSQL_5')"/>
<IMPORT NAME="Driver-MYSQL8" MODULE="mysql-connector-j-8.0.33.jar" MVN="mvn:com.mysql/mysql-connector-j/8.0.33" REQUIRED_IF="(DB_MYSQL_VERSION == 'MYSQL_8') AND (USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MYSQL')" />
@@ -868,8 +855,8 @@
<IMPORT NAME="Driver-Oracle11g" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-19.19.0.0.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc8/19.19.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.26.jar" MVN="mvn:org.postgresql/postgresql/42.2.26" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.6.0.jar" MVN="mvn:org.postgresql/postgresql/42.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((DBTYPE=='POSTGRE') AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-FIREBIRD" MODULE="jaybird-full-2.1.1.jar" MVN="mvn:org.talend.libraries/jaybird-full-2.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jdbc.firebird/lib/jaybird-full-2.1.1.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='FIREBIRD')" />
<IMPORT NAME="Driver-HSQLDb" MODULE="hsqldb-2.7.1.jar" MVN="mvn:org.hsqldb/hsqldb/2.7.1" REQUIRED_IF="DBTYPE=='HSQLDB'"/>
<IMPORT NAME="Driver-INFORMIX-JDBC" MODULE="ifxjdbc.jar" MVN="mvn:org.talend.libraries/ifxjdbc/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />

View File

@@ -176,7 +176,7 @@ abstract class Manager {
}
createTableSQL.append(suffix);
} else {
boolean isPostgresishDB = ("postgres_id".equalsIgnoreCase(getDBMSId()) || "postgresplus_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) );
boolean isPostgresishDB = ("postgres_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) );
if(!lengthIgnored) {
if (isPostgresishDB && metadataColumn.getLength() == null) {
}else {
@@ -1354,69 +1354,6 @@ class PostgreManager extends Manager {
return javaCode.toString();
}
}
class PostgrePlusManager extends Manager {
private String host;
private String port;
private String dbSchema;
private boolean useExistingConnection;
private String connection;
public PostgrePlusManager(String host, String port, String dbName, String tableName, String dbSchema, String userName, boolean useExistingConnection, String connection, String cid, String additionalParams) {
super(dbName, tableName, userName, cid, additionalParams);
this.host = host;
this.port = port;
this.dbSchema = dbSchema;
this.useExistingConnection = useExistingConnection;
this.connection = connection;
}
protected String getDriver() {
return "org.postgresql.Driver";
}
public String getSpecificConnectionURL() {
return "\"jdbc:postgresql://\" + " + host + " + \":\" + " + port + " + \"/\" + " + dbName;
}
public String getConnection() {
StringBuilder javaCode = new StringBuilder();
if(useExistingConnection) {
javaCode.append(retrieveTable());
javaCode.append("java.sql.Connection conn_" + cid + " = (java.sql.Connection)globalMap.get(\"conn_" + connection + "\");");
} else {
javaCode.append(super.getConnection());
}
return javaCode.toString();
}
protected String getDBMSId() {
return "postgresplus_id";
}
protected String getLProtectedChar() {
return "\\\"";
}
protected String getRProtectedChar() {
return "\\\"";
}
public String closeConnection() {
StringBuilder javaCode = new StringBuilder();
if(useExistingConnection) {
javaCode.append("");
} else {
javaCode.append(super.closeConnection());
}
return javaCode.toString();
}
protected String retrieveTable() {
StringBuilder javaCode = new StringBuilder();
javaCode.append(super.retrieveTable());
if(useExistingConnection) {
javaCode.append("String dbSchema_" + cid + " = (String)globalMap.get(\"schema_" + connection + "\");\r\n");
} else {
javaCode.append("String dbSchema_" + cid + " = " + dbSchema + ";\r\n");
}
javaCode.append("if(dbSchema_" + cid + " != null && dbSchema_" + cid + ".trim().length() != 0) {");
javaCode.append("tableName_" + cid + " = dbSchema_" + cid + " + \"" + getLProtectedChar() + "." + getRProtectedChar() + "\" + tableName_" + cid + ";\r\n");
javaCode.append("}");
return javaCode.toString();
}
}
class SQLiteManager extends Manager {
private boolean useExistingConnection;
private String connection;
@@ -1695,7 +1632,7 @@ class TeradataManager extends Manager {
createTableSQL.append(suffix);
} else {
if(!lengthIgnored) {
if (("postgres_id".equalsIgnoreCase(getDBMSId()) || "postgresplus_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
if (("postgres_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
}else {
prefix = "(";
suffix = ") ";
@@ -1714,7 +1651,7 @@ class TeradataManager extends Manager {
createTableSQL.append(comma + precision);
}
if (("postgres_id".equalsIgnoreCase(getDBMSId()) || "postgresplus_id".equalsIgnoreCase(getDBMSId()) ||"greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
if (("postgres_id".equalsIgnoreCase(getDBMSId()) ||"greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
} else {
createTableSQL.append(suffix);
}
@@ -2339,15 +2276,6 @@ class ManagerFactory {
boolean tempTable = ("true").equals(ElementParameterParser.getValue(node, "__TEMPTABLE__"));
boolean unloggedTable = ("true").equals(ElementParameterParser.getValue(node, "__UNLOGGED__"));
manager = new PostgreManager(host, port, dbName, tableName, dbSchema, userName, useExistingConnection, connection, cid, tempTable, unloggedTable, additionalParams);
} else if(("POSTGREPLUS").equals(dbType)) {
String host = ElementParameterParser.getValue(node, "__HOST__");
String port = ElementParameterParser.getValue(node, "__PORT__");
String dbSchema = ElementParameterParser.getValue(node, "__SCHEMA_DB__");
String dbName = ElementParameterParser.getValue(node, "__DBNAME__");
String userName = ElementParameterParser.getValue(node, "__USER__");
boolean useExistingConnection = ("true").equals(ElementParameterParser.getValue(node, "__USE_EXISTING_CONNECTION__"));
String connection = stringUtil.getString(ElementParameterParser.getValue(node, "__CONNECTION_POSTGREPLUS__"));
manager = new PostgrePlusManager(host, port, dbName, tableName, dbSchema, userName, useExistingConnection, connection, cid, additionalParams);
} else if(("SQLITE").equals(dbType)) {
String dbName = ElementParameterParser.getValue(node, "__DBFILE_SQLITE__");
String userName = ElementParameterParser.getValue(node, "__USER__");
@@ -2446,7 +2374,7 @@ if(columnList != null && columnList.size() > 0) {
String cid = node.getUniqueName();
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
boolean tableNameCaseSensitive=false;
if("DB2".equalsIgnoreCase(dbType)||"POSTGRE".equalsIgnoreCase(dbType)||"POSTGREPLUS".equalsIgnoreCase(dbType)||"GREENPLUM".equalsIgnoreCase(dbType)){
if("DB2".equalsIgnoreCase(dbType)||"POSTGRE".equalsIgnoreCase(dbType)||"GREENPLUM".equalsIgnoreCase(dbType)){
tableNameCaseSensitive=true;
}
if(("HSQLDB").equals(dbType)){
@@ -2555,7 +2483,7 @@ if(columnList != null && columnList.size() > 0) {
}
}
<%
} else if ("GREENPLUM".equalsIgnoreCase(dbType) || "POSTGRE".equalsIgnoreCase(dbType) || "POSTGREPLUS".equalsIgnoreCase(dbType)) {
} else if ("GREENPLUM".equalsIgnoreCase(dbType) || "POSTGRE".equalsIgnoreCase(dbType)) {
if ("true".equals(ElementParameterParser.getValue(node, "__TEMPTABLE__"))) {
%>
java.sql.PreparedStatement tempTablePs_<%=cid %> = conn_<%=cid %>.prepareStatement("SELECT * FROM information_schema.tables WHERE table_type='LOCAL TEMPORARY' AND table_name = ?");

View File

@@ -96,7 +96,7 @@ DB_MYSQL_VERSION.ITEM.MYSQL_5=Mysql 5
DB_MYSQL_VERSION.ITEM.MYSQL_8=Mysql 8
DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
DB_POSTGRE_VERSION.NAME=DB Version
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=Prior to v9
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=Prior to v9 (Deprecated)
DB_POSTGRE_VERSION.ITEM.V9_X=v9 and later
QUERY.NAME=Query
CREATE_TABLE_TYPE.NAME=Create

View File

@@ -96,7 +96,7 @@ DB_MYSQL_VERSION.ITEM.MYSQL_5=MySQL 5
DB_MYSQL_VERSION.ITEM.MYSQL_8=MySQL 8
DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
DB_POSTGRE_VERSION.NAME=Version de la base de donn\u00E9es
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=Ant\u00E9rieure \u00E0 la v9
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=Ant\u00E9rieure \u00E0 la v9 (d\u00E9pr\u00E9ci\u00E9e)
DB_POSTGRE_VERSION.ITEM.V9_X=V9 et plus
QUERY.NAME=Requ\u00EAte
CREATE_TABLE_TYPE.NAME=Cr\u00E9er

View File

@@ -96,7 +96,7 @@ DB_MYSQL_VERSION.ITEM.MYSQL_5=Mysql 5
DB_MYSQL_VERSION.ITEM.MYSQL_8=Mysql8
DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
DB_POSTGRE_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=v9\u4EE5\u524D
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=v9\u4EE5\u524D(\u975E\u63A8\u5968)
DB_POSTGRE_VERSION.ITEM.V9_X=v9\u4EE5\u964D
QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
CREATE_TABLE_TYPE.NAME=\u306E\u4F5C\u6210

View File

@@ -96,7 +96,7 @@ DB_MYSQL_VERSION.ITEM.MYSQL_5=Mysql 5
DB_MYSQL_VERSION.ITEM.MYSQL_8=Mysql 8
DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
DB_POSTGRE_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=v9 \u4E4B\u524D\u7248\u672C
DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=v9 \u4E4B\u524D\u7684\u7248\u672C (\u5DF2\u5F03\u7528)
DB_POSTGRE_VERSION.ITEM.V9_X=v9 \u53CA\u66F4\u65B0\u7248\u672C
QUERY.NAME=\u67E5\u8BE2
CREATE_TABLE_TYPE.NAME=\u521B\u5EFA

View File

@@ -61,7 +61,7 @@
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
REQUIRED="true" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED="true" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -71,7 +71,7 @@
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -85,7 +85,7 @@
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -83,7 +83,7 @@
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -110,7 +110,7 @@
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -36,9 +36,9 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="jackson-databind-2.13.4.2.jar" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.4.jar" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.13.4.jar" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.14.3.jar" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED="true" />
<IMPORT NAME="jackson-core-2.14.3.jar" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.14.3.jar" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED="true" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -200,9 +200,9 @@
<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.4.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -212,7 +212,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.30.2.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.30.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -56,7 +56,7 @@
<PARAMETER
NAME="CONNECTION"
FIELD="COMPONENT_LIST"
REQUIRED="true" FILTER="REGEXP:^tJDBCConnection|tSnowflakeConnection|tSAPHanaConnection|tDeltaLakeConnection$"
REQUIRED="true" FILTER="REGEXP:^JDBCConnection|tSnowflakeConnection|tSAPHanaConnection|tDeltaLakeConnection$"
NUM_ROW="2"
SHOW_IF="(#LINK@CONNECTOR.OUT.TABLE_REF == '0') AND (USE_EXISTING_CONNECTION == 'true')"
DYNAMIC_SETTINGS="true"/>

View File

@@ -221,7 +221,7 @@
} else if("MYSQL".equals(dbType)){
return "`";
}
String[] array_types = new String[]{"DB2","GREENPLUM","POSTGRE","POSTGREPLUS","PARACCEL","INGRES","SQLITE","TERADATA","INTERBASE"};
String[] array_types = new String[]{"DB2","GREENPLUM","POSTGRE","PARACCEL","INGRES","SQLITE","TERADATA","INTERBASE"};
for(String db :array_types){
if(db.equals(dbType)){
return "\\\"";

View File

@@ -189,7 +189,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.26.jar" MVN="mvn:org.postgresql/postgresql/42.2.26" REQUIRED_IF="DB_VERSION =='V9_X' AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.6.0.jar" MVN="mvn:org.postgresql/postgresql/42.6.0" REQUIRED_IF="DB_VERSION =='V9_X' AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9' AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -35,5 +35,5 @@ LINK_STYLE.ITEM.BEZIER_CURVE=Bezier curve
LINK_STYLE.ITEM.LINE=Line (fastest)
CONNECTION.NAME=Component List
DB_VERSION.NAME=DB Version
DB_VERSION.ITEM.PRIOR_TO_V9=Prior to v9
DB_VERSION.ITEM.PRIOR_TO_V9=Prior to v9 (Deprecated)
DB_VERSION.ITEM.V9_X=v9 and later

View File

@@ -35,5 +35,5 @@ LINK_STYLE.ITEM.BEZIER_CURVE=Courbe de B\u00E9zier
LINK_STYLE.ITEM.LINE=Ligne (rapide)
CONNECTION.NAME=Liste des composants
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.PRIOR_TO_V9=Ant\u00E9rieure \u00E0 la V9
DB_VERSION.ITEM.PRIOR_TO_V9=Ant\u00E9rieure \u00E0 la v9 (d\u00E9pr\u00E9ci\u00E9e)
DB_VERSION.ITEM.V9_X=V9 et plus

View File

@@ -35,5 +35,5 @@ LINK_STYLE.ITEM.BEZIER_CURVE=\u30D9\u30B8\u30A7\u66F2\u7DDA
LINK_STYLE.ITEM.LINE=\u76F4\u7DDA(\u6700\u901F)
CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
DB_VERSION.ITEM.PRIOR_TO_V9=v9\u4EE5\u524D
DB_VERSION.ITEM.PRIOR_TO_V9=v9\u4EE5\u524D(\u975E\u63A8\u5968)
DB_VERSION.ITEM.V9_X=v9\u4EE5\u964D

View File

@@ -35,5 +35,5 @@ LINK_STYLE.ITEM.BEZIER_CURVE=\u8D1D\u585E\u5C14\u66F2\u7EBF
LINK_STYLE.ITEM.LINE=\u76F4\u7EBF (\u6700\u5FEB)
CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
DB_VERSION.ITEM.PRIOR_TO_V9=v9 \u4E4B\u524D\u7248\u672C
DB_VERSION.ITEM.PRIOR_TO_V9=v9 \u4E4B\u524D\u7684\u7248\u672C (\u5DF2\u5F03\u7528)
DB_VERSION.ITEM.V9_X=v9 \u53CA\u66F4\u65B0\u7248\u672C

View File

@@ -65,5 +65,5 @@ USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
CONNECTION.NAME=\u63A5\u7D9A
USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30E2\u30FC\u30C9\u306E\u4F7F\u7528
USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA

View File

@@ -346,7 +346,15 @@ COMPATIBILITY="ALL"
NUM_ROW="100" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="USE_STRICT_REPLY_PARSING">
<DEFAULT>true</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="RENAME_AFTER"
FIELD="CHECK"
NUM_ROW="105"
SHOW="true"
>
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="CONFIG_CLIENT"
FIELD="CHECK"

View File

@@ -21,6 +21,7 @@
String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
String useExistingConn = ElementParameterParser.getValue(node, "__USE_EXISTING_CONNECTION__");
boolean sftp = false;
boolean renameAfterUpload = ("true").equals(ElementParameterParser.getValue(node, "__RENAME_AFTER__"));
boolean ftps = false;
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
boolean useGlob = ("true").equals(ElementParameterParser.getValue(node, "__PERL5_REGEX__"));
@@ -105,12 +106,21 @@ try{
}
String destRename_<%= cid %> = map<%=cid %>.get(key<%=cid %>);
final String dest_<%=cid%>;
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + listings<%=cid %>[m<%=cid %>].getName();
}
else {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + destRename_<%= cid %>;
}
<%
if (renameAfterUpload) {
%>
dest_<%=cid%> = remoteDir_<%=cid%>+"/"+listings<%=cid %>[m<%=cid %>].getName();
<%
} else {
%>
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + listings<%=cid %>[m<%=cid %>].getName();
} else {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + destRename_<%= cid %>;
}
<%
}
%>
try{
c_<%=cid%>.put(listings<%=cid %>[m<%=cid %>].getAbsolutePath(), dest_<%=cid%>, monitor<%=cid%>, mode<%=cid%>);
@@ -171,6 +181,32 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
<%}%>
System.err.println("No matches found for mask '" + key<%=cid %> + "'!");
}
<%
if (renameAfterUpload) {
%>
//do rename
if (!((map<%=cid %>.get(key<%=cid %>) == null) || map<%=cid %>.get(key<%=cid %>).isEmpty() || key<%=cid %>.equals(map<%=cid %>.get(key<%=cid %>)))){
<%
if(("overwrite").equals(sftpoverwrite) || ("resume").equals(sftpoverwrite)){
%>
try{
c_<%=cid%>.rm(<%=remotedir %>+"/"+map<%=cid %>.get(key<%=cid %>));
}catch(com.jcraft.jsch.SftpException e_<%=cid%>){
}
<%
}
%>
try{
c_<%=cid%>.rename(<%=remotedir %>+"/"+key<%=cid %>, <%=remotedir %>+"/"+map<%=cid %>.get(key<%=cid %>));
globalMap.put("<%=cid %>_CURRENT_STATUS", "File rename OK.");
}catch(com.jcraft.jsch.SftpException e_<%=cid%>){
globalMap.put("<%=cid %>_CURRENT_STATUS", "File rename fail.");
throw e_<%=cid%>;
}
}
<%
}
%>
}
<%
@@ -292,12 +328,21 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
final String destRename_<%= cid %> = map<%=cid %>.get(key<%=cid %>);
final String dest_<%=cid%>;
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
<%
if (renameAfterUpload) {
%>
dest_<%=cid%> = listings<%=cid %>[m<%=cid %>].getName();
<%
} else {
%>
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
dest_<%=cid%> = listings<%=cid %>[m<%=cid %>].getName();
} else {
dest_<%=cid%> = destRename_<%= cid %>;
}
<%
}
else {
dest_<%=cid%> = destRename_<%= cid %>;
}
%>
globalMap.put("<%=cid %>_CURRENT_FILE_EXISTS", remoteExistsFiles_<%=cid%>.contains(dest_<%=cid%>));
<%
@@ -360,6 +405,26 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
+ file_in_localDir_<%=cid%>.length() + " bytes upload successfully");
<%
}
%>
<%
if (renameAfterUpload) {
%>
//do rename
if (destRename_<%= cid %> != null && !destRename_<%= cid %>.isEmpty() && ! destRename_<%= cid %>.equals(dest_<%=cid%>)) {
<%
if(!"never".equals(ftpsoverwrite)){
%>
if ((remoteExistsFiles_<%=cid%>.contains(destRename_<%=cid%>))){
ftpExecutorAndChecker_<%=cid %>.executeAndCheckResult(() -> effectivelyFinalFtp_<%=cid %>.deleteFile(destRename_<%= cid %>));
}
<%
}
%>
ftpExecutorAndChecker_<%=cid %>.executeAndCheckResult(() -> effectivelyFinalFtp_<%=cid %>.rename(dest_<%=cid%>, destRename_<%= cid %>));
globalMap.put("<%=cid %>_CURRENT_STATUS", "File rename OK.");
}
<%
}
%>
nb_file_<%=cid%>++;
}

View File

@@ -71,3 +71,4 @@ CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Client parameter
CLIENT_PARAMETERS.ITEM.VALUE=Value
RENAME_AFTER.NAME=Rename after upload/on remote

View File

@@ -38,6 +38,10 @@
int dynamic_index = -1;
boolean hasDynamic = false;
int dynamicColumnlength = 100;
String dynamic = ElementParameterParser.getValue(node, "__DYNAMIC__");
final boolean useExistingDynamic = "true".equals(ElementParameterParser.getValue(node, "__USE_EXISTING_DYNAMIC__"));
final String useHeaderAsIs = ElementParameterParser.getValue(node, "__USE_HEADER_AS_IS__");
final String dyn = dynamic+"_DYNAMIC";
List<IMetadataColumn> columnList = null;
List<IMetadataTable> metadatas = node.getMetadataList();
IMetadataTable metadata = null;
@@ -73,32 +77,46 @@
%>
if(isFirstCheckDyn_<%=cid %>){// for the header line
<%
if(isCsv){
if(useExistingDynamic){
%>
int colsLen_<%=cid %> = row<%=cid %>.length;
dynamic_<%=cid %> = (routines.system.Dynamic)globalMap.get("<%=dyn%>");
isFirstCheckDyn_<%=cid %> = false;
<%
}else{
%>
int colsLen_<%=cid %> = fid_<%=cid %>.getColumnsCountOfCurrentRow();
} else {
if(isCsv){
%>
int colsLen_<%=cid %> = row<%=cid %>.length;
<%
}else{
%>
int colsLen_<%=cid %> = fid_<%=cid %>.getColumnsCountOfCurrentRow();
<%
}
%>
for (int i = <%=dynamic_index-1%>; i < colsLen_<%=cid %>-<%=colLen-dynamic_index%>; i++) {
routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
if(<%=useHeaderAsIs%>) {
dynamicMetadata_<%=cid%>.setName(<%if(isCsv){%>row<%=cid %>[i]<%}else{%>fid_<%=cid %>.get(i)<%}%>);
} else {
dynamicMetadata_<%=cid%>.setName(<%if(isCsv){%>row<%=cid %>[i]<%}else{%>fid_<%=cid %>.get(i)<%}%>.replaceAll("[ .-]+", "_"));
}
dynamicMetadata_<%=cid%>.setDbName(dynamicMetadata_<%=cid%>.getName());
dynamicMetadata_<%=cid%>.setType("id_String");
dynamicMetadata_<%=cid%>.setDbType("VARCHAR");
dynamicMetadata_<%=cid%>.setLength(<%=dynamicColumnlength%>);
dynamicMetadata_<%=cid%>.setPrecision(0);
dynamicMetadata_<%=cid%>.setNullable(true);
dynamicMetadata_<%=cid%>.setKey(false);
dynamicMetadata_<%=cid%>.setSourceType(routines.system.DynamicMetadata.sourceTypes.demilitedFile);
dynamicMetadata_<%=cid%>.setColumnPosition(i);
dynamic_<%=cid%>.metadatas.add(dynamicMetadata_<%=cid%>);
}
isFirstCheckDyn_<%=cid %> = false;
continue;
<%
}
%>
for (int i = <%=dynamic_index-1%>; i < colsLen_<%=cid %>-<%=colLen-dynamic_index%>; i++) {
routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
dynamicMetadata_<%=cid%>.setName(<%if(isCsv){%>row<%=cid %>[i]<%}else{%>fid_<%=cid %>.get(i)<%}%>.replaceAll("[ .-]+", "_"));
dynamicMetadata_<%=cid%>.setDbName(dynamicMetadata_<%=cid%>.getName());
dynamicMetadata_<%=cid%>.setType("id_String");
dynamicMetadata_<%=cid%>.setDbType("VARCHAR");
dynamicMetadata_<%=cid%>.setLength(<%=dynamicColumnlength%>);
dynamicMetadata_<%=cid%>.setPrecision(0);
dynamicMetadata_<%=cid%>.setNullable(true);
dynamicMetadata_<%=cid%>.setKey(false);
dynamicMetadata_<%=cid%>.setSourceType(routines.system.DynamicMetadata.sourceTypes.demilitedFile);
dynamicMetadata_<%=cid%>.setColumnPosition(i);
dynamic_<%=cid%>.metadatas.add(dynamicMetadata_<%=cid%>);
}
isFirstCheckDyn_<%=cid %> = false;
continue;
}
<%
}
@@ -236,7 +254,9 @@
int fieldCount = <%=sourceValueName%>.getColumnsCountOfCurrentRow();
dynamic_column_count_<%=cid%> = <%=dynamicName%>.getColumnCount();
for (int i = 0; i < dynamic_column_count_<%=cid%> ; i++) {
<%if(!useExistingDynamic){%>
for (int i = 0; i < dynamic_column_count_<%=cid%>; i++) {
if ((<%=dynamic_index%>+i) < fieldCount){
<%=targetConnName %>.<%=column.getLabel() %>.addColumnValue(<%=sourceValueName%>.get(<%=dynamic_index%>+i)<%=(isTrimAll || (!trimSelects.isEmpty() && ("true").equals(trimSelects.get(valueN).get("TRIM"))))?".trim()":"" %>);
}
@@ -244,6 +264,20 @@
<%=targetConnName %>.<%=column.getLabel() %>.addColumnValue("");
}
}
<%} else {%>
int maxColumnNumberInDynamicColumn_<%=cid%> = fieldCount - <%=sizeListColumns - 1%>;
for (int i = 0; i < dynamic_column_count_<%=cid%>; i++) {
Object v_<%=cid%> = null;
final routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = <%=dynamicName%>.getColumnMetadata(i);
if ((<%=dynamic_index%>+i) < fieldCount && i < maxColumnNumberInDynamicColumn_<%=cid%>){<%//B1 start%>
final String tempValue_<%=cid%> = <%=sourceValueName%>.get(<%=dynamic_index%>+i)<%=(isTrimAll || (!trimSelects.isEmpty() && ("true").equals(trimSelects.get(valueN).get("TRIM"))))?".trim()":"" %>;
final String separator_<%=cid%> = <%= fieldSeparator %>;
<%@ include file="./use_existing_schema.javajet"%>
}
dynamic_column_count_<%=cid%> = maxColumnNumberInDynamicColumn_<%=cid%>;
<%}%>
<%
}else{
@@ -498,8 +532,8 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
continue;
}
try {
fid_<%=cid %> = new org.talend.fileprocess.FileInputDelimited(zis_<%=cid %>, <%=encoding %>,<%=fieldSeparator %>,<%=rowSeparator %>,<%=removeEmptyRowFlag %>,<%=header %><%=hasDynamic?"-1":""%>,<%=footer %>,
<%if(hasDynamic){%>
fid_<%=cid %> = new org.talend.fileprocess.FileInputDelimited(zis_<%=cid %>, <%=encoding %>,<%=fieldSeparator %>,<%=rowSeparator %>,<%=removeEmptyRowFlag %>,<%=header %><%=(hasDynamic&&!useExistingDynamic)?"-1":""%>,<%=footer %>,
<%if(hasDynamic&&!useExistingDynamic){%>
(limit_<%=cid%> > 0) ? limit_<%=cid%>+1 : limit_<%=cid%>
<%} else {%>
limit_<%=cid%>
@@ -525,7 +559,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
%>
}
try {
fid_<%=cid %> = new org.talend.fileprocess.FileInputDelimited(<%=filename %>, <%=encoding %>,<%=fieldSeparator %>,<%=rowSeparator %>,<%=removeEmptyRowFlag %>,<%=header %><%=hasDynamic?"-1":""%>,<%=footer %>,<%if(hasDynamic){%>
fid_<%=cid %> = new org.talend.fileprocess.FileInputDelimited(<%=filename %>, <%=encoding %>,<%=fieldSeparator %>,<%=rowSeparator %>,<%=removeEmptyRowFlag %>,<%=header %><%=(hasDynamic&&!useExistingDynamic)?"-1":""%>,<%=footer %>,<%if(hasDynamic&&!useExistingDynamic){%>
(limit_<%=cid%> > 0) ? limit_<%=cid%>+1 : limit_<%=cid%>
<%} else {%>
limit_<%=cid%>
@@ -884,6 +918,8 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ex_<%=cid%>.getMessage());
<%=targetConnName %>.<%=column.getLabel() %> = <%=dynamicName%>.copyMetadata();
}
int fieldCount = <%=sourceValueName%>.length;
<%if(!useExistingDynamic){%>
for (int i = 0; i < dynamic_column_count_<%=cid%>; i++) {
if ((<%=dynamic_index%>+i) < fieldCount) {
<%=targetConnName %>.<%=column.getLabel() %>.addColumnValue(<%=sourceValueName%>[<%=dynamic_index%>+i]);
@@ -891,6 +927,21 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ex_<%=cid%>.getMessage());
<%=targetConnName %>.<%=column.getLabel() %>.addColumnValue("");
}
}
<%} else {%>
int maxColumnNumberInDynamicColumn_<%=cid%> = fieldCount - <%=columnSize - 1%>;
for (int i = 0; i < dynamic_column_count_<%=cid%>; i++) {
Object v_<%=cid%> = null;
final routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = <%=dynamicName%>.getColumnMetadata(i);
if ((<%=dynamic_index%>+i) < fieldCount && i < maxColumnNumberInDynamicColumn_<%=cid%>){<%//B1 start%>
final String tempValue_<%=cid%> = <%=sourceValueName%>[<%=dynamic_index%>+i];
final String separator_<%=cid%> = String.valueOf(fieldSeparator_<%=cid %>_ListType[0]);
<%@ include file="./use_existing_schema.javajet"%>
}
dynamic_column_count_<%=cid%> = maxColumnNumberInDynamicColumn_<%=cid%>;
<%}%>
<%
}
}
@@ -1285,7 +1336,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
}
if(limit<%=cid%> != 0){
for(currentLine<%=cid %>=0;currentLine<%=cid %> < <%= header %><%=hasDynamic?"-1":""%>;currentLine<%=cid %>++){
for(currentLine<%=cid %>=0;currentLine<%=cid %> < <%= header %><%=(hasDynamic&&!useExistingDynamic)?"-1":""%>;currentLine<%=cid %>++){
csvReader<%=cid %>.readNext();
}
}

Some files were not shown because too many files have changed in this diff Show More