最近我对一个开源库进行了概念探究,该库在java上实现了diff命令和其他许多功能。
基本上我比较了两个java文件,并获得了它们之间修改的行,在这些信息的基础上,我认为可以轻松地实现您想要的功能。
基本上我有两个java文件位于 src/test/resources/files
文件夹下:
File1
package com.onuba.car.javadiff;
import difflib.Chunk;
import difflib.Delta;
import difflib.DiffUtils;
import difflib.Patch;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class FileComparator {
private final File original;
private final File revised;
public FileComparator(File original, File revised) {
this.original = original;
this.revised = revised;
}
public List<Chunk> getChangesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.CHANGE);
}
public List<Chunk> getInsertsFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.INSERT);
}
public List<Chunk> getDeletesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.DELETE);
}
private List<Chunk> getChunksByType(Delta.TYPE type) throws IOException {
final List<Chunk> listOfChanges = new ArrayList<Chunk>();
final List<Delta> deltas = getDeltas();
for (Delta delta : deltas) {
if (delta.getType() == type) {
listOfChanges.add(delta.getRevised());
}
}
return listOfChanges;
}
private List<Delta> getDeltas() throws IOException {
final List<String> originalFileLines = fileToLines(original);
final List<String> revisedFileLines = fileToLines(revised);
final Patch patch = DiffUtils.diff(originalFileLines, revisedFileLines);
return patch.getDeltas();
}
private List<String> fileToLines(File file) throws IOException {
final List<String> lines = new ArrayList<String>();
String line;
final BufferedReader in = new BufferedReader(new FileReader(file));
while ((line = in.readLine()) != null) {
lines.add(line);
}
return lines;
}
<style= bold>Hello</style>
}
文件2
package com.onuba.car.javadiff;
import difflib.Chunk;
import difflib.Delta;
import difflib.DiffUtils;
import difflib.Patch;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class FileComparator {
private final File original;
private final File revised;
public FileComparator(File original, File revised) {
this.original = original;
this.revised = revised;
}
public List<Chunk> getChangesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.CHANGE);
}
public List<Chunk> getInsertsFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.INSERT);
}
public List<Chunk> getDeletesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.DELETE);
}
private List<Chunk> getChunksByType(Delta.TYPE type) throws IOException {
final List<Chunk> listOfChanges = new ArrayList<Chunk>();
final List<Delta> deltas = getDeltas();
for (Delta delta : deltas) {
if (delta.getType() == type) {
listOfChanges.add(delta.getRevised());
}
}
return listOfChanges;
}
private List<Delta> getDeltas(String nuevoParam) throws IOException {
final List<String> originalFileLines = fileToLines(original);
final List<String> revisedFileLines = fileToLines(revised);
final Patch patch = DiffUtils.diff(originalFileLines, revisedFileLines);
return patch.getDeltas();
}
private List<String> fileToLines(File file, String nuevoParam) throws IOException {
final List<String> lines = new ArrayList<String>();
String line;
final BufferedReader in = new BufferedReader(new FileReader(file));
while ((line = in.readLine()) != null) {
lines.add(line);
}
return lines;
}
<style = Italic>Hello</style>
private void nuevoMetodoCool(File file) {
}
}
一个简短的文件比较器类(记住它只是一个概念验证 :D)
package com.onuba.car.javadiff;
import difflib.Chunk;
import difflib.Delta;
import difflib.DiffUtils;
import difflib.Patch;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class FileComparator {
private final File original;
private final File revised;
public FileComparator(File original, File revised) {
this.original = original;
this.revised = revised;
}
public List<Chunk> getChangesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.CHANGE);
}
public List<Chunk> getInsertsFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.INSERT);
}
public List<Chunk> getDeletesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.DELETE);
}
private List<Chunk> getChunksByType(Delta.TYPE type) throws IOException {
final List<Chunk> listOfChanges = new ArrayList<Chunk>();
final List<Delta> deltas = getDeltas();
for (Delta delta : deltas) {
if (delta.getType() == type) {
listOfChanges.add(delta.getRevised());
}
}
return listOfChanges;
}
private List<Delta> getDeltas() throws IOException {
final List<String> originalFileLines = fileToLines(original);
final List<String> revisedFileLines = fileToLines(revised);
final Patch patch = DiffUtils.diff(originalFileLines, revisedFileLines);
return patch.getDeltas();
}
private List<String> fileToLines(File file) throws IOException {
final List<String> lines = new ArrayList<String>();
String line;
final BufferedReader in = new BufferedReader(new FileReader(file));
while ((line = in.readLine()) != null) {
lines.add(line);
}
return lines;
}
}
还需要为此编写一个 Junit 测试
package com.onuba.car.javadiff.test;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
import java.util.List;
import org.junit.Test;
import com.everis.car.javadiff.FileComparator;
import difflib.Chunk;
public class FileComparatorTest {
private final File original = new File("./src/test/resources/files/FileComparatorv1.java");
private final File revised = new File("./src/test/resources/files/FileComparatorv2.java");
@Test
public void shouldGetChangesBetweenFiles() {
final FileComparator comparator = new FileComparator(original, revised);
try {
final List<Chunk> changesFromOriginal = comparator.getChangesFromOriginal();
final int changeNum = changesFromOriginal.size();
System.out.println("Tamaño de cambios: " + changeNum);
for (int i = 0; i < changeNum; i++) {
final Chunk change = changesFromOriginal.get(i);
final int firstLineOfFirstChange = change.getPosition() + 1;
final int changeSize = change.size();
System.out.println("Cambio nº " + i);
System.out.println("firstLineOfFirstChange: " + firstLineOfFirstChange);
System.out.println("changeSize: " + changeSize);
System.out.println("change text: ");
showTest(change.getLines());
}
} catch (IOException ioe) {
fail("Error running test shouldGetChangesBetweenFiles " + ioe.toString());
}
}
@Test
public void shouldGetInsertsBetweenFiles() {
final FileComparator comparator = new FileComparator(original, revised);
try {
final List<Chunk> insertsFromOriginal = comparator.getInsertsFromOriginal();
final int changeNum = insertsFromOriginal.size();
System.out.println("Tamaño de inserciones: " + changeNum);
for (int i = 0; i < changeNum; i++) {
final Chunk change = insertsFromOriginal.get(i);
final int firstLineOfFirstChange = change.getPosition() + 1;
final int changeSize = change.size();
System.out.println("insercion nº " + i);
System.out.println("firstLineOfFirstInsertion: " + firstLineOfFirstChange);
System.out.println("insertion Size: " + changeSize);
System.out.println("insertion text: ");
showTest(change.getLines());
}
} catch (IOException ioe) {
fail("Error running test shouldGetInsertsBetweenFiles " + ioe.toString());
}
}
@Test
public void shouldGetDeletesBetweenFiles() {
final FileComparator comparator = new FileComparator(original, revised);
try {
final List<Chunk> deletesFromOriginal = comparator.getDeletesFromOriginal();
final int changeNum = deletesFromOriginal.size();
System.out.println("Tamaño de deletes: " + changeNum);
for (int i = 0; i < changeNum; i++) {
final Chunk change = deletesFromOriginal.get(i);
final int firstLineOfFirstChange = change.getPosition() + 1;
final int changeSize = change.size();
System.out.println("delete nº " + i);
System.out.println("firstLineOfFirstDelete: " + firstLineOfFirstChange);
System.out.println("delete Size: " + changeSize);
System.out.println("delete text: ");
showTest(change.getLines());
}
} catch (IOException ioe) {
fail("Error running test shouldGetInsertsBetweenFiles " + ioe.toString());
}
}
private void showTest(List<?> texts) {
if (texts != null) {
for (Object s : texts) {
System.out.println(s.toString());
}
}
}
}
最后是我的pom.xml文件
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.onuba.car</groupId>
<artifactId>javadiffpoc</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JavaDiff :: POC</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
</dependency>
<dependency>
<groupId>com.googlecode.java-diff-utils</groupId>
<artifactId>diffutils</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.4</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
抱歉有些日志和一些小细节是用西班牙语写的:D,也许通过这个你可以达到你想要的目的。
该库主页:
https://code.google.com/p/java-diff-utils/页面末尾有教程链接(为西班牙语)。
希望可以帮到你!
更新:
我写了一个简单的类,可以生成具有删除线差异的文件,代码如下(我不太了解你所需的格式,如果需要,可以添加更多装饰符):
package com.onuba.car.javadiff;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.util.ArrayList;
import java.util.List;
import difflib.Chunk;
public class Comparer {
private final File original = new File("./src/test/resources/files/FileComparatorv1.java");
private final File revised = new File("./src/test/resources/files/FileComparatorv2.java");
public static void main(String[] args) {
final Comparer comparer = new Comparer();
comparer.createDiffFile();
}
private void createDiffFile() {
PrintWriter diffFile = null;
RandomAccessFile oldFile = null;
try {
diffFile = new PrintWriter("./diffFile_" + System.currentTimeMillis(), "UTF-8");
oldFile = new RandomAccessFile(original, "r");
final FileComparator comparator = new FileComparator(original, revised);
final List<Chunk> changesFromOriginal = comparator.getChangesFromOriginal();
final int changeNum = changesFromOriginal.size();
System.out.println("Tamaño de cambios: " + changeNum);
final List<Integer> changesIndex = new ArrayList<Integer>();
for (Chunk change : changesFromOriginal) {
changesIndex.add(change.getPosition());
}
String line = oldFile.readLine();
int lineIndex = 0;
while (line != null) {
if (changesIndex.contains(lineIndex)) {
String strikeLine = "From: <strike-through color=yellow>" + line + "</strike-through>";
diffFile.print(strikeLine + " To: <strong>");
for (Object s : changesFromOriginal.get(changesIndex.indexOf(lineIndex)).getLines()) {
diffFile.println(s.toString());
}
diffFile.print("</strong>");
} else {
diffFile.println(line);
}
line = oldFile.readLine();
lineIndex++;
}
} catch (IOException e) {
} finally {
try {
if (diffFile != null) {
diffFile.close();
}
if (oldFile != null) {
oldFile.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
输出文件为:
package com.onuba.car.javadiff;
import difflib.Chunk;
import difflib.Delta;
import difflib.DiffUtils;
import difflib.Patch;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class FileComparator {
private final File original;
private final File revised;
public FileComparator(File original, File revised) {
this.original = original;
this.revised = revised;
}
public List<Chunk> getChangesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.CHANGE);
}
public List<Chunk> getInsertsFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.INSERT);
}
public List<Chunk> getDeletesFromOriginal() throws IOException {
return getChunksByType(Delta.TYPE.DELETE);
}
private List<Chunk> getChunksByType(Delta.TYPE type) throws IOException {
final List<Chunk> listOfChanges = new ArrayList<Chunk>();
final List<Delta> deltas = getDeltas();
for (Delta delta : deltas) {
if (delta.getType() == type) {
listOfChanges.add(delta.getRevised());
}
}
return listOfChanges;
}
From: <strike-through color=yellow> private List<Delta> getDeltas() throws IOException {</strike-through> To: <strong> private List<Delta> getDeltas(String nuevoParam) throws IOException {
</strong>
final List<String> originalFileLines = fileToLines(original);
final List<String> revisedFileLines = fileToLines(revised);
final Patch patch = DiffUtils.diff(originalFileLines, revisedFileLines);
return patch.getDeltas();
}
From: <strike-through color=yellow> private List<String> fileToLines(File file) throws IOException {</strike-through> To: <strong> private List<String> fileToLines(File file, String nuevoParam) throws IOException {
</strong> final List<String> lines = new ArrayList<String>();
String line;
final BufferedReader in = new BufferedReader(new FileReader(file));
while ((line = in.readLine()) != null) {
lines.add(line);
}
return lines;
}
From: <strike-through color=yellow> <style= bold>Hello</style></strike-through> To: <strong> <style = Italic>Hello</style>
private void nuevoMetodoCool(File file) {
}
</strong>
}
你觉得这对你有用吗?