Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix default setting #4955

Merged
merged 533 commits into from
Sep 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
533 commits
Select commit Hold shift + click to select a range
7dd79b3
Add pull request coverage check and set threshold as 0.1% (#1678)
htynkn Apr 26, 2018
2711943
Optimize_hessian_desr_performance (#1705)
Apr 26, 2018
27c4d84
We need to change the version to SNAPSHOT to satisfy release:prepare
chickenlj Apr 26, 2018
0bf4809
upgrade to 2.6.2-SNAPSHOT
chickenlj Apr 26, 2018
01e100d
fixes #1089, make ExecutionDispatcher meet dubbo-user-book (#1449)
Apr 30, 2018
a17dc54
enhance comments, javadoc and logging message for (#1722)
beiwei30 May 2, 2018
8079b08
Merge pull request #1716, unit test for AbstractConfigTest.
beiwei30 May 3, 2018
2a52a91
add test for serialization api & fastjson & fst module (#1718)
htynkn May 3, 2018
299f78a
Merge pull request #1717, NettyHelper in netty extension populated Lo…
beiwei30 May 3, 2018
e42d8e0
[Dubbo-1687]Enhance test coverage for dubbo filter (#1715)
qinnnyul May 3, 2018
1022415
optimize unit test for serialization hession2/jdk/kryo (#1726)
jerrick-zhu May 3, 2018
4effd18
fix * imports issue (#1721)
htynkn May 3, 2018
836b1b1
#1731: checkMultiExtension in com.alibaba.dubbo.config.AbstractIn…
beiwei30 May 4, 2018
6a1fe5b
unit test for dubbo-config-api (#1733)
beiwei30 May 4, 2018
1fdb3fe
Fix isShutdown() always return true (#1426)
maxiaoguang64 May 9, 2018
be072bf
Bump version to 2.6.2-SNAPSHOT.
ralf0131 May 9, 2018
e5102b9
Fix #934 #1756 use loadBalance policy to choose invoke when providers…
jerrick-zhu May 9, 2018
30276e9
Remove unnecessary null check.
ralf0131 May 9, 2018
2ee855b
Remove redundant final modifier.
ralf0131 May 9, 2018
4ee3672
Remove unnecessary null check.
ralf0131 May 9, 2018
ebfcc0f
Remove redundant array creation.
ralf0131 May 9, 2018
700aae4
Remove unnecessary null check.
ralf0131 May 9, 2018
1a3f26a
Remove unnecessary null check and fix typo.
ralf0131 May 9, 2018
aefed24
Config api unit test (#1758)
beiwei30 May 9, 2018
ebc0508
enable tcp no delay for netty 3 server (#1746)
nobodyiam May 9, 2018
37fe87d
Change parent pom back to oss in this version
chickenlj May 10, 2018
3ffa756
Add binary release module 'distribution'
chickenlj May 10, 2018
8bf64dd
Bump version to 2.6.2 for release
chickenlj May 10, 2018
23070d8
Merge pull request #1616, fix hessian1 serialized short, byte is conv…
zonghaishang May 10, 2018
d0dd7d4
Polish distribution pom
chickenlj May 10, 2018
45f07f9
unit test for RegistryConfigTest (#1775)
beiwei30 May 10, 2018
35e7431
Fix hessian-lite spelling mistake (#1779)
jerrick-zhu May 11, 2018
8d04a23
Remove unecessary cast.
ralf0131 May 12, 2018
cebadbb
Remove unnecessary null check. (#1764)
refeccd May 12, 2018
0a2f0da
Such logic already exists in findAnnotationName (#1750)
JackCaptain1015 May 12, 2018
6950835
Remove unnecessary null check.
ralf0131 May 12, 2018
0faf0d3
Ignore testStatusChecker since it is unstable and consider removing i…
ralf0131 May 13, 2018
e2c2337
unit test for ServiceConfig (#1780)
beiwei30 May 14, 2018
1b44392
Merge pull request #1761, add Locale serialize & deserialize support.
nzomkxia May 14, 2018
2ff0fcb
Upgrade tomcat version to 8.5.31. (#1781)
ralf0131 May 14, 2018
46e5f8b
add test for monitor module (#1741)
htynkn May 14, 2018
24b34ed
[Dubbo-1687]Add unit tests for dubbo-filter-validation module (#1736)
qinnnyul May 14, 2018
5272859
clean up: finish unit test for config-api (#1795)
beiwei30 May 14, 2018
fad8507
Extracting public code to the parent class (#1776)
scxwhite May 14, 2018
a935c5b
Support package NOTICE & LICENSE into sub-module jar.
chickenlj May 14, 2018
cd15656
Bump version to 2.6.2-SNAPSHOT
chickenlj May 14, 2018
5bff3a8
Bump version to 2.6.2-SNAPSHOT
chickenlj May 14, 2018
32bdcdd
[maven-release-plugin] prepare release dubbo-2.6.2
chickenlj May 14, 2018
870de92
[maven-release-plugin] prepare for next development iteration
chickenlj May 14, 2018
c2d0e9d
Add assembly plugin
chickenlj May 14, 2018
d313d33
unit test for com.alibaba.dubbo.common.status.support (#1796)
beiwei30 May 15, 2018
4845b64
New threadLocal provides more performance. (#1745)
carryxyh May 15, 2018
322e8ff
unit test for SimpleDataStore (#1797)
beiwei30 May 15, 2018
9c20de6
Add CHANGES.md as release note.
chickenlj May 15, 2018
0ac3615
Polish release notes in CHANGES.md
chickenlj May 15, 2018
3ec341b
Thread pool unit test (#1802)
beiwei30 May 15, 2018
3f384fc
Fix bug in InternalThreadLocal and provides unit test (#1803)
carryxyh May 15, 2018
93a9ccc
make unit test stable (#1805)
beiwei30 May 15, 2018
4550d56
#1682: Enhance the test coverage part-4: dubbo-common/src/main/ja…
beiwei30 May 16, 2018
b0b1453
Remove redundant cast.
ralf0131 May 16, 2018
ba447eb
Merge pull request #1792, fix zk unsubscribe issue.
nzomkxia May 17, 2018
3d8eaba
Merge pull request #1570, fix annotation demo in dubbo-test.
zonghaishang May 17, 2018
9407cf4
Add a construtor to accept address and protocol for RegistryConfig.
ralf0131 Apr 28, 2018
e70aaad
Remove unused code.
ralf0131 Apr 28, 2018
8aa45dd
Ensure Dubbo can shutdown correctly when running both under tomcat an…
ralf0131 May 7, 2018
bfa0a43
Add comments.
ralf0131 May 9, 2018
ff073a1
Add dependency.
ralf0131 May 9, 2018
0b83562
Using ExecutorUtil#gracefulShutdown instead of create a new method.
ralf0131 May 9, 2018
390db55
Correct pom version.
ralf0131 May 9, 2018
30ee49a
Fix UT failure.
ralf0131 May 10, 2018
06e5e67
Merge pull request #1811, fix unstable hessian protocol unit test by …
ralf0131 May 17, 2018
7dac296
Merge branch 'graceful-shutdown-in-tomcat' of https://github.com/ralf…
ralf0131 May 17, 2018
c784fa0
Merge branch 'ralf0131-graceful-shutdown-in-tomcat'
ralf0131 May 17, 2018
8d11dba
Merge pull request #1808, fix URL parsing problem when user filed con…
leiwei2094 May 17, 2018
0bcafb7
Simplify code, no function change.
ralf0131 May 17, 2018
8caa2f8
Remove unnecessary null check.
ralf0131 May 17, 2018
4f4a925
Ensure merger is specified to true to demonstrate the merger feature.
ralf0131 May 17, 2018
22c0fc5
Merge pull request #1643, ChannelState branch prediction optimization.
hengyunabc May 18, 2018
ebe418b
Remove .orig file and update gitigonre.
ralf0131 May 20, 2018
4b971e5
#1816: dubbo schema compatibility
beiwei30 May 21, 2018
2c6c0a6
Go back to 2.6.2-SNAPSHOT to prepare for the next release.
chickenlj May 21, 2018
4391466
Add source-release assembly config
chickenlj May 21, 2018
d4ca62b
Add arguments for release-plugin
chickenlj May 21, 2018
a556ad2
#1816: dubbo schema compatibility
beiwei30 May 21, 2018
59c3835
Fix minor issues reported in 2.6.2 RC1
chickenlj May 22, 2018
e322896
Add *.log exclude pattern for source-release assembly
chickenlj May 22, 2018
f247ccc
Skip checkstyle by default
chickenlj May 22, 2018
3e70559
Skip rat by default
chickenlj May 22, 2018
e9d4c03
Merge checkstyle-plugin configuration
chickenlj May 22, 2018
3901003
Exclude release temp files
chickenlj May 22, 2018
3f1a83c
Exclude release temp files
chickenlj May 22, 2018
1efa9d4
#1597: CacheFilter,when value is null,it will throw NPE(if use eh…
beiwei30 May 22, 2018
55461ab
#1830: dbindex support in redis (#1831)
beiwei30 May 23, 2018
404408b
Merge pull request #1839, remove validation key from provider url reg…
nzomkxia May 24, 2018
1243146
Add profile for distribution module
chickenlj May 24, 2018
be2542e
[maven-release-plugin] prepare release dubbo-2.6.2
chickenlj May 24, 2018
f992c68
[maven-release-plugin] prepare for next development iteration
chickenlj May 24, 2018
1f63dc4
Merge pull request #1836, there is a potential deadlock in DubboProto…
beiwei30 May 25, 2018
a105fa7
Use InternalThreadLocal in consumer side (#1825)
carryxyh May 25, 2018
3ea614c
optimize_zk_create (#1833)
May 25, 2018
9700cba
fix #1845 (#1851)
hqq2023623 May 28, 2018
bee28e8
update CXF to latest version and add test case for webservice protoco…
kimmking May 28, 2018
0028774
#1682: Enhance the test coverage part-4 (#1862)
beiwei30 May 30, 2018
6b907a5
[Dubbo-1693] Enhance the test coverage part-14 (#1859)
DeadLion May 31, 2018
d32cee8
Merge pull request #1866, clarify license for codes referencing third…
carryxyh May 31, 2018
eca2c3d
Merge pull request #1820, improve graceful shutdown.
ralf0131 May 31, 2018
a277b38
Merge pull request #1837, spring spi support inject by type.
chickenlj May 31, 2018
912995a
Merge pull request #1843, support implicit delivery of attachments fr…
chickenlj May 31, 2018
12b124a
Merge pull request #1868, add test for rpc modules.
htynkn Jun 1, 2018
907143a
[Dubbo-1684] add unit test for dubbo spring config (#1809)
htynkn Jun 1, 2018
e9b8681
Merge pull request #1827, support generic invoke and attachment for h…
jerrick-zhu Jun 1, 2018
69d072c
Merge pull request #1872, get the real methodname to support consiste…
chickenlj Jun 1, 2018
f3a7f2e
Merge pull request #348, AtomicPositiveInteger less memory used & pro…
fengjiachun Jun 1, 2018
6d55953
Merge pull request #1873, support proxy for provider side.
jerrick-zhu Jun 1, 2018
2e09f21
Merge #1740 manually, fix typo.
chickenlj Jun 1, 2018
fcd67d6
Adding maven wrapper to Dubbo project (#1887)
carryxyh Jun 5, 2018
2e8141f
Merge pull request #1453, restore the bug that attachment has not bee…
Jun 5, 2018
b77f4b5
remove author info from #1453
chickenlj Jun 5, 2018
99fd3cb
Merge branch '2.6.2-release'
chickenlj Jun 6, 2018
7a9dc9d
upgrade version manually after merge 2.6.2-release
chickenlj Jun 6, 2018
851ec9e
remove hessian-lite of 2.6.x and use https://github.com/dubbo/hessian…
lovepoem Jul 15, 2018
216f2f8
Merge pull request #2117, fix protocol version compatibility with low…
jerrick-zhu Jul 23, 2018
5bb2eb8
#1431: here is a StackOverflow bug? dubbo version 2.5.9, Failsafe…
beiwei30 Jun 11, 2018
611b5d7
Updage changes for 2.6.3
chickenlj Jul 23, 2018
a5ea248
Merge #2114 mannually from master, enable configuration of Consumer t…
tswstarplanet Jul 25, 2018
5cfa356
Merge #2114 mannually from master, enable configuration of Consumer t…
chickenlj Jul 26, 2018
c0e0d14
Merge pull request #2126, ensure compatibility for elegant shutdown u…
ralf0131 Jul 26, 2018
daa0bec
Resolve conflicts of merging #1820
chickenlj Jul 26, 2018
3fc6e34
Upgrade hessian-lite dependency to 3.2.4
chickenlj Jul 26, 2018
2385eff
[maven-release-plugin] prepare release dubbo-2.6.3
chickenlj Jul 26, 2018
f664cdc
[maven-release-plugin] prepare for next development iteration
chickenlj Jul 26, 2018
b9f6fdd
support char[] for generic invoke #2003 (#2137)
jerrick-zhu Jul 26, 2018
7ce73ab
Update CHANGES.md
htynkn Jul 27, 2018
279c5be
Exclude maven wrapper when package
chickenlj Jul 30, 2018
b43e3c8
Merge branch '2.6.3-release' of https://github.com/apache/incubator-d…
chickenlj Jul 30, 2018
e705ad1
Merge pull request #2024, binding attachment before a clusterInvoker …
carryxyh Jul 31, 2018
da9508a
Merge pull request #2146, fix redis auth problem for RedisProtocol.
ningyu1 Jul 31, 2018
01aaf68
fix subscription when enable monitor (#2166)
jasonjoo2010 Aug 2, 2018
13ee1d9
solve compatible issue with dubbo 2.5.9, 2.5.10 (#2175)
jasonjoo2010 Aug 3, 2018
51b3e54
solve compatible issue with dubbo 2.5.9, 2.5.10 (#2175)
jasonjoo2010 Aug 3, 2018
c1dc611
Add compatibility notice to Release Notes
chickenlj Aug 4, 2018
df672da
fix ut unstable (#2192)
jerrick-zhu Aug 6, 2018
596993a
Replace hard coded version number of hessian-lite #2136 (#2195)
HauyuChen Aug 7, 2018
6c933c8
Fixes #2136, replace hard coded hessian-lite version with mavne prope…
chickenlj Aug 10, 2018
f511823
Remove hessian-lite license.
ralf0131 Aug 13, 2018
e949fc3
fix ut stable, #2227 (#2302)
jerrick-zhu Aug 15, 2018
0a778e5
fix retries to 2, #2162 (#2303)
jerrick-zhu Aug 15, 2018
22b0788
Revert version to 2.6.2-SNAPSHOT to prepare for 2.6.3 RC4
chickenlj Aug 20, 2018
048c1b5
Replace outdated license header
chickenlj Aug 20, 2018
2a8e103
Include 'apache' in release package name.
chickenlj Aug 20, 2018
3ca50ff
Fix version issue: 2.6.2-SNAPSHOT to 2.6.3-SNAPSHOT
chickenlj Aug 20, 2018
4c07e58
[maven-release-plugin] prepare release dubbo-2.6.3
chickenlj Aug 20, 2018
6a0aee5
[maven-release-plugin] prepare for next development iteration
chickenlj Aug 20, 2018
adce1f1
complete LICENSE for test xml, fix checkstyle problem
diecui1202 Aug 24, 2018
56d20ae
[maven-release-plugin] prepare release dubbo-2.6.3
chickenlj Aug 27, 2018
90b4560
New ascii logo for 2.6.x (#2402)
carryxyh Aug 29, 2018
edb58c9
Merge pull request #2417, add release script (draft).
chickenlj Sep 5, 2018
e791a87
Direct return when the server goes down unnormally. (#2451)
carryxyh Sep 6, 2018
b41bc7a
fix telnet invoke NPE #2218 (#2273) (#2453)
jerrick-zhu Sep 6, 2018
1af5ed9
upgrade javadoc to 3.0.1 (#2454)
jerrick-zhu Sep 6, 2018
8f92b5c
Qos enhancement, take #2153 back to 2.6.x (#2455)
jerrick-zhu Sep 6, 2018
6e92e5b
remove dubbo-all javadoc plugin (#2456)
jerrick-zhu Sep 6, 2018
2c06919
Merge branch '2.6.3-release' into 2.6.x
chickenlj Sep 12, 2018
6f8401a
Prepare for the next development version
chickenlj Sep 12, 2018
0a2e1ff
add cache for travis, fix ut for stable (#2501)
jerrick-zhu Sep 13, 2018
916756a
fix time, timestamp, SQL. Date type conversion problems (#2502)
ningyu1 Sep 14, 2018
0127926
add change log for 2.6.4
diecui1202 Sep 14, 2018
b5929bd
Enhance NOTICE file.
ralf0131 Sep 17, 2018
604f683
change port for unit test
diecui1202 Sep 17, 2018
2b80ac8
Merge branch '2.6.4-release' of github.com:apache/incubator-dubbo int…
diecui1202 Sep 17, 2018
313b93e
[maven-release-plugin] prepare release dubbo-2.6.4
diecui1202 Sep 17, 2018
f2b3edb
[maven-release-plugin] prepare for next development iteration
diecui1202 Sep 17, 2018
e4d88be
fix #2560, use target/test-classes as the basedir (#2564)
jerrick-zhu Sep 27, 2018
9bde543
Optimize LeastActiveLoadBalance and add weight test case. (#2584)
carryxyh Sep 29, 2018
5ab8aad
Merge branch '2.6.4-release' into 2.6.x
diecui1202 Oct 8, 2018
a28e13a
fix #2600, add javadoc plugin to dubbo-all module (#2602)
jerrick-zhu Oct 8, 2018
efe5a90
Removed jdk9 from .travis.yml. (#2609)
cbolgiano Oct 9, 2018
2c33372
update release script (#2615)
jerrick-zhu Oct 9, 2018
616b59f
Fix incorrect descriptions for dubbo-serialization module for 2.6.x. …
carryxyh Oct 9, 2018
a64cdd4
Fixed 2.6.x branch a minor issue with doConnect not using getConnectT…
Oct 9, 2018
ed08b61
fix #1641, support get system load on windows. (#2621)
jerrick-zhu Oct 10, 2018
69414f8
fix #2063
nzomkxia Oct 11, 2018
a9cd309
@Service and @Reference Optimization (#2657)
mercyblitz Oct 19, 2018
2843d2b
#1903: merge issue 1903's fix from 2.7.0 to 2.6.x (#2668)
beiwei30 Oct 23, 2018
b42ead7
#2016: merge fix from 2.7.0 to 2.6.x (#2680)
beiwei30 Oct 24, 2018
c660e7e
Smooth Round Robin selection (#2647)
jasonjoo2010 Oct 26, 2018
0556709
remove author info for RoundRobinLoadBalance (#2696)
jasonjoo2010 Oct 29, 2018
0b55b46
Bug Fix & Enhancement (#2687)
mercyblitz Oct 29, 2018
22b1a4d
release 2.6.5 (#2705)
cvictory Oct 29, 2018
82d1723
2.6.5 release changes.md (#2708)
cvictory Oct 30, 2018
8a35672
modify 2.6.5 release log (replace pr link with issue link) (#2716)
cvictory Oct 31, 2018
8a8447c
remove serviceclassHolder and also fix the issue #2637 (#2607)
Jeff-Lv Oct 31, 2018
f86b462
fix referenceBean initialization issue (#2719)
YoungHu Nov 1, 2018
daeffe7
[Dubbo-2678] Add ability to turn off SPI auto injection, special supp…
chickenlj Nov 1, 2018
6dd3edc
merge https://github.com/apache/incubator-dubbo/pull/2725 (#2734)
beiwei30 Nov 5, 2018
036ca5b
[DUBBO-2489] MockClusterInvoker provides local forced mock,I tested i…
beiwei30 Nov 7, 2018
45ceffd
Add forks support for ForkingCluster. (#2751)
carryxyh Nov 7, 2018
dd4dc3e
#2748: Provider should disable mock configuration (#2750)
beiwei30 Nov 7, 2018
bf93f09
Fix the bug that ReferenceBean refers service more than once when deb…
code4wt Nov 8, 2018
ba74644
merge pull request #2353 to 2.6.x to fix #2353 (#2761)
beiwei30 Nov 8, 2018
6297132
#2762: [Dubbo - qos-http] stopServer should be invoked ? (#2768)
beiwei30 Nov 9, 2018
c41ccf8
2.6.5 release note change (#2775)
cvictory Nov 12, 2018
e8bbe1c
[Dubbo-2678] Add ability to turn off SPI auto injection, special supp…
chickenlj Nov 1, 2018
fd51396
Update release note
chickenlj Nov 13, 2018
9140d11
fix #2459 sha512 issue
cvictory Nov 13, 2018
c06d876
[maven-release-plugin] prepare release dubbo-2.6.5
cvictory Nov 13, 2018
659c682
[maven-release-plugin] prepare for next development iteration
cvictory Nov 13, 2018
ce10e67
fix 2798 on branch 2.6.x (#2805)
kexianjun Nov 20, 2018
a362bcc
release 2.6.5 and modify pom.xml version to 2.6.6-snapshot
cvictory Nov 23, 2018
45937c3
Remove extra modifiers (#2876)
CrazyHZM Dec 4, 2018
84b67a8
feature:import TagRouter (#3065)
lexburner Jan 17, 2019
a73bb09
Merge pull request #3315, fixes #2842, duplicate SPI config items.
cvictory Jan 24, 2019
de82700
Fix random ut falling in DubboMonitorTest (#3336)
biyuhao Jan 28, 2019
2b6209c
use netty4 as default transporter for 2.6.6 #3029 (#3318)
nzomkxia Jan 28, 2019
c402ecb
Activate SPI sort (#3412)
dongYES Feb 1, 2019
6d91f3b
Merge pull request #3502, apply #3295 to 2.6 branch.
nzomkxia Feb 19, 2019
f454e7c
Merge pull request #3511, apply #2925 to branch 2.6.x (to make telnet…
nzomkxia Feb 20, 2019
343c796
Revise the naming conventions (#3506)
kuaike Feb 20, 2019
29ef42c
apply #2220 to 2.6.x branch, issue #2178 (#3519)
nzomkxia Feb 21, 2019
454f037
update hessian-lite to 2.6.5 (#3538)
nzomkxia Feb 22, 2019
5cdc13c
[Enhancement] inline the source code of spring-context-support (#3225)
mercyblitz Feb 25, 2019
0e97d71
[Dubbo-2298] Add Annotation-Driven for MethodConfig and ArgumentConfi…
cvictory Feb 25, 2019
e7f9e2b
update notice
nzomkxia Feb 28, 2019
d897be6
update CHANGE.md
nzomkxia Feb 28, 2019
6ed863b
[maven-release-plugin] prepare release dubbo-2.6.6
nzomkxia Feb 28, 2019
98e95a7
[maven-release-plugin] prepare for next development iteration
nzomkxia Feb 28, 2019
fe463cb
[DUBBO-3243] Fix Invalid use of BasicClientConnManager: connection st…
CrazyHZM Mar 7, 2019
ad04204
Merge branch '2.6.x' into 2.6.6-release
nzomkxia Mar 7, 2019
4342de9
Multicast ipv6 support for branch 2.6.x (#3430)
chickenlj Mar 8, 2019
cd0e9a6
fix fastjson serialize type (#3767)
cyejing Mar 29, 2019
09beba0
Add ASF header #3721 (#3783)
wanghbxxxx Apr 2, 2019
f780164
fix for #4111 (#4114)
uglycow May 22, 2019
922b277
Disclaimer removed (#4233)
p3trur0 Jun 3, 2019
28d345b
[No issue] Fix: @Method default value will be set to the field of Met…
cvictory Jun 25, 2019
c0f3dc1
Polish /apache/dubbo#3695 : @Reference field can't refer its' @Servic…
mercyblitz Jun 25, 2019
eac08a6
Nacos Dubbo Registry can't sense the change (#4392)
mercyblitz Jun 27, 2019
345a0f0
Dubbo throws IoException with error message while decoding fail (#4396)
qixiaobo Jun 29, 2019
a1453bb
Dubbo throws exception when use java serializer (#4530)
qixiaobo Jul 11, 2019
089c2e3
upgrade fastjson to 1.2.58 (#4624)
qixiaobo Jul 22, 2019
b486649
修复注册中心域名解析导致的单点问题 (#4293)
356082462 Jul 23, 2019
642ef8d
enhance travis
beiwei30 Aug 22, 2019
bf04245
travis config on 2.6.x (#4916)
beiwei30 Aug 22, 2019
974b078
fix default setting
brucelwl Aug 27, 2019
ab59df1
enhance travis build
beiwei30 Aug 28, 2019
27364ee
switch back to openjdk since zulu 7 doesn't support javascript, see i…
beiwei30 Sep 2, 2019
87ff1ec
use zulu jdk 7 but disable ScriptRouterTest
beiwei30 Sep 2, 2019
a3cc428
add timeout config to zookeeper client (#4963)
LiZhenNet Sep 2, 2019
8c4695c
merge latest code
brucelwl Sep 4, 2019
4e66c87
Merge remote-tracking branch 'upstream/2.6.x' into 2.6.x
brucelwl Sep 6, 2019
03e6e7a
解决冲突
brucelwl Sep 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

/**
* Abstract generic {@link BeanPostProcessor} implementation for customized annotation that annotated injected-object.
*
* <p>
* The source code is cloned from https://github.com/alibaba/spring-context-support/blob/1.0.2/src/main/java/com/alibaba/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
*
* @since 2.6.6
Expand Down Expand Up @@ -224,7 +224,7 @@ private AnnotationInjectedBeanPostProcessor.AnnotatedInjectionMetadata buildAnno

}

private InjectionMetadata findInjectionMetadata(String beanName, Class<?> clazz, PropertyValues pvs) {
public InjectionMetadata findInjectionMetadata(String beanName, Class<?> clazz, PropertyValues pvs) {
// Fall back to class name as cache key, for backwards compatibility with custom callers.
String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
// Quick check on the concurrent map first, with minimal locking.
Expand Down Expand Up @@ -314,8 +314,8 @@ protected ConfigurableListableBeanFactory getBeanFactory() {
*
* @return non-null {@link Collection}
*/
protected Collection<Object> getInjectedObjects() {
return this.injectedObjectsCache.values();
protected Map<String, Object> getInjectedObjects() {
return this.injectedObjectsCache;
}

/**
Expand Down Expand Up @@ -402,7 +402,7 @@ protected Map<InjectionMetadata.InjectedElement, Object> getInjectedFieldObjects

for (AnnotationInjectedBeanPostProcessor.AnnotatedFieldElement fieldElement : fieldElements) {

injectedElementBeanMap.put(fieldElement, fieldElement.bean);
injectedElementBeanMap.put(fieldElement, fieldElement.injectedBean);

}

Expand All @@ -428,20 +428,19 @@ protected Map<InjectionMetadata.InjectedElement, Object> getInjectedMethodObject

for (AnnotationInjectedBeanPostProcessor.AnnotatedMethodElement methodElement : methodElements) {

injectedElementBeanMap.put(methodElement, methodElement.object);
injectedElementBeanMap.put(methodElement, methodElement.injectedBean);

}

}

return Collections.unmodifiableMap(injectedElementBeanMap);

}

/**
* {@link A} {@link InjectionMetadata} implementation
*/
private class AnnotatedInjectionMetadata extends InjectionMetadata {
public class AnnotatedInjectionMetadata extends InjectionMetadata {

private final Collection<AnnotationInjectedBeanPostProcessor.AnnotatedFieldElement> fieldElements;

Expand All @@ -466,13 +465,13 @@ public Collection<AnnotationInjectedBeanPostProcessor.AnnotatedMethodElement> ge
/**
* {@link A} {@link Method} {@link InjectionMetadata.InjectedElement}
*/
private class AnnotatedMethodElement extends InjectionMetadata.InjectedElement {
public class AnnotatedMethodElement extends InjectionMetadata.InjectedElement {

private final Method method;

private final A annotation;

private volatile Object object;
private volatile Object injectedBean;

protected AnnotatedMethodElement(Method method, PropertyDescriptor pd, A annotation) {
super(method, pd);
Expand All @@ -485,14 +484,29 @@ protected void inject(Object bean, String beanName, PropertyValues pvs) throws T

Class<?> injectedType = pd.getPropertyType();

Object injectedObject = getInjectedObject(annotation, bean, beanName, injectedType, this);
injectedBean = getInjectedObject(annotation, bean, beanName, injectedType, this);

ReflectionUtils.makeAccessible(method);

method.invoke(bean, injectedObject);
method.invoke(bean, injectedBean);

}

public Method getMethod() {
return method;
}

public A getAnnotation() {
return annotation;
}

public Object getInjectedBean() {
return injectedBean;
}

public PropertyDescriptor getPd() {
return this.pd;
}
}

/**
Expand All @@ -504,7 +518,7 @@ public class AnnotatedFieldElement extends InjectionMetadata.InjectedElement {

private final A annotation;

private volatile Object bean;
private volatile Object injectedBean;

protected AnnotatedFieldElement(Field field, A annotation) {
super(field, null);
Expand All @@ -517,12 +531,24 @@ protected void inject(Object bean, String beanName, PropertyValues pvs) throws T

Class<?> injectedType = field.getType();

Object injectedObject = getInjectedObject(annotation, bean, beanName, injectedType, this);
injectedBean = getInjectedObject(annotation, bean, beanName, injectedType, this);

ReflectionUtils.makeAccessible(field);

field.set(bean, injectedObject);
field.set(bean, injectedBean);

}

public Field getField() {
return field;
}

public A getAnnotation() {
return annotation;
}

public Object getInjectedBean() {
return injectedBean;
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ public class DubboConfigBindingBeanPostProcessor implements BeanPostProcessor, A

private ApplicationContext applicationContext;

private boolean ignoreUnknownFields = true;

private boolean ignoreInvalidFields = true;

private List<DubboConfigBeanCustomizer> configBeanCustomizers = Collections.emptyList();

/**
Expand All @@ -93,11 +89,8 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) thro
bind(prefix, dubboConfig);

customize(beanName, dubboConfig);

}

return bean;

}

private void bind(String prefix, AbstractConfig dubboConfig) {
Expand All @@ -118,22 +111,6 @@ private void customize(String beanName, AbstractConfig dubboConfig) {

}

public boolean isIgnoreUnknownFields() {
return ignoreUnknownFields;
}

public void setIgnoreUnknownFields(boolean ignoreUnknownFields) {
this.ignoreUnknownFields = ignoreUnknownFields;
}

public boolean isIgnoreInvalidFields() {
return ignoreInvalidFields;
}

public void setIgnoreInvalidFields(boolean ignoreInvalidFields) {
this.ignoreInvalidFields = ignoreInvalidFields;
}

public DubboConfigBinder getDubboConfigBinder() {
return dubboConfigBinder;
}
Expand Down Expand Up @@ -175,9 +152,6 @@ private void initDubboConfigBinder() {
}
}

dubboConfigBinder.setIgnoreUnknownFields(ignoreUnknownFields);
dubboConfigBinder.setIgnoreInvalidFields(ignoreInvalidFields);

}

private void initConfigBeanCustomizers() {
Expand All @@ -199,6 +173,10 @@ private void initConfigBeanCustomizers() {
protected DubboConfigBinder createDubboConfigBinder(Environment environment) {
DefaultDubboConfigBinder defaultDubboConfigBinder = new DefaultDubboConfigBinder();
defaultDubboConfigBinder.setEnvironment(environment);

defaultDubboConfigBinder.setIgnoreUnknownFields(true);
defaultDubboConfigBinder.setIgnoreInvalidFields(true);

return defaultDubboConfigBinder;
}

Expand Down