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.

Sign up for GitHub

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

[Dubbo-2298] Add Annotation-Driven for MethodConfig and ArgumentConfig #2603

Merged
merged 14 commits into from
Feb 25, 2019
Merged

[Dubbo-2298] Add Annotation-Driven for MethodConfig and ArgumentConfig #2603

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e695745
support methodConfig and argementConfig. fix #2298
cvictory Sep 30, 2018
bf29a82
unit test
cvictory Sep 30, 2018
ab14d6a
unit test
cvictory Oct 8, 2018
7aadbcc
remove unused
cvictory Oct 8, 2018
2dd2dd2
remove author
cvictory Oct 8, 2018
815d8f3
add licence
cvictory Oct 12, 2018
67fa1b0
Merge branch '2.6.x' into 2.6.x_issue_2298
cvictory Oct 19, 2018
380ae5e
pull 2.6.x
cvictory Oct 23, 2018
ba02575
merge file
cvictory Oct 23, 2018
dbe8bb8
fix conflict
cvictory Nov 1, 2018
67cc140
format the code
cvictory Nov 1, 2018
67fb98c
merge 2.6.x
cvictory Nov 2, 2018
3eb90ec
Merge branch '2.6.x' into 2.6.x_issue_2298
cvictory Feb 18, 2019
9bff5de
Merge branch '2.6.x' into 2.6.x_issue_2298
nzomkxia Feb 25, 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
Prev Previous commit
Next Next commit
remove unused
  • Loading branch information
@cvictory
cvictory committed Oct 8, 2018
commit 7aadbcc24957463ef7062d91c8a8a31ff2d983ee
1 change: 0 additions & 1 deletion ...test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
public class AnnotationConsumer {

public static void main(String[] args) throws Exception {
System.setProperty("java.net.preferIPv4Stack", "true");
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class);
context.start();
final AnnotationAction annotationAction = (AnnotationAction) context.getBean("annotationAction");
Expand Down
1 change: 0 additions & 1 deletion ...test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
public class AnnotationProvider {

public static void main(String[] args) throws Exception {
System.setProperty("java.net.preferIPv4Stack", "true");
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ProviderConfiguration.class);
context.start();
System.in.read();
Expand Down
2 changes: 1 addition & 1 deletion ...examples/src/main/java/com/alibaba/dubbo/examples/annotation/action/AnnotationAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@Component("annotationAction")
public class AnnotationAction {

@Reference(methods = {@Method(name = "sayHello", timeout = 1000)})
@Reference(methods = {@Method(name = "sayHello", timeout = 5000)})
private AnnotationService annotationService;

public String doSayHello(String name) {
Expand Down