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 2015/07/24 20:29:52 UTC
[18/25] incubator-twill git commit: Cleanup on Apache Twill code.
Cleanup on Apache Twill code.
When doing previous PR I saw some small cleanups opportunity:
1. Remove unnecessary public meodifiers in the interfaces method definition because they automatically public.
2. All field members declared in an interface are by default public, static and final so it is redundant to say it again.
3. Remove unused imports.
4. Remove private modifier in enum constructors bc they inherently private.
5. Remove static modifier for inner classes for interface bc they inherently static.
This closes #53 on GitHub.
Signed-off-by: Terence Yim <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/3a0f6e1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/3a0f6e1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/3a0f6e1a
Branch: refs/heads/site
Commit: 3a0f6e1a1645b79f6d8008f6ba3c7d91edd4447c
Parents: d4a1508
Author: hsaputra <hs...@apache.org>
Authored: Tue Jul 14 10:11:55 2015 -0700
Committer: Terence Yim <ch...@apache.org>
Committed: Tue Jul 14 18:03:10 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/twill/api/ResourceReport.java | 10 +++++-----
.../java/org/apache/twill/api/ResourceSpecification.java | 4 ++--
.../main/java/org/apache/twill/filesystem/Location.java | 2 +-
.../java/org/apache/twill/kafka/client/Compression.java | 2 +-
.../org/apache/twill/kafka/client/KafkaPublisher.java | 2 +-
.../java/org/apache/twill/example/yarn/HelloWorld.java | 5 +----
.../internal/appmaster/RunnableContainerRequest.java | 1 -
.../apache/twill/internal/appmaster/TrackerService.java | 1 -
8 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/twill-api/src/main/java/org/apache/twill/api/ResourceReport.java
----------------------------------------------------------------------
diff --git a/twill-api/src/main/java/org/apache/twill/api/ResourceReport.java b/twill-api/src/main/java/org/apache/twill/api/ResourceReport.java
index 750376a..75271c7 100644
--- a/twill-api/src/main/java/org/apache/twill/api/ResourceReport.java
+++ b/twill-api/src/main/java/org/apache/twill/api/ResourceReport.java
@@ -32,33 +32,33 @@ public interface ResourceReport {
* @param runnableName the runnable name.
* @return resources being used by all instances of the runnable.
*/
- public Collection<TwillRunResources> getRunnableResources(String runnableName);
+ Collection<TwillRunResources> getRunnableResources(String runnableName);
/**
* Get all the run resources being used across all runnables.
*
* @return all run resources used by all instances of all runnables.
*/
- public Map<String, Collection<TwillRunResources>> getResources();
+ Map<String, Collection<TwillRunResources>> getResources();
/**
* Get the resources application master is using.
*
* @return resources being used by the application master.
*/
- public TwillRunResources getAppMasterResources();
+ TwillRunResources getAppMasterResources();
/**
* Get the id of the application master.
*
* @return id of the application master.
*/
- public String getApplicationId();
+ String getApplicationId();
/**
* Get the list of services of the application master.
*
* @return list of services of the application master.
*/
- public List<String> getServices();
+ List<String> getServices();
}
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/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 50d4ed4..d8d873f 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
@@ -36,7 +36,7 @@ public interface ResourceSpecification {
private final int multiplier;
- private SizeUnit(int multiplier) {
+ SizeUnit(int multiplier) {
this.multiplier = multiplier;
}
}
@@ -81,7 +81,7 @@ public interface ResourceSpecification {
/**
* Builder for creating {@link ResourceSpecification}.
*/
- static final class Builder {
+ final class Builder {
private int cores;
private int memory;
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/twill-common/src/main/java/org/apache/twill/filesystem/Location.java
----------------------------------------------------------------------
diff --git a/twill-common/src/main/java/org/apache/twill/filesystem/Location.java b/twill-common/src/main/java/org/apache/twill/filesystem/Location.java
index 04edd27..2560e55 100644
--- a/twill-common/src/main/java/org/apache/twill/filesystem/Location.java
+++ b/twill-common/src/main/java/org/apache/twill/filesystem/Location.java
@@ -34,7 +34,7 @@ public interface Location {
/**
* Suffix added to every temp file name generated with {@link #getTempFile(String)}.
*/
- static final String TEMP_FILE_SUFFIX = ".tmp";
+ String TEMP_FILE_SUFFIX = ".tmp";
/**
* Checks if the this location exists.
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/twill-core/src/main/java/org/apache/twill/kafka/client/Compression.java
----------------------------------------------------------------------
diff --git a/twill-core/src/main/java/org/apache/twill/kafka/client/Compression.java b/twill-core/src/main/java/org/apache/twill/kafka/client/Compression.java
index 8597d3b..d3e51bf 100644
--- a/twill-core/src/main/java/org/apache/twill/kafka/client/Compression.java
+++ b/twill-core/src/main/java/org/apache/twill/kafka/client/Compression.java
@@ -28,7 +28,7 @@ public enum Compression {
private final String codec;
- private Compression() {
+ Compression() {
this.codec = name().toLowerCase();
}
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/twill-core/src/main/java/org/apache/twill/kafka/client/KafkaPublisher.java
----------------------------------------------------------------------
diff --git a/twill-core/src/main/java/org/apache/twill/kafka/client/KafkaPublisher.java b/twill-core/src/main/java/org/apache/twill/kafka/client/KafkaPublisher.java
index 0be45cb..f096375 100644
--- a/twill-core/src/main/java/org/apache/twill/kafka/client/KafkaPublisher.java
+++ b/twill-core/src/main/java/org/apache/twill/kafka/client/KafkaPublisher.java
@@ -73,7 +73,7 @@ public interface KafkaPublisher {
private final int ack;
- private Ack(int ack) {
+ Ack(int ack) {
this.ack = ack;
}
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/twill-examples/yarn/src/main/java/org/apache/twill/example/yarn/HelloWorld.java
----------------------------------------------------------------------
diff --git a/twill-examples/yarn/src/main/java/org/apache/twill/example/yarn/HelloWorld.java b/twill-examples/yarn/src/main/java/org/apache/twill/example/yarn/HelloWorld.java
index a9cbba8..ff1b83c 100644
--- a/twill-examples/yarn/src/main/java/org/apache/twill/example/yarn/HelloWorld.java
+++ b/twill-examples/yarn/src/main/java/org/apache/twill/example/yarn/HelloWorld.java
@@ -104,10 +104,7 @@ public class HelloWorld {
@Override
public boolean accept(String className, URL classUrl, URL classPathUrl) {
// exclude hadoop but not hbase package
- if (className.startsWith("org.apache.hadoop") && !className.startsWith("org.apache.hadoop.hbase")) {
- return false;
- }
- return true;
+ return !(className.startsWith("org.apache.hadoop") && !className.startsWith("org.apache.hadoop.hbase"));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/RunnableContainerRequest.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/RunnableContainerRequest.java b/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/RunnableContainerRequest.java
index f065380..2105629 100644
--- a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/RunnableContainerRequest.java
+++ b/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/RunnableContainerRequest.java
@@ -26,7 +26,6 @@ import org.apache.twill.api.TwillSpecification;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/3a0f6e1a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java b/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
index 7c09c58..d3f7c86 100644
--- a/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
+++ b/twill-yarn/src/main/java/org/apache/twill/internal/appmaster/TrackerService.java
@@ -64,7 +64,6 @@ import java.net.URL;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import javax.ws.rs.GET;
/**
* Webservice that the Application Master will register back to the resource manager