Merge branch 'develop' into feature/dependency-updates

Author: patrickwestphal

.gitignore

@@ -17,3 +17,5 @@ project/plugins/project/
 .worksheet
 *.iml
 .idea
+
+scalastyle-output.xml

README.md

@@ -17,14 +17,15 @@
 	- [Setup](#setup)
 		- [Prerequisites](#prerequisites)
 		- [From source](#from-source)
-		- [Using Maven pre-build artifacts](#)
+		- [Using Maven pre-build artifacts](#using-maven-pre-build-artifacts)
 		- [Using SBT](#using-SBT)
 	- [Usage](#usage)
 		- [Example](#example)
-	- [Supported Reasoning Profiles](#)
+	- [Supported Reasoning Profiles](#supported-reasoning-profiles)
 		- [RDFS](#rdfs)
 		- [RDFS Simple](#rdfs-simple)
 		- [OWL Horst](#owl-horst)
+  	- [How to Contribute](#how-to-contribute)
 
 
 ## Structure
@@ -216,3 +217,7 @@ OWL Horst is a fragment of OWL and was proposed by Herman ter Horst [1] defining
 
 [1] Herman J. ter Horst:
 *Completeness, decidability and complexity of entailment for RDF Schema and a semantic extension involving the OWL vocabulary.* J. Web Sem. 3(2-3): 79-115 (2005)
+
+## How to Contribute
+We always welcome new contributors to the project! Please see [our contribution guide](http://sansa-stack.net/contributing-to-sansa/) for more details on how to get started contributing to SANSA.
+

pom.xml

@@ -82,6 +82,7 @@
     <CodeCacheSize>512m</CodeCacheSize>
     <gpg.keyname>AKSW</gpg.keyname>
     <owlapi.version>5.1.5</owlapi.version>
+    <scalastyle.config.path>${project.basedir}/scalastyle-config.xml</scalastyle.config.path>
   </properties>
 
   <prerequisites>
@@ -554,30 +555,33 @@
         <groupId>com.versioneye</groupId>
         <artifactId>versioneye-maven-plugin</artifactId>
       </plugin>
-      <!--<plugin>-->
-        <!--<groupId>org.scalastyle</groupId>-->
-        <!--<artifactId>scalastyle-maven-plugin</artifactId>-->
-        <!--<version>0.8.0</version>-->
-        <!--<configuration>-->
-          <!--<verbose>false</verbose>-->
-          <!--<failOnViolation>false</failOnViolation>-->
-          <!--<includeTestSourceDirectory>false</includeTestSourceDirectory>-->
-          <!--<failOnWarning>false</failOnWarning>-->
-          <!--<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>-->
-          <!--<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>-->
-          <!--<configLocation>scalastyle-config.xml</configLocation>-->
-          <!--<outputFile>${basedir}/target/scalastyle-output.xml</outputFile>-->
-          <!--<inputEncoding>${project.build.sourceEncoding}</inputEncoding>-->
-          <!--<outputEncoding>${project.reporting.outputEncoding}</outputEncoding>-->
-        <!--</configuration>-->
-        <!--<executions>-->
-          <!--<execution>-->
-            <!--<goals>-->
-              <!--<goal>check</goal>-->
-            <!--</goals>-->
-          <!--</execution>-->
-        <!--</executions>-->
-      <!--</plugin>-->
+
+      <!-- Scalastyle -->
+      <plugin>
+        <groupId>org.scalastyle</groupId>
+        <artifactId>scalastyle-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <configuration>
+          <verbose>false</verbose>
+          <failOnViolation>false</failOnViolation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <failOnWarning>false</failOnWarning>
+          <sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
+          <testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
+          <!-- we use a central config located in the root directory -->
+          <configLocation>${scalastyle.config.path}</configLocation>
+          <outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
+          <outputEncoding>UTF-8</outputEncoding>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 
@@ -702,6 +706,7 @@
 
     <!-- the profile used for deployment to Sonatype Maven repository -->
     <profile>
+      <!-- for Maven Central deployment -->
       <id>ossrh</id>
       <distributionManagement>
         <repository>
@@ -820,5 +825,18 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- for Scalastyle plugin -->
+    <profile>
+      <id>root-dir</id>
+      <activation>
+        <file>
+          <exists>${project.basedir}/../../scalastyle-config.xml</exists>
+        </file>
+      </activation>
+      <properties>
+        <scalastyle.config.path>${project.basedir}/../scalastyle-config.xml</scalastyle.config.path>
+      </properties>
+    </profile>
   </profiles>
 </project>

sansa-inference-common/src/main/scala/net/sansa_stack/inference/data/JenaOps.scala

@@ -1,10 +1,10 @@
 package net.sansa_stack.inference.data
 
+import scala.collection.JavaConverters._
+
 import org.apache.jena.datatypes.{BaseDatatype, RDFDatatype, TypeMapper}
 import org.apache.jena.graph.{Graph => JenaGraph, Node => JenaNode, Triple => JenaTriple, _}
-import org.apache.jena.rdf.model.{Literal => JenaLiteral, Seq => _}
-
-import scala.collection.JavaConverters._
+import org.apache.jena.rdf.model.{Seq => _}
 
 class JenaOps extends RDFOps[Jena]  {
 
@@ -33,10 +33,12 @@ class JenaOps extends RDFOps[Jena]  {
     val s = t.getSubject
     val p = t.getPredicate
     val o = t.getObject
-    if (p.isInstanceOf[Jena#URI])
-      (s, p.asInstanceOf[Jena#URI], o)
-    else
-      throw new RuntimeException("fromTriple: predicate " + p.toString + " must be a URI")
+    p match {
+      case uri: Node_URI =>
+        (s, uri, o)
+      case _ =>
+        throw new RuntimeException("fromTriple: predicate " + p.toString + " must be a URI")
+    }
   }
 
   // node
@@ -52,10 +54,11 @@ class JenaOps extends RDFOps[Jena]  {
   def makeUri(iriStr: String): Jena#URI = { NodeFactory.createURI(iriStr).asInstanceOf[Node_URI] }
 
   def fromUri(node: Jena#URI): String =
-    if (node.isURI)
+    if (node.isURI) {
       node.getURI
-    else
+    } else {
       throw new RuntimeException("fromUri: " + node.toString() + " must be a URI")
+    }
 
   // bnode
 
@@ -67,17 +70,18 @@ class JenaOps extends RDFOps[Jena]  {
   }
 
   def fromBNode(bn: Jena#BNode): String =
-    if (bn.isBlank)
+    if (bn.isBlank) {
       bn.getBlankNodeId.getLabelString
-    else
+    } else {
       throw new RuntimeException("fromBNode: " + bn.toString + " must be a BNode")
+    }
 
   // literal
 
   // TODO the javadoc doesn't say if this is thread safe
   lazy val mapper = TypeMapper.getInstance
 
-  def jenaDatatype(datatype: Jena#URI) = {
+  private def jenaDatatype(datatype: Jena#URI) = {
     val iriString = fromUri(datatype)
     val typ = mapper.getTypeByName(iriString)
     if (typ == null) {
@@ -94,20 +98,21 @@ class JenaOps extends RDFOps[Jena]  {
   val __rdfLangStringURI: Jena#URI = makeUri("http://www.w3.org/1999/02/22-rdf-syntax-ns#langString")
 
   def makeLiteral(lexicalForm: String, datatype: Jena#URI): Jena#Literal =
-    if (datatype == __xsdStringURI)
+    if (datatype == __xsdStringURI) {
       NodeFactory.createLiteral(lexicalForm, null, null).asInstanceOf[Node_Literal]
-    else
+    } else {
       NodeFactory.createLiteral(lexicalForm, null, jenaDatatype(datatype)).asInstanceOf[Node_Literal]
+    }
 
   def makeLangTaggedLiteral(lexicalForm: String, lang: Jena#Lang): Jena#Literal =
     NodeFactory.createLiteral(lexicalForm, fromLang(lang), null).asInstanceOf[Node_Literal]
 
 
   // lang
 
-  def makeLang(langString: String) = langString
+  def makeLang(langString: String): String = langString
 
-  def fromLang(lang: Jena#Lang) = lang
+  def fromLang(lang: Jena#Lang): String = lang
 
 
 

sansa-inference-common/src/main/scala/net/sansa_stack/inference/data/RDF.scala

@@ -39,4 +39,4 @@ trait RDF {
   // types for the graph traversal API
   type NodeMatch
   type NodeAny <: NodeMatch
-}
+}

sansa-inference-common/src/main/scala/net/sansa_stack/inference/data/RDFTuple.scala

@@ -8,6 +8,7 @@ package net.sansa_stack.inference.data
   * @author Lorenz Buehmann
   */
 case class RDFTuple(s: String, o: String) extends Product2[String, String] {
-    override def _1: String = s
-    override def _2: String = o
-  }
+  override def _1: String = s
+
+  override def _2: String = o
+}

sansa-inference-common/src/main/scala/net/sansa_stack/inference/data/SimpleRDFOps.scala

@@ -17,10 +17,12 @@ class SimpleRDFOps extends RDFOps[SimpleRDF]  {
         val s = t.s
         val p = t.p
         val o = t.o
-        if (p.isInstanceOf[SimpleRDF#URI])
-            (s, p.asInstanceOf[SimpleRDF#URI], o)
-        else
-            throw new RuntimeException("fromTriple: predicate " + p.toString + " must be a URI")
+        p match {
+            case uri: String =>
+                (s, uri, o)
+            case _ =>
+                throw new RuntimeException("fromTriple: predicate " + p.toString + " must be a URI")
+        }
     }
 
     // node

sansa-inference-common/src/main/scala/net/sansa_stack/inference/rules/minimizer/MinimizationRule.scala

@@ -18,4 +18,4 @@ abstract class MinimizationRule extends Logging {
 
   def apply(graph: RuleDependencyGraph): RuleDependencyGraph
 
-}
+}

sansa-inference-common/src/main/scala/net/sansa_stack/inference/rules/plan/SimplePlanGenerator.scala

@@ -1,30 +1,20 @@
 package net.sansa_stack.inference.rules.plan
 
-import java.io.PrintWriter
-import java.util.Collections
+import scala.collection.JavaConverters._
+import scala.util.Try
 
-import com.google.common.collect.ImmutableList
 import org.apache.calcite.config.Lex
+import org.apache.calcite.interpreter.{BindableConvention, Bindables}
 import org.apache.calcite.plan.{RelOptUtil, _}
+import org.apache.calcite.rel.`type`.RelDataTypeSystem
+import org.apache.calcite.rel.rules._
 import org.apache.calcite.rel.{RelCollationTraitDef, RelNode}
 import org.apache.calcite.schema.SchemaPlus
 import org.apache.calcite.sql.parser.SqlParser
 import org.apache.calcite.tools._
-import collection.JavaConverters._
-import scala.util.Try
-
-import org.apache.calcite.rel.`type`.RelDataTypeSystem
-import org.apache.calcite.rel.externalize.RelWriterImpl
-import org.apache.calcite.rel.rules._
 import org.apache.jena.reasoner.rulesys.Rule
 
 import net.sansa_stack.inference.utils.{Logging, RuleUtils}
-import org.apache.calcite.adapter.enumerable.{EnumerableConvention, EnumerableRules}
-import org.apache.calcite.interpreter.{BindableConvention, Bindables}
-import org.apache.calcite.plan.RelOptPlanner.CannotPlanException
-import org.apache.calcite.plan.hep.{HepMatchOrder, HepPlanner, HepProgramBuilder}
-import org.apache.calcite.plan.volcano.VolcanoPlanner
-import org.apache.calcite.sql2rel.{RelDecorrelator, SqlToRelConverter}
 
 /**
   * @author Lorenz Buehmann
@@ -37,7 +27,7 @@ class SimplePlanGenerator(schema: SchemaPlus) extends Logging {
     BindableConvention.INSTANCE.getTraitDef
   )
 
-  val optRuleSet = RuleSets.ofList(
+  val optRuleSet: RuleSet = RuleSets.ofList(
     FilterJoinRule.FILTER_ON_JOIN,// push a filter into a join
     FilterJoinRule.JOIN,// push filter into the children of a join
     ProjectJoinTransposeRule.INSTANCE// push a projection to the children of a join
@@ -68,13 +58,13 @@ class SimplePlanGenerator(schema: SchemaPlus) extends Logging {
 //      // Context provides a way to store data within the planner session that can be accessed in planner rules.
 //      .context(Contexts.EMPTY_CONTEXT)
 //      // Rule sets to use in transformation phases. Each transformation phase can use a different set of rules.
-////      .ruleSets(optRuleSet)
+// //      .ruleSets(optRuleSet)
 //      .ruleSets(RuleSets.ofList(Bindables.BINDABLE_TABLE_SCAN_RULE, Bindables.BINDABLE_PROJECT_RULE, Bindables.BINDABLE_JOIN_RULE, Bindables.BINDABLE_FILTER_RULE, FilterJoinRule.FILTER_ON_JOIN))
 //      .programs(Programs.ofRules(Bindables.BINDABLE_TABLE_SCAN_RULE, Bindables.BINDABLE_PROJECT_RULE, Bindables.BINDABLE_JOIN_RULE, Bindables.BINDABLE_FILTER_RULE, FilterJoinRule.FILTER_ON_JOIN))
 //
 //      // Custom cost factory to use during optimization
 //      .costFactory(null)
-////      .programs(program)
+// //      .programs(program)
 //      .typeSystem(RelDataTypeSystem.DEFAULT)
 //      .build()
 

sansa-inference-common/src/main/scala/net/sansa_stack/inference/utils/JenaTripleToNTripleString.scala

@@ -9,7 +9,7 @@ import org.apache.jena.graph.Triple
   * @author Lorenz Buehmann
   */
 class JenaTripleToNTripleString
-    extends ((Triple) => String)
+    extends Function[Triple, String]
     with java.io.Serializable {
   override def apply(t: Triple): String = {
     val subStr =
@@ -27,7 +27,7 @@ class JenaTripleToNTripleString
       } else {
         s"<${t.getObject}>"
       }
-    s"${subStr} <${t.getPredicate}> ${objStr} ."
+    s"$subStr <${t.getPredicate}> $objStr ."
   }
 }