Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Untitled diff
创建于
8年前
差异永不过期
清除
导出
分享
解释
58 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
125 行
全部复制
25 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
93 行
全部复制
/*
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
复制
已复制
复制
已复制
package org.apache.any23.cli;
package org.apache.any23.cli;
复制
已复制
复制
已复制
import org.apache.any23.cli.flows.PeopleExtractor;
import org.apache.any23.rdf.RDFUtils;
import org.apache.any23.rdf.RDFUtils;
复制
已复制
复制
已复制
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FileUtils;
复制
已复制
复制
已复制
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.model.Model;
复制
已复制
复制
已复制
import org.eclipse.rdf4j.model.ValueFactory;
import org.eclipse.rdf4j.model.impl.TreeModel
;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import org.eclipse.rdf4j.model.impl.TreeModel
Factory;
import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
import org.eclipse.rdf4j.rio.Rio;
import org.eclipse.rdf4j.rio.Rio;
import org.junit.Assert;
import org.junit.Assert;
import org.junit.Test;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.LoggerFactory;
import java.io.BufferedInputStream;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileInputStream;
复制
已复制
复制
已复制
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Arrays;
复制
已复制
复制
已复制
import java.util.
function.Function
;
import java.util.
stream.Stream
;
/**
/**
* This is example for task ANY23-396
* This is example for task ANY23-396
*
*
* @author Jacek Grzebyta (jgrzebyta@apache.org)
* @author Jacek Grzebyta (jgrzebyta@apache.org)
复制
已复制
复制
已复制
* @author Hans Brende (hansbrende@apache.org)
*/
*/
public class ExtractorsFlowTest extends ToolTestBase {
public class ExtractorsFlowTest extends ToolTestBase {
复制
已复制
复制
已复制
private static final String testingDatafile = "/org/apache/any23/extractor/csv/test-comma.csv";
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ExtractorsFlowTest() {
public ExtractorsFlowTest() {
super(Rover.class);
super(Rover.class);
}
}
复制
已复制
复制
已复制
private static final String testingDatafile = "/org/apache/any23/extractor/csv/test-comma.csv";
private static final ValueFactory vf = SimpleValueFactory.getInstance();
private Logger log = LoggerFactory.getLogger(getClass());
/*
Domain ontology & data model
*/
public static final String NAMESPACE = "http://supercustom.net/ontology/";
public static final IRI PERSON = vf.createIRI(NAMESPACE, "Person");
public static final IRI FULL_NAME = vf.createIRI(NAMESPACE, "fullName");
public static final IRI HASH = vf.createIRI(NAMESPACE, "hash");
public static final String DATA_NAMESPACE = "http://rdf.supercustom.net/data/";
// domain ontology person IRI factory
public static Function<String, IRI> personIRIFactory = (String s) -> {
return vf.createIRI(DATA_NAMESPACE, DigestUtils.sha1Hex(s));
};
/**
/**
复制
已复制
复制
已复制
* Emulates action described in
description of issue
ANY23-396.
* Emulates action described in
ANY23-396.
* @throws Exception
*/
*/
@Test
@Test
public void runTestFor396() throws Exception {
public void runTestFor396() throws Exception {
File outputFile = File.createTempFile("mockdata-", ".ttl", tempDirectory);
File outputFile = File.createTempFile("mockdata-", ".ttl", tempDirectory);
File logFile = File.createTempFile("log-exec-", ".txt", tempDirectory);
File logFile = File.createTempFile("log-exec-", ".txt", tempDirectory);
复制
已复制
复制
已复制
runTool(String.format("-l %s
--workflow
-o %s -f
turtle -e csv
,people
-d %s %s",
runTool(String.format("-l %s
-o %s -f
people,
turtle -e csv
-d %s %s",
logFile.getAbsolutePath(),
logFile.getAbsolutePath(),
outputFile.getAbsolutePath(),
outputFile.getAbsolutePath(),
复制
已复制
复制
已复制
"urn:dataser:raw/"
,
PeopleExtractor.RAW_NS
,
copyResourceToTempFile(testingDatafile).getAbsolutePath()));
copyResourceToTempFile(testingDatafile).getAbsolutePath()));
复制
已复制
复制
已复制
// create some statement of expected model
Model expected = new TreeModelFactory().createEmptyModel();
String[] fullNames = new String[] {"Davide Palmisano", "Michele Mostarda", "Giovanni Tummarello"};
// populate expected model
// populate expected model
复制
已复制
复制
已复制
Arrays.asList(fullNames).stream().forEach( fullN -> {
Model
expected
= new TreeModel(
);
IRI person = personIRIFactory.apply(fullN);
Stream.of("Davide Palmisano", "Michele Mostarda", "Giovanni Tummarello")
expected
.add(person, RDF.TYPE, PERSON
);
.map(PeopleExtractor::createPerson).forEach(
expected
::addAll);
expected.add(person, FULL_NAME, vf.createLiteral(fullN));
expected
.add(person, HASH, vf.createLiteral(DigestUtils.sha1Hex(fullN), XMLSchema.HEXBINARY));
});
复制
已复制
复制
已复制
log.
info
("\n\nlog file content:\n{}", FileUtils.readFileToString(logFile, "utf-8"));
if (log.isDebugEnabled()) {
log.
info
("\n\nData file: \n{}", FileUtils.readFileToString(outputFile, "utf-8"));
log.
debug
("\n\nlog file content:\n{}", FileUtils.readFileToString(logFile, "utf-8"));
log.
debug
("\n\nData file: \n{}", FileUtils.readFileToString(outputFile, "utf-8"));
}
Assert.assertTrue(assertCompareModels(expected, outputFile));
Assert.assertTrue(assertCompareModels(expected, outputFile));
}
}
复制
已复制
复制
已复制
/**
/**
* Compare expected model and received from input File.
* Compare expected model and received from input File.
复制
已复制
复制
已复制
* @param expected
* @param received
* @return
*/
*/
复制
已复制
复制
已复制
public
boolean assertCompareModels(Model expected, File received) throws Exception {
private
boolean assertCompareModels(Model expected, File received) throws Exception {
Model receivedModel = new TreeModel
Factory().createEmptyModel
();
Model receivedModel = new TreeModel
();
receivedModel.addAll(Arrays.asList(RDFUtils.parseRDF(
receivedModel.addAll(Arrays.asList(RDFUtils.parseRDF(
复制
已复制
复制
已复制
Rio.getParserFormatForFileName(received.getName()).
get(
),
Rio.getParserFormatForFileName(received.getName()).
orElseThrow(AssertionError::new
),
new BufferedInputStream(new FileInputStream(received)),
new BufferedInputStream(new FileInputStream(received)),
received.toURI().toString()
received.toURI().toString()
)));
)));
return receivedModel.containsAll(expected);
return receivedModel.containsAll(expected);
}
}
复制
已复制
复制
已复制
}
}
已保存差异
原始文本
打开文件
/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You 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 org.apache.any23.cli; import org.apache.any23.rdf.RDFUtils; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.ValueFactory; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.eclipse.rdf4j.model.impl.TreeModelFactory; import org.eclipse.rdf4j.model.vocabulary.RDF; import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.eclipse.rdf4j.rio.Rio; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.util.Arrays; import java.util.function.Function; /** * This is example for task ANY23-396 * * @author Jacek Grzebyta (jgrzebyta@apache.org) */ public class ExtractorsFlowTest extends ToolTestBase { public ExtractorsFlowTest() { super(Rover.class); } private static final String testingDatafile = "/org/apache/any23/extractor/csv/test-comma.csv"; private static final ValueFactory vf = SimpleValueFactory.getInstance(); private Logger log = LoggerFactory.getLogger(getClass()); /* Domain ontology & data model */ public static final String NAMESPACE = "http://supercustom.net/ontology/"; public static final IRI PERSON = vf.createIRI(NAMESPACE, "Person"); public static final IRI FULL_NAME = vf.createIRI(NAMESPACE, "fullName"); public static final IRI HASH = vf.createIRI(NAMESPACE, "hash"); public static final String DATA_NAMESPACE = "http://rdf.supercustom.net/data/"; // domain ontology person IRI factory public static Function<String, IRI> personIRIFactory = (String s) -> { return vf.createIRI(DATA_NAMESPACE, DigestUtils.sha1Hex(s)); }; /** * Emulates action described in description of issue ANY23-396. * @throws Exception */ @Test public void runTestFor396() throws Exception { File outputFile = File.createTempFile("mockdata-", ".ttl", tempDirectory); File logFile = File.createTempFile("log-exec-", ".txt", tempDirectory); runTool(String.format("-l %s --workflow -o %s -f turtle -e csv,people -d %s %s", logFile.getAbsolutePath(), outputFile.getAbsolutePath(), "urn:dataser:raw/", copyResourceToTempFile(testingDatafile).getAbsolutePath())); // create some statement of expected model Model expected = new TreeModelFactory().createEmptyModel(); String[] fullNames = new String[] {"Davide Palmisano", "Michele Mostarda", "Giovanni Tummarello"}; // populate expected model Arrays.asList(fullNames).stream().forEach( fullN -> { IRI person = personIRIFactory.apply(fullN); expected.add(person, RDF.TYPE, PERSON); expected.add(person, FULL_NAME, vf.createLiteral(fullN)); expected.add(person, HASH, vf.createLiteral(DigestUtils.sha1Hex(fullN), XMLSchema.HEXBINARY)); }); log.info("\n\nlog file content:\n{}", FileUtils.readFileToString(logFile, "utf-8")); log.info("\n\nData file: \n{}", FileUtils.readFileToString(outputFile, "utf-8")); Assert.assertTrue(assertCompareModels(expected, outputFile)); } /** * Compare expected model and received from input File. * @param expected * @param received * @return */ public boolean assertCompareModels(Model expected, File received) throws Exception { Model receivedModel = new TreeModelFactory().createEmptyModel(); receivedModel.addAll(Arrays.asList(RDFUtils.parseRDF( Rio.getParserFormatForFileName(received.getName()).get(), new BufferedInputStream(new FileInputStream(received)), received.toURI().toString() ))); return receivedModel.containsAll(expected); } }
更改后文本
打开文件
/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You 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 org.apache.any23.cli; import org.apache.any23.cli.flows.PeopleExtractor; import org.apache.any23.rdf.RDFUtils; import org.apache.commons.io.FileUtils; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.TreeModel; import org.eclipse.rdf4j.rio.Rio; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.stream.Stream; /** * This is example for task ANY23-396 * * @author Jacek Grzebyta (jgrzebyta@apache.org) * @author Hans Brende (hansbrende@apache.org) */ public class ExtractorsFlowTest extends ToolTestBase { private static final String testingDatafile = "/org/apache/any23/extractor/csv/test-comma.csv"; private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); public ExtractorsFlowTest() { super(Rover.class); } /** * Emulates action described in ANY23-396. */ @Test public void runTestFor396() throws Exception { File outputFile = File.createTempFile("mockdata-", ".ttl", tempDirectory); File logFile = File.createTempFile("log-exec-", ".txt", tempDirectory); runTool(String.format("-l %s -o %s -f people,turtle -e csv -d %s %s", logFile.getAbsolutePath(), outputFile.getAbsolutePath(), PeopleExtractor.RAW_NS, copyResourceToTempFile(testingDatafile).getAbsolutePath())); // populate expected model Model expected = new TreeModel(); Stream.of("Davide Palmisano", "Michele Mostarda", "Giovanni Tummarello") .map(PeopleExtractor::createPerson).forEach(expected::addAll); if (log.isDebugEnabled()) { log.debug("\n\nlog file content:\n{}", FileUtils.readFileToString(logFile, "utf-8")); log.debug("\n\nData file: \n{}", FileUtils.readFileToString(outputFile, "utf-8")); } Assert.assertTrue(assertCompareModels(expected, outputFile)); } /** * Compare expected model and received from input File. */ private boolean assertCompareModels(Model expected, File received) throws Exception { Model receivedModel = new TreeModel(); receivedModel.addAll(Arrays.asList(RDFUtils.parseRDF( Rio.getParserFormatForFileName(received.getName()).orElseThrow(AssertionError::new), new BufferedInputStream(new FileInputStream(received)), received.toURI().toString() ))); return receivedModel.containsAll(expected); } }
查找差异