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); } }
尋找差異