Merge branch 'develop' of github.com:SANSA-Stack/SANSA-Inference into develop

# Conflicts:
#	sansa-inference-common/src/main/resources/log4j.properties

Author: LorenzBuehmann

sansa-inference-common/pom.xml

@@ -97,7 +97,7 @@
   </dependencies>
 
   <build>
-    <sourceDirectory>src/main/scala</sourceDirectory>
+    <sourceDirectory>src/main/scala,src/main/resources</sourceDirectory>
     <testSourceDirectory>src/test/scala</testSourceDirectory>
     <!--<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>-->
     <!--<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>-->

sansa-inference-common/src/main/resources/log4j.properties

@@ -17,6 +17,6 @@ log4j.appender.stdout.layout.ConversionPattern=%r %-5p %C:%L - %m%n
 
 log4j.logger.akka.event.slf4j.Slf4jLogger=ERROR
 log4j.logger.akka.remote.Remoting=ERROR
-log4j.logger.org.spark_project.jetty=ERROR
-log4j.logger.org.apache.spark=ERROR
-log4j.logger.org.apache.hadoop=ERROR
+
+log4j.logger.org.apache.hadoop=ERROR
+log4j.logger.org.apache.calcite=ERROR

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

@@ -20,7 +20,7 @@ import org.apache.calcite.tools.Frameworks
 class SimpleCalciteConnection extends CalciteConnection{
 
   val rootSchema = Frameworks.createRootSchema(true)
-  var schema: String = ""
+  var schema: String = null
 
   override def config(): CalciteConnectionConfig = null
 
@@ -32,7 +32,7 @@ class SimpleCalciteConnection extends CalciteConnection{
 
   override def getProperties: Properties = null
 
-  override def setSchema(schema: String): Unit = {}
+  override def setSchema(s: String): Unit = schema = s
 
   override def setAutoCommit(autoCommit: Boolean): Unit = {}