From 352e8ed1ad317413c8a51dc5d5a361915bfe8f65 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Fri, 3 Mar 2017 01:11:14 -0500
Subject: [PATCH] Implement error-prone static analyzer, fix some problems it
 found

---
 pom.xml                                       | 20 +++++++++++++++++++
 .../com/moparisthebest/rcrdit/RcrdIt.java     | 16 ++++++++-------
 .../moparisthebest/rcrdit/tuner/Tuner.java    |  1 +
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3bcf64..f44e8e0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -156,13 +156,33 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
+                    <compilerId>javac-with-errorprone</compilerId>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>true</showDeprecation>
                     <debug>true</debug>
+                    <debuglevel>lines,vars,source</debuglevel>
                     <compilerArgs>
                         <arg>-Xlint</arg>
+                        <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-compiler-javac-errorprone</artifactId>
+                        <version>2.8.1</version>
+                    </dependency>
+                    <!-- override plexus-compiler-javac-errorprone's dependency on
+                         Error Prone with the latest version -->
+                    <dependency>
+                        <groupId>com.google.errorprone</groupId>
+                        <artifactId>error_prone_core</artifactId>
+                        <version>2.0.18</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
diff --git a/src/main/java/com/moparisthebest/rcrdit/RcrdIt.java b/src/main/java/com/moparisthebest/rcrdit/RcrdIt.java
index a6be2b1..163a314 100644
--- a/src/main/java/com/moparisthebest/rcrdit/RcrdIt.java
+++ b/src/main/java/com/moparisthebest/rcrdit/RcrdIt.java
@@ -18,6 +18,8 @@
 
 package com.moparisthebest.rcrdit;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.moparisthebest.jdbc.QueryMapper;
 import com.moparisthebest.rcrdit.autorec.AutoRec;
 import com.moparisthebest.rcrdit.autorec.Profile;
@@ -167,13 +169,13 @@ public class RcrdIt extends ResourceConfig implements AutoCloseable {
         // generate unique identifier..
         md.reset();
         // incorporate everything to make this unique
-        md.update(Long.toString(start.toEpochMilli()).getBytes());
-        md.update(Long.toString(stop.toEpochMilli()).getBytes());
-        md.update(Long.toString(prog.getProgram().getStart().toEpochMilli()).getBytes());
-        md.update(Long.toString(prog.getProgram().getStop().toEpochMilli()).getBytes());
-        md.update(prog.getProgram().getChannelName().getBytes());
-        md.update(name.getBytes());
-        md.update(description.getBytes());
+        md.update(Long.toString(start.toEpochMilli()).getBytes(UTF_8));
+        md.update(Long.toString(stop.toEpochMilli()).getBytes(UTF_8));
+        md.update(Long.toString(prog.getProgram().getStart().toEpochMilli()).getBytes(UTF_8));
+        md.update(Long.toString(prog.getProgram().getStop().toEpochMilli()).getBytes(UTF_8));
+        md.update(prog.getProgram().getChannelName().getBytes(UTF_8));
+        md.update(name.getBytes(UTF_8));
+        md.update(description.getBytes(UTF_8));
         final byte[] digest = md.digest();
         final Uid uid = new Uid(String.format("%0" + (digest.length << 1) + "x", new BigInteger(1, digest)));
         /*
diff --git a/src/main/java/com/moparisthebest/rcrdit/tuner/Tuner.java b/src/main/java/com/moparisthebest/rcrdit/tuner/Tuner.java
index f7d9324..4b9a4e5 100644
--- a/src/main/java/com/moparisthebest/rcrdit/tuner/Tuner.java
+++ b/src/main/java/com/moparisthebest/rcrdit/tuner/Tuner.java
@@ -34,6 +34,7 @@ public interface Tuner extends AutoCloseable {
 
     boolean stopAndRecordNow(ProgramAutoRec stop, ProgramAutoRec start, Timer timer);
 
+    @Override
     public void close();
 
     default ProgramAutoRec getRecording() {