Merge pull request #6 from jpwhitemn/master

fixed unit test broken by core-test enum change for google stlyes. A…
edgexfoundry · Aug 19, 2017 · 63c8250 · 63c8250
2 parents 7254a6f + 4f8c9a4
commit 63c8250
Show file tree

Hide file tree

Showing 10 changed files with 928 additions and 967 deletions.
diff --git a/src/main/java/org/edgexfoundry/Application.java b/src/main/java/org/edgexfoundry/Application.java
@@ -1,22 +1,21 @@
 /*******************************************************************************
  * Copyright 2016-2017 Dell Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  *
- * @microservice:  core-command
+ * @microservice: core-command
  * @author: Jim White, Dell
  * @version: 1.0.0
  *******************************************************************************/
+
 package org.edgexfoundry;
 
 import org.springframework.boot.SpringApplication;
@@ -30,10 +29,10 @@
 @EnableDiscoveryClient
 public class Application {
 
-	public static void main(String[] args) {
-		ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args);
-		String welcomeMsg = ctx.getEnvironment().getProperty("app.open.msg");
-		System.out.println(welcomeMsg);
-	}
+  public static void main(String[] args) {
+    ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args);
+    String welcomeMsg = ctx.getEnvironment().getProperty("app.open.msg");
+    System.out.println(welcomeMsg);
+  }
 
 }
diff --git a/src/main/java/org/edgexfoundry/HeartBeat.java b/src/main/java/org/edgexfoundry/HeartBeat.java
@@ -1,22 +1,21 @@
 /*******************************************************************************
  * Copyright 2016-2017 Dell Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  *
- * @microservice:  core-command
+ * @microservice: core-command
  * @author: Jim White, Dell
  * @version: 1.0.0
  *******************************************************************************/
+
 package org.edgexfoundry;
 
 import org.springframework.beans.factory.annotation.Value;
@@ -28,15 +27,14 @@
 @Component
 public class HeartBeat {
 
-	// private static final Logger logger = Logger.getLogger(HeartBeat.class);
-	private final static org.edgexfoundry.support.logging.client.EdgeXLogger logger = org.edgexfoundry.support.logging.client.EdgeXLoggerFactory
-			.getEdgeXLogger(HeartBeat.class);
+  private static final org.edgexfoundry.support.logging.client.EdgeXLogger logger =
+      org.edgexfoundry.support.logging.client.EdgeXLoggerFactory.getEdgeXLogger(HeartBeat.class);
 
-	@Value("${heart.beat.msg}")
-	private String heartBeatMsg;
+  @Value("${heart.beat.msg}")
+  private String heartBeatMsg;
 
-	@Scheduled(fixedRateString = "${heart.beat.time}")
-	public void pulse() {
-		logger.info(heartBeatMsg);
-	}
+  @Scheduled(fixedRateString = "${heart.beat.time}")
+  public void pulse() {
+    logger.info(heartBeatMsg);
+  }
 }