remove pointless singletons

betamaxteam · Nov 9, 2013 · af43b64 · af43b64
1 parent 455d4c1
commit af43b64
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/betamax-core/src/main/java/co/freeside/betamax/io/FileTypeMapper.java b/betamax-core/src/main/java/co/freeside/betamax/io/FileTypeMapper.java
@@ -30,11 +30,7 @@ public class FileTypeMapper {
      */
     public static final String DEFAULT_EXTENSION = ".data";
 
-    public static FileTypeMapper getInstance() {
-        return INSTANCE;
-    }
-
-    private final MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes();
+    private static final MimeTypes MIME_TYPES = MimeTypes.getDefaultMimeTypes();
 
     private static final Logger LOG = Logger.getLogger(FileTypeMapper.class.getName());
 
@@ -46,10 +42,10 @@ public static FileTypeMapper getInstance() {
      * @param contentType a MIME content type such as `text/plain`.
      * @return a filename with an appropriate extension.
      */
-    public String filenameFor(String baseName, String contentType) {
+    public static String filenameFor(String baseName, String contentType) {
         String filename;
         try {
-            String extension = mimeTypes.forName(contentType).getExtension();
+            String extension = MIME_TYPES.forName(contentType).getExtension();
             filename = baseName + extension;
         } catch (MimeTypeException e) {
             LOG.warning(String.format("Could not get extension for %s content type: %s", contentType, e.getMessage()));
@@ -58,8 +54,6 @@ public String filenameFor(String baseName, String contentType) {
         return filename;
     }
 
-    private static final FileTypeMapper INSTANCE = new FileTypeMapper();
-
     private FileTypeMapper() {
     }
 }
diff --git a/betamax-core/src/main/java/co/freeside/betamax/io/FilenameNormalizer.java b/betamax-core/src/main/java/co/freeside/betamax/io/FilenameNormalizer.java
@@ -20,17 +20,14 @@
 
 public final class FilenameNormalizer {
 
-    public String toFilename(String tapeName) {
+    public static String toFilename(String tapeName) {
         return Normalizer.normalize(tapeName, Normalizer.Form.NFD)
                 .replaceAll("\\p{InCombiningDiacriticalMarks}+", "")
                 .replaceAll("[^\\w\\d]+", "_")
                 .replaceFirst("^_", "")
                 .replaceFirst("_$", "");
     }
 
-    private static final FilenameNormalizer INSTANCE = new FilenameNormalizer();
-
-    public static FilenameNormalizer getInstance() {
-        return INSTANCE;
+    private FilenameNormalizer() {
     }
 }
diff --git a/betamax-core/src/main/java/co/freeside/betamax/tape/MemoryTape.java b/betamax-core/src/main/java/co/freeside/betamax/tape/MemoryTape.java
@@ -254,8 +254,8 @@ private void recordBodyInline(Message message, RecordedMessage clone) throws IOE
     }
 
     private void recordBodyToFile(Message message, RecordedMessage clone) throws IOException {
-        String filename = FileTypeMapper.getInstance().filenameFor("response", message.getContentType());
-        File body = fileResolver.toFile(FilenameNormalizer.getInstance().toFilename(name), filename);
+        String filename = FileTypeMapper.filenameFor("response", message.getContentType());
+        File body = fileResolver.toFile(FilenameNormalizer.toFilename(name), filename);
         Files.createParentDirs(body);
         ByteStreams.copy(message.getBodyAsBinary(), Files.newOutputStreamSupplier(body));
         clone.setBody(body);

diff --git a/betamax-core/src/main/java/co/freeside/betamax/tape/yaml/YamlTapeLoader.java b/betamax-core/src/main/java/co/freeside/betamax/tape/yaml/YamlTapeLoader.java
@@ -100,7 +100,7 @@ public void writeTo(Tape tape, Writer writer) throws IOException {
     }
 
     public File fileFor(String tapeName) {
-        final String normalizedName = FilenameNormalizer.getInstance().toFilename(tapeName);
+        final String normalizedName = FilenameNormalizer.toFilename(tapeName);
         return fileResolver.toFile(normalizedName + ".yaml");
     }
 

diff --git a/betamax-core/src/test/groovy/co/freeside/betamax/io/FilenameNormalizerSpec.groovy b/betamax-core/src/test/groovy/co/freeside/betamax/io/FilenameNormalizerSpec.groovy
@@ -21,12 +21,9 @@ import spock.lang.*
 @Unroll
 class FilenameNormalizerSpec extends Specification {
 
-    @Subject
-    def normalizer = FilenameNormalizer.instance
-
     void "normalized form of '#s' is '#filename'"() {
         expect:
-        normalizer.toFilename(s) == filename
+        FilenameNormalizer.toFilename(s) == filename
 
         where:
         s              | filename

diff --git a/betamax-core/src/test/groovy/co/freeside/betamax/tape/ExternalBodySpec.groovy b/betamax-core/src/test/groovy/co/freeside/betamax/tape/ExternalBodySpec.groovy
@@ -80,7 +80,7 @@ class ExternalBodySpec extends Specification {
 
         then: "the body file is created in the tape root directory"
         def body = tape.interactions[-1].response.body as File
-        body.parentFile.name == FilenameNormalizer.instance.toFilename(tape.name)
+        body.parentFile.name == FilenameNormalizer.toFilename(tape.name)
         body.parentFile.parentFile == tapeRoot
     }