Index: core/src/main/java/org/apache/hama/zookeeper/QuorumPeer.java =================================================================== --- core/src/main/java/org/apache/hama/zookeeper/QuorumPeer.java (revision 1179058) +++ core/src/main/java/org/apache/hama/zookeeper/QuorumPeer.java (working copy) @@ -80,7 +80,7 @@ } } - private static void runZKServer(QuorumPeerConfig zkConfig) throws UnknownHostException, IOException { + private static void runZKServer(QuorumPeerConfig zkConfig) throws IOException { if (zkConfig.isDistributed()) { QuorumPeerMain qp = new QuorumPeerMain(); qp.runFromConfig(zkConfig); Index: core/src/main/java/org/apache/hama/bsp/BSPMaster.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/BSPMaster.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/BSPMaster.java (working copy) @@ -100,8 +100,6 @@ // startTime private long startTime; - // HTTP server - private HttpServer infoServer; private int infoPort; // Filesystem @@ -118,9 +116,6 @@ // Jobs' Meta Data private Integer nextJobId = Integer.valueOf(1); private int totalSubmissions = 0; // how many jobs has been submitted by - // clients - private int totalTasks = 0; // currnetly running tasks - private int totalTaskCapacity; // max tasks that groom server can run private Map jobs = new TreeMap(); private TaskScheduler taskScheduler; @@ -261,7 +256,7 @@ infoPort = conf.getInt("bsp.http.infoserver.port", 40013); - infoServer = new HttpServer("bspmaster", host, infoPort, true, conf); + HttpServer infoServer = new HttpServer("bspmaster", host, infoPort, true, conf); infoServer.setAttribute("bsp.master", this); // starting webserver @@ -640,8 +635,9 @@ } int tasksPerGroom = conf.getInt(Constants.MAX_TASKS_PER_GROOM, 3); - this.totalTaskCapacity = tasksPerGroom * numGroomServers; + int totalTaskCapacity = tasksPerGroom * numGroomServers; + int totalTasks = 0; if (detailed) { return new ClusterStatus(groomsMap, totalTasks, totalTaskCapacity, state); } else { Index: core/src/main/java/org/apache/hama/bsp/TaskLog.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/TaskLog.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/TaskLog.java (working copy) @@ -239,7 +239,7 @@ List result = new ArrayList(3); result.add(bashCommand); result.add("-c"); - StringBuffer mergedCmd = new StringBuffer(); + StringBuilder mergedCmd = new StringBuilder(); if (setup != null && setup.size() > 0) { mergedCmd.append(addCommand(setup, false)); mergedCmd.append(";"); @@ -285,7 +285,7 @@ */ public static String addCommand(List cmd, boolean isExecutable) throws IOException { - StringBuffer command = new StringBuffer(); + StringBuilder command = new StringBuilder(); for (String s : cmd) { command.append('\''); if (isExecutable) { @@ -318,7 +318,7 @@ List result = new ArrayList(3); result.add(bashCommand); result.add("-c"); - StringBuffer mergedCmd = new StringBuffer(); + StringBuilder mergedCmd = new StringBuilder(); mergedCmd.append("exec "); boolean isExecutable = true; for (String s : cmd) { Index: core/src/main/java/org/apache/hama/bsp/GroomServer.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/GroomServer.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/GroomServer.java (working copy) @@ -88,7 +88,7 @@ // Constants static enum State { NORMAL, COMPUTE, SYNC, BARRIER, STALE, INTERRUPTED, DENIED - }; + } private static ZooKeeper zk = null; @@ -286,7 +286,7 @@ int rpcPort = -1; String rpcAddr = null; - if (false == this.initialized) { + if (!this.initialized) { rpcAddr = conf.get(Constants.GROOM_RPC_HOST, Constants.DEFAULT_GROOM_RPC_HOST); rpcPort = conf.getInt(Constants.GROOM_RPC_PORT, @@ -696,7 +696,6 @@ } catch (IOException ioe) { LOG.error("Got fatal exception while reinitializing GroomServer: " + StringUtils.stringifyException(ioe)); - return; } } Index: core/src/main/java/org/apache/hama/bsp/Directive.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/Directive.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/Directive.java (working copy) @@ -43,7 +43,7 @@ public int value() { return this.t; } - }; + } public Directive(){} Index: core/src/main/java/org/apache/hama/bsp/TaskInProgress.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/TaskInProgress.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/TaskInProgress.java (working copy) @@ -49,11 +49,6 @@ private JobInProgress job; private int completes = 0; - // Status - // private double progress = 0; - // private String state = ""; - private long startTime = 0; - // The 'next' usable taskid of this tip int nextTaskId = 0; @@ -133,7 +128,7 @@ * Return the start time */ public long getStartTime() { - return startTime; + return 0l; } /** @@ -162,7 +157,7 @@ * @return Returns true if the Task is the first attempt of the tip */ public boolean isFirstAttempt(TaskAttemptID taskId) { - return firstTaskId == null ? false : firstTaskId.equals(taskId); + return firstTaskId != null && firstTaskId.equals(taskId); } /** Index: core/src/main/java/org/apache/hama/bsp/BSPPeer.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/BSPPeer.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/BSPPeer.java (working copy) @@ -639,7 +639,7 @@ String[] result = null; try { result = zk.getChildren("/" + jobConf.getJobID().toString(), this) - .toArray(new String[0]); + .toArray(new String[zk.getChildren("/" + jobConf.getJobID().toString(), this).size()]); } catch (KeeperException e) { e.printStackTrace(); } catch (InterruptedException e) { Index: core/src/main/java/org/apache/hama/bsp/GroomServerAction.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/GroomServerAction.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/GroomServerAction.java (working copy) @@ -50,8 +50,8 @@ /** Ask a task to save its output. */ COMMIT_TASK - }; - + } + /** * A factory-method to create objects of given {@link ActionType}. * @param actionType the {@link ActionType} of object to create. Index: core/src/main/java/org/apache/hama/bsp/SimpleTaskScheduler.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/SimpleTaskScheduler.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/SimpleTaskScheduler.java (working copy) @@ -70,7 +70,7 @@ * JobInProgress from Wait Queue to Processing Queue. */ public void run() { - if (false == initialized) { + if (!initialized) { throw new IllegalStateException("SimpleTaskScheduler initialization" + " is not yet finished!"); } @@ -148,7 +148,7 @@ GroomProtocol worker = groomServerManager.findGroomServer(this.stus); try { // dispatch() to the groom server - Directive d1 = new DispatchTasksDirective(actions.toArray(new GroomServerAction[0])); + Directive d1 = new DispatchTasksDirective(actions.toArray(new GroomServerAction[actions.size()])); worker.dispatch(d1); } catch (IOException ioe) { LOG.error("Fail to dispatch tasks to GroomServer " Index: core/src/main/java/org/apache/hama/bsp/BSPJobClient.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/BSPJobClient.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/BSPJobClient.java (working copy) @@ -271,8 +271,7 @@ * @throws FileNotFoundException * @throws IOException */ - public RunningJob submitJob(BSPJob job) throws FileNotFoundException, - IOException { + public RunningJob submitJob(BSPJob job) throws IOException { return submitJobInternal(job); } @@ -407,8 +406,7 @@ return sysDir; } - public static void runJob(BSPJob job) throws FileNotFoundException, - IOException { + public static void runJob(BSPJob job) throws IOException { BSPJobClient jc = new BSPJobClient(job.getConf()); if (job.getNumBspTask() == 0 Index: core/src/main/java/org/apache/hama/bsp/BSPJob.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/BSPJob.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/BSPJob.java (working copy) @@ -34,7 +34,7 @@ public class BSPJob extends BSPJobContext { public static enum JobState { DEFINE, RUNNING - }; + } private JobState state = JobState.DEFINE; private BSPJobClient jobClient; Index: core/src/main/java/org/apache/hama/bsp/KillJobAction.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/KillJobAction.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/KillJobAction.java (working copy) @@ -33,7 +33,7 @@ public KillJobAction() { super(ActionType.KILL_JOB); - jobId = new String(); + jobId = ""; } public KillJobAction(String killJobId) { Index: core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/LocalBSPRunner.java (working copy) @@ -175,7 +175,6 @@ @Override public void killJob(BSPJobID jobid) throws IOException { - return; } @Override Index: core/src/main/java/org/apache/hama/bsp/TaskRunner.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/TaskRunner.java (revision 1179058) +++ core/src/main/java/org/apache/hama/bsp/TaskRunner.java (working copy) @@ -154,7 +154,7 @@ } private String assembleClasspath(BSPJob jobConf, File workDir) { - StringBuffer classPath = new StringBuffer(); + StringBuilder classPath = new StringBuilder(); // start with same classpath as parent process classPath.append(System.getProperty("java.class.path")); classPath.append(SYSTEM_PATH_SEPARATOR); Index: core/src/main/java/org/apache/hama/checkpoint/CheckpointRunner.java =================================================================== --- core/src/main/java/org/apache/hama/checkpoint/CheckpointRunner.java (revision 1179058) +++ core/src/main/java/org/apache/hama/checkpoint/CheckpointRunner.java (working copy) @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.Callable; @@ -68,9 +69,7 @@ String javaOpts = config.get("bsp.checkpoint.child.java.opts", "-Xmx50m"); String[] javaOptsSplit = javaOpts.split(" "); - for (int i = 0; i < javaOptsSplit.length; i++) { - vargs.add(javaOptsSplit[i]); - } + Collections.addAll(vargs, javaOptsSplit); vargs.add("-classpath"); vargs.add(System.getProperty("java.class.path")); vargs.add(CheckpointerChild.class.getName()); Index: core/src/main/java/org/apache/hama/checkpoint/Checkpointer.java =================================================================== --- core/src/main/java/org/apache/hama/checkpoint/Checkpointer.java (revision 1179058) +++ core/src/main/java/org/apache/hama/checkpoint/Checkpointer.java (working copy) @@ -190,7 +190,7 @@ while(isAlive()) { BSPSerializableMessage msg = queue.take(); String path = msg.checkpointedPath(); - if(null == path || path.toString().isEmpty()) + if(null == path || path.isEmpty()) throw new NullPointerException("File dest is not provided."); FSDataOutputStream out = this.dfs.create(new Path(path)); msg.messageBundle().write(out); @@ -199,6 +199,6 @@ } } try { } finally { LOG.info("Stop checkpointing."); this.stop(); } - return new Boolean(true); + return Boolean.TRUE; } } Index: core/src/main/java/org/apache/hama/util/RunJar.java =================================================================== --- core/src/main/java/org/apache/hama/util/RunJar.java (revision 1179058) +++ core/src/main/java/org/apache/hama/util/RunJar.java (working copy) @@ -133,14 +133,15 @@ } } ClassLoader loader = new URLClassLoader((URL[]) classPath - .toArray(new URL[0])); + .toArray(new URL[classPath.size()])); Thread.currentThread().setContextClassLoader(loader); Class mainClass = loader.loadClass(mainClassName); Method main = mainClass.getMethod("main", new Class[] { Array.newInstance( String.class, 0).getClass() }); String[] newArgs = (String[]) Arrays.asList(args).subList(firstArg, - args.length).toArray(new String[0]); + args.length).toArray(new String[Arrays.asList(args).subList(firstArg, + args.length).size()]); try { main.invoke(null, new Object[] { newArgs }); } catch (InvocationTargetException e) { Index: core/src/main/java/org/apache/hama/util/Bytes.java =================================================================== --- core/src/main/java/org/apache/hama/util/Bytes.java (revision 1179058) +++ core/src/main/java/org/apache/hama/util/Bytes.java (working copy) @@ -887,8 +887,7 @@ if (left == null && right == null) { return true; } - return (left == null || right == null || (left.length != right.length) ? false - : compareTo(left, right) == 0); + return (!(left == null || right == null || (left.length != right.length)) && compareTo(left, right) == 0); } /** Index: core/src/main/java/org/apache/hama/util/RandomVariable.java =================================================================== --- core/src/main/java/org/apache/hama/util/RandomVariable.java (revision 1179058) +++ core/src/main/java/org/apache/hama/util/RandomVariable.java (working copy) @@ -31,8 +31,7 @@ * @return a double between 0 and 1. */ public static double rand() { - double x = Math.random(); - return x; + return Math.random(); } /** @@ -44,8 +43,7 @@ */ public static int randInt(int i0, int i1) { double x = rand(); - int i = i0 + (int) Math.floor((i1 - i0 + 1) * x); - return i; + return i0 + (int) Math.floor((i1 - i0 + 1) * x); } /** @@ -74,8 +72,7 @@ * @return a double. */ public static double uniform(double min, double max) { - double x = min + (max - min) * rand(); - return x; + return min + (max - min) * rand(); } /** @@ -109,9 +106,8 @@ * @return a double. */ public static double normal(double mu, double sigma) { - double x = mu + sigma * Math.cos(2 * Math.PI * rand()) + return mu + sigma * Math.cos(2 * Math.PI * rand()) * Math.sqrt(-2 * Math.log(rand())); - return x; } /** @@ -137,9 +133,8 @@ * @return a double. */ public static double logNormal(double mu, double sigma) { - double x = mu + sigma * Math.cos(2 * Math.PI * rand()) + return mu + sigma * Math.cos(2 * Math.PI * rand()) * Math.sqrt(-2 * Math.log(rand())); - return x; } /** @@ -150,8 +145,7 @@ * @return a double. */ public static double exponential(double lambda) { - double x = -1 / lambda * Math.log(rand()); - return x; + return -1 / lambda * Math.log(rand()); } /** @@ -162,9 +156,8 @@ * @return a double. */ public static double triangular(double min, double max) { - double x = min / 2 + (max - min) * rand() / 2 + min / 2 + (max - min) + return min / 2 + (max - min) * rand() / 2 + min / 2 + (max - min) * rand() / 2; - return x; } /** @@ -177,10 +170,9 @@ */ public static double triangular(double min, double med, double max) { double y = rand(); - double x = (y < ((med - min) / (max - min))) ? (min + Math.sqrt(y + return (y < ((med - min) / (max - min))) ? (min + Math.sqrt(y * (max - min) * (med - min))) : (max - Math.sqrt((1 - y) * (max - min) * (max - med))); - return x; } /** @@ -209,8 +201,7 @@ * @return a double. */ public static double cauchy(double mu, double sigma) { - double x = sigma * Math.tan(Math.PI * (rand() - 0.5)) + mu; - return x; + return sigma * Math.tan(Math.PI * (rand() - 0.5)) + mu; } /** @@ -221,7 +212,6 @@ * @return a double. */ public static double weibull(double lambda, double c) { - double x = Math.pow(-Math.log(1 - rand()), 1 / c) / lambda; - return x; + return Math.pow(-Math.log(1 - rand()), 1 / c) / lambda; } } Index: core/src/main/java/org/apache/hama/util/BSPServletUtil.java =================================================================== --- core/src/main/java/org/apache/hama/util/BSPServletUtil.java (revision 1179058) +++ core/src/main/java/org/apache/hama/util/BSPServletUtil.java (working copy) @@ -56,7 +56,7 @@ public static String generateJobTable(String label, JobStatus[] jobs, int refresh, int rowId) throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (jobs.length > 0) { sb.append("\n"); Index: examples/src/main/java/org/apache/hama/examples/PiEstimator.java =================================================================== --- examples/src/main/java/org/apache/hama/examples/PiEstimator.java (revision 1179058) +++ examples/src/main/java/org/apache/hama/examples/PiEstimator.java (working copy) @@ -138,11 +138,9 @@ } // Choose one as a master - for (String hostName : cluster.getActiveGroomNames().keySet()) { - conf.set(MASTER_TASK,hostName); - break; - } + conf.set(MASTER_TASK,String.valueOf(cluster.getActiveGroomNames().keySet().toArray()[0])); + FileSystem fileSys = FileSystem.get(conf); initTempDir(fileSys); Index: examples/src/main/java/org/apache/hama/examples/graph/PageRankBase.java =================================================================== --- examples/src/main/java/org/apache/hama/examples/graph/PageRankBase.java (revision 1179058) +++ examples/src/main/java/org/apache/hama/examples/graph/PageRankBase.java (working copy) @@ -61,8 +61,7 @@ static void mapAdjacencyList(Configuration conf, BSPPeer peer, HashMap> realAdjacencyList, HashMap tentativePagerank, - HashMap lookupMap) throws FileNotFoundException, - IOException { + HashMap lookupMap) throws IOException { FileSystem fs = FileSystem.get(conf); Path p = new Path(conf.get("in.path." + peer.getPeerName().split(":")[0])); Index: examples/src/main/java/org/apache/hama/examples/graph/ShortestPathsBase.java =================================================================== --- examples/src/main/java/org/apache/hama/examples/graph/ShortestPathsBase.java (revision 1179058) +++ examples/src/main/java/org/apache/hama/examples/graph/ShortestPathsBase.java (working copy) @@ -107,8 +107,7 @@ protected final static void mapAdjacencyList(Configuration conf, BSPPeer peer, Map> adjacencyList, - Map vertexLookupMap) - throws FileNotFoundException, IOException { + Map vertexLookupMap) throws IOException { FileSystem fs = FileSystem.get(conf); Path p = new Path(conf.get("in.path." + peer.getPeerName().split(":")[0])); Index: examples/src/main/java/org/apache/hama/examples/graph/partitioning/AbstractGraphPartitioner.java =================================================================== --- examples/src/main/java/org/apache/hama/examples/graph/partitioning/AbstractGraphPartitioner.java (revision 1179058) +++ examples/src/main/java/org/apache/hama/examples/graph/partitioning/AbstractGraphPartitioner.java (working copy) @@ -76,7 +76,7 @@ + ShortestPaths.PARTED + Path.SEPARATOR + entry.split(ShortestPaths.NAME_VALUE_SEPARATOR)[0])); conf.set(ShortestPaths.MASTER_TASK, entry); - groomNameBuilder.append(entry + ";"); + groomNameBuilder.append(entry).append(";"); } // put every peer into the configuration conf.set(ShortestPaths.BSP_PEERS, groomNameBuilder.toString()); Index: examples/src/main/java/org/apache/hama/examples/graph/ShortestPaths.java =================================================================== --- examples/src/main/java/org/apache/hama/examples/graph/ShortestPaths.java (revision 1179058) +++ examples/src/main/java/org/apache/hama/examples/graph/ShortestPaths.java (working copy) @@ -128,7 +128,7 @@ } for (String name : peer.getAllPeerNames()) { - peer.send(name, new BooleanMessage("", count > 0 ? true : false)); + peer.send(name, new BooleanMessage("", count > 0)); } } Index: examples/src/main/java/org/apache/hama/examples/graph/Vertex.java =================================================================== --- examples/src/main/java/org/apache/hama/examples/graph/Vertex.java (revision 1179058) +++ examples/src/main/java/org/apache/hama/examples/graph/Vertex.java (working copy) @@ -64,9 +64,7 @@ if (getClass() != obj.getClass()) return false; Vertex other = (Vertex) obj; - if (!name.equals(other.name)) - return false; - return true; + return name.equals(other.name); } @Override