Move static method in superclass

diff --git a/pf4j/src/main/java/org/pf4j/processor/ExtensionStorage.java b/pf4j/src/main/java/org/pf4j/processor/ExtensionStorage.java
index 20a684f93bf9a9aa91c23f637c1cc6a4965632a4..f3b3bbdada01ec22e717e4423995b91d4540479d 100644 (file)
--- a/pf4j/src/main/java/org/pf4j/processor/ExtensionStorage.java
+++ b/pf4j/src/main/java/org/pf4j/processor/ExtensionStorage.java
@@ -17,8 +17,12 @@ package org.pf4j.processor;
 
 import javax.annotation.processing.Filer;
 import javax.lang.model.element.Element;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 /**
  * It's a storage (database) that persists {@link org.pf4j.Extension}s.
@@ -29,6 +33,9 @@ import java.util.Set;
  */
 public abstract class ExtensionStorage {
 
+    private static final Pattern COMMENT = Pattern.compile("#.*");
+    private static final Pattern WHITESPACE = Pattern.compile("\\s+");
+
     protected final ExtensionAnnotationProcessor processor;
 
     public ExtensionStorage(ExtensionAnnotationProcessor processor) {
@@ -74,4 +81,19 @@ public abstract class ExtensionStorage {
         processor.info(element, message, args);
     }
 
+    public static void read(Reader reader, Set<String> entries) throws IOException {
+        BufferedReader bufferedReader = new BufferedReader(reader);
+
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            line = COMMENT.matcher(line).replaceFirst("");
+            line = WHITESPACE.matcher(line).replaceAll("");
+            if (line.length() > 0) {
+                entries.add(line);
+            }
+        }
+
+        bufferedReader.close();
+    }
+
 }

diff --git a/pf4j/src/main/java/org/pf4j/processor/LegacyExtensionStorage.java b/pf4j/src/main/java/org/pf4j/processor/LegacyExtensionStorage.java
index 38ebfb5480f0dcff644c2ad449bb6302fbf66a7b..3abde8dbff3eeb57c2882c797b55eb007c50c188 100644 (file)
--- a/pf4j/src/main/java/org/pf4j/processor/LegacyExtensionStorage.java
+++ b/pf4j/src/main/java/org/pf4j/processor/LegacyExtensionStorage.java
@@ -18,17 +18,14 @@ package org.pf4j.processor;
 import javax.annotation.processing.FilerException;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.Reader;
 import java.nio.file.NoSuchFileException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 /**
  * Stores {@link org.pf4j.Extension}s in {@code META-INF/extensions.idx}.
@@ -39,28 +36,10 @@ public class LegacyExtensionStorage extends ExtensionStorage {
 
     public static final String EXTENSIONS_RESOURCE = "META-INF/extensions.idx";
 
-    private static final Pattern COMMENT = Pattern.compile("#.*");
-    private static final Pattern WHITESPACE = Pattern.compile("\\s+");
-
     public LegacyExtensionStorage(ExtensionAnnotationProcessor processor) {
         super(processor);
     }
 
-    public static void read(Reader reader, Set<String> entries) throws IOException {
-        BufferedReader bufferedReader = new BufferedReader(reader);
-
-        String line;
-        while ((line = bufferedReader.readLine()) != null) {
-            line = COMMENT.matcher(line).replaceFirst("");
-            line = WHITESPACE.matcher(line).replaceAll("");
-            if (line.length() > 0) {
-                entries.add(line);
-            }
-        }
-
-        bufferedReader.close();
-    }
-
     @Override
     public Map<String, Set<String>> read() {
         Map<String, Set<String>> extensions = new HashMap<>();

diff --git a/pf4j/src/main/java/org/pf4j/processor/ServiceProviderExtensionStorage.java b/pf4j/src/main/java/org/pf4j/processor/ServiceProviderExtensionStorage.java
index 7e07cd0b21f4fe632bd070c1d61d28bb9860fa8a..e2bf39777dbc131c1b698172af008d4a3ce924a3 100644 (file)
--- a/pf4j/src/main/java/org/pf4j/processor/ServiceProviderExtensionStorage.java
+++ b/pf4j/src/main/java/org/pf4j/processor/ServiceProviderExtensionStorage.java
@@ -18,17 +18,14 @@ package org.pf4j.processor;
 import javax.annotation.processing.FilerException;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.Reader;
 import java.nio.file.NoSuchFileException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 /**
  * Stores {@link org.pf4j.Extension}s in {@code META-INF/services}.
@@ -39,28 +36,10 @@ public class ServiceProviderExtensionStorage extends ExtensionStorage {
 
     public static final String EXTENSIONS_RESOURCE = "META-INF/services";
 
-    private static final Pattern COMMENT = Pattern.compile("#.*");
-    private static final Pattern WHITESPACE = Pattern.compile("\\s+");
-
     public ServiceProviderExtensionStorage(ExtensionAnnotationProcessor processor) {
         super(processor);
     }
 
-    public static void read(Reader reader, Set<String> entries) throws IOException {
-        BufferedReader bufferedReader = new BufferedReader(reader);
-
-        String line;
-        while ((line = bufferedReader.readLine()) != null) {
-            line = COMMENT.matcher(line).replaceFirst("");
-            line = WHITESPACE.matcher(line).replaceAll("");
-            if (line.length() > 0) {
-                entries.add(line);
-            }
-        }
-
-        bufferedReader.close();
-    }
-
     @Override
     public Map<String, Set<String>> read() {
         Map<String, Set<String>> extensions = new HashMap<>();