Create consistent package naming

Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/01abf8f7
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/01abf8f7
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/01abf8f7

Branch: refs/heads/master
Commit: 01abf8f7e7afe8b5f540f1d688c68b8313c405cb
Parents: 0910104
Author: Lewis John McGibbney <[email protected]>
Authored: Thu Feb 23 21:44:31 2017 -0800
Committer: Lewis John McGibbney <[email protected]>
Committed: Thu Feb 23 21:44:31 2017 -0800

----------------------------------------------------------------------
 .../any23/extractor/openie/OpenIEExtractor.java | 129 +++++++++++++++++++
 .../openie/OpenIEExtractorFactory.java          |  52 ++++++++
 .../apache/any23/openie/OpenIEExtractor.java    | 129 -------------------
 .../any23/openie/OpenIEExtractorFactory.java    |  52 --------
 4 files changed, 181 insertions(+), 181 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/any23/blob/01abf8f7/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractor.java
----------------------------------------------------------------------
diff --git 
a/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractor.java 
b/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractor.java
new file mode 100644
index 0000000..b8fda29
--- /dev/null
+++ 
b/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractor.java
@@ -0,0 +1,129 @@
+/*
+ * 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.openie;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+
+import org.apache.any23.extractor.Extractor;
+import org.apache.any23.configuration.Configuration;
+import org.apache.any23.configuration.DefaultConfiguration;
+import org.apache.any23.extractor.ExtractionContext;
+import org.apache.any23.extractor.ExtractorDescription;
+import org.apache.any23.rdf.RDFUtils;
+import org.apache.any23.util.StreamUtils;
+import org.apache.tika.Tika;
+import org.apache.tika.exception.TikaException;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.apache.any23.extractor.ExtractionException;
+import org.apache.any23.extractor.ExtractionParameters;
+import org.apache.any23.extractor.ExtractionResult;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+
+import edu.knowitall.openie.Argument;
+import edu.knowitall.openie.Instance;
+import edu.knowitall.openie.OpenIE;
+import edu.knowitall.tool.parse.ClearParser;
+import edu.knowitall.tool.postag.ClearPostagger;
+import edu.knowitall.tool.srl.ClearSrl;
+import edu.knowitall.tool.tokenize.ClearTokenizer;
+import scala.collection.JavaConversions;
+import scala.collection.Seq;
+
+/**
+ * An <a href="https://github.com/allenai/openie-standalone";>OpenIE</a> 
+ * extractor able to generate <i>RDF</i> statements from 
+ * sentences representing relations in the text.
+ */
+public class OpenIEExtractor implements Extractor.TagSoupDOMExtractor {
+
+    private static final Logger LOG = 
LoggerFactory.getLogger(OpenIEExtractor.class);
+
+    private IRI documentRoot;
+
+    /**
+     * default constructor
+     */
+    OpenIEExtractor() {
+        // default constructor
+    }
+
+    /**
+     * @see org.apache.any23.extractor.Extractor#getDescription()
+     */
+    @Override
+    public ExtractorDescription getDescription() {
+        return OpenIEExtractorFactory.getDescriptionInstance();
+    }
+
+    @Override
+    public void run(ExtractionParameters extractionParameters,
+            ExtractionContext context, Document in, ExtractionResult out)
+                    throws IOException, ExtractionException {
+
+        IRI documentIRI = context.getDocumentIRI();
+        documentRoot = RDFUtils.iri(documentIRI.toString() + "root");
+        out.writeNamespace(RDF.PREFIX, RDF.NAMESPACE);
+        out.writeNamespace(RDFS.PREFIX, RDFS.NAMESPACE);
+        LOG.debug("Processing: {}", documentIRI.toString());
+
+        OpenIE openIE = new OpenIE(
+                new ClearParser(
+                        new ClearPostagger(
+                                new ClearTokenizer())), new ClearSrl(), false, 
false);
+
+        Seq<Instance> extractions = null;
+        Tika tika = new Tika();
+        try {
+            extractions = 
openIE.extract(tika.parseToString(StreamUtils.documentToInputStream(in)));
+        } catch (TransformerConfigurationException | 
TransformerFactoryConfigurationError e) {
+            LOG.error("Encountered error during OpenIE extraction.", e);
+        } catch (TikaException e) {
+            LOG.error("Encountered error whilst parsing InputStream with 
Tika.", e);
+        }
+
+        List<Instance> listExtractions = 
JavaConversions.seqAsJavaList(extractions);
+        // for each extraction instance we can obtain a number of extraction 
elements
+        // instance.confidence() - a confidence value for the extraction itself
+        // instance.extr().context() - an optional representation of the 
context for this extraction
+        // instance.extr().arg1().text() - subject
+        // instance.extr().rel().text() - predicate
+        // instance.extr().arg2s().text() - object
+        for(Instance instance : listExtractions) {
+            final Configuration immutableConf = 
DefaultConfiguration.singleton();
+            if (instance.confidence() > 
Double.parseDouble(immutableConf.getProperty("any23.extraction.openie.confidence.threshold",
 "0.5"))) {
+                List<Argument> listArg2s = 
JavaConversions.seqAsJavaList(instance.extr().arg2s());
+                for(Argument argument : listArg2s) {
+                    Resource subject = 
RDFUtils.makeIRI(instance.extr().arg1().text(), documentIRI);
+                    IRI predicate = (IRI) 
RDFUtils.makeIRI(instance.extr().rel().text(), documentIRI);
+                    Value object = RDFUtils.toValue(argument.text());
+                    out.writeTriple(subject, predicate, object);
+                }
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/any23/blob/01abf8f7/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractorFactory.java
----------------------------------------------------------------------
diff --git 
a/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractorFactory.java
 
b/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractorFactory.java
new file mode 100644
index 0000000..4a1696a
--- /dev/null
+++ 
b/openie/src/main/java/org/apache/any23/extractor/openie/OpenIEExtractorFactory.java
@@ -0,0 +1,52 @@
+/*
+ * 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.openie;
+
+import java.util.Arrays;
+
+import org.apache.any23.extractor.ExtractorDescription;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.SimpleExtractorFactory;
+import org.apache.any23.rdf.Prefixes;
+
+/**
+ * @author lewismc
+ *
+ */
+public class OpenIEExtractorFactory extends 
SimpleExtractorFactory<OpenIEExtractor>
+    implements ExtractorFactory<OpenIEExtractor> {
+
+    public static final String NAME = "openie";
+
+    public static final Prefixes prefixes = null;
+
+    private static final ExtractorDescription descriptionInstance = new 
OpenIEExtractorFactory();
+
+    public OpenIEExtractorFactory() {
+        super(NAME, prefixes, Arrays.asList("text/html;q=0.1", 
"application/xhtml+xml;q=0.1"), "example-openie.html");
+    }
+
+    @Override
+    public OpenIEExtractor createExtractor() {
+        return new OpenIEExtractor();
+    }
+
+    public static ExtractorDescription getDescriptionInstance() {
+        return descriptionInstance;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/any23/blob/01abf8f7/openie/src/main/java/org/apache/any23/openie/OpenIEExtractor.java
----------------------------------------------------------------------
diff --git a/openie/src/main/java/org/apache/any23/openie/OpenIEExtractor.java 
b/openie/src/main/java/org/apache/any23/openie/OpenIEExtractor.java
deleted file mode 100644
index b8fda29..0000000
--- a/openie/src/main/java/org/apache/any23/openie/OpenIEExtractor.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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.openie;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-
-import org.apache.any23.extractor.Extractor;
-import org.apache.any23.configuration.Configuration;
-import org.apache.any23.configuration.DefaultConfiguration;
-import org.apache.any23.extractor.ExtractionContext;
-import org.apache.any23.extractor.ExtractorDescription;
-import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.util.StreamUtils;
-import org.apache.tika.Tika;
-import org.apache.tika.exception.TikaException;
-import org.eclipse.rdf4j.model.IRI;
-import org.eclipse.rdf4j.model.Resource;
-import org.eclipse.rdf4j.model.Value;
-import org.eclipse.rdf4j.model.vocabulary.RDF;
-import org.eclipse.rdf4j.model.vocabulary.RDFS;
-import org.apache.any23.extractor.ExtractionException;
-import org.apache.any23.extractor.ExtractionParameters;
-import org.apache.any23.extractor.ExtractionResult;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-
-import edu.knowitall.openie.Argument;
-import edu.knowitall.openie.Instance;
-import edu.knowitall.openie.OpenIE;
-import edu.knowitall.tool.parse.ClearParser;
-import edu.knowitall.tool.postag.ClearPostagger;
-import edu.knowitall.tool.srl.ClearSrl;
-import edu.knowitall.tool.tokenize.ClearTokenizer;
-import scala.collection.JavaConversions;
-import scala.collection.Seq;
-
-/**
- * An <a href="https://github.com/allenai/openie-standalone";>OpenIE</a> 
- * extractor able to generate <i>RDF</i> statements from 
- * sentences representing relations in the text.
- */
-public class OpenIEExtractor implements Extractor.TagSoupDOMExtractor {
-
-    private static final Logger LOG = 
LoggerFactory.getLogger(OpenIEExtractor.class);
-
-    private IRI documentRoot;
-
-    /**
-     * default constructor
-     */
-    OpenIEExtractor() {
-        // default constructor
-    }
-
-    /**
-     * @see org.apache.any23.extractor.Extractor#getDescription()
-     */
-    @Override
-    public ExtractorDescription getDescription() {
-        return OpenIEExtractorFactory.getDescriptionInstance();
-    }
-
-    @Override
-    public void run(ExtractionParameters extractionParameters,
-            ExtractionContext context, Document in, ExtractionResult out)
-                    throws IOException, ExtractionException {
-
-        IRI documentIRI = context.getDocumentIRI();
-        documentRoot = RDFUtils.iri(documentIRI.toString() + "root");
-        out.writeNamespace(RDF.PREFIX, RDF.NAMESPACE);
-        out.writeNamespace(RDFS.PREFIX, RDFS.NAMESPACE);
-        LOG.debug("Processing: {}", documentIRI.toString());
-
-        OpenIE openIE = new OpenIE(
-                new ClearParser(
-                        new ClearPostagger(
-                                new ClearTokenizer())), new ClearSrl(), false, 
false);
-
-        Seq<Instance> extractions = null;
-        Tika tika = new Tika();
-        try {
-            extractions = 
openIE.extract(tika.parseToString(StreamUtils.documentToInputStream(in)));
-        } catch (TransformerConfigurationException | 
TransformerFactoryConfigurationError e) {
-            LOG.error("Encountered error during OpenIE extraction.", e);
-        } catch (TikaException e) {
-            LOG.error("Encountered error whilst parsing InputStream with 
Tika.", e);
-        }
-
-        List<Instance> listExtractions = 
JavaConversions.seqAsJavaList(extractions);
-        // for each extraction instance we can obtain a number of extraction 
elements
-        // instance.confidence() - a confidence value for the extraction itself
-        // instance.extr().context() - an optional representation of the 
context for this extraction
-        // instance.extr().arg1().text() - subject
-        // instance.extr().rel().text() - predicate
-        // instance.extr().arg2s().text() - object
-        for(Instance instance : listExtractions) {
-            final Configuration immutableConf = 
DefaultConfiguration.singleton();
-            if (instance.confidence() > 
Double.parseDouble(immutableConf.getProperty("any23.extraction.openie.confidence.threshold",
 "0.5"))) {
-                List<Argument> listArg2s = 
JavaConversions.seqAsJavaList(instance.extr().arg2s());
-                for(Argument argument : listArg2s) {
-                    Resource subject = 
RDFUtils.makeIRI(instance.extr().arg1().text(), documentIRI);
-                    IRI predicate = (IRI) 
RDFUtils.makeIRI(instance.extr().rel().text(), documentIRI);
-                    Value object = RDFUtils.toValue(argument.text());
-                    out.writeTriple(subject, predicate, object);
-                }
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/any23/blob/01abf8f7/openie/src/main/java/org/apache/any23/openie/OpenIEExtractorFactory.java
----------------------------------------------------------------------
diff --git 
a/openie/src/main/java/org/apache/any23/openie/OpenIEExtractorFactory.java 
b/openie/src/main/java/org/apache/any23/openie/OpenIEExtractorFactory.java
deleted file mode 100644
index 4a1696a..0000000
--- a/openie/src/main/java/org/apache/any23/openie/OpenIEExtractorFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.openie;
-
-import java.util.Arrays;
-
-import org.apache.any23.extractor.ExtractorDescription;
-import org.apache.any23.extractor.ExtractorFactory;
-import org.apache.any23.extractor.SimpleExtractorFactory;
-import org.apache.any23.rdf.Prefixes;
-
-/**
- * @author lewismc
- *
- */
-public class OpenIEExtractorFactory extends 
SimpleExtractorFactory<OpenIEExtractor>
-    implements ExtractorFactory<OpenIEExtractor> {
-
-    public static final String NAME = "openie";
-
-    public static final Prefixes prefixes = null;
-
-    private static final ExtractorDescription descriptionInstance = new 
OpenIEExtractorFactory();
-
-    public OpenIEExtractorFactory() {
-        super(NAME, prefixes, Arrays.asList("text/html;q=0.1", 
"application/xhtml+xml;q=0.1"), "example-openie.html");
-    }
-
-    @Override
-    public OpenIEExtractor createExtractor() {
-        return new OpenIEExtractor();
-    }
-
-    public static ExtractorDescription getDescriptionInstance() {
-        return descriptionInstance;
-    }
-
-}

Reply via email to