Repository: cxf Updated Branches: refs/heads/3.1.x-fixes d4aa22c8d -> 20a4f79a7
FIx checkstyle issues # Conflicts: # distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/97eb4f3e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/97eb4f3e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/97eb4f3e Branch: refs/heads/3.1.x-fixes Commit: 97eb4f3e2db0678af3c2ae6cac999ce821574b10 Parents: d4aa22c Author: Daniel Kulp <dk...@apache.org> Authored: Mon Jul 25 16:22:51 2016 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Jul 25 16:23:51 2016 -0400 ---------------------------------------------------------------------- .../rs/client/SampleRestClientApplication.java | 29 +++++++++++--------- .../rs/service/SampleRestApplication.java | 2 +- .../rs/client/SampleRestClientApplication.java | 21 ++++++++------ .../registry/eureka/RegistryApplication.java | 5 +++- 4 files changed, 33 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java index 0fed450..8dbf659 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java @@ -31,7 +31,10 @@ import sample.rs.service.HelloService; @SpringBootApplication @EnableJaxRsWebClient @EnableJaxRsProxyClient -public class SampleRestClientApplication { +public final class SampleRestClientApplication { + private SampleRestClientApplication() { + } + public static void main(String[] args) { new SpringApplicationBuilder(SampleRestClientApplication.class) .web(false) @@ -40,24 +43,24 @@ public class SampleRestClientApplication { @Bean CommandLineRunner initWebClientRunner(final WebClient webClient) { - return new CommandLineRunner() { + return new CommandLineRunner() { - @Override - public void run(String... runArgs) throws Exception { - System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class)); - } - }; + @Override + public void run(String... runArgs) throws Exception { + System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class)); + } + }; } @Bean CommandLineRunner initProxyClientRunner(final HelloService client) { - return new CommandLineRunner() { + return new CommandLineRunner() { - @Override - public void run(String... runArgs) throws Exception { - System.out.println(client.sayHello("ApacheCxfProxyUser")); - } - }; + @Override + public void run(String... runArgs) throws Exception { + System.out.println(client.sayHello("ApacheCxfProxyUser")); + } + }; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java index 60ef15e..f622a43 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java @@ -60,4 +60,4 @@ public class SampleRestApplication { } - } +} http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java index 4ec4e60..9db3fa4 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java @@ -44,7 +44,10 @@ import sample.rs.service.HelloService; @SpringBootApplication @EnableEurekaClient @EnableJaxRsProxyClient -public class SampleRestClientApplication { +public final class SampleRestClientApplication { + private SampleRestClientApplication() { + } + public static void main(String[] args) { new SpringApplicationBuilder(SampleRestClientApplication.class) .web(false) @@ -53,13 +56,13 @@ public class SampleRestClientApplication { @Bean CommandLineRunner initProxyClient(final HelloService service) { - return new CommandLineRunner() { - @Override - public void run(String... runArgs) throws Exception { - System.out.println(service.sayHello("ApacheCxfProxyUser1")); - System.out.println(service.sayHello("ApacheCxfProxyUser2")); - } - }; + return new CommandLineRunner() { + @Override + public void run(String... runArgs) throws Exception { + System.out.println(service.sayHello("ApacheCxfProxyUser1")); + System.out.println(service.sayHello("ApacheCxfProxyUser2")); + } + }; } /** @@ -74,7 +77,7 @@ public class SampleRestClientApplication { DiscoveryClient discoveryClient; List<String> addresses = new LinkedList<String>(); - public EurekaFailoverFeature() { + EurekaFailoverFeature() { super("eureka://registry"); } http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java index c08dc8a..bed6961 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java @@ -6,7 +6,10 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; @SpringBootApplication @EnableEurekaServer -public class RegistryApplication { +public final class RegistryApplication { + private RegistryApplication() { + } + public static void main(String[] args) { SpringApplication.run(RegistryApplication.class, args); }
