You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by ha...@apache.org on 2018/10/29 17:00:42 UTC
[1/4] any23 git commit: ANY23-406 Suppress unnecessary warnings
Repository: any23
Updated Branches:
refs/heads/master 36682ccdf -> f87ac66bc
ANY23-406 Suppress unnecessary warnings
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/6bd246ee
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/6bd246ee
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/6bd246ee
Branch: refs/heads/master
Commit: 6bd246ee3f8c7b4cc8167da0307efeca9cbc9023
Parents: 36682cc
Author: Hans <fi...@gmail.com>
Authored: Mon Oct 29 10:52:04 2018 -0500
Committer: Hans <fi...@gmail.com>
Committed: Mon Oct 29 10:52:04 2018 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/any23/rdf/PopularPrefixes.java | 5 ++---
mime/src/main/resources/org/apache/any23/mime/tika-config.xml | 5 ++++-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/6bd246ee/core/src/main/java/org/apache/any23/rdf/PopularPrefixes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/rdf/PopularPrefixes.java b/core/src/main/java/org/apache/any23/rdf/PopularPrefixes.java
index 7535b8b..5170bee 100644
--- a/core/src/main/java/org/apache/any23/rdf/PopularPrefixes.java
+++ b/core/src/main/java/org/apache/any23/rdf/PopularPrefixes.java
@@ -36,19 +36,18 @@ public class PopularPrefixes {
private static final String RESOURCE_NAME = "/org/apache/any23/prefixes/prefixes.properties";
- private static Prefixes popularPrefixes = getPrefixes();
+ private static final Prefixes popularPrefixes = getPrefixes();
private static Prefixes getPrefixes() {
Prefixes prefixes = new Prefixes();
Properties properties = new Properties();
try {
- logger.info(String.format("Loading prefixes from %s", RESOURCE_NAME));
+ logger.trace(String.format("Loading prefixes from %s", RESOURCE_NAME));
properties.load(getResourceAsStream());
} catch (IOException e) {
logger.error(String.format("Error while loading prefixes from %s", RESOURCE_NAME), e);
throw new RuntimeException(String.format("Error while loading prefixes from %s", RESOURCE_NAME));
}
- popularPrefixes = new Prefixes();
for (Map.Entry entry : properties.entrySet()) {
if (testIRICompliance((String) entry.getValue())) {
prefixes.add(
http://git-wip-us.apache.org/repos/asf/any23/blob/6bd246ee/mime/src/main/resources/org/apache/any23/mime/tika-config.xml
----------------------------------------------------------------------
diff --git a/mime/src/main/resources/org/apache/any23/mime/tika-config.xml b/mime/src/main/resources/org/apache/any23/mime/tika-config.xml
index 5eb0222..98b14f1 100644
--- a/mime/src/main/resources/org/apache/any23/mime/tika-config.xml
+++ b/mime/src/main/resources/org/apache/any23/mime/tika-config.xml
@@ -17,4 +17,7 @@
-->
<properties>
<mimeTypeRepository resource="/org/apache/any23/mime/mimetypes.xml" magic="false"/>
-</properties>
\ No newline at end of file
+
+ <!-- Cf. ANY23-406, TIKA-2490 -->
+ <service-loader initializableProblemHandler="ignore"/>
+</properties>
[4/4] any23 git commit: ANY23-38 remove references to JUL
Posted by ha...@apache.org.
ANY23-38 remove references to JUL
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/f87ac66b
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/f87ac66b
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/f87ac66b
Branch: refs/heads/master
Commit: f87ac66bc6d96a580468d1cbf9b963365662fb1f
Parents: 5aba30b
Author: Hans <fi...@gmail.com>
Authored: Mon Oct 29 11:45:26 2018 -0500
Committer: Hans <fi...@gmail.com>
Committed: Mon Oct 29 11:45:26 2018 -0500
----------------------------------------------------------------------
.../main/java/org/apache/any23/cli/ToolRunner.java | 7 -------
.../main/java/org/apache/any23/util/LogUtils.java | 17 ++++++++++-------
2 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/f87ac66b/cli/src/main/java/org/apache/any23/cli/ToolRunner.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/any23/cli/ToolRunner.java b/cli/src/main/java/org/apache/any23/cli/ToolRunner.java
index a19ecf1..39e0c0a 100644
--- a/cli/src/main/java/org/apache/any23/cli/ToolRunner.java
+++ b/cli/src/main/java/org/apache/any23/cli/ToolRunner.java
@@ -22,7 +22,6 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.converters.FileConverter;
import org.apache.any23.Any23;
import org.apache.any23.plugin.Any23PluginManager;
-import org.apache.any23.util.LogUtils;
import java.io.File;
import java.io.IOException;
@@ -118,12 +117,6 @@ public final class ToolRunner {
return 1;
}
- if (verbose) {
- LogUtils.setVerboseLogging();
- } else {
- LogUtils.setDefaultLogging();
- }
-
long start = currentTimeMillis();
int exit = 0;
http://git-wip-us.apache.org/repos/asf/any23/blob/f87ac66b/core/src/main/java/org/apache/any23/util/LogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/util/LogUtils.java b/core/src/main/java/org/apache/any23/util/LogUtils.java
index 30b24ca..727df55 100644
--- a/core/src/main/java/org/apache/any23/util/LogUtils.java
+++ b/core/src/main/java/org/apache/any23/util/LogUtils.java
@@ -17,23 +17,26 @@
package org.apache.any23.util;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.invoke.MethodHandles;
/**
* Provides specific application logger configuration methods.
+ * @deprecated since 2.3. JUL is no longer used in this project.
*/
+@Deprecated
public class LogUtils {
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public static void setDefaultLogging() {
- Logger.getLogger("").setLevel(Level.WARNING);
- Logger.getLogger("").getHandlers()[0].setLevel(Level.ALL);
+ logger.error("setDefaultLogging() is not supported.");
}
public static void setVerboseLogging() {
- Logger.getLogger("").setLevel(Level.INFO);
- Logger.getLogger("org.apache.any23").setLevel(Level.ALL);
- Logger.getLogger("").getHandlers()[0].setLevel(Level.ALL);
+ logger.error("setVerboseLogging() is not supported.");
}
}
[2/4] any23 git commit: ANY23-402 deprecate nonstandard JSONWriter
Posted by ha...@apache.org.
ANY23-402 deprecate nonstandard JSONWriter
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/ead895e4
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/ead895e4
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/ead895e4
Branch: refs/heads/master
Commit: ead895e49710b9278577e3c7f881ffc05fb5286f
Parents: 6bd246e
Author: Hans <fi...@gmail.com>
Authored: Mon Oct 29 11:07:51 2018 -0500
Committer: Hans <fi...@gmail.com>
Committed: Mon Oct 29 11:07:51 2018 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/any23/writer/JSONWriter.java | 4 +++-
.../main/java/org/apache/any23/writer/JSONWriterFactory.java | 3 +++
.../src/test/java/org/apache/any23/writer/JSONWriterTest.java | 7 ++++---
3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/ead895e4/core/src/main/java/org/apache/any23/writer/JSONWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/writer/JSONWriter.java b/core/src/main/java/org/apache/any23/writer/JSONWriter.java
index 58d869a..2df37b3 100644
--- a/core/src/main/java/org/apache/any23/writer/JSONWriter.java
+++ b/core/src/main/java/org/apache/any23/writer/JSONWriter.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Optional;
-import org.apache.any23.configuration.Settings;
import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Literal;
@@ -34,7 +33,10 @@ import org.eclipse.rdf4j.model.Value;
* Implementation of <i>JSON</i> {@link TripleWriter}.
*
* @author Michele Mostarda (mostarda@fbk.eu)
+ *
+ * @deprecated since 2.3. Use {@link JSONLDWriter} instead.
*/
+@Deprecated
public class JSONWriter extends TripleWriterHandler implements FormatWriter {
private JsonGenerator ps;
http://git-wip-us.apache.org/repos/asf/any23/blob/ead895e4/core/src/main/java/org/apache/any23/writer/JSONWriterFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/writer/JSONWriterFactory.java b/core/src/main/java/org/apache/any23/writer/JSONWriterFactory.java
index 8877a25..9e85e99 100644
--- a/core/src/main/java/org/apache/any23/writer/JSONWriterFactory.java
+++ b/core/src/main/java/org/apache/any23/writer/JSONWriterFactory.java
@@ -26,7 +26,10 @@ import java.util.Collections;
/**
* @author Peter Ansell p_ansell@yahoo.com
* @author Hans Brende (hansbrende@apache.org)
+ *
+ * @deprecated since 2.3. Use {@link JSONLDWriterFactory} instead.
*/
+@Deprecated
public class JSONWriterFactory implements TripleWriterFactory {
http://git-wip-us.apache.org/repos/asf/any23/blob/ead895e4/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java b/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java
index 0099d9f..8b305ef 100644
--- a/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java
+++ b/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java
@@ -25,7 +25,7 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * Test case for {@link JSONWriter} and {@link JSONLDWriter} class.
+ * Test case for {@link JSONLDWriter} and deprecated JSONWriter classes.
*
* @author Michele Mostarda (mostarda@fbk.eu)
* @author Julio Caguano
@@ -33,6 +33,7 @@ import org.junit.Test;
public class JSONWriterTest {
@Test
+ @Deprecated
public void testJSONWriting() throws TripleHandlerException, IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
writeContentComplicated(new JSONWriter(baos));
@@ -150,7 +151,7 @@ public class JSONWriterTest {
SimpleValueFactory.getInstance().createIRI("http://graph/2"),
null
);
- if (writer instanceof JSONWriter) {
+ if (!(writer instanceof JSONLDWriter)) {
writer.receiveTriple(
SimpleValueFactory.getInstance().createIRI("http://sub/3"),
SimpleValueFactory.getInstance().createIRI("http://pred/3"),
@@ -158,7 +159,7 @@ public class JSONWriterTest {
null,
null
);
- } else if (writer instanceof JSONLDWriter) {
+ } else {
//creating a fake extraction context in order to write triples is terrible.
//see improved solution in "writeContentSimple"!
ExtractionContext extractionContext = new ExtractionContext("rdf-nq", SimpleValueFactory.getInstance().createIRI("http://any23.org/tmp/"));
[3/4] any23 git commit: ANY23-332 remove plugin properties from
default config
Posted by ha...@apache.org.
ANY23-332 remove plugin properties from default config
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/5aba30bb
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/5aba30bb
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/5aba30bb
Branch: refs/heads/master
Commit: 5aba30bb5be3f045f3441f2d595a9ca9dccab949
Parents: ead895e
Author: Hans <fi...@gmail.com>
Authored: Mon Oct 29 11:23:32 2018 -0500
Committer: Hans <fi...@gmail.com>
Committed: Mon Oct 29 11:23:32 2018 -0500
----------------------------------------------------------------------
api/src/main/resources/default-configuration.properties | 8 ++------
.../any23/plugin/extractor/openie/OpenIEExtractor.java | 9 +++++++--
2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/5aba30bb/api/src/main/resources/default-configuration.properties
----------------------------------------------------------------------
diff --git a/api/src/main/resources/default-configuration.properties b/api/src/main/resources/default-configuration.properties
index 4f68586..0991f23 100644
--- a/api/src/main/resources/default-configuration.properties
+++ b/api/src/main/resources/default-configuration.properties
@@ -43,8 +43,8 @@ any23.extraction.metadata.domain.per.entity=off
# Allows to decide which RDFa Extractor to enable.
# If 'on' will be activated the programmatic RDFa 1.1 Extractor
-# (org.deri.any23.extractor.rdfa.RDFa11Extractor) otherwise will be
-# registered the RDFa 1.0 legacy one (org.deri.any23.extractor.rdfa.RDFaExtractor).
+# (org.apache.any23.extractor.rdfa.RDFa11Extractor) otherwise will be
+# registered the RDFa 1.0 legacy one (org.apache.any23.extractor.rdfa.RDFaExtractor).
any23.extraction.rdfa.programmatic=on
# The extraction context IRI to be used by the
@@ -72,7 +72,3 @@ any23.extraction.head.meta=on
# Allows to specify a CSV file separator and comment delimeter
any23.extraction.csv.field=,
any23.extraction.csv.comment=#
-
-# A confidence threshold for the OpenIE extractions
-# Any extractions below this value will not be processed.
-any23.extraction.openie.confidence.threshold=0.5
http://git-wip-us.apache.org/repos/asf/any23/blob/5aba30bb/plugins/openie/src/main/java/org/apache/any23/plugin/extractor/openie/OpenIEExtractor.java
----------------------------------------------------------------------
diff --git a/plugins/openie/src/main/java/org/apache/any23/plugin/extractor/openie/OpenIEExtractor.java b/plugins/openie/src/main/java/org/apache/any23/plugin/extractor/openie/OpenIEExtractor.java
index d02b5a2..9b62626 100644
--- a/plugins/openie/src/main/java/org/apache/any23/plugin/extractor/openie/OpenIEExtractor.java
+++ b/plugins/openie/src/main/java/org/apache/any23/plugin/extractor/openie/OpenIEExtractor.java
@@ -120,8 +120,13 @@ public class OpenIEExtractor implements Extractor.TagSoupDOMExtractor {
// instance.extr().arg1().text() - subject
// instance.extr().rel().text() - predicate
// instance.extr().arg2s().text() - object
- final Configuration immutableConf = DefaultConfiguration.singleton();
- Double threshold = Double.parseDouble(immutableConf.getProperty("any23.extraction.openie.confidence.threshold", "0.5"));
+ String thresholdString;
+ try {
+ thresholdString = extractionParameters.getProperty("any23.extraction.openie.confidence.threshold");
+ } catch (RuntimeException e) {
+ thresholdString = null;
+ }
+ double threshold = thresholdString == null ? 0.5 : Double.parseDouble(thresholdString);
for(Instance instance : listExtractions) {
if (instance.confidence() > threshold) {
List<Argument> listArg2s = JavaConversions.seqAsJavaList(instance.extr().arg2s());