Bump junit from 4.12 to 4.13.1

README.md

@@ -0,0 +1,9 @@
+# PandaDB
+
+Intelligent Graph Database.
+
+<img src="https://github.com/bluejoe2008/PandaDB-2019/blob/master/docs/logo.png?raw=true" width=200>
+
+## Licensing
+
+PandaDB-2019 is an open source product licensed under GPLv3.

aipm-library/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>parent</artifactId>
+        <groupId>cn.pandadb</groupId>
+        <version>0.0.2</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.pandadb</groupId>
+    <artifactId>aipm-library</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>cn.pandadb</groupId>
+            <artifactId>commons</artifactId>
+            <version>${pandadb.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.pandadb</groupId>
+            <artifactId>blob-commons</artifactId>
+            <version>${pandadb.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-parser-combinators_2.11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>info.debatty</groupId>
+            <artifactId>java-string-similarity</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

src/aipm/scala/cn/aipm/CommonBlobPropertyExtractor.scala → aipm-library/src/main/scala/cn/aipm/CommonBlobPropertyExtractor.scala

@@ -1,8 +1,8 @@
 package cn.aipm
 
-import cn.graiph.PropertyExtractor
-import cn.graiph.blob.Blob
-import cn.graiph.util.Configuration
+import cn.pandadb.cypherplus.PropertyExtractor
+import cn.pandadb.blob.Blob
+import cn.pandadb.util.{ContextMap, Configuration}
 
 /**
   * Created by bluejoe on 2019/2/17.

src/aipm/scala/cn/aipm/audio/AudioRecongnizer.scala → aipm-library/src/main/scala/cn/aipm/audio/AudioRecongnizer.scala

@@ -1,9 +1,8 @@
 package cn.aipm.audio
 
-import cn.graiph.PropertyExtractor
+import cn.pandadb.cypherplus.PropertyExtractor
 import cn.aipm.service.ServiceInitializer
-import cn.graiph.blob.Blob
-
+import cn.pandadb.blob.Blob
 
 class AudioRecongnizer extends PropertyExtractor with ServiceInitializer {
 

src/aipm/scala/cn/aipm/image/DogOrCatClassifier.scala → aipm-library/src/main/scala/cn/aipm/image/DogOrCatClassifier.scala

@@ -1,8 +1,8 @@
 package cn.aipm.image
 
 import cn.aipm.service.ServiceInitializer
-import cn.graiph.PropertyExtractor
-import cn.graiph.blob.Blob
+import cn.pandadb.cypherplus.PropertyExtractor
+import cn.pandadb.blob.Blob
 
 class DogOrCatClassifier extends PropertyExtractor with ServiceInitializer {
 

src/aipm/scala/cn/aipm/image/FaceSimilarityComparator.scala → aipm-library/src/main/scala/cn/aipm/image/FaceSimilarityComparator.scala

@@ -1,9 +1,8 @@
 package cn.aipm.image
 
-import cn.graiph.SetComparator
+import cn.pandadb.cypherplus.SetComparator
 import cn.aipm.service.ServiceInitializer
-import cn.graiph.blob.Blob
-
+import cn.pandadb.blob.Blob
 
 class FaceSimilarityComparator extends SetComparator with ServiceInitializer {
 

src/aipm/scala/cn/aipm/image/ImageMetaDataExtractor.scala → aipm-library/src/main/scala/cn/aipm/image/ImageMetaDataExtractor.scala

@@ -2,9 +2,9 @@ package cn.aipm.image
 
 import javax.imageio.ImageIO
 
-import cn.graiph.PropertyExtractor
-import cn.graiph.blob.Blob
-import cn.graiph.util.Configuration
+import cn.pandadb.cypherplus.PropertyExtractor
+import cn.pandadb.blob.Blob
+import cn.pandadb.util.{ContextMap, Configuration}
 
 /**
   * Created by bluejoe on 2019/2/17.

src/aipm/scala/cn/aipm/image/PlateNumberExtractor.scala → aipm-library/src/main/scala/cn/aipm/image/PlateNumberExtractor.scala

@@ -1,9 +1,8 @@
 package cn.aipm.image
 
-import cn.graiph.PropertyExtractor
+import cn.pandadb.cypherplus.PropertyExtractor
 import cn.aipm.service.ServiceInitializer
-import cn.graiph.blob.Blob
-
+import cn.pandadb.blob.Blob
 
 class PlateNumberExtractor extends PropertyExtractor with ServiceInitializer {
 

src/aipm/scala/cn/aipm/service/Services.scala → aipm-library/src/main/scala/cn/aipm/service/Services.scala

@@ -2,8 +2,8 @@ package cn.aipm.service
 
 import java.io.InputStream
 
-import cn.graiph.AnyComparator
-import cn.graiph.util.{ConfigUtils, Configuration}
+import cn.pandadb.cypherplus.AnyComparator
+import cn.pandadb.util.{ContextMap, ConfigUtils, Configuration}
 import scala.collection.immutable.Map
 import scala.util.parsing.json.JSON
 import ConfigUtils._
@@ -47,7 +47,6 @@ class Services(private val _aipmHttpHostUrl: String) {
 
   }
 
-
   def extractPlateNumber(img1InputStream: InputStream): String = {
     val serviceUrl = getServiceUrl("PlateNumber")
 
@@ -112,7 +111,6 @@ class Services(private val _aipmHttpHostUrl: String) {
     }
   }
 
-
   def segmentText(text: String): List[String] = {
     val serviceUrl = getServiceUrl("TextSegment")
     val contents = Map("text" -> text)

src/aipm/scala/cn/aipm/service/WebUtils.scala → aipm-library/src/main/scala/cn/aipm/service/WebUtils.scala

@@ -38,7 +38,6 @@ object WebUtils {
     resStr
   }
 
-
   def doPost(reqUrl: String, strContents: Map[String, String] = Map(), fileContents: Map[String, File] = Map(),
              inStreamContents: Map[String, InputStream] = Map()): String = {
     var resStr = ""

src/aipm/scala/cn/aipm/text/ChineseTokenizer.scala → aipm-library/src/main/scala/cn/aipm/text/ChineseTokenizer.scala

@@ -1,7 +1,7 @@
 package cn.aipm.text
 
 import cn.aipm.service.ServiceInitializer
-import cn.graiph.PropertyExtractor
+import cn.pandadb.cypherplus.PropertyExtractor
 
 class ChineseTokenizer extends PropertyExtractor with ServiceInitializer {
 

src/aipm/scala/cn/aipm/text/JaroStringSimilarity.scala → aipm-library/src/main/scala/cn/aipm/text/JaroStringSimilarity.scala

@@ -1,7 +1,7 @@
 package cn.aipm.text
 
-import cn.graiph.ValueComparator
-import cn.graiph.util.Configuration
+import cn.pandadb.cypherplus.ValueComparator
+import cn.pandadb.util.{ContextMap, Configuration}
 import info.debatty.java.stringsimilarity.{Cosine, Jaccard, JaroWinkler}
 
 /**

src/aipm/scala/cn/aipm/text/SentimentClassifier.scala → aipm-library/src/main/scala/cn/aipm/text/SentimentClassifier.scala

@@ -1,7 +1,7 @@
 package cn.aipm.text
 
 import cn.aipm.service.ServiceInitializer
-import cn.graiph.PropertyExtractor
+import cn.pandadb.cypherplus.PropertyExtractor
 
 class SentimentClassifier extends PropertyExtractor with ServiceInitializer {
 

src/graiph-database/scala/cn/graiph/util/ExternalProcess.scala → aipm-library/src/main/scala/cn/aipm/util/ExternalProcess.scala

@@ -1,8 +1,10 @@
-package cn.graiph.util
+package cn.aipm.util
 
 import java.io.ByteArrayOutputStream
-import cn.graiph.blob.Blob
+import cn.pandadb.blob.Blob
+import cn.pandadb.util.{StreamUtils, Logging}
 import StreamUtils._
+import cn.pandadb.util.Logging
 import org.apache.commons.io.IOUtils
 import scala.util.parsing.json.JSON
 

blob-commons/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.pandadb</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.0.2</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.pandadb</groupId>
+    <artifactId>blob-commons</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>cn.pandadb</groupId>
+            <artifactId>commons</artifactId>
+            <version>${pandadb.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>eu.medsea.mimeutil</groupId>
+            <artifactId>mime-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

src/blob/scala/cn/graiph/blob/BlobIO.scala → blob-commons/src/main/scala/cn/pandadb/blob/BlobIO.scala

@@ -17,12 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package cn.graiph.blob
+package cn.pandadb.blob
 
 import java.io.ByteArrayOutputStream
-
-import cn.graiph.util.StreamUtils
-import cn.graiph.util.StreamUtils._
+import cn.pandadb.util.StreamUtils
+import cn.pandadb.util.StreamUtils._
 
 /**
   * Created by bluejoe on 2019/4/18.

src/graiph-database/scala/cn/graiph/CypherPluginRegistry.scala → blob-commons/src/main/scala/cn/pandadb/blob/CypherPluginRegistry.scala

@@ -1,48 +1,11 @@
-package cn.graiph
+package cn.pandadb.blob
 
-import cn.graiph.blob.Blob
-import cn.graiph.util.{Configuration, Logging}
+import cn.pandadb.cypherplus._
+import cn.pandadb.util.{ContextMap, PandaException, Configuration, Logging}
 
 import scala.beans.BeanProperty
 import scala.collection.mutable
 
-trait AnyComparator {
-  def initialize(conf: Configuration);
-}
-
-trait ValueComparator extends AnyComparator {
-  def compare(a: Any, b: Any): Double;
-}
-
-trait SetComparator extends AnyComparator {
-  def compareAsSets(a: Any, b: Any): Array[Array[Double]];
-}
-
-/**
-  * Created by bluejoe on 2019/1/31.
-  */
-trait CustomPropertyProvider {
-  def getCustomProperty(x: Any, propertyName: String): Option[Any];
-}
-
-trait ValueMatcher {
-  def like(a: Any, b: Any, algoName: Option[String], threshold: Option[Double]): Option[Boolean];
-
-  def containsOne(a: Any, b: Any, algoName: Option[String], threshold: Option[Double]): Option[Boolean];
-
-  def containsSet(a: Any, b: Any, algoName: Option[String], threshold: Option[Double]): Option[Boolean];
-
-  /**
-    * compares two values
-    */
-  def compareOne(a: Any, b: Any, algoName: Option[String]): Option[Double];
-
-  /**
-    * compares two objects as sets
-    */
-  def compareSet(a: Any, b: Any, algoName: Option[String]): Option[Array[Array[Double]]];
-}
-
 object ValueType {
   def typeNameOf(x: Any): String = x match {
     case b: Blob => s"blob/${b.mimeType.major}".toLowerCase()
@@ -74,7 +37,7 @@ class CypherPluginRegistry {
   @BeanProperty var extractors: Array[DomainExtractorEntry] = Array();
   @BeanProperty var comparators: Array[DomainComparatorEntry] = Array();
 
-  def createCustomPropertyProvider(conf: Configuration) = new CustomPropertyProvider {
+  def createCustomPropertyProvider(conf: Configuration): CustomPropertyProvider = new CustomPropertyProvider {
     extractors.foreach(_.extractor.initialize(conf));
 
     //propertyName, typeName
@@ -113,7 +76,7 @@ class CypherPluginRegistry {
     }
   }
 
-  def createValueComparatorRegistry(conf: Configuration) = new ValueMatcher with Logging {
+  def createValueComparatorRegistry(conf: Configuration): ValueMatcher = new ValueMatcher with Logging {
     type CompareAnyMethod = (Any, Any) => Any;
     type CompareValueMethod = (Any, Any) => Double;
     type CompareSetMethod = (Any, Any) => Array[Array[Double]];
@@ -181,14 +144,16 @@ class CypherPluginRegistry {
       }
     }
 
-    private def getMatchedComparator(compareValueOrSet: Boolean, typeA: String, typeB: String, algoName: Option[String]): Option[(CompareAnyMethod, DomainComparatorEntry)] = {
+    private def getMatchedComparator(compareValueOrSet: Boolean, typeA: String, typeB: String,
+                                     algoName: Option[String]): Option[(CompareAnyMethod, DomainComparatorEntry)] = {
       def isEntryMatched(entry: DomainComparatorEntry, typeName: String): Boolean = {
         val f = entry.domain.equalsIgnoreCase(typeName) &&
-          (if (compareValueOrSet)
+          (if (compareValueOrSet) {
             entry.comparator.isInstanceOf[ValueComparator]
-          else
+          }
+          else {
             entry.comparator.isInstanceOf[SetComparator]
-            )
+          })
 
         algoName.map { name =>
           f && entry.name.equalsIgnoreCase(name)
@@ -198,10 +163,12 @@ class CypherPluginRegistry {
       }
 
       def doCompare(comparator: AnyComparator, a: Any, b: Any): Any = {
-        if (compareValueOrSet)
-          comparator.asInstanceOf[ValueComparator].compare(a, b);
-        else
-          comparator.asInstanceOf[SetComparator].compareAsSets(a, b);
+        if (compareValueOrSet) {
+          comparator.asInstanceOf[ValueComparator].compare(a, b)
+        }
+        else {
+          comparator.asInstanceOf[SetComparator].compareAsSets(a, b)
+        }
       }
 
       comparators.find(isEntryMatched(_, ValueType.concat(typeA, typeB)))
@@ -250,16 +217,17 @@ class CypherPluginRegistry {
 }
 
 class UnknownPropertyException(name: String, x: Any)
-  extends RuntimeException(s"unknown property `$name` for $x") {
+  extends PandaException(s"unknown property `$name` for $x") {
 
 }
 
 class NoSuitableComparatorException(a: Any, b: Any, algoName: Option[String])
-  extends RuntimeException(s"no suiltable comparator: ${ValueType.typeNameOf(a)} and ${ValueType.typeNameOf(b)}, algorithm name: ${algoName.getOrElse("(none)")}") {
+  extends PandaException(s"no suiltable comparator: ${ValueType.typeNameOf(a)} and ${ValueType.typeNameOf(b)}," +
+    s" algorithm name: ${algoName.getOrElse("(none)")}") {
 
 }
 
 class TooManyObjectsException(o: Any)
-  extends RuntimeException(s"too many objects: $o") {
+  extends PandaException(s"too many objects: $o") {
 
 }