Compare commits

...

139 Commits

Author SHA1 Message Date
firefryy
7d9a6523f2 fix(TBD-8343): NoSuchMethodError when Having tGSConnection and tS3Connection Components Within one Job # 2019-04-16 16:41:14 +02:00
wang wei
8bdbf54702 fix(TDI-41894): Randomly the job fails with "java.security.SignatureException: Invalid encoding for signature" error. (#3323) 2019-04-11 10:30:27 +08:00
hcyi
5a31dee1e6 fix(TUP-22521):tHiveMap- Unexpected SQL syntax for 'case when (#3373)
...then....else' condition.
2019-04-08 15:26:29 +08:00
Jane Ding
54ea80c057 fix(TUP-21920)Nullpointer on build job (#3336) (#3369)
https://jira.talendforge.org/browse/TUP-21920
Loop dependency classpath issue caused main class not found
2019-04-03 16:20:09 +08:00
Jane Ding
026da45e5f fix(TUP-22269)Twebservice throwing Null Pointer Exception (#3364) (#3367)
https://jira.talendforge.org/browse/TUP-22269
2019-04-03 10:47:51 +08:00
Zhiwei Xue
8008c962eb fix(TUP-22438):Null pointer exception when executing the jobs. (#3365) 2019-04-03 10:39:20 +08:00
wang wei
8434786772 fix(TDI-42072): NullPointerException when using the tDie component in the child job and execute the job from the parent job.(#3352) 2019-04-02 16:17:17 +08:00
Jane Ding
9b6cc94bb3 fix(TUP-22342)Joblet referring to objects that do not exist (#3355) (#3358)
https://jira.talendforge.org/browse/TUP-22342
2019-04-02 15:32:57 +08:00
slushatel
5d8beaf970 feat(TDI-41963): change jdbc driver version from 1.2.16.1027 to 1.2.2… (#3327)
* feat(TDI-41963): change jdbc driver version from 1.2.16.1027 to 1.2.20.1043

* feat(TDI-41963): change redshift module name to "redshift-jdbc42-no-awssdk-1.2.20.1043.jar"

(cherry picked from commit 2307f13545)
2019-04-01 15:02:25 +03:00
Dmytro Sylaiev
4767634e17 fix(TDI-42024): Change execProt and execPBSZ order (#3333) 2019-04-01 13:00:52 +03:00
wang wei
9d2393ac06 fix(TDI-41898): Comment in the query in tJDBCInput component does not work if the job is migrated from 6.2.1 to 7.1.1(#3334) 2019-03-28 14:15:16 +08:00
Jane Ding
8dcab9ecc7 fix(TUP-22269)Twebservice throwing Null Pointer Exception (#3349) (#3351)
https://jira.talendforge.org/browse/TUP-22269
2019-03-28 11:46:56 +08:00
sponomarova
4aabe7d7ec fix(TBD-8496): field separator for service account bigquery (#3329) (#3341) 2019-03-22 15:32:53 +02:00
sponomarova
3cc9e21102 fix(TBD-8484): REQUIRED/NULLABLE columns are created according to schema (#3324) (#3340) 2019-03-22 14:44:16 +02:00
sponomarova
af92dc5b76 Hliashchuk/fix/tbd 8356 bigquery empty strings (#3322) (#3339)
* fix(TBD-8356): empty strings handling in bigquery

* fix(TBD-8356): service account empty strings support
2019-03-22 14:44:02 +02:00
sponomarova
bc0e2f7260 fix(TBD-7153): Fixed missing mappings for BigQuery (#3291) (#3337) 2019-03-22 12:51:20 +02:00
apoltavtsev
7cc6f6ac15 TESB-24730 Services no longer accessible ( NPE) after route deployment 2019-03-21 09:50:15 +03:00
Denis Sergent
2751dfe852 TESB-25045 Authorize Docker Build for job with tRESTClient (#3328)
Fix for side effect disabling Docker build
2019-03-20 16:13:36 +01:00
Vladimir Bogatyrov
16aa76f641 [TESB-25164] Intermittent "ClassNotFoundException: javax.mail.Address" errors 2019-03-20 09:25:12 +02:00
wang wei
692dcc9d02 fix(TDI-41188): map Snowflake Time type to Talend Date instead of Talend Integer (#2945) (#3325) 2019-03-20 14:17:10 +08:00
chmyga
f72e50612c fix(TDI-41951): special chars in column comment (#3318)
* Use text escape method usage in SPSOutput and SalesforceWaveBulkExec components
2019-03-19 14:36:45 +02:00
kjwang-talend
ffdf68dc06 kjwang/Fix-TUP-21903 tSalesForceConnection fix junit (#3314) (#3316)
https://jira.talendforge.org/browse/TUP-21903
2019-03-15 14:59:09 +08:00
kjwang-talend
686c47fa3e fix(TUP-21903):tSalesForceConnection JWT flow does not work with Context (#3254) (#3310)
* fix(TUP-21903):tSalesForceConnection JWT flow does not work with Context
group variable set for connection type Oauth.
2019-03-13 16:34:17 +08:00
pyzhou
5b4a39fab6 fix(TDI-41789): Redshift change migration logic (#3304)
Conflicts:
	main/plugins/org.talend.repository/plugin.xml
2019-03-12 17:03:30 +08:00
pyzhou
db3131e579 Pyzhou/tdi 41910 t s3 check connection (#3303)
* fix(TDI-41910):tS3Connecyion uncheck connection

* add logic to divide job from 6.3.0 or before
2019-03-12 16:34:48 +08:00
hcyi
b3d6f5b488 feat(TUP-21495):Support MFA on studio for the Cloud. (#3253) (#3307)
* feat(TUP-21495):Support MFA on studio for the Cloud.

* feat(TUP-21495):improve for Support MFA on studio for the Cloud.

* feat(TUP-21495):improve for Support MFA on studio for the Cloud.

* feat(TUP-21495):improve for connection GUI part.

* fix(TUP-22063)[bug] when use different cloud type,click ... to fetch
(#3270)

* fix(TUP-22063)[bug] when use different cloud type,click ... to fetch
token will all open the same url.
https://jira.talendforge.org/browse/TUP-22063

* fix(TUP-22063)[bug] when use different cloud type,click ... to fetch
token will all open the same url.
https://jira.talendforge.org/browse/TUP-22063

* fix(TUP-22063)[bug] when use different cloud type,click ... to fetch
token will all open the same url.
https://jira.talendforge.org/browse/TUP-22063

* fix(TUP-22063)[bug] when use different cloud type,click ... to fetch
(#3274)

token will all open the same url.
https://jira.talendforge.org/browse/TUP-22063

* fix(TUP-22144)[bug] UX suggestion for layout of password/token.
https://jira.talendforge.org/browse/TUP-22144

* feat(TUP-21495):TUP-22141 [bug] update and save the connection in
create
connection page will make the token change.

* feat(TUP-21495):TUP-22140 [bug] In create connection page, there is no
response when click ... button to fetch token if the cloud url is
removed.
2019-03-08 15:12:44 +08:00
Dmytro Sylaiev
cc4f98de11 fix(TDI-41897): Fix compile error on generated code (#3294) 2019-03-07 14:59:43 +02:00
Dmytro Sylaiev
d648ce0631 fix(TDI-41808): Fix showing pass as clear text NZLoad (#3269)
* fix(TDI-41808): Fix showing pass as clear text NZLoad

* fix(TDI-41808): Rewrite fix to be more efficient

* chore(TDI-41808): Fix indentation

* fix(TDI-41808): Avoid to show real length of password

* fix(TDI-41808): Use constant from util class
2019-03-07 14:26:42 +02:00
Jane Ding
a590117841 fix(TUP-21920) Nullpointer on build job (#3266) (#3306) 2019-03-07 18:34:41 +08:00
hwang-talend
b02afd0b6b bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput (#3301)
bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput component
2019-03-07 11:38:39 +08:00
hcyi
c2518d5ff1 fix(TUP-21777):[7.0.1] Metadata Wizard with SSL cannot retrieve cluster (#3296) (#3300)
settings.
2019-03-07 10:29:26 +08:00
Denis Sergent
a0e98fe2ec fix(TESB-24920) (#3286) (#3292)
* TESB-21832 Problems with job/route exec. with local runtime in Studio

Local runtime for Studio job/routes execution should not be used in some
cases: build type has to be checked to define the best execution
processor. As execution processor must change when build type is updated
in deployment tab, processor can not be persisted anymore.

* Studio graphical improvements

Fixed some graphical inconsistencies in Studio (borders, margins...)

* TESB-22230 NPE in build item wizard when changing build type

* TESB-22230 NPE in build item wizard when changing build type

* TESB-22230 NPE in build item wizard when changing build type

* TESB-24920 Default endpoint URI not added to endpoint with cRest

This commit improves the way endpoint URL is displayed in console when a
Route/Dataservice is ran in Studio (in case context variables are used).

* Revert "TESB-24920 Default endpoint URI not added to endpoint with cRest"

This reverts commit 0f43b7d406.

* TESB-24920 Default endpoint URI not added to endpoint with cRest

This commit improves the way endpoint URL is displayed in console when a
Route/Dataservice is ran in Studio (in case context variables are used).
2019-03-05 17:39:40 +01:00
Denis Sergent
0ecf059e06 TESB-25045 Authorize Docker Build for job with tRESTClient (#3295)
Jobs containing tRESTClient or tESBConsumer components can be build as
Job standalone. Thereby it is now also possible to package build as a
Docker image. This commit also improve the way error messages are
managed in build wizard: before, a displayed error message could wrongly
disappear because of new controls for docker export details.
2019-03-05 17:38:50 +01:00
Zhiwei Xue
18dcaa912e fix(TUP-22000):remove job cache when deleting job. (#3284) 2019-03-05 10:53:55 +08:00
Mike Yan
95c213d78d fix(TUP-21983): fixed Compile failed for MSESB_IMAGE type (#3288) 2019-03-04 15:07:47 +08:00
hwang-talend
07d52b8207 bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput (#3262)
bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput component
2019-03-04 11:17:42 +08:00
Emmanuel GALLOIS
62bc03fce1 fix(TDI-41795): migrate correctly connection and linked connection (#3251)
* fix(TDI-41795): migrate correctly connection and linked connection
* fix(TDI-41795): fix invalid char in properties files
* chore(TDI-41795): do net set value at each property, just once
* fix(TDI-41795): correct NPE for tGoogleDriveCopy/Put
* fix(TDI-41795): do not corrupt tcompv0 components
  - fix migration version and breaks
  - do not execute migration for tcompv0 components

(cherry picked from commit c23955d51f)
2019-02-26 09:49:06 +01:00
Zhiwei Xue
1b9001bb4a fix(TUP-21983):NullPointerException When publishing a job as docker (#3259) 2019-02-26 16:00:50 +08:00
pyzhou
4332e04aed Pyzhou/TDI-41789 t redshift fixed log path (#3260)
* fix(TDI-41789): tRedshift require log file path

* redirect log to console

* change tab to space

Conflicts:
	main/plugins/org.talend.repository/plugin.xml
2019-02-26 14:48:50 +08:00
jiezhang-tlnd
9d4447b34f fix(TUP-21849)Salesforce name was changed while it is being edited for spec (#3250) (#3255)
* fix(TUP-21849)Salesforce name was changed while it is being edited for
spec

* fix(TUP-21849)Salesforce: name was changed while it is being edited for
spec
2019-02-21 14:23:32 +08:00
pyzhou
55d1005883 fix(TDI-41665):shutdown transfer manager right after download. (#3239)
* fix(TDI-41665):shutdown transfer manager right after download.

* correct EOF

* get shutdown method out of the use conn logic
2019-02-19 17:59:28 +08:00
apoltavtsev
fd853ea406 TESB-24784 Propagation of Connection extra properties is added (#3246)
* TESB-24784 Propagation of Connection extra properties is added

* Propagation of Connection extra properties is added
2019-02-18 08:55:28 +01:00
msjian
eb2e2de35c fix(TDQ-10842): fix can export the user define report template files (#3241) 2019-02-18 15:35:37 +08:00
Antoine Parent
c5080e8131 fix(TBD-8299): Compile error on BigQuery Component (#3235)
Error was fixed for one component, but still present when multiple
components were used.
Changed the <%cid%> to <%=cid%>
2019-02-15 16:42:35 +01:00
Antoine Parent
2d52068314 fix(TBD-8299): tBigQueryOutput compile error (#3225)
Add a <%cid%> to prevent a compile error when using more than one
tBigQueryOuput
2019-02-15 16:42:24 +01:00
Antoine Parent
20da6e89bb fix(TBD-8102): tBigQueryInput compile error (#3222)
Just add a <%cid%> to prevent a compile error when more using more than
one tBigQueryInput
2019-02-15 16:33:45 +01:00
hcyi
1609b68ec7 fix(TUP-21888):NPE when importing job. (#3236) 2019-02-13 16:27:16 +08:00
hwang-talend
52ef80d962 bugfix(TUP-21895):An error has occurred. UNEXPECTED_EXCEPTION when (#3217)
opening job migrated 6.4.1 to 7.1.1 (job using tJDBCInput)
2019-02-13 16:19:47 +08:00
apoltavtsev@gmail.com
6a0298d19c TESB-22085 Missing import statement is added 2019-02-12 12:10:46 +03:00
apoltavtsev
893b43791a TESB-22085:Dynamic schema column type is always String in Runtime 2019-02-11 11:01:12 +03:00
Laurent BOURGEOIS
e3e802dcd1 fix(TBD-8301) : Use Regional Location for BigQuery datasets (#3228) (#3229) 2019-02-07 16:35:13 +01:00
Antoine Parent
8fe82b64de Aparent/TPS-2891 (#3227)
* fix(TBD-8260): fix for tBigQueryOutput which always treats Integer schema as Nullable (#3200)

* fix(TBD-8260): compile error for tBigQueryOutput (#3210)

* fix(TBD-8269): Talend is automatically converting BigDecimal type to String (#3211)

* fix(TBD-8242): Compilation error for tFileInputDelimited/tFixedFlowInput with int type not nullable (#3193)
2019-02-07 11:41:10 +01:00
jiezhang-tlnd
f6e5c968cd fix(TUP-21836)Display of SFTP Metadata (#3201) (#3208)
* fix(TUP-21836)Display of SFTP Metadata

* fix(TUP-21836)Display of SFTP Metadata
2019-01-30 18:10:20 +08:00
Tao Tao
226c06a88a Ttao/backport/tup 20927 automatic scrolling in execution console log (#3206)
* fix(TUP-20927)Automatic scrolling in execution console prevent upper log (#2845)

* fix(TUP-20927)Automatic scrolling in execution console prevent upper log
messages checking
https://jira.talendforge.org/browse/TUP-20927

*     fix(TUP-20927)Automatic scrolling in execution console prevent upper log messages checking
    https://jira.talendforge.org/browse/TUP-20927

* Fixed(TUP-20927)Automatic scrolling in execution console prevent upper log messages checking (#2890)

https://jira.talendforge.org/browse/TUP-20927

* fix(TUP-20927)Automatic scrolling in execution console prevent upper log (#2929)

messages checking

* Fix(TUP-21161)can't use the up-arrow button or scroll bar to locate at (#2959)

the top when the gap is too small

https://jira.talendforge.org/browse/TUP-21161

* bugfix(TUP-21336): Run view console result is not synchronized when I (#3067)

switch different job on job editor

https://jira.talendforge.org/browse/TUP-21336
2019-01-30 11:06:38 +08:00
Dmytro Sylaiev
a258c4e630 fix(TDI-41678): Upgrade custom lib version to avoid compile error (#3202)
* fix(TDI-41678): Upgrade custom lib version to avoid compile error

* fix(TDI-41678): Make timestamp-version
2019-01-28 14:16:58 +02:00
hcyi
adab2d7423 fix(TUP-21648):tJDBCSCDELT table list cannot be retrieved. (#3187) 2019-01-25 14:20:26 +08:00
Zhiwei Xue
08256bd17c fix(TUP-21532):re-fix child assembly problem. (#3181) (#3183) 2019-01-22 14:27:39 +08:00
Zhiwei Xue
b39b600aee fix(TUP-21532):fix StandardJobStandaloneBuildProviderTest (#3175) 2019-01-17 16:51:59 +08:00
Dmytro Sylaiev
43af7e8f79 feat(TDI-40990): Add http proxy support for ftps (#3080)
* feat(TDI-40990): Add http proxy support for ftps

* Avoid set PROT and PBSZ commands

* feat(TDI-40990): Allign using proxy marker

* feat(TDI-40990): Remove SSLReuse class from template

* feat(TDI-40990): Use correct constructor

* feat(TDI-40990): Bound FTP components to proxy-support ftps library

* feat(TDI-40990): Make talend-commons-net library included to studio

* Bound all ftp components except tFTPConnection to UrlPath

* feat(TDI-40990): Use HTTP proxy when it's set for FTPS

* chore(TDI-40990): Change package name for custom clients
2019-01-16 10:34:27 +02:00
Dmytro Sylaiev
b8cb379ce8 Dsylaiev/tdi 40990 support ftps http proxy commons net prot p (#3146)
* feat(TDI-40990): Add talend-commons-net library

* feat(TDI-40990): Add distribution section to deploy lib in nexus

* chore(TDI-40990): Use talend formatter

* feat(TDI-40990): Extract SSLSessionReuseFTPSClient behavior

* feat(TDI-40990): Rename ProxyClient

* chore(TDI-40990): Minor refactoring

* Use while instead of for

* chore(TDI-40990): Remove eclipse service files

* chore(TDI-40990): Change package name

* feat(TDI-40990): Extends talend-commons-net library to support PROT C

* Major refactoring

* chore(TDI-40990): Make methods order more reasonable

* chore(TDI-40990): Add comments

* Fix using default PROT level
2019-01-16 10:34:11 +02:00
jzhao
dccaacef8e fix(TDI-41506):High CVE Vulnerability found in Talend Components (#3119)
* upgrade commons-fileupload from 1.0 to 1.3.1
* upgrade xalan/serializer from 2.7.1 to 2.7.2
* remove serializer-2.7.1
2019-01-16 16:21:33 +08:00
Zhiwei Xue
98160e5aed fix(TUP-21532): fix run job and assembly problem. (#3168) 2019-01-16 10:36:51 +08:00
hcyi
3dd18ce8b4 fix(TUP-20508):Audit: Generating cannot be finished and canceled after (#2957) (#3167)
30 mins.
2019-01-16 10:35:25 +08:00
hcyi
6a128dcd44 fix(TUP-21648):tJDBCSCDELT table list cannot be retrieved. (#3158) 2019-01-10 16:10:14 +08:00
Zhiwei Xue
9c4302cf17 fix(TUP-21596):exclude tLibraryLoad jars for independent subjob. (#3147) 2019-01-09 10:26:25 +08:00
Tao Tao
e86211e74d bugfix(TUP-21564):tMap settings - the "Options" window pop-up not (#3136) (#3140)
showing complete view

https://jira.talendforge.org/browse/TUP-21564
2019-01-08 15:35:09 +08:00
Mike Yan
fce35ea640 fix(TESB-24336): Add route and service type for local runtime mode (#3144) 2019-01-04 16:15:53 +08:00
Roman
8f530406a1 fix(TDI-41556): Redshift driver name was changed (#3096) (#3138)
* fix(TDI-41556): Redshift driver name was changed

* fix(TDI-41556): moved the creation of array outside loop
2019-01-03 17:08:08 +02:00
Dmytro Sylaiev
a9145e05ad Dsylaiev/tdi 41404 backport to 71 (#3123)
* fix(TDI-41404): Avoid 64kb method issue when too many context paramet… (#3025)

* fix(TDI-41404): Avoid 64kb method issue when too many context parameter exists

* fix(TDI-41404): Regain missing warnings

* Dsylaiev/tdi 41404 fix 64kb issue t run job context (#3087)

* fix(TDI-41404): Avoid 64kb method issue when too many context parameter exists

* fix(TDI-41404): Regain missing warnings

* fix(TDI-41404): Fix wrong context processing in footer
2019-01-03 16:59:05 +02:00
Zhiwei Xue
63bd4a1253 fix(TUP-21532):fix junit. (#3141) 2019-01-03 16:31:55 +08:00
Zhiwei Xue
7ab15ba51c fix(TUP-21532):Standard DI job which refers to big data batch job having (#3120) (#3130)
* fix(TUP-21532):Standard DI job which refers to big data batch job having
S3 component and standard DI job having S3 connection component fails
with an error.

* fix(TUP-21532):add JUnit
2019-01-02 15:22:46 +08:00
SunChaoqun
0e754dafca TESB-24354:SFTP proxy bean not recognized in runtime only (#3133) 2019-01-02 14:28:31 +08:00
Jane Ding
773cf557cf fix(TUP-21425)Job built in 7.0.1 not working in 7.1.1 (#3106) (#3115)
https://jira.talendforge.org/browse/TUP-21425
2018-12-26 18:47:29 +08:00
Chao MENG
4888bd71fd fix(TUP-21474): Facing issue while accessing joblet present on job in (#3112)
fix(TUP-21474): Facing issue while accessing joblet present on job in main project
https://jira.talendforge.org/browse/TUP-21474
2018-12-26 14:26:17 +08:00
Chao MENG
fbd94e6fde fix(TUP-21474): Facing issue while accessing joblet present on job in (#3105) (#3110)
fix(TUP-21474): Facing issue while accessing joblet present on job in main project
https://jira.talendforge.org/browse/TUP-21474
2018-12-25 18:29:39 +08:00
hwang-talend
5528ba12b5 bugfix(TUP-20663):tAccessOutputBulkExec/tAccessBulkExec are visible at (#3053)
bugfix(TUP-20663):tAccessOutputBulkExec/tAccessBulkExec are visible at default even without activating in the Project Setting
2018-12-25 14:53:55 +08:00
Jane Ding
015c47b701 fix(TUP-21333)OnSubJob Links Not Working (#3079) (#3103)
https://jira.talendforge.org/browse/TUP-21333
2018-12-24 11:44:33 +08:00
zwxue
4181c69924 fix(TUP-21175):fix BuildJobHandlerTest for TDM (#3095) (#3100) 2018-12-24 10:05:56 +08:00
jiezhang-tlnd
297f4ca718 fix(TUP-21396)keeping popup for running a job after adding a var in (#3070) (#3089)
context group
2018-12-20 09:59:49 +08:00
zwxue
cb3eeb5f00 fix(TUP-21175):fix JUnit (#3085)
* fix(TUP-21175):fix JUnit (#3039)

* fix(TUP-21175): fix Junits. (#3064)

* fix(TUP-21175):fix test BuildJobHandlerTest.testBuildJobWithTDM (#3084)
2018-12-19 19:10:23 +08:00
hcyi
60418702d5 fix(TUP-21167):Install Additional Packages has no available modules. (#3062) (#3081) 2018-12-17 19:07:50 +08:00
hcyi
d537d51b6a fix(TUP-21356):talend-bigdata-launcher-1.2.0-20170410.jar not found when (#3077)
spark job launched from standard job by jobserver.
2018-12-14 19:16:16 +08:00
Chao MENG
88e7223e60 fix(TUP-21461): Routine libraries can't be updated to pom.xml of routine (#3074)
fix(TUP-21461): Routine libraries can't be updated to pom.xml of routine in special case
https://jira.talendforge.org/browse/TUP-21461
2018-12-14 18:24:53 +08:00
chmyga
e66c45bc8a fix(TDI-41469): tFileUnarchive zip64 format error (#3026) (#3065)
* fix(TDI-41469): tFileUnarchive zip64 format error

* Use apache commons compress in checkArchive lib

* fix(TDI-41469): tFileUnarchive zip64 format error

* Remove unused method
2018-12-13 13:49:21 +02:00
Dmytro Sylaiev
18d5a99c5d Dsylaiev/tdi 41507 backport to 71 (#3060)
* Dsylaiev/tdi 41440 update jackson databind version in custom lib (#3002)

* fix(TDI-31328): Add default datePattern to SVNLogInput locked schema

* fix(TDI-41440): Update jackson-databind version

* Dsylaiev/tdi 41440 update jackson databind version in custom lib (#3037)

* fix(TDI-31328): Add default datePattern to SVNLogInput locked schema

* fix(TDI-41440): Update jackson-databind version

* fix(TDI-41440): Add nexus repos for maven deploy

* Dsylaiev/tdi 41440 update jackson databind version in custom lib (#3043)

* fix(TDI-31328): Add default datePattern to SVNLogInput locked schema

* fix(TDI-41440): Update jackson-databind version

* fix(TDI-41440): Add nexus repos for maven deploy

* fix(TDI-41440): Add missing nexus uri

* fix(TDI-41440): Remove redundant UTF-8 property
2018-12-11 11:31:50 +02:00
pyzhou
b4aeedc543 Pyzhou/tdi 41474 s3 check connection option (#3035) (#3036)
* fix(TDI-41474):S3 check connection option.

* change EOF
2018-12-11 10:05:40 +08:00
Tao Tao
5ce507ad14 bugfix(TUP-21356):"talend-bigdata-launcher-1.2.0-20170410.jar" not found (#3054) (#3057)
when spark job launched from standard job by jobserver

https://jira.talendforge.org/browse/TUP-21356?page=com.atlassian.jira.plugin.system.issuetabpanels%3Aall-tabpanel
2018-12-10 14:45:17 +08:00
nrousseau
fcef3bc66b fix(TUP-21175) avoid exception during junit execution 2018-12-10 10:18:48 +08:00
hwang-talend
1491a5739a bugfix(TUP-21134):"Throw an error if the file already exist" is ticked (#3031)
#2052
2018-12-07 11:49:26 +08:00
Jane Ding
67311d9d7f fix(TUP-21138)Ubuntu18: Resources: Job which uses Resources run failed (#3046) (#3050)
if its name contains uppercase letter
https://jira.talendforge.org/browse/TUP-21138
2018-12-06 11:15:53 +08:00
Jane Ding
125a3fdfb8 fix(TUP-21245)faile to check JDBC connection with context Migrate from (#3034) (#3047)
6.4.1 to 7.1.1
https://jira.talendforge.org/browse/TUP-21245
2018-12-06 10:13:55 +08:00
jiezhang-tlnd
cdc588f608 fix(TUP-21326)Guess Schema has error if use existing connection in (#3032) (#3049)
Joblet
2018-12-06 10:12:57 +08:00
hcyi
533301a787 fix(TUP-21160):refix JDBC connection will not commit even if autocommit (#3033) (#3041)
is set to True.
2018-12-04 16:38:38 +08:00
hcyi
4e58202b5a fix(TUP-21042):Edit and update the used context group,will show double (#2864) (#3040)
value and context view vanish.
2018-12-04 16:38:03 +08:00
hwang-talend
803a6e6ee0 Hwang/tup 21105 b71 (#3029)
* bugfix(TUP-21105):tDBConnection(Snowflake) issue within joblet.

* bugfix(TUP-21105):tDBConnection(Snowflake) issue within joblet.
2018-12-04 14:29:43 +08:00
ypiel
3575dcde57 fix(TDI-41394) : Qa fix - tCreateTable+Vertica9
* fix(TDI-41394) : Qa fix - tCreateTable+Vertica9

* fix(TDI-41394) : Qa fix - Properties from metadata

* fix(TDI-41394) : QA Fix - Vertica9 as default

* fix(TDI-41394) : remove UrlPath thatwas not anymore on master

* fix(TDI-41394) : Add urlPath for MSSQL as it was before
2018-11-29 10:31:10 +01:00
zwxue
98dd599cd7 fix(TUP-21252):tMap losing all links in testcase when we do some (#3014)
modification in the main job in the same component
2018-11-29 11:12:16 +08:00
Mike Yan
e036744720 fix(TESB-22833):CI builder NoClassDefFoundError error with routelet (#2997) 2018-11-28 09:39:47 +01:00
hwang-talend
5323e62bf0 Hwang/tup 21164 (#3004) (#3011)
* bugfix(TUP-21164):Context is not recognized as context variable in ELT
Map components and is not separated with string concat from SQL code
2018-11-28 15:48:19 +08:00
jiezhang-tlnd
9196c9c79d fix(TUP-21094)Job can not be run after the first time I set tELTMap and (#3000) (#3008)
run the job
2018-11-28 10:39:59 +08:00
hwang-talend
0dbe12a296 bugfix(TUP-21118):Code view/test case still link last component even all (#2969) (#3005)
bugfix(TUP-21118):Code view/test case still link last component even all job editor closed
2018-11-27 16:25:14 +08:00
jiezhang-tlnd
7aa1c0e7b2 Jzhang/bugfix/tup 20880 repository share show warn dialog choice should also exists for local project (#2999) (#3003)
* fix(TUP-20880)Repository share: show warn dialog choice should also
exists for local project

* fix(TUP-20880)Repository share: show warn dialog choice should also
exists for local project

* fix(TUP-20880)repository share show warn dialog choice should also
exists for local project

* fix(TUP-20880)repository share show warn dialog choice should also
exists for local project
2018-11-27 11:12:06 +08:00
hwang-talend
7f6d41819f Hwang/tup 21105 t db connection (#2953) (#2993)
* bugfix(TUP-21105):tDBConnection(Snowflake) issue within joblet.
2018-11-23 14:47:52 +08:00
hwang-talend
47d9a652a3 bugfix(TUP-21164):Context is not recognized as context variable in ELT (#2984)
bugfix(TUP-21164):Context is not recognized as context variable in ELT
Map components and is not separated with string concat from SQL code
2018-11-23 10:51:07 +08:00
Jane Ding
102e04bcf6 fix(TUP-21064)NPE happens when 'save as' routine (#2934) (#2989)
fix(TUP-21064)NPE happens when 'save as' routine
https://jira.talendforge.org/browse/TUP-21064
2018-11-23 10:13:36 +08:00
kjwang-talend
6f877d1272 fix(TUP-21160):JDBC connection will not commit even if autocommit is set (#2976) (#2981)
to True.
2018-11-22 14:33:58 +08:00
jiezhang-tlnd
33f2a34c18 fix(TUP-21148)Can't save the changes of Connections (#2978) (#2980)
* fix(TUP-21148)Can't save the changes of Connections
https://jira.talendforge.org/browse/TUP-21148

* fix(TUP-21148)Can't save the changes of Connections
2018-11-22 14:28:46 +08:00
zwxue
3946746389 fix(TUP-20316):support JDBC for implicit context (#2975) 2018-11-22 09:53:33 +08:00
ypiel
7de8cf0dd9 fix(TDI-41394) : tCreateTable vertica 9 support (#2968)
* fix(TDI-41394) : tCreateTable vertica 9 support
* fix(TDI-41394) : remove .bak files
2018-11-19 12:49:52 +01:00
jiezhang-tlnd
c0e8309908 fix(TUP-21049)can't find other database in default list with Chinese and (#2924) (#2962)
* fix(TUP-21049)can't find other database in default list with Chinese and
Japanese(just DelegateComponent fixed)

* fix(TUP-21049) just fixed the unified components
2018-11-19 10:05:16 +08:00
zwxue
7db41b47ec fix(TUP-19972):remove joblet cache when doing rename (#2949) 2018-11-15 17:35:22 +08:00
hcyi
4aca59591b fix(TUP-21044);JDBC driver changed when load JDBC-Mysql8 to "Project Setting ---> Job setting ---> Stats&Logs". (#2883) (#2958)
* fix(TUP-21044);JDBC driver changed when load JDBC-Mysql8 to "Project
Setting ---> Job setting ---> Stats&Logs".

* fix(TUP-21044);add some junits for get driver jar from mvn url.
2018-11-15 15:18:19 +08:00
Jane Ding
97cdeb17c0 fix(TUP-21075)Problem of display in the tMap with Mojave (#2943) (#2954)
https://jira.talendforge.org/browse/TUP-21075
2018-11-15 11:53:29 +08:00
Stéphane Bouchet
f49282d082 TESB-24093 : context values can be overriten by MS. (#2947) 2018-11-13 16:44:05 +01:00
Dmytro Sylaiev
2e7381fc92 fix(TDI-41330): Use sql TIME in setNull for SIQ (#2927) (#2936) 2018-11-12 13:55:43 +02:00
hcyi
27b2a92e96 fix(TUP-20561):Prompt message not clear enough when report generation (#2932) (#2935)
fails because of DB configuration
2018-11-12 14:29:45 +08:00
hwang-talend
b9f4b84ff9 bugfix(TUP-21058):Snowflake ELTJDBCInput/Output (#2895)
bugfix(TUP-21058):Snowflake ELTJDBCInput/Output
2018-11-12 10:44:26 +08:00
Dmytro Sylaiev
1f9725c002 fix(TDI-41320): Fix oracle 11 migration task use existing connection (#2902) (#2933) 2018-11-09 13:35:06 +02:00
zwxue
22dc91ebff fix(TUP-21025):popup dialog for docker error. (#2926) 2018-11-08 14:44:19 +08:00
hcyi
b4d514d368 fix(TUP-21054):Jars from db wizard not synchronized with component. (#2861) (#2923) 2018-11-08 10:55:13 +08:00
jzhao
a6b0f424f9 fix(TDI-41176):'File Json' > 'Input Json' metadata does not show parent values in Preview with JsonPath (#2820) (#2921)
* add a new checkbox "Use the loop node as root" (tFileInputJson)

* fix tExtractJsonField

* fix wizard by set "Use the loop node as root" to false
2018-11-08 10:04:52 +08:00
hcyi
98752ea5ac fix(TUP-20516):Audit improve (#2920)
* fix(TUP-20514):Project setting-Aduit can not save the db info if switch to another type of db. (#2905)

* fix(TUP-20514):Project setting-Aduit can not save the db info if switch
to another type of db.

* fix(TUP-20567):Generate button should be disabled if no history listed.

* fix(TUP-20561):Prompt message not clear enough when report generation (#2897)

fails because of DB configuration

* fix(TUP-20516):Audit: Improve: Better Use an Error message if connection isn't successful (#2896)

* fix(TUP-20516):Audit: Improve: Better Use an Error message if connection
isn't successful

* fix(TUP-20515):Project setting-Aduit: better give clear fail information
when the db is not correctly setted.
2018-11-07 18:25:44 +08:00
Tao Tao
37419ed075 fix(TUP-20612)After change tdbInput from mysql to db2, find the needed jar will not change when click "table name". (#2880) (#2919)
https://jira.talendforge.org/browse/TUP-20612
2018-11-07 18:01:43 +08:00
Jane Ding
3b33b5865f fix(TUP-21055)Migration check executed at each start of studio (#2884) (#2916)
* fix(TUP-21055)Migration check executed at each start of studio
https://jira.talendforge.org/browse/TUP-21055

* fix(TUP-21055)Migration check executed at each start of studio
https://jira.talendforge.org/browse/TUP-21055

* fix(TUP-21055)Migration check executed at each start of studio
https://jira.talendforge.org/browse/TUP-21055
Sort the ConfigTypeNode collection

* fix(TUP-21055)Migration check executed at each start of studio
https://jira.talendforge.org/browse/TUP-21055

* fix(TUP-21055)Migration check executed at each start of studio
https://jira.talendforge.org/browse/TUP-21055
2018-11-07 15:22:11 +08:00
jiezhang-tlnd
3f1a1ccee5 fix(TUP-21017)ORACLE_DB_fail to dataviewer for context mode (#2892)
* fix(TUP-21017)ORACLE_DB_fail to dataviewer for context mode

* fix(TUP-21017)ORACLE DB data viewer fail in context
2018-11-07 10:26:58 +08:00
Dmytro Sylaiev
e2869d0d42 fix(TDI-41276): Use correct SQLType for null Time (#2852) (#2910)
* fix(TDI-41276): Use correct SQLType for null Time

* fix(TDI-41276): Fix codegen error
2018-11-06 13:14:09 +02:00
Jane Ding
afe1a09660 fix(TUP-21075)Problem of display in the tMap with Mojave (#2900) (#2906)
* fix(TUP-21075)Problem of display in the tMap with Mojave
https://jira.talendforge.org/browse/TUP-21075

* fix(TUP-21075)use duplicate name for jdbc connection, no error show
https://jira.talendforge.org/browse/TUP-21075

* fix(TUP-21075)Problem of display in the tMap with Mojave
https://jira.talendforge.org/browse/TUP-21075
2018-11-06 16:07:28 +08:00
Tao Tao
05c8fbc560 fix(TUP-21022)Project Setting->Shell Setting ->Ps1: unfriendly (#2904) (#2909)
display of description
2018-11-06 15:51:38 +08:00
hwang-talend
d6faa40ede bugfix(TUP-21030):Components don't change to Built-in mode (#2879) (#2903)
* bugfix(TUP-21030):Components don't change to Built-in mode
2018-11-06 10:10:18 +08:00
Jane Ding
874dc4b11f fix(TUP-20913)Remote project:job run use old data if not run the child (#2888) (#2889)
job first after change the resources item
https://jira.talendforge.org/browse/TUP-20913
2018-11-02 16:27:54 +08:00
jiezhang-tlnd
1514ffcc72 fix(TUP-20675)"Web-app Url" is read-only and empty after clicking "+"; (#2887) 2018-11-02 15:29:06 +08:00
jiezhang-tlnd
db67c962f0 fix(TUP-21005)In studio Java Debugging of Routes fails (#2871) 2018-11-01 17:03:34 +08:00
hwang-talend
8ce0822a05 bugfix(TUP-21041):ELT Maps generate incorrect SQL when sql contains (#2857) (#2877)
bugfix(TUP-21041):ELT Maps generate incorrect SQL when sql contains schema.table.column1 + schema.table.column2
2018-11-01 16:53:59 +08:00
hwang-talend
216732d14c bugfix(TUP-20915):Testcase: Deleted testcase is still in build-out (#2863) (#2876)
bugfix(TUP-20915):Testcase: Deleted testcase is still in build-out file->sunfire-reports folder
2018-11-01 16:53:37 +08:00
hwang-talend
be5a66353e bugfix(TUP-20693):Table selection widget - wrong generated code (#2818) (#2860) (#2875)
bugfix(TUP-20693):Table selection widget - wrong generated code
2018-11-01 16:32:59 +08:00
hwang-talend
b5ab262801 Hwang/tup 20837 master (#2859) (#2874)
* bugfix(TUP-20837):Job containing saleforce components takes too much
time to open
2018-11-01 15:55:51 +08:00
Jane Ding
6334b756c7 fix(TUP-20778)Reference Project - New context group variable not (#2849) (#2866)
getting applied to the jobs
https://jira.talendforge.org/browse/TUP-20778
2018-10-31 10:54:28 +08:00
Jane Ding
25079b1341 fix(TUP-20913)Remote project:job run use old data if not run the child (#2858) (#2867)
job first after change the resources item
https://jira.talendforge.org/browse/TUP-20913
2018-10-31 10:53:42 +08:00
Jenkins Continuous Build server
a68c9e0cfc Set version to 7.1.2 SNAPSHOT 2018-10-30 12:51:16 +01:00
481 changed files with 5299 additions and 1223 deletions

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.abstractmap.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.abstractmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.alfrescooutput.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.alfrescooutput

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.business.diagram.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.designer.business.diagram
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.designer.codegen Nl Fragment
Bundle-SymbolicName: org.talend.designer.codegen.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.codegen
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.designer.components.exchange.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.components.exchange

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Designer Plug-in Nl Fragment
Bundle-SymbolicName: org.talend.designer.core.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.core
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.dbmap.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.dbmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.dbmap.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.designer.documentation.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.documentation

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.documentation.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.fileoutputxml.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.fileoutputxml

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.gefabstractmap.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.gefabstractmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mapper component Plug-in Nl Fragment
Bundle-SymbolicName: org.talend.designer.mapper.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.mapper
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Maven Job NL
Bundle-SymbolicName: org.talend.designer.maven.job.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.designer.maven.job
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.job.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Rowgenerator Nl Fragment
Bundle-SymbolicName: org.talend.designer.rowgenerator.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.rowgenerator
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.designer.runprocess.nl fragment
Bundle-SymbolicName: org.talend.designer.runprocess.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.designer.runprocess
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runprocess.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.scd.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.scd

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.scd.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.webservice.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.webservice

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.webservice.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.designer.xmlmap.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.designer.xmlmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.xmlmap.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Expression Builder Nl Fragment
Bundle-SymbolicName: org.talend.expressionbuilder.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.expressionbuilder
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.expressionbuilder.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: NL
Bundle-SymbolicName: org.talend.presentation.onboarding.resource.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.presentation.onboarding.resource
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: NL
Bundle-SymbolicName: org.talend.presentation.onboarding.resource.tos.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.presentation.onboarding.resource.tos
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.ftp.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.repository.ftp

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.ftp.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.json.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.repository.json
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.json.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.repository
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.view.di.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.repository.view.di

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.di.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.sbi.engines.client.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.sbi.engines.client

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.engines.client.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.spagic.engines.client.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Fragment-Host: org.talend.spagic.engines.client

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.engines.client.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.sqlbuilder Nl Fragment
Bundle-SymbolicName: org.talend.sqlbuilder.nl
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.sqlbuilder
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sqlbuilder.nl</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.designer.business.feature"
label="Business Feature"
version="7.1.1.qualifier"
version="7.1.2.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#business-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.designer.feature"
label="Designer Feature"
version="7.1.1.qualifier"
version="7.1.2.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#designer-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.branding.tos.feature"
label="Tos branding feature"
version="7.1.1.qualifier"
version="7.1.2.qualifier"
provider-name=".Talend SA."
plugin="org.talend.rcp.branding.tos">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.branding.tos.test.feature"
label="Test feature for TOS"
version="7.1.1.qualifier">
version="7.1.2.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.repository.feature"
label="Repository Feature"
version="7.1.1.qualifier"
version="7.1.2.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#repository-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.sbi.feature"
label="SBI Feature"
version="7.1.1.qualifier"
version="7.1.2.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.spagic.feature"
label="SPAGIC Feature"
version="7.1.1.qualifier"
version="7.1.2.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.components.feature"
label="Components-feature"
version="7.1.1.qualifier">
version="7.1.2.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.components.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.core.feature"
label="Feature"
version="7.1.1.qualifier">
version="7.1.2.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.core.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.feature"
label="Tos feature"
version="7.1.1.qualifier"
version="7.1.2.qualifier"
provider-name=".Talend SA.">
<description url="http://www.example.com/description">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.libraries.feature"
label="Libraries_feature"
version="7.1.1.qualifier">
version="7.1.2.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.libraries.feature</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Abstract Map Plug-in
Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
Require-Bundle: org.eclipse.core.runtime,
org.talend.core,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Alfresco Output Component Plug-in
Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Vendor: .Talend SA.
Require-Bundle: org.eclipse.core.runtime,
org.talend.core,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
Bundle-Vendor: %providerName

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CodeGen Plug-in
Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Localization: plugin
Require-Bundle: org.talend.core.repository,
org.eclipse.emf.codegen,

View File

@@ -506,7 +506,7 @@
if (inContext == null) {
inContext = <%=className%>.class.getClassLoader().getResourceAsStream("config/contexts/" + contextStr + ".properties");
}
if (inContext != null) {
if (inContext != null && context != null && context.isEmpty()) {
//defaultProps is in order to keep the original context value
defaultProps.load(inContext);
inContext.close();
@@ -528,107 +528,128 @@
}
<%
String warningMessageFormat = "Null value will be used for context parameter %s: %s";
for (IContextParameter ctxParam :params)
{
%>
context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
<%
if (ctxParam.getType().equals("id_Password")) {
%>
String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
context.<%=ctxParam.getName()%> = null;
if(pwd_<%=ctxParam.getName()%>_value!=null) {
if(context_param.containsKey("<%=ctxParam.getName()%>")) {//no need to decrypt if it come from program argument or parent job runtime
context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
} else if (!pwd_<%=ctxParam.getName()%>_value.isEmpty()) {
try {
context.<%=ctxParam.getName()%> = routines.system.PasswordEncryptUtil.decryptPassword(pwd_<%=ctxParam.getName()%>_value);
context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
} catch (java.lang.RuntimeException e) {
//do nothing
}
}
}
<%
continue;
}
String typeToGenerate ="String";
if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value")))
{
typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
}
if(typeToGenerate.equals("java.util.Date"))
{
final int maxContextInOneMethodToProcess = 100;
int lastMethodNumber = 0;
%>
class ContextProcessing {
private void processContext_0() {
<%
for (int i = 1; i <= params.size(); i++) {
IContextParameter ctxParam = params.get(i-1);
if (i % maxContextInOneMethodToProcess == 0) {
/* close previous method and declare new */
lastMethodNumber++;
%>
}
%>
try{
String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
if (context_<%=ctxParam.getName()%>_value == null){
context_<%=ctxParam.getName()%>_value = "";
}
int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
String context_<%=ctxParam.getName()%>_pattern = "yyyy-MM-dd HH:mm:ss";
if(context_<%=ctxParam.getName()%>_pos > -1){
context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
}
private void processContext_<%=lastMethodNumber%>() {
<%
} //endIf
%>
context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
<%
if (ctxParam.getType().equals("id_Password")) {
%>
String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
context.<%=ctxParam.getName()%> = null;
if(pwd_<%=ctxParam.getName()%>_value!=null) {
if(context_param.containsKey("<%=ctxParam.getName()%>")) {//no need to decrypt if it come from program argument or parent job runtime
context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
} else if (!pwd_<%=ctxParam.getName()%>_value.isEmpty()) {
try {
context.<%=ctxParam.getName()%> = routines.system.PasswordEncryptUtil.decryptPassword(pwd_<%=ctxParam.getName()%>_value);
context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
} catch (java.lang.RuntimeException e) {
//do nothing
}
}
}
<%
continue;
}
String typeToGenerate ="String";
if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
}
if(typeToGenerate.equals("java.util.Date")) {
%>
try{
String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
if (context_<%=ctxParam.getName()%>_value == null){
context_<%=ctxParam.getName()%>_value = "";
}
int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
String context_<%=ctxParam.getName()%>_pattern = "yyyy-MM-dd HH:mm:ss";
if(context_<%=ctxParam.getName()%>_pos > -1){
context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
}
context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
}catch(ParseException e)
{
} catch(ParseException e) {
<%
if (isLog4jEnabled) {
if (isLog4jEnabled) {
%>
log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
<%
} else {
} else {
%>
System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
<%
}
}
%>
context.<%=ctxParam.getName()%>=null;
}
<%
}else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String") )
{
%>
context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
<%
}else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null)
{
%>
context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();
<%
} else {
%>
try{
context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
}catch(NumberFormatException e){
context.<%=ctxParam.getName()%>=null;
}
<%
if (isLog4jEnabled) {
} else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String")) {
%>
log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
<%
} else {
} else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null) {
%>
System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();
<%
}
} else {
%>
try{
context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
} catch(NumberFormatException e){
<%
if (isLog4jEnabled) {
%>
log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
<%
} else {
%>
System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
<%
}
%>
context.<%=ctxParam.getName()%>=null;
}
<%
}
}
%>
} <%/*close last method*/%>
public void processAllContext() {
<%
for (int i = 0; i <=lastMethodNumber; i++) {
%>
processContext_<%=i %>();
<%
}
%>
context.<%=ctxParam.getName()%>=null;
}
<%
}
}
%>
new ContextProcessing().processAllContext();
} catch (java.io.IOException ie) {
System.err.println("Could not load context "+contextStr);
ie.printStackTrace();
}
// get context value from parent directly
if (parentContextMap != null && !parentContextMap.isEmpty()) {
<% for (IContextParameter ctxParam :params){

View File

@@ -312,7 +312,7 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
}
%>
}
private ContextProperties context = new ContextProperties();
protected ContextProperties context = new ContextProperties(); // will be instanciated by MS.
public ContextProperties getContext() {
return this.context;
}

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Exchange Plug-in
Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1</version>
<version>7.1.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Components Libs Plug-in
Bundle-SymbolicName: org.talend.designer.components.libs
Bundle-Version: 7.1.1.qualifier
Bundle-Version: 7.1.2.qualifier
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-Vendor: .Talend SA.

View File

@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.libraries</groupId>
<artifactId>checkArchive-1.1-20171121</artifactId>
<artifactId>checkArchive-1.1-20181130</artifactId>
<version>6.0.0</version>
<name>checkArchive</name>
<description>Dependence for tFileArchive and tFileUnAchive</description>

View File

@@ -5,10 +5,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
@@ -17,7 +13,10 @@ import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipFile;
// import javax.crypto.Cipher;
@@ -36,8 +35,6 @@ public class IntegrityUtil {
zipFile = new ZipFile(file);
return true;
} catch (ZipException e) {
return false;
} catch (IOException e) {
return false;
} finally {
@@ -58,7 +55,6 @@ public class IntegrityUtil {
try {
zipFile = new ZipFile(file);
} catch (ZipException e) {
} catch (IOException e) {
} finally {
try {
@@ -72,27 +68,6 @@ public class IntegrityUtil {
}
}
/**
* Check the zip entry is valid
*
* @param input
* @return
*/
public static boolean isZipEntryValid(final ZipInputStream input) {
try {
ZipEntry entry = input.getNextEntry();
return true;
} catch (ZipException e) {
// TODO Auto-generated catch block
return false;
} catch (IOException e) {
return false;
} catch (Exception e) {
return false;
}
}
/**
* To check if the encrpted zip file is corrupted or not
*
@@ -101,18 +76,15 @@ public class IntegrityUtil {
* @return
*/
public static boolean isEncryptedZipValid(final File file, String password) {
ZipInputStream input = null;
ZipArchiveInputStream input = null;
InputStream target = null;
try {
target = new FileInputStream(file);
target = new CipherInputStream(target, createCipher(Cipher.DECRYPT_MODE, password));
input = new ZipInputStream(target);
ZipEntry entry = input.getNextEntry();
input = new ZipArchiveInputStream(target);
ArchiveEntry entry = input.getNextEntry();
return true;
} catch (ZipException e) {
// TODO Auto-generated catch block
return false;
} catch (IOException e) {
return false;
} catch (Exception e) {

View File

@@ -0,0 +1,50 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.libraries</groupId>
<artifactId>commons-net-ftps-proxy</artifactId>
<version>3.6.1-talend-20190128</version>
<name>commons-net-talend</name>
<dependencies>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
</dependencies>
<properties>
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
</properties>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
</snapshotRepository>
<repository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -0,0 +1,309 @@
package org.talend.ftp;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Inet6Address;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocket;
import org.apache.commons.net.ftp.FTPCmd;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.commons.net.util.Base64;
public class HTTPProxyFTPSClient extends SSLSessionReuseFTPSClient {
/** Default PROT Command */
private static final String DEFAULT_PROT = "C";
private final String proxyHost;
private final int proxyPort;
private final String proxyUsername;
private final String proxyPassword;
private SSLContext context;
private String protectionLevel;
private String tunnelHost; // Save the host when setting up a tunnel (needed for EPSV)
private static final byte[] CRLF = { '\r', '\n' };
private final Base64 base64 = new Base64();
public HTTPProxyFTPSClient(boolean isImplicit, SSLContext context, String proxyHost, int proxyPort, String proxyUser,
String proxyPass) {
super(isImplicit, context);
this.proxyHost = proxyHost;
this.proxyPort = proxyPort;
this.proxyUsername = proxyUser;
this.proxyPassword = proxyPass;
this.tunnelHost = null;
this.context = context;
this.protectionLevel = DEFAULT_PROT;
}
/**
* Call execPROT from Parent class and stores current protection level
*
* @see org.apache.commons.net.ftp.FTPSClient#execPROT(String)
*/
@Override
public void execPROT(String prot) throws SSLException, IOException {
super.execPROT(prot);
this.protectionLevel = prot;
}
/**
* @see org.apache.commons.net.SocketClient#connect(java.lang.String, int)
*/
@Override
public void connect(String host, int port) throws IOException {
_socket_ = new Socket(proxyHost, proxyPort);
_input_ = _socket_.getInputStream();
_output_ = _socket_.getOutputStream();
try {
tunnelHandshake(host, port, _input_, _output_);
} catch (Exception e) {
throw new IOException("Could not connect to " + host + " using port " + port, e);
}
super._connectAction_();
}
/**
* Open ssl socket (if private protection level selected) using tunnel socket
*
* @see org.apache.commons.net.ftp.FTPSClient#_openDataConnection_(java.lang.String, java.lang.String)
*/
@Override
protected Socket _openDataConnection_(String command, String arg) throws IOException {
//Force local passive mode, active mode not supported by through proxy
if (getDataConnectionMode() != PASSIVE_LOCAL_DATA_CONNECTION_MODE) {
throw new IllegalStateException("Only passive connection mode supported using proxy");
}
final boolean isInet6Address = getRemoteAddress() instanceof Inet6Address;
String passiveHost;
// Try EPSV command first on IPv6 - and IPv4 if enabled.
// When using IPv4 with NAT it has the advantage
// to work with more rare configurations.
// E.g. if FTP server has a static PASV address (external network)
// and the client is coming from another internal network.
// In that case the data connection after PASV command would fail,
// while EPSV would make the client succeed by taking just the port.
boolean attemptEPSV = isUseEPSVwithIPv4() || isInet6Address;
if (attemptEPSV && epsv() == FTPReply.ENTERING_EPSV_MODE) {
_parseExtendedPassiveModeReply(_replyLines.get(0));
passiveHost = this.tunnelHost;
} else {
if (isInet6Address) {
return null; // Must use EPSV for IPV6
}
// If EPSV failed on IPV4, revert to PASV
if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) {
return null;
}
_parsePassiveModeReply(_replyLines.get(0));
passiveHost = this.getPassiveHost();
}
return DEFAULT_PROT.equals(protectionLevel) ?
openPlainDataConnection(passiveHost, command, arg) : openEncryptedDataConnection(passiveHost, command, arg);
}
/**
* Create, configure and open SSLSocket via plain tunnel Socket
* @param passiveHost host returned from ftp server after sending PASV command
* @param command to execute
* @param arg for command
* @return SSLSocket using to Data transmit
* @throws IOException
*/
private Socket openEncryptedDataConnection(String passiveHost, String command, String arg) throws IOException {
Socket proxySocket = createTunnelSocket();
proxySocket.connect(new InetSocketAddress(proxyHost, proxyPort), getConnectTimeout());
tunnelHandshake(passiveHost, this.getPassivePort(), proxySocket.getInputStream(),
proxySocket.getOutputStream());
Socket socket = context.getSocketFactory().createSocket(proxySocket, passiveHost, this.getPassivePort(), true);
_prepareDataSocket_(socket);
configureDataSocket(socket);
if (isRestartOffsetIncorrect()) {
proxySocket.close();
socket.close();
return null;
}
if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
proxySocket.close();
socket.close();
return null;
}
if (socket instanceof SSLSocket) {
SSLSocket sslSocket = (SSLSocket) socket;
configureSSLDataSocket(sslSocket);
sslSocket.startHandshake();
}
return socket;
}
private Socket createTunnelSocket() throws IOException {
Socket proxySocket = new Socket();
configureDataSocket(proxySocket);
return proxySocket;
}
private void configureSSLDataSocket(SSLSocket sslSocket) {
sslSocket.setUseClientMode(getUseClientMode());
sslSocket.setEnableSessionCreation(getEnableSessionCreation());
// server mode
if (!getUseClientMode()) {
sslSocket.setNeedClientAuth(getNeedClientAuth());
sslSocket.setWantClientAuth(getWantClientAuth());
}
if (getEnabledCipherSuites() != null) {
sslSocket.setEnabledCipherSuites(getEnabledCipherSuites());
}
if (getEnabledProtocols() != null) {
sslSocket.setEnabledProtocols(getEnabledProtocols());
}
}
private void configureDataSocket(Socket socket) throws IOException {
if (getReceiveDataSocketBufferSize() > 0) {
socket.setReceiveBufferSize(getReceiveDataSocketBufferSize());
}
if (getSendDataSocketBufferSize() > 0) {
socket.setSendBufferSize(getSendDataSocketBufferSize());
}
if (getPassiveLocalIPAddress() != null) {
socket.bind(new InetSocketAddress(getPassiveLocalIPAddress(), 0));
}
}
/**
* @see org.apache.commons.net.ftp.FTPHTTPClient#_openDataConnection_(FTPCmd, String)
* @return Plain Socket using HTTP proxy
*/
private Socket openPlainDataConnection(String passiveHost, String command, String arg) throws IOException {
Socket socket = preparePlainDataTunnelSocket(passiveHost);
if (isRestartOffsetIncorrect()) {
socket.close();
return null;
}
if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
socket.close();
return null;
}
return socket;
}
/**
* Create, prepare and connect plain data transmit socket via tunnel proxy
*/
private Socket preparePlainDataTunnelSocket(String passiveHost) throws IOException {
Socket socket = _socketFactory_.createSocket(proxyHost, proxyPort);
InputStream is = socket.getInputStream();
OutputStream os = socket.getOutputStream();
tunnelHandshake(passiveHost, this.getPassivePort(), is, os);
return socket;
}
/**
* HTTP handshake for proxy
*/
private void tunnelHandshake(String host, int port, InputStream input, OutputStream output) throws IOException {
final String connectString = "CONNECT " + host + ":" + port + " HTTP/1.1";
final String hostString = "Host: " + host + ":" + port;
this.tunnelHost = host;
output.write(connectString.getBytes(StandardCharsets.UTF_8));
output.write(CRLF);
output.write(hostString.getBytes(StandardCharsets.UTF_8));
output.write(CRLF);
if (proxyUsername != null && proxyPassword != null) {
final String auth = proxyUsername + ":" + proxyPassword;
final String header =
"Proxy-Authorization: Basic " + base64.encodeToString(auth.getBytes(StandardCharsets.UTF_8));
output.write(header.getBytes(StandardCharsets.UTF_8));
}
output.write(CRLF);
output.flush();
List<String> response = new ArrayList<>();
BufferedReader reader = new BufferedReader(new InputStreamReader(input, getCharset()));
String responseLine;
while ((responseLine = reader.readLine()) != null && responseLine.length() > 0) {
response.add(responseLine);
}
int size = response.size();
if (size == 0) {
throw new IOException("No response from proxy");
}
String code;
String resp = response.get(0);
if (resp.startsWith("HTTP/") && resp.length() >= 12) {
code = resp.substring(9, 12);
} else {
throw new IOException("Invalid response from proxy: " + resp);
}
if (!"200".equals(code)) {
StringBuilder msg = new StringBuilder();
msg.append("HTTPTunnelConnector: connection failed\r\n");
msg.append("Response received from the proxy:\r\n");
for (String line : response) {
msg.append(line);
msg.append("\r\n");
}
throw new IOException(msg.toString());
}
}
private boolean isRestartOffsetIncorrect() throws IOException {
return (getRestartOffset() > 0) && !restart(getRestartOffset());
}
}

View File

@@ -0,0 +1,43 @@
package org.talend.ftp;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.Socket;
import java.util.Locale;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.SSLSocket;
import org.apache.commons.net.ftp.FTPSClient;
public class SSLSessionReuseFTPSClient extends FTPSClient {
public SSLSessionReuseFTPSClient(boolean isImplicit, SSLContext context) {
super(isImplicit, context);
}
@Override
protected void _prepareDataSocket_(final Socket socket) {
if (socket instanceof SSLSocket) {
final SSLSession session = ((SSLSocket) _socket_).getSession();
final SSLSessionContext context = session.getSessionContext();
try {
final Field sessionHostPortCache = context.getClass().getDeclaredField("sessionHostPortCache");
sessionHostPortCache.setAccessible(true);
final Object cache = sessionHostPortCache.get(context);
final Method putMethod = cache.getClass().getDeclaredMethod("put", Object.class, Object.class);
putMethod.setAccessible(true);
final Method getHostMethod = socket.getClass().getDeclaredMethod("getHost");
getHostMethod.setAccessible(true);
Object host = getHostMethod.invoke(socket);
final String key =
String.format("%s:%s", host, String.valueOf(socket.getPort())).toLowerCase(Locale.ROOT);
putMethod.invoke(cache, key, session);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}

View File

@@ -7,7 +7,7 @@
<groupId>org.talend.libraries</groupId>
<artifactId>talend-codegen-utils</artifactId>
<!-- release for revert version of library -->
<version>0.25.3</version>
<version>0.25.4</version>
<packaging>jar</packaging>
<properties>

View File

@@ -100,4 +100,12 @@ public interface DiSchemaConstants {
/** The key will have this as a prefix, pointing to the value. */
String TALEND6_DYNAMIC_ADDITIONAL_PROPERTIES = "di.dynamic.prop."; //$NON-NLS-1$
/** tell Avro converter how to process Original Avro logical type time
* if value is "TALEND_DATE", it mean use Talend Date, if not, will use Talend Integer like before
* we add this only one purpose : for the old job, we keep Talend Integer, for new job, we use Talend Date
* */
public static final String LOGICAL_TIME_TYPE_AS = "LOGICAL_TIME_TYPE_AS";
public static final String AS_TALEND_DATE = "TALEND_DATE";
}

View File

@@ -409,6 +409,8 @@ public class IncomingSchemaEnforcer {
// TODO(igonchar): This is wrong. However I left it as is. We have to fix it after release
// Seems, talendType is added by Studio to schema
//seems only a safe check for Date with Long and String type input,in fact, will not enter them, so consider remove the code below,
//or it works for some old job?
if ("java.util.Date".equals(javaClass) || "id_Date".equals(talendType)) {
if (diValue instanceof Date) {
avroValue = diValue;
@@ -459,6 +461,12 @@ public class IncomingSchemaEnforcer {
return;
}
if (LogicalTypeUtils.isLogicalTimeMillis(fieldSchema)) {
//the writer in snowflakewriter can process int and date both, snowflakewriter is the unique writer which studio use for logicalTime type.
currentRecord.put(index, diValue);
return;
}
// TODO(igonchar): I'm not sure it is correct. For me avro value should be string. Conversion to BigDecimal may be
// delegated to component. Component should decide whether convert to BigDecimal
if ("id_BigDecimal".equals(talendType) || "java.math.BigDecimal".equals(javaClass)) {

View File

@@ -13,6 +13,8 @@
package org.talend.codegen.enforcer;
import static org.talend.codegen.DiSchemaConstants.TALEND6_COLUMN_TALEND_TYPE;
import static org.talend.codegen.DiSchemaConstants.LOGICAL_TIME_TYPE_AS;
import static org.talend.codegen.DiSchemaConstants.AS_TALEND_DATE;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -212,8 +214,13 @@ public class OutgoingSchemaEnforcer implements IndexedRecord {
ZonedDateTime zonedDate = ld.atStartOfDay(ZoneId.systemDefault());
return Date.from(zonedDate.toInstant());
} else if (logicalType == LogicalTypes.timeMillis()) {
return value;
if (AS_TALEND_DATE.equals(valueField.getProp(LOGICAL_TIME_TYPE_AS))) {
return new Date((Integer) value);
} else {
return value;
}
} else if (logicalType == LogicalTypes.timestampMillis()) {
//TODO use java.sql.Timestamp for precision to nano second? not sure as logicalType is not only for database maybe
return new Date((Long) value);
}
}

View File

@@ -36,6 +36,8 @@ public class OutgoingSchemaEnforcerTest {
*/
private static Schema talend6Schema;
private static Schema talend6Schema4LogicalTimeAsDateOutput;
/**
* An actual record that a component would like to be emitted, which may or may not contain enriched schema
* information.
@@ -80,6 +82,20 @@ public class OutgoingSchemaEnforcerTest {
.name("logicalTimestamp").type(AvroUtils._logicalTimestamp()).noDefault() //
.endRecord(); //
talend6Schema4LogicalTimeAsDateOutput = SchemaBuilder.builder().record("Record").fields() //
.name("id").type().intType().noDefault() //
.name("name").type().stringType().noDefault() //
.name("age").type().intType().noDefault() //
.name("valid").type().booleanType().noDefault() //
.name("createdDate").prop(DiSchemaConstants.TALEND6_COLUMN_TALEND_TYPE, "id_Date") //
.prop(DiSchemaConstants.TALEND6_COLUMN_PATTERN, "yyyy-MM-dd'T'HH:mm:ss'000Z'").type().nullable().longType()
.noDefault() //
.name("logicalDate").type(AvroUtils._logicalDate()).noDefault() //
.name("logicalTime").prop(DiSchemaConstants.LOGICAL_TIME_TYPE_AS, DiSchemaConstants.AS_TALEND_DATE)
.type(AvroUtils._logicalTime()).noDefault() //
.name("logicalTimestamp").type(AvroUtils._logicalTimestamp()).noDefault() //
.endRecord(); //
record = new GenericData.Record(runtimeSchema);
record.put(0, 1);
record.put(1, "User");
@@ -124,6 +140,22 @@ public class OutgoingSchemaEnforcerTest {
assertThat(enforcer.get(7), equalTo((Object) new Date(1467170137872L)));
}
@Test
public void testDateOutput4LogicalTime() {
IndexMapper indexMapper = new IndexMapperByIndex(talend6Schema4LogicalTimeAsDateOutput);
OutgoingSchemaEnforcer enforcer = new OutgoingSchemaEnforcer(talend6Schema4LogicalTimeAsDateOutput, indexMapper);
enforcer.setWrapped(record);
assertThat(enforcer.get(0), equalTo((Object) 1));
assertThat(enforcer.get(1), equalTo((Object) "User"));
assertThat(enforcer.get(2), equalTo((Object) 100));
assertThat(enforcer.get(3), equalTo((Object) true));
assertThat(enforcer.get(4), equalTo((Object) new Date(1467170137872L)));
assertThat(enforcer.get(5), equalTo((Object) DATE_COMPARE));
assertThat(enforcer.get(6), equalTo((Object) new Date(1000)));
assertThat(enforcer.get(7), equalTo((Object) new Date(1467170137872L)));
}
/**
* Checks {@link OutgoingSchemaEnforcer#get(int)} returns correct values retrieved from wrapped
* {@link IndexedRecord} in case design and runtime schema have different order of the fields

View File

@@ -4,7 +4,11 @@
<groupId>org.talend</groupId>
<artifactId>talend-httputil</artifactId>
<name>talend-httputil</name>
<version>1.0.1</version>
<version>1.0.2</version>
<properties>
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
</properties>
<dependencies>
<dependency>
@@ -16,7 +20,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.5.3</version>
<version>2.9.7</version>
</dependency>
<dependency>
@@ -34,6 +38,20 @@
</dependency>
</dependencies>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
</snapshotRepository>
<repository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
@@ -53,13 +71,5 @@
<directory>src/main/java</directory>
</resource>
</resources>
<!--
<testResources>
<testResource>
<directory>src/test/java</directory>
</testResource>
</testResources>
-->
</build>
</project>

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