refactor: minor code clean up

Author: ashleycaselli

src/main/java/net/trustyuri/FixTrustyFile.java

@@ -41,9 +41,8 @@ public static void fix(File file) throws IOException, TrustyUriException {
      * Creates a new FixTrustyFile object for the given trusty file.
      *
      * @param file the trusty file to fix
-     * @throws IOException if there is an error reading the file
      */
-    public FixTrustyFile(File file) throws IOException {
+    public FixTrustyFile(File file) {
         this.file = file;
     }
 

src/main/java/net/trustyuri/RunBatch.java

@@ -26,11 +26,10 @@ private RunBatch() {
      * Runs a batch of commands from a file, one per line. Lines starting with # are ignored.
      *
      * @param args the first argument is the batch file to run
-     * @throws IOException        if there is an error reading the batch file or the running file
-     * @throws RDF4JException     if there is an error running a command that uses RDF4J
-     * @throws TrustyUriException if there is an error running a command that uses TrustyUri
+     * @throws IOException    if there is an error reading the batch file or the running file
+     * @throws RDF4JException if there is an error running a command that uses RDF4J
      */
-    public static void main(String[] args) throws IOException, RDF4JException, TrustyUriException {
+    public static void main(String[] args) throws IOException, RDF4JException {
         String batchFile = args[0];
 
         BufferedReader reader = new BufferedReader(new FileReader(batchFile));

src/main/java/net/trustyuri/TrustyUriModule.java

@@ -19,21 +19,21 @@ public interface TrustyUriModule {
      *
      * @return the module ID
      */
-    public String getModuleId();
+    String getModuleId();
 
     /**
      * Returns the algorithm ID used for the transformation to ni-URIs.
      *
      * @return the algorithm ID
      */
-    public String getAlgorithmId();
+    String getAlgorithmId();
 
     /**
      * Returns the length of the trusty URI data part in bytes.
      *
      * @return data part length
      */
-    public int getDataPartLength();
+    int getDataPartLength();
 
     /**
      * Checks the hash for the given resource.
@@ -43,7 +43,7 @@ public interface TrustyUriModule {
      * @throws IOException        if an I/O error occurs
      * @throws TrustyUriException if the trusty URI is invalid
      */
-    public boolean hasCorrectHash(TrustyUriResource resource) throws IOException, TrustyUriException;
+    boolean hasCorrectHash(TrustyUriResource resource) throws IOException, TrustyUriException;
 
     /**
      * Fixes the trusty URI of the given file by calculating the correct hash and renaming the file
@@ -53,14 +53,14 @@ public interface TrustyUriModule {
      * @throws TrustyUriException            if the trusty URI is invalid
      * @throws UnsupportedOperationException if the module does not support fixing trusty URIs
      */
-    public void fixTrustyFile(File file) throws IOException, TrustyUriException, UnsupportedOperationException;
+    void fixTrustyFile(File file) throws IOException, TrustyUriException, UnsupportedOperationException;
 
     /**
      * Checks whether the given URI could be a trusty URI represented by this module.
      *
      * @param uri the URI
      * @return true if the URI matches the format of this module
      */
-    public boolean matches(IRI uri);
+    boolean matches(IRI uri);
 
 }

src/main/java/net/trustyuri/TrustyUriResource.java

@@ -7,6 +7,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 
@@ -166,7 +167,7 @@ public InputStream getInputStream() {
      * @return an InputStreamReader for the resource, using UTF-8 encoding
      */
     public InputStreamReader getInputStreamReader() {
-        return new InputStreamReader(in, Charset.forName("UTF-8"));
+        return new InputStreamReader(in, StandardCharsets.UTF_8);
     }
 
     /**

src/main/java/net/trustyuri/TrustyUriUtils.java

@@ -153,7 +153,9 @@ public static String getBase64Hash(String s) {
      */
     public static byte[] getBase64Bytes(String base64String) {
         base64String = base64String.replace('-', '+').replace('_', '/');
-        while (base64String.length() % 4 > 0) base64String = base64String + "=";
+        while (base64String.length() % 4 > 0) {
+            base64String = base64String + "=";
+        }
         return DatatypeConverter.parseBase64Binary(base64String);
     }
 

src/main/java/net/trustyuri/file/ProcessFile.java

@@ -41,7 +41,7 @@ public static void process(File file) throws IOException {
             base = filename.replaceFirst("^(.*)(\\.[A-Za-z0-9\\-_]{0,20})$", "$1");
         }
         String glue = "";
-        if (base.length() > 0 && base.charAt(base.length() - 1) != '.') {
+        if (!base.isEmpty() && base.charAt(base.length() - 1) != '.') {
             glue = ".";
         }
         File hashFile = new File(file.getParentFile(), base + glue + ac.toString() + ext);

src/main/java/net/trustyuri/rdf/CheckLargeRdf.java

@@ -15,6 +15,7 @@
 
 import java.io.*;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.Comparator;
 import java.util.List;
@@ -80,7 +81,7 @@ public boolean check() throws IOException, TrustyUriException {
             public void handleStatement(Statement st) throws RDFHandlerException {
                 String s = SerStatementComparator.toString(st) + "\n";
                 try {
-                    preOut.write(s.getBytes(Charset.forName("UTF-8")));
+                    preOut.write(s.getBytes(StandardCharsets.UTF_8));
                 } catch (IOException ex) {
                     ex.printStackTrace();
                 }

src/main/java/net/trustyuri/rdf/RdfFileContent.java

@@ -67,7 +67,7 @@ public void handleStatement(Statement st) throws RDFHandlerException {
             obj = st.getObject();
             rdfEntityMap.put(obj, obj);
         }
-        Resource context = null;
+        Resource context;
         if (st.getContext() == null) {
             st = SimpleValueFactory.getInstance().createStatement(subj, pred, obj);
         } else {

src/main/java/net/trustyuri/rdf/RdfHasher.java

@@ -136,7 +136,7 @@ public static String getDigestString(List<Statement> statements) {
      * @return the message digest
      */
     public static MessageDigest getDigest() {
-        MessageDigest md = null;
+        MessageDigest md;
         try {
             md = MessageDigest.getInstance("SHA-256");
         } catch (NoSuchAlgorithmException ex) {

src/main/java/net/trustyuri/rdf/RdfUtils.java

@@ -13,7 +13,7 @@
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.zip.GZIPOutputStream;
@@ -232,7 +232,7 @@ public static RdfFileContent load(InputStream in, RDFFormat format) throws IOExc
         RdfFileContent content = new RdfFileContent(format);
         p.setRDFHandler(content);
         try {
-            p.parse(new InputStreamReader(in, Charset.forName("UTF-8")), "");
+            p.parse(new InputStreamReader(in, StandardCharsets.UTF_8), "");
         } catch (RDF4JException ex) {
             ex.printStackTrace();
             throw new TrustyUriException(ex);
@@ -283,11 +283,11 @@ public static void fixTrustyRdf(File file) throws IOException, TrustyUriExceptio
         OutputStream out;
         String filename = r.getFilename().replace(oldArtifactCode.toString(), newArtifactCode.toString());
         if (filename.matches(".*\\.(gz|gzip)")) {
-            out = new GZIPOutputStream(new FileOutputStream(new File("fixed." + filename)));
+            out = new GZIPOutputStream(new FileOutputStream("fixed." + filename));
         } else {
-            out = new FileOutputStream(new File("fixed." + filename));
+            out = new FileOutputStream("fixed." + filename);
         }
-        RDFWriter writer = Rio.createWriter(r.getFormat(RDFFormat.TRIG), new OutputStreamWriter(out, Charset.forName("UTF-8")));
+        RDFWriter writer = Rio.createWriter(r.getFormat(RDFFormat.TRIG), new OutputStreamWriter(out, StandardCharsets.UTF_8));
         TransformRdf.transformPreprocessed(content, null, writer, null);
     }