Cleaning up

Author: Thomas Risberg

tweet-counts-hadoop/.classpath

@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -22,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

tweet-counts-hadoop/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6

tweet-counts-hadoop/src/main/java/com/springdeveloper/hadoop/TweetHashTagCounter.java

@@ -13,12 +13,6 @@
 
 public class TweetHashTagCounter {
 
-	/**
-	 * @param args
-	 * @throws IOException 
-	 * @throws ClassNotFoundException 
-	 * @throws InterruptedException 
-	 */
 	public static void main(String[] args) throws IOException, InterruptedException, ClassNotFoundException {
 		Configuration conf = new Configuration();
 		String[] myArgs = new GenericOptionsParser(conf, args).getRemainingArgs();
@@ -28,13 +22,16 @@ public static void main(String[] args) throws IOException, InterruptedException,
 		}
 		Job job =  Job.getInstance(conf, "Tweet Hash Tag Counter");
 		job.setJarByClass(TweetHashTagCounter.class);
+
+		FileInputFormat.addInputPath(job, new Path(myArgs[0]));
+		FileOutputFormat.setOutputPath(job, new Path(myArgs[1]));
+
 		job.setMapperClass(TweetCountMapper.class);
-		job.setCombinerClass(IntSumReducer.class);
 		job.setReducerClass(IntSumReducer.class);
+
 		job.setOutputKeyClass(Text.class);
 		job.setOutputValueClass(IntWritable.class);
-		FileInputFormat.addInputPath(job, new Path(myArgs[0]));
-		FileOutputFormat.setOutputPath(job, new Path(myArgs[1]));
+
 		System.exit(job.waitForCompletion(true) ? 0 : 1);
 	}