From fd1095e91c6daece794ffb5340dbb54ad04a6ac7 Mon Sep 17 00:00:00 2001
From: Luke Lovett <luke.lovett@mongodb.com>
Date: Mon, 18 May 2015 11:48:29 -0700
Subject: [PATCH] Checkstyle fixes related to recent changes with reusing
 Writable types.

---
 .../com/mongodb/hadoop/io/MongoUpdateWritable.java     | 10 +++++-----
 .../com/mongodb/hadoop/examples/enron/MailPair.java    |  4 ++--
 .../mongodb/hadoop/streaming/io/MongoOutputReader.java |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/com/mongodb/hadoop/io/MongoUpdateWritable.java b/core/src/main/java/com/mongodb/hadoop/io/MongoUpdateWritable.java
index 0852f7d9..3360b9b6 100644
--- a/core/src/main/java/com/mongodb/hadoop/io/MongoUpdateWritable.java
+++ b/core/src/main/java/com/mongodb/hadoop/io/MongoUpdateWritable.java
@@ -38,7 +38,7 @@
 public class MongoUpdateWritable implements Writable {
 
     private static final Log LOG = LogFactory.getLog(MongoUpdateWritable.class);
-    private static final BSONEncoder enc = new BasicBSONEncoder();
+    private final BSONEncoder enc = new BasicBSONEncoder();
 
     private BasicBSONObject query;
     private BasicBSONObject modifiers;
@@ -80,19 +80,19 @@ public boolean isMultiUpdate() {
         return multiUpdate;
     }
 
-    public void setQuery(BasicBSONObject query) {
+    public void setQuery(final BasicBSONObject query) {
         this.query = query;
     }
 
-    public void setModifiers(BasicBSONObject modifiers) {
+    public void setModifiers(final BasicBSONObject modifiers) {
         this.modifiers = modifiers;
     }
 
-    public void setUpsert(boolean upsert) {
+    public void setUpsert(final boolean upsert) {
         this.upsert = upsert;
     }
 
-    public void setMultiUpdate(boolean multiUpdate) {
+    public void setMultiUpdate(final boolean multiUpdate) {
         this.multiUpdate = multiUpdate;
     }
 
diff --git a/examples/enron/src/main/java/com/mongodb/hadoop/examples/enron/MailPair.java b/examples/enron/src/main/java/com/mongodb/hadoop/examples/enron/MailPair.java
index 4e004889..bdc23dc8 100644
--- a/examples/enron/src/main/java/com/mongodb/hadoop/examples/enron/MailPair.java
+++ b/examples/enron/src/main/java/com/mongodb/hadoop/examples/enron/MailPair.java
@@ -23,7 +23,7 @@ public String getFrom() {
         return from;
     }
 
-    public void setFrom(String from) {
+    public void setFrom(final String from) {
         this.from = from;
     }
 
@@ -31,7 +31,7 @@ public String getTo() {
         return to;
     }
 
-    public void setTo(String to) {
+    public void setTo(final String to) {
         this.to = to;
     }
 
diff --git a/streaming/src/main/java/com/mongodb/hadoop/streaming/io/MongoOutputReader.java b/streaming/src/main/java/com/mongodb/hadoop/streaming/io/MongoOutputReader.java
index 79012360..586d70c3 100644
--- a/streaming/src/main/java/com/mongodb/hadoop/streaming/io/MongoOutputReader.java
+++ b/streaming/src/main/java/com/mongodb/hadoop/streaming/io/MongoOutputReader.java
@@ -30,10 +30,10 @@ public boolean readKeyValue() throws IOException {
         // Actually, just read the value as the key is embedded.
         try {
             currentValue.readFields(in);
-            Object _id = currentValue.getDoc().get("_id");
-            currentKey.setDoc(new BasicDBObject("_id", _id));
+            Object id = currentValue.getDoc().get("_id");
+            currentKey.setDoc(new BasicDBObject("_id", id));
             // If successful we'll have an _id field
-            return _id != null;
+            return id != null;
         } catch (IndexOutOfBoundsException e) {
             // No more data
             LOG.info("No more data; no key/value pair read.");