Author: wumpz

…fflib/unifieddiff/UnifiedDiffParser.java …fflib/unifieddiff/UnifiedDiffReader.javasrc/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java renamed to src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParser.java renamed to src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java

@@ -35,11 +35,11 @@
  *
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
-public final class UnifiedDiffParser {
+public final class UnifiedDiffReader {
 
     static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
 
-    private final UnifiedDiffReader READER;
+    private final InternalUnifiedDiffReader READER;
     private final UnifiedDiff data = new UnifiedDiff();
     private final UnifiedDiffLine[] MAIN_PARSER_RULES = new UnifiedDiffLine[]{
         new UnifiedDiffLine(true, "^diff\\s", this::processDiff),
@@ -54,8 +54,8 @@ public final class UnifiedDiffParser {
 
     private UnifiedDiffFile actualFile;
 
-    UnifiedDiffParser(Reader reader) {
-        this.READER = new UnifiedDiffReader(reader);
+    UnifiedDiffReader(Reader reader) {
+        this.READER = new InternalUnifiedDiffReader(reader);
     }
 
     // schema = [[/^\s+/, normal], [/^diff\s/, start], [/^new file mode \d+$/, new_file], 
@@ -103,10 +103,10 @@ static String[] parseFileNames(String line) {
         };
     }
 
-    private static final Logger LOG = Logger.getLogger(UnifiedDiffParser.class.getName());
+    private static final Logger LOG = Logger.getLogger(UnifiedDiffReader.class.getName());
 
     public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOException, UnifiedDiffParserException {
-        UnifiedDiffParser parser = new UnifiedDiffParser(new BufferedReader(new InputStreamReader(stream)));
+        UnifiedDiffReader parser = new UnifiedDiffReader(new BufferedReader(new InputStreamReader(stream)));
         return parser.parse();
     }
 
@@ -244,11 +244,11 @@ public boolean isStopsHeaderParsing() {
     }
 }
 
-class UnifiedDiffReader extends BufferedReader {
+class InternalUnifiedDiffReader extends BufferedReader {
 
     private String lastLine;
 
-    public UnifiedDiffReader(Reader reader) {
+    public InternalUnifiedDiffReader(Reader reader) {
         super(reader);
     }
 

src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.unifieddiff;
+
+import java.io.Writer;
+
+/**
+ *
+ * @author Tobias Warneke (t.warneke@gmx.net)
+ */
+public class UnifiedDiffWriter {
+
+    public static void write(UnifiedDiff diff, Writer writer) {
+
+    }
+}

…b/unifieddiff/UnifiedDiffParserTest.java …b/unifieddiff/UnifiedDiffReaderTest.javasrc/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java renamed to src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java src/test/java/com/github/difflib/unifieddiff/UnifiedDiffParserTest.java renamed to src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java

@@ -31,9 +31,9 @@
  *
  * @author Tobias Warneke (t.warneke@gmx.net)
  */
-public class UnifiedDiffParserTest {
+public class UnifiedDiffReaderTest {
 
-    public UnifiedDiffParserTest() {
+    public UnifiedDiffReaderTest() {
     }
 
     @BeforeClass
@@ -54,7 +54,7 @@ public void tearDown() {
 
     @Test
     public void testSimpleParse() throws IOException {
-        UnifiedDiff diff = UnifiedDiffParser.parseUnifiedDiff(UnifiedDiffParserTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));
 
         System.out.println(diff);
 
@@ -69,13 +69,13 @@ public void testSimpleParse() throws IOException {
 
     @Test
     public void testParseDiffBlock() {
-        String[] files = UnifiedDiffParser.parseFileNames("diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java");
+        String[] files = UnifiedDiffReader.parseFileNames("diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java");
         assertThat(files).containsExactly("src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java", "src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java");
     }
 
     @Test
     public void testChunkHeaderParsing() {
-        Pattern pattern = UnifiedDiffParser.UNIFIED_DIFF_CHUNK_REGEXP;
+        Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
         Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */");
 
         assertTrue(matcher.find());
@@ -86,7 +86,7 @@ public void testChunkHeaderParsing() {
     @Test
     public void testChunkHeaderParsing2() {
         //"^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@.*$"
-        Pattern pattern = UnifiedDiffParser.UNIFIED_DIFF_CHUNK_REGEXP;
+        Pattern pattern = UnifiedDiffReader.UNIFIED_DIFF_CHUNK_REGEXP;
         Matcher matcher = pattern.matcher("@@ -189,6 +189,7 @@");
 
         assertTrue(matcher.find());

src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 java-diff-utils.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.difflib.unifieddiff;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author Tobias Warneke (t.warneke@gmx.net)
+ */
+public class UnifiedDiffWriterTest {
+
+    public UnifiedDiffWriterTest() {
+    }
+
+    @BeforeClass
+    public static void setUpClass() {
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+    }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+    @Test
+    public void testSomeMethod() {
+        // TODO review the generated test code and remove the default call to fail.
+        fail("The test case is a prototype.");
+    }
+
+}