Remove Guava (for now)

Author: aadnk

pom.xml

@@ -70,12 +70,6 @@
             <version>0.9.3</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>27.0-jre</version>
-        </dependency>
-
         <dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>

src/main/java/com/comphenix/rema1000/Application.java

@@ -5,7 +5,6 @@
 import com.comphenix.rema1000.model.DataRoot;
 import com.comphenix.rema1000.model.ReceiptEntry;
 import com.comphenix.rema1000.model.Transaction;
-import com.google.common.io.MoreFiles;
 import com.google.gson.Gson;
 import com.google.gson.stream.JsonReader;
 
@@ -128,8 +127,9 @@ private static OutputStream getOutput(ArgumentParser parser) throws IOException
         Path outputFile = parser.getDestination();
 
         if (extension != null && outputFile != null) {
-            @SuppressWarnings("UnstableApiUsage")
-            String fileExtension = MoreFiles.getFileExtension(outputFile);
+            String fileName = outputFile.getFileName().toString();
+            int dotIndex = fileName.lastIndexOf('.');
+            String fileExtension = dotIndex != -1 ? fileName.substring(dotIndex + 1) : "";
 
             // Error
             if (!extension.equalsIgnoreCase(fileExtension)) {

src/main/java/com/comphenix/rema1000/io/AbstractTableWriter.java

@@ -1,28 +1,24 @@
 package com.comphenix.rema1000.io;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 import java.io.IOException;
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 public abstract class AbstractTableWriter implements TableWriter {
     // Index of the current column (initially -1)
     private int columnIndex = -1;
-    protected BiMap<String, Integer> headerLookup = HashBiMap.create();
+    protected Map<String, Integer> headerIndexLookup = new HashMap<>();
+    protected Map<Integer, String> headerNameLookup = new HashMap<>();
 
     protected boolean closed;
 
     @Override
     public int getHeaderIndex(String header) {
-        return headerLookup.getOrDefault(header, -1);
+        return headerIndexLookup.getOrDefault(header, -1);
     }
 
     @Override
     public String getHeaderName(int index) {
-        return headerLookup.inverse().get(index);
+        return headerNameLookup.get(index);
     }
 
     @Override
@@ -32,19 +28,20 @@ public int getHeaderCount() {
 
     @Override
     public Set<String> headers() {
-        return Collections.unmodifiableSet(headerLookup.keySet());
+        return Collections.unmodifiableSet(headerIndexLookup.keySet());
     }
 
     @Override
     public int createHeader(String headerName) throws IOException {
         checkClosed();
-        Integer existing = headerLookup.get(headerName);
+        Integer existing = headerIndexLookup.get(headerName);
 
         if (existing == null) {
             int column = ++columnIndex;
 
             onHeaderCreated(headerName, column);
-            headerLookup.put(headerName, column);
+            headerIndexLookup.put(headerName, column);
+            headerNameLookup.put(column, headerName);
             return column;
         }
         return existing;

src/main/java/com/comphenix/rema1000/io/DataTableConverter.java

@@ -1,12 +1,12 @@
 package com.comphenix.rema1000.io;
 
 import com.comphenix.rema1000.model.*;
-import com.google.common.collect.ImmutableList;
 
 import java.io.IOException;
 import java.time.Instant;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Convert data to individual tables.
@@ -80,8 +80,9 @@ public void writeTableTopList(TableWriter writer, TopListMetadata metadata) thro
         int volume = createHeader(writer, "Volume");
 
         // Sort entries by rank
-        ImmutableList<ScorecardEntry> entries = ImmutableList.sortedCopyOf(
-                Comparator.comparing(ScorecardEntry::getRank), metadata.getScorecard());
+        List<ScorecardEntry> entries = metadata.getScorecard().stream().sorted(
+                Comparator.comparing(ScorecardEntry::getRank)).
+                collect(Collectors.toList());
 
         for (ScorecardEntry entry : entries) {
             writer.incrementRow();

src/main/java/com/comphenix/rema1000/io/DataWriter.java

@@ -2,8 +2,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
 
 public abstract class DataWriter<T> {
     /**

src/main/java/com/comphenix/rema1000/io/sql/SqlTableWriter.java

@@ -1,8 +1,6 @@
 package com.comphenix.rema1000.io.sql;
 
 import com.comphenix.rema1000.io.AbstractTableWriter;
-import com.google.common.base.Strings;
-import com.google.common.collect.Maps;
 import com.google.gson.internal.Primitives;
 
 import java.io.IOException;
@@ -73,7 +71,7 @@ public int hashCode() {
     private final String lineBreak = System.lineSeparator();
 
     // Current columns
-    private Map<String, TableColumn> tableColumns = Maps.newHashMap();
+    private Map<String, TableColumn> tableColumns = new HashMap<>();
 
     // Current values to be written to the output
     private List<Object> values = new ArrayList<>();
@@ -118,7 +116,7 @@ public TableColumn getTableColumn(int headerIndex) {
     public TableColumn getTableColumn(String headerName) {
         TableColumn result = tableColumns.get(headerName);
 
-        if (result == null && headerLookup.containsKey(headerName)) {
+        if (result == null && headerIndexLookup.containsKey(headerName)) {
             // Default column
             result = new TableColumn(headerName);
         }
@@ -208,7 +206,7 @@ protected void writeHeaders() throws IOException {
                 builder.append(" ");
                 writeColumnType(builder, columnType);
             }
-            if (!Strings.isNullOrEmpty(column.getForeignTable())) {
+            if (column.getForeignTable() != null && !column.getForeignTable().isEmpty()) {
                 builder.append(" REFERENCES ");
                 writeIdentifier(builder, column.getForeignTable());
                 builder.append("(");

src/main/java/com/comphenix/rema1000/io/sql/SqlWriter.java

@@ -6,12 +6,12 @@
 import com.comphenix.rema1000.model.DataRoot;
 import com.comphenix.rema1000.model.Transaction;
 import com.comphenix.rema1000.model.TransactionsInfo;
-import com.google.common.base.Charsets;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 public class SqlWriter extends DataWriter<DataRoot> {
@@ -25,7 +25,7 @@ protected String getHeaderName(TableWriter writer, String headerName) {
 
     @Override
     public void write(OutputStream output, DataRoot data) throws IOException {
-        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(output, Charsets.UTF_8))) {
+        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8))) {
 
             try (SqlTableWriter tableWriter = new SqlTableWriter("TopList", writer)) {
                 tableWriter.putTableColumn("rank", new SqlTableWriter.TableColumn(