Skip to content

refactor: Remove @RequestMapping annotations #292

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: Remove @RequestMapping annotations #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions .../src/test/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;

Expand Down Expand Up @@ -153,7 +152,7 @@ public void should_properly_find_local_instance() {
@FeignClient("loadBalancerApp")
public interface IdUsingFeignClient {

@RequestMapping(method = RequestMethod.GET, value = "/hi")
@GetMapping("/hi")
String hi();

}
Expand All @@ -172,7 +171,7 @@ TestLoadBalancedClient testLoadBalancedClient(@LoadBalanced RestTemplate restTem
return new TestLoadBalancedClient(restTemplate, springAppName);
}

@RequestMapping("/hi")
@GetMapping("/hi")
public String hi() {
return "hi";
}
Expand All @@ -183,7 +182,7 @@ public String hi() {
@Profile("loadbalancer")
class PingController {

@RequestMapping("/ping")
@GetMapping("/ping")
String ping() {
return "pong";
}
Expand Down
4 changes: 2 additions & 2 deletions ...t/java/org/springframework/cloud/zookeeper/discovery/ZookeeprDiscoveryNonWebAppTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.SocketUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;

Expand Down Expand Up @@ -119,7 +119,7 @@ RestTemplate restTemplate() {
@RestController
static class HelloProducer {

@RequestMapping("/")
@GetMapping("/")
public String foo() {
return "foo";
}
Expand Down
15 changes: 7 additions & 8 deletions .../test/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;

Expand Down Expand Up @@ -79,18 +78,18 @@ public int getPort() {
@FeignClient("someAlias")
interface AliasUsingFeignClient {

@RequestMapping(method = RequestMethod.GET, value = "/application/beans")
@GetMapping("/application/beans")
String getBeans();

@RequestMapping(method = RequestMethod.GET, value = "/checkHeaders")
@GetMapping("/checkHeaders")
String checkHeaders();

}

@FeignClient("nameWithoutAlias")
interface IdUsingFeignClient {

@RequestMapping(method = RequestMethod.GET, value = "/application/beans")
@GetMapping("/application/beans")
String getBeans();

}
Expand All @@ -104,17 +103,17 @@ class PingController {
this.portListener = portListener;
}

@RequestMapping("/ping")
@GetMapping("/ping")
String ping() {
return "pong";
}

@RequestMapping("/port")
@GetMapping("/port")
Integer port() {
return this.portListener.getPort();
}

@RequestMapping("/checkHeaders")
@GetMapping("/checkHeaders")
String checkHeaders(@RequestHeader("Content-Type") String contentType,
@RequestHeader("header1") Collection<String> header1,
@RequestHeader("header2") Collection<String> header2) {
Expand Down
13 changes: 6 additions & 7 deletions .../src/main/java/org/springframework/cloud/zookeeper/sample/SampleZookeeperApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
Expand Down Expand Up @@ -66,22 +65,22 @@ public class SampleZookeeperApplication {
@Autowired
private RestTemplate rest;

@RequestMapping("/")
@GetMapping("/")
public ServiceInstance lb() {
return this.loadBalancer.choose(this.appName);
}

@RequestMapping("/hi")
@GetMapping("/hi")
public String hi() {
return "Hello World! from " + this.registration;
}

@RequestMapping("/self")
@GetMapping("/self")
public String self() {
return this.appClient.hi();
}

@RequestMapping("/myenv")
@GetMapping("/myenv")
public String env(@RequestParam("prop") String prop) {
return this.env.getProperty(prop, "Not Found");
}
Expand All @@ -103,7 +102,7 @@ public static void main(String[] args) {
@FeignClient("testZookeeperApp")
interface AppClient {

@RequestMapping(path = "/hi", method = RequestMethod.GET)
@GetMapping("/hi")
String hi();

}
Expand Down