cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [5/6] cxf git commit: Fix checkstyle issues in samples
Date Wed, 23 Nov 2016 16:44:41 GMT
Fix checkstyle issues in samples

# Conflicts:
#	distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
#	distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
#	distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a8f1f095
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a8f1f095
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a8f1f095

Branch: refs/heads/3.1.x-fixes
Commit: a8f1f095ecddd639d1496c1fa6189ebf2e371716
Parents: 2164a19
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Nov 23 09:39:03 2016 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Nov 23 10:53:07 2016 -0500

----------------------------------------------------------------------
 .../src/main/java/sample/rs/service/SampleRestApplication.java  | 5 +++--
 .../src/main/java/registry/eureka/RegistryApplication.java      | 4 ++--
 .../src/main/java/sample/ws/SampleWsApplicationClient.java      | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a8f1f095/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 e146a7f..35bf34a 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
@@ -19,6 +19,8 @@
 package sample.rs.service;
 import java.util.Collections;
 
+import com.codahale.metrics.MetricRegistry;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
 import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
@@ -27,13 +29,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 
-import com.codahale.metrics.MetricRegistry;
 
 @SpringBootApplication
 @EnableEurekaClient
 public class SampleRestApplication {
     @Bean
-    public MetricRegistry metricRegistry(){
+    public MetricRegistry metricRegistry() {
         return new MetricRegistry();
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/a8f1f095/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 0cbdc6e..b38ed90 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
@@ -22,12 +22,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
+//CHECKSTYLE:OFF
 @SpringBootApplication
 @EnableEurekaServer
-//CHECKSTYLE:OFF
 public class RegistryApplication {
-//CHECKSTYLE:ON    
     public static void main(String[] args) {
         SpringApplication.run(RegistryApplication.class, args);
     }
 }
+//CHECKSTYLE:ON

http://git-wip-us.apache.org/repos/asf/cxf/blob/a8f1f095/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
index 76f4611..15ea971 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
@@ -24,8 +24,8 @@ import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
 
+//CHECKSTYLE:OFF
 public class SampleWsApplicationClient {
-
  
     public static void main(String[] args) {
         String address = "http://localhost:8080/Service/Hello";
@@ -44,3 +44,5 @@ public class SampleWsApplicationClient {
     }
 
 }
+//CHECKSTYLE:ON
+


Mime
View raw message