Modernizer improvements

JabRef · Jul 20, 2017 · 53589c2 · 53589c2
1 parent 78f8779
commit 53589c2
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 34 deletions.
diff --git a/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java b/src/main/java/org/jabref/gui/groups/TransferableEntrySelection.java
@@ -5,6 +5,7 @@
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -67,11 +68,12 @@ public Object getTransferData(DataFlavor someFlavor)
 
         else if (someFlavor.equals(DataFlavor.getTextPlainUnicodeFlavor())) {
 
-            String charset = TransferableEntrySelection.FLAVOR_EXTERNAL.getParameter("charset");
-            if (charset == null) {
-                charset = "";
+            String charsetName = TransferableEntrySelection.FLAVOR_EXTERNAL.getParameter("charset");
+            if (charsetName == null) {
+                charsetName = "";
             }
-            return new ByteArrayInputStream(s.getBytes(charset.trim()));
+            Charset charset = Charset.forName(charsetName.trim());
+            return new ByteArrayInputStream(s.getBytes(charset));
         }
 
         //The text/plain DataFormat of javafx uses the String.class directly as representative class and no longer an InputStream

diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java b/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java
@@ -9,7 +9,7 @@
  */
 public final class TitleParser {
 
-    private StringBuffer buffer;
+    private StringBuilder buffer;
     private int wordStart;
 
     public List<Word> parse(String title) {
@@ -55,7 +55,7 @@ private Optional<Word> createWord(boolean[] isProtected) {
 
     private void reset() {
         wordStart = -1;
-        buffer = new StringBuffer();
+        buffer = new StringBuilder();
     }
 
     private static boolean[] determineProtectedChars(String title) {

diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -510,7 +510,7 @@ private BibtexString parseString() throws IOException {
 
     private String parsePreamble() throws IOException {
         skipWhitespace();
-        return parseBracketedText().toString();
+        return parseBracketedText();
 
     }
 
@@ -802,8 +802,8 @@ private String parseKey() throws IOException {
 
     }
 
-    private StringBuffer parseBracketedText() throws IOException {
-        StringBuffer value = new StringBuffer();
+    private String parseBracketedText() throws IOException {
+        StringBuilder value = new StringBuilder();
 
         consume('{', '(');
 
@@ -842,7 +842,7 @@ private StringBuffer parseBracketedText() throws IOException {
 
         consume('}', ')');
 
-        return value;
+        return value.toString();
     }
 
     private boolean isClosingBracketNext() {

diff --git a/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java b/src/main/java/org/jabref/logic/importer/util/OAI2Handler.java
@@ -20,13 +20,13 @@ public class OAI2Handler extends DefaultHandler {
 
     private final BibEntry entry;
 
-    private StringBuffer authors;
+    private StringBuilder authors;
 
     private String keyname;
 
     private String forenames;
 
-    private StringBuffer characters;
+    private StringBuilder characters;
 
 
     public OAI2Handler(BibEntry be) {
@@ -35,7 +35,7 @@ public OAI2Handler(BibEntry be) {
 
     @Override
     public void startDocument() throws SAXException {
-        authors = new StringBuffer();
+        authors = new StringBuilder();
     }
 
     @Override
@@ -47,7 +47,7 @@ public void characters(char[] ch, int start, int length) throws SAXException {
     public void startElement(String uri, String localName, String qualifiedName,
             Attributes attributes) throws SAXException {
 
-        characters = new StringBuffer();
+        characters = new StringBuilder();
     }
 
     @Override

diff --git a/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java b/src/main/java/org/jabref/logic/xmp/XMPSchemaBibtex.java
@@ -150,13 +150,13 @@ public void addSequenceDateValue(String field, Calendar date) {
     private static String getContents(NodeList seqList) {
 
         Element seqNode = (Element) seqList.item(0);
-        StringBuffer seq = null;
+        StringBuilder seq = null;
 
         NodeList items = seqNode.getElementsByTagName("rdf:li");
         for (int j = 0; j < items.getLength(); j++) {
             Element li = (Element) items.item(j);
             if (seq == null) {
-                seq = new StringBuffer();
+                seq = new StringBuilder();
             } else {
                 seq.append(" and ");
             }

diff --git a/src/main/java/org/jabref/shared/security/Password.java b/src/main/java/org/jabref/shared/security/Password.java
@@ -1,6 +1,7 @@
 package org.jabref.shared.security;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -41,7 +42,7 @@ public Password(char[] phrase, String key) throws NoSuchAlgorithmException, NoSu
      */
     public String encrypt() throws GeneralSecurityException, UnsupportedEncodingException {
         cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivSpec);
-        return new String(Base64.getEncoder().encode(cipher.doFinal(phrase)), "UTF-8");
+        return new String(Base64.getEncoder().encode(cipher.doFinal(phrase)), StandardCharsets.UTF_8);
     }
 
     /**
@@ -51,7 +52,7 @@ public String encrypt() throws GeneralSecurityException, UnsupportedEncodingExce
      */
     public String decrypt() throws GeneralSecurityException, UnsupportedEncodingException {
         cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec);
-        return new String(cipher.doFinal(Base64.getDecoder().decode(phrase)), "UTF-8");
+        return new String(cipher.doFinal(Base64.getDecoder().decode(phrase)), StandardCharsets.UTF_8);
     }
 
     /**

diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -80,7 +80,7 @@ public void writeWithNullPreferencesThrowsException() throws Exception {
 
     @Test
     public void writeEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(Charsets.US_ASCII);
+        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
 
         StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
 
@@ -98,7 +98,7 @@ public void writePreamble() throws Exception {
 
     @Test
     public void writePreambleAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(Charsets.US_ASCII);
+        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
         database.setPreamble("Test preamble");
 
         StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
@@ -123,7 +123,7 @@ public void writeEntry() throws Exception {
 
     @Test
     public void writeEncodingAndEntry() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(Charsets.US_ASCII);
+        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
         BibEntry entry = new BibEntry();
         entry.setType(BibtexEntryTypes.ARTICLE);
         database.insertEntry(entry);
@@ -148,7 +148,7 @@ public void writeEpilogue() throws Exception {
 
     @Test
     public void writeEpilogueAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(Charsets.US_ASCII);
+        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
         database.setEpilog("Test epilog");
 
         StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);
@@ -171,7 +171,7 @@ public void writeMetadata() throws Exception {
 
     @Test
     public void writeMetadataAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(Charsets.US_ASCII);
+        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
         DatabaseBibtexKeyPattern bibtexKeyPattern = new DatabaseBibtexKeyPattern(mock(GlobalBibtexKeyPattern.class));
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
@@ -202,7 +202,7 @@ public void writeGroups() throws Exception {
 
     @Test
     public void writeGroupsAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(Charsets.US_ASCII);
+        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
 
         GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
         groupRoot.addChild(GroupTreeNode.fromGroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')));
@@ -232,7 +232,7 @@ public void writeString() throws Exception {
 
     @Test
     public void writeStringAndEncoding() throws Exception {
-        SavePreferences preferences = new SavePreferences().withEncoding(Charsets.US_ASCII);
+        SavePreferences preferences = new SavePreferences().withEncoding(StandardCharsets.US_ASCII);
         database.addString(new BibtexString("name", "content"));
 
         StringSaveSession session = databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList(), preferences);

diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -12,7 +13,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import com.google.common.base.Charsets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -41,7 +41,7 @@ public void setUp() {
         exportFormat = ExportFormats.getExportFormat("oocsv");
 
         databaseContext = new BibDatabaseContext();
-        charset = Charsets.UTF_8;
+        charset = StandardCharsets.UTF_8;
     }
 
     @After

diff --git a/src/test/java/org/jabref/logic/exporter/ExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/ExportFormatTest.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,7 +15,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import com.google.common.base.Charsets;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -46,7 +46,7 @@ public ExportFormatTest(IExportFormat format, String name) {
     @Before
     public void setUp() {
         databaseContext = new BibDatabaseContext();
-        charset = Charsets.UTF_8;
+        charset = StandardCharsets.UTF_8;
         entries = Collections.emptyList();
     }
 

diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -12,7 +13,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import com.google.common.base.Charsets;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -42,7 +42,7 @@ public void setUp() {
         exportFormat = ExportFormats.getExportFormat("html");
 
         databaseContext = new BibDatabaseContext();
-        charset = Charsets.UTF_8;
+        charset = StandardCharsets.UTF_8;
         BibEntry entry = new BibEntry();
         entry.setField("title", "my paper title");
         entry.setField("author", "Stefan Kolb");

diff --git a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
@@ -3,14 +3,14 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.Collections;
 import java.util.List;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import com.google.common.base.Charsets;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32,7 +32,7 @@ public class MsBibExportFormatTest {
     @Before
     public void setUp() throws Exception {
         databaseContext = new BibDatabaseContext();
-        charset = Charsets.UTF_8;
+        charset = StandardCharsets.UTF_8;
         msBibExportFormat = new MSBibExportFormat();
         tempFile = testFolder.newFile();
     }

diff --git a/src/test/java/org/jabref/logic/remote/RemoteTest.java b/src/test/java/org/jabref/logic/remote/RemoteTest.java
@@ -4,6 +4,7 @@
 import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 
 import org.jabref.logic.remote.client.RemoteListenerClient;
 import org.jabref.logic.remote.server.RemoteListenerServerLifecycle;
@@ -91,7 +92,7 @@ public void testClientConnectingToWrongServer() throws IOException, InterruptedE
                 @Override
                 public void run() {
                     try (Socket socket2 = socket.accept(); OutputStream os = socket2.getOutputStream()) {
-                        os.write("whatever".getBytes("UTF8"));
+                        os.write("whatever".getBytes(StandardCharsets.UTF_8));
                     } catch (IOException e) {
                         // Ignored
                     }