You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@twill.apache.org by ch...@apache.org on 2014/04/22 08:06:27 UTC
[30/50] [abbrv] git commit: fixing checkstyle violations #TWILL-40
fixing checkstyle violations #TWILL-40
Signed-off-by: Terence Yim <te...@continuuity.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/fd10dc95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/fd10dc95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/fd10dc95
Branch: refs/heads/site
Commit: fd10dc9557eb9e7a1a14b4bdb84287093f27c7cf
Parents: ac67f1f
Author: Fabian Murariu <mu...@gmail.com>
Authored: Fri Feb 14 11:57:01 2014 +0200
Committer: Terence Yim <te...@continuuity.com>
Committed: Fri Feb 21 12:33:26 2014 -0800
----------------------------------------------------------------------
.../apache/twill/api/ResourceSpecification.java | 4 +-
.../internal/DefaultResourceSpecification.java | 4 +-
.../json/ResourceSpecificationCodec.java | 8 +++-
.../json/ResourceSpecificationCodecTest.java | 40 +++++++++++++-------
.../twill/internal/yarn/YarnAMClient.java | 11 ++++--
.../apache/twill/yarn/EchoServerTestRun.java | 2 -
6 files changed, 45 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/fd10dc95/twill-api/src/main/java/org/apache/twill/api/ResourceSpecification.java
----------------------------------------------------------------------
diff --git a/twill-api/src/main/java/org/apache/twill/api/ResourceSpecification.java b/twill-api/src/main/java/org/apache/twill/api/ResourceSpecification.java
index 75427a7..5416346 100644
--- a/twill-api/src/main/java/org/apache/twill/api/ResourceSpecification.java
+++ b/twill-api/src/main/java/org/apache/twill/api/ResourceSpecification.java
@@ -79,14 +79,14 @@ public interface ResourceSpecification {
int getInstances();
/**
- * Returns the execution hosts, expects Fully Qualified Domain Names host + domain
+ * Returns the execution hosts, expects Fully Qualified Domain Names host + domain.
* This is a suggestion for the scheduler depending on cluster load it may ignore it
* @return An array containing the hosts where the containers should run
*/
String[] getHosts();
/**
- * Returns the execution racks
+ * Returns the execution racks.
* This is a suggestion for the scheduler depending on cluster load it may ignore it
* @return An array containing the racks where the containers should run
*/
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/fd10dc95/twill-api/src/main/java/org/apache/twill/internal/DefaultResourceSpecification.java
----------------------------------------------------------------------
diff --git a/twill-api/src/main/java/org/apache/twill/internal/DefaultResourceSpecification.java b/twill-api/src/main/java/org/apache/twill/internal/DefaultResourceSpecification.java
index 4451ac1..7274b5c 100644
--- a/twill-api/src/main/java/org/apache/twill/internal/DefaultResourceSpecification.java
+++ b/twill-api/src/main/java/org/apache/twill/internal/DefaultResourceSpecification.java
@@ -35,7 +35,9 @@ public final class DefaultResourceSpecification implements ResourceSpecification
this(virtualCores, memorySize, instances, uplink, downlink, new String[0], new String[0]);
}
- public DefaultResourceSpecification(int virtualCores, int memorySize, int instances, int uplink, int downlink, String[] hosts, String[] racks) {
+ public DefaultResourceSpecification(int virtualCores, int memorySize, int instances,
+ int uplink, int downlink,
+ String[] hosts, String[] racks) {
this.virtualCores = virtualCores;
this.memorySize = memorySize;
this.instances = instances;
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/fd10dc95/twill-core/src/main/java/org/apache/twill/internal/json/ResourceSpecificationCodec.java
----------------------------------------------------------------------
diff --git a/twill-core/src/main/java/org/apache/twill/internal/json/ResourceSpecificationCodec.java b/twill-core/src/main/java/org/apache/twill/internal/json/ResourceSpecificationCodec.java
index e88045c..5233220 100644
--- a/twill-core/src/main/java/org/apache/twill/internal/json/ResourceSpecificationCodec.java
+++ b/twill-core/src/main/java/org/apache/twill/internal/json/ResourceSpecificationCodec.java
@@ -17,7 +17,13 @@
*/
package org.apache.twill.internal.json;
-import com.google.gson.*;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
import org.apache.twill.api.ResourceSpecification;
import org.apache.twill.internal.DefaultResourceSpecification;
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/fd10dc95/twill-core/src/test/java/org/apache/twill/internal/json/ResourceSpecificationCodecTest.java
----------------------------------------------------------------------
diff --git a/twill-core/src/test/java/org/apache/twill/internal/json/ResourceSpecificationCodecTest.java b/twill-core/src/test/java/org/apache/twill/internal/json/ResourceSpecificationCodecTest.java
index 7bd4f39..b5ffec6 100644
--- a/twill-core/src/test/java/org/apache/twill/internal/json/ResourceSpecificationCodecTest.java
+++ b/twill-core/src/test/java/org/apache/twill/internal/json/ResourceSpecificationCodecTest.java
@@ -5,12 +5,13 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import org.apache.twill.api.ResourceSpecification;
import org.apache.twill.internal.DefaultResourceSpecification;
+import org.junit.Assert;
import org.junit.Test;
+import org.unitils.reflectionassert.ReflectionAssert;
-import static org.apache.twill.api.ResourceSpecification.SizeUnit.GIGA;
-import static org.junit.Assert.assertEquals;
-import static org.unitils.reflectionassert.ReflectionAssert.assertLenientEquals;
-
+/**
+ * Maybe this checkstyle rule needs to be removed
+ */
public class ResourceSpecificationCodecTest {
private final Gson gson = new GsonBuilder().serializeNulls()
.registerTypeAdapter(ResourceSpecification.class, new ResourceSpecificationCodec())
@@ -19,33 +20,44 @@ public class ResourceSpecificationCodecTest {
@Test
public void testCodec() throws Exception {
- String expectedString = "{\"cores\":2,\"memorySize\":1024,\"instances\":2,\"uplink\":100,\"downlink\":100,\"hosts\":[\"one1\",\"two2\"],\"racks\":[\"three3\"]}";
+ String expectedString =
+ "{" +
+ "\"cores\":2," +
+ "\"memorySize\":1024," +
+ "\"instances\":2," +
+ "\"uplink\":100," +
+ "\"downlink\":100," +
+ "\"hosts\":[\"one1\",\"two2\"]," +
+ "\"racks\":[\"three3\"]" +
+ "}";
final ResourceSpecification expected =
- new DefaultResourceSpecification(2, 1024, 2, 100, 100, new String[]{"one1", "two2"}, new String[]{"three3"});
+ new DefaultResourceSpecification(2, 1024, 2, 100, 100,
+ new String[]{"one1", "two2"}, new String[]{"three3"});
final String actualString = gson.toJson(expected);
- assertEquals(expectedString, actualString);
+ Assert.assertEquals(expectedString, actualString);
final JsonElement expectedJson = gson.toJsonTree(expected);
final ResourceSpecification actual = gson.fromJson(expectedJson, DefaultResourceSpecification.class);
final JsonElement actualJson = gson.toJsonTree(actual);
- assertEquals(expectedJson, actualJson);
- assertLenientEquals(expected, actual);
+ Assert.assertEquals(expectedJson, actualJson);
+ ReflectionAssert.assertLenientEquals(expected, actual);
}
@Test
public void testBuilder() throws Exception {
final ResourceSpecification actual = ResourceSpecification.Builder.with()
.setVirtualCores(5)
- .setMemory(4, GIGA)
+ .setMemory(4, ResourceSpecification.SizeUnit.GIGA)
.setInstances(3)
.setHosts("a1", "b2", "c3")
.setRacks("r2")
- .setUplink(10, GIGA)
- .setDownlink(5, GIGA).build();
+ .setUplink(10, ResourceSpecification.SizeUnit.GIGA)
+ .setDownlink(5, ResourceSpecification.SizeUnit.GIGA).build();
final DefaultResourceSpecification expectd =
- new DefaultResourceSpecification(5, 4096, 3, 10240, 5120, new String[]{"a1", "b2", "c3"}, new String[]{"r2"});
- assertLenientEquals(expectd, actual);
+ new DefaultResourceSpecification(5, 4096, 3, 10240, 5120,
+ new String[]{"a1", "b2", "c3"}, new String[]{"r2"});
+ ReflectionAssert.assertLenientEquals(expectd, actual);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/fd10dc95/twill-yarn/src/main/java/org/apache/twill/internal/yarn/YarnAMClient.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/main/java/org/apache/twill/internal/yarn/YarnAMClient.java b/twill-yarn/src/main/java/org/apache/twill/internal/yarn/YarnAMClient.java
index c8da649..9351201 100644
--- a/twill-yarn/src/main/java/org/apache/twill/internal/yarn/YarnAMClient.java
+++ b/twill-yarn/src/main/java/org/apache/twill/internal/yarn/YarnAMClient.java
@@ -19,6 +19,7 @@ package org.apache.twill.internal.yarn;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Service;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
@@ -27,9 +28,10 @@ import org.apache.twill.internal.ProcessLauncher;
import java.net.InetSocketAddress;
import java.net.URL;
-import java.util.*;
-
-import static org.apache.commons.lang.ArrayUtils.isEmpty;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
/**
* This interface provides abstraction for AM to interacts with YARN to abstract out YARN version specific
@@ -72,8 +74,9 @@ public interface YarnAMClient extends Service {
public abstract String apply();
private <T> ContainerRequestBuilder add(Collection<T> collection, T... more) {
- if (!isEmpty(more))
+ if (!ArrayUtils.isEmpty(more)){
Collections.addAll(collection, more);
+ }
return this;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/fd10dc95/twill-yarn/src/test/java/org/apache/twill/yarn/EchoServerTestRun.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/test/java/org/apache/twill/yarn/EchoServerTestRun.java b/twill-yarn/src/test/java/org/apache/twill/yarn/EchoServerTestRun.java
index 1c3034c..23fc82b 100644
--- a/twill-yarn/src/test/java/org/apache/twill/yarn/EchoServerTestRun.java
+++ b/twill-yarn/src/test/java/org/apache/twill/yarn/EchoServerTestRun.java
@@ -61,8 +61,6 @@ public final class EchoServerTestRun extends BaseYarnTest {
.setVirtualCores(1)
.setMemory(1, ResourceSpecification.SizeUnit.GIGA)
.setInstances(2)
- .setHosts("someHost1.domain.no","someHost2.domain.no") /*demo only ignored in this test*/
- .setRacks("someRack1") /* demo only ignored in this test*/
.build())
.addLogHandler(new PrinterLogHandler(new PrintWriter(System.out, true)))
.withApplicationArguments("echo")