rename packages

es-plugins/assembly/common-script-plugin.xml

@@ -20,7 +20,7 @@
             <scope>runtime</scope>
             <useProjectArtifact>true</useProjectArtifact>
             <includes>
-                <include>com.kayhut</include>
+                <include>com.yangdb</include>
             </includes>
         </dependencySet>
     </dependencySets>

es-plugins/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>fuse</artifactId>
-        <groupId>com.kayhut</groupId>
+        <groupId>com.yangdb</groupId>
         <version>0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

es-plugins/resources/CommonScriptPlugin.properties

@@ -1,6 +1,6 @@
 description = Common script plugin for elasticsearch
 version = 1.0
-name = kayhut-common-script-plugin
-classname = com.kayhut.es.plugins.script.CommonScriptPlugin
+name = yangdb-common-script-plugin
+classname = com.yangdb.es.plugins.script.CommonScriptPlugin
 java.version = 1.8
 elasticsearch.version = 5.3.2

es-plugins/src/main/java/com/kayhut/es/plugins/script/regex/RegexScript.java

@@ -1,4 +1,4 @@
-package com.kayhut.es.plugins.script.regex;
+package com.yangdb.es.plugins.script.regex;
 
 /*-
  * #%L

es-plugins/src/main/java/com/kayhut/es/plugins/script/regex/RegexScriptFactory.java

@@ -1,4 +1,4 @@
-package com.kayhut.es.plugins.script.regex;
+package com.yangdb.es.plugins.script.regex;
 
 /*-
  * #%L

es-plugins/src/main/java/com/kayhut/es/plugins/script/regex/RegexUtil.java

@@ -1,4 +1,4 @@
-package com.kayhut.es.plugins.script.regex;
+package com.yangdb.es.plugins.script.regex;
 
 /*-
  * #%L

es-plugins/src/main/java/com/kayhut/es/plugins/script/regex/WildcardScriptFactory.java

@@ -1,4 +1,4 @@
-package com.kayhut.es.plugins.script.regex;
+package com.yangdb.es.plugins.script.regex;
 
 /*-
  * #%L

es-plugins/src/test/java/com/kayhut/es/plugins/script/CommonScriptPluginTests.java

@@ -1,4 +1,4 @@
-package com.kayhut.es.plugins.script;
+package com.yangdb.es.plugins.script;
 
 import org.junit.Test;
 

es-plugins/src/test/java/com/kayhut/es/plugins/script/RegexUtilTests.java

@@ -1,6 +1,6 @@
-package com.kayhut.es.plugins.script;
+package com.yangdb.es.plugins.script;
 
-import com.kayhut.es.plugins.script.regex.RegexUtil;
+import com.yangdb.es.plugins.script.regex.RegexUtil;
 import org.junit.Assert;
 import org.junit.Test;
 

fuse-asg/pom.xml

@@ -2,7 +2,7 @@
 <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>fuse</artifactId>
-        <groupId>com.kayhut</groupId>
+        <groupId>com.yangdb</groupId>
         <version>0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -40,11 +40,11 @@
             <artifactId>front-end-9.0</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.kayhut</groupId>
+            <groupId>com.yangdb</groupId>
             <artifactId>fuse-model</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.kayhut</groupId>
+            <groupId>com.yangdb</groupId>
             <artifactId>fuse-core</artifactId>
         </dependency>
         <dependency>
@@ -59,7 +59,7 @@
 
         <!-- test -->
         <dependency>
-            <groupId>com.kayhut</groupId>
+            <groupId>com.yangdb</groupId>
             <artifactId>fuse-model</artifactId>
             <type>test-jar</type>
             <scope>test</scope>

fuse-asg/src/main/java/com/kayhut/fuse/asg/AsgCypherTransformer.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/AsgCypherTransformer.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg;
+package com.yangdb.fuse.asg;
 
 /*-
  * #%L
@@ -21,17 +21,9 @@
  */
 
 import com.google.inject.Inject;
-import com.kayhut.fuse.asg.strategy.AsgStrategy;
-import com.kayhut.fuse.asg.strategy.AsgStrategyRegistrar;
-import com.kayhut.fuse.asg.translator.cypher.CypherTranslator;
-import com.kayhut.fuse.dispatcher.ontology.OntologyProvider;
-import com.kayhut.fuse.dispatcher.query.QueryTransformer;
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
-import com.kayhut.fuse.model.ontology.Ontology;
-import javaslang.collection.Stream;
-
-import java.util.Optional;
+import com.yangdb.fuse.asg.translator.cypher.CypherTranslator;
+import com.yangdb.fuse.dispatcher.query.QueryTransformer;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
 
 /**
  * Created by Roman on 12/15/2017.

fuse-asg/src/main/java/com/kayhut/fuse/asg/AsgModule.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/AsgModule.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg;
+package com.yangdb.fuse.asg;
 
 /*-
  * #%L
@@ -22,15 +22,15 @@
 
 import com.google.inject.Binder;
 import com.google.inject.TypeLiteral;
-import com.kayhut.fuse.asg.strategy.AsgStrategyRegistrar;
-import com.kayhut.fuse.asg.strategy.CypherAsgStrategyRegistrar;
-import com.kayhut.fuse.asg.strategy.M1AsgStrategyRegistrar;
-import com.kayhut.fuse.asg.strategy.M1CypherAsgStrategyRegistrar;
-import com.kayhut.fuse.dispatcher.asg.QueryToCompositeAsgTransformer;
-import com.kayhut.fuse.dispatcher.modules.ModuleBase;
-import com.kayhut.fuse.dispatcher.query.QueryTransformer;
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.query.Query;
+import com.yangdb.fuse.asg.strategy.AsgStrategyRegistrar;
+import com.yangdb.fuse.asg.strategy.CypherAsgStrategyRegistrar;
+import com.yangdb.fuse.asg.strategy.M1AsgStrategyRegistrar;
+import com.yangdb.fuse.asg.strategy.M1CypherAsgStrategyRegistrar;
+import com.yangdb.fuse.dispatcher.asg.QueryToCompositeAsgTransformer;
+import com.yangdb.fuse.dispatcher.modules.ModuleBase;
+import com.yangdb.fuse.dispatcher.query.QueryTransformer;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.query.Query;
 import com.typesafe.config.Config;
 import org.jooby.Env;
 

fuse-asg/src/main/java/com/kayhut/fuse/asg/AsgQueryTransformer.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/AsgQueryTransformer.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg;
+package com.yangdb.fuse.asg;
 
 /*-
  * #%L
@@ -21,13 +21,13 @@
  */
 
 import com.google.inject.Inject;
-import com.kayhut.fuse.asg.strategy.AsgStrategy;
-import com.kayhut.fuse.asg.strategy.AsgStrategyRegistrar;
-import com.kayhut.fuse.dispatcher.ontology.OntologyProvider;
-import com.kayhut.fuse.dispatcher.query.QueryTransformer;
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
-import com.kayhut.fuse.model.ontology.Ontology;
+import com.yangdb.fuse.asg.strategy.AsgStrategy;
+import com.yangdb.fuse.asg.strategy.AsgStrategyRegistrar;
+import com.yangdb.fuse.dispatcher.ontology.OntologyProvider;
+import com.yangdb.fuse.dispatcher.query.QueryTransformer;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.asgQuery.AsgStrategyContext;
+import com.yangdb.fuse.model.ontology.Ontology;
 import javaslang.collection.Stream;
 
 import java.util.Optional;

fuse-asg/src/main/java/com/kayhut/fuse/asg/AsgValidationModule.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/AsgValidationModule.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg;
+package com.yangdb.fuse.asg;
 
 /*-
  * #%L
@@ -22,12 +22,12 @@
 
 import com.google.inject.Binder;
 import com.google.inject.TypeLiteral;
-import com.kayhut.fuse.asg.validation.AsgQueryValidator;
-import com.kayhut.fuse.asg.validation.AsgValidatorStrategyRegistrar;
-import com.kayhut.fuse.asg.validation.AsgValidatorStrategyRegistrarImpl;
-import com.kayhut.fuse.dispatcher.modules.ModuleBase;
-import com.kayhut.fuse.dispatcher.validation.QueryValidator;
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.asg.validation.AsgQueryValidator;
+import com.yangdb.fuse.asg.validation.AsgValidatorStrategyRegistrar;
+import com.yangdb.fuse.asg.validation.AsgValidatorStrategyRegistrarImpl;
+import com.yangdb.fuse.dispatcher.modules.ModuleBase;
+import com.yangdb.fuse.dispatcher.validation.QueryValidator;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
 import com.typesafe.config.Config;
 import org.jooby.Env;
 

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/AsgElementStrategy.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/AsgElementStrategy.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L
@@ -20,10 +20,10 @@
  * #L%
  */
 
-import com.kayhut.fuse.model.asgQuery.AsgEBase;
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
-import com.kayhut.fuse.model.query.EBase;
+import com.yangdb.fuse.model.asgQuery.AsgEBase;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.asgQuery.AsgStrategyContext;
+import com.yangdb.fuse.model.query.EBase;
 
 /**
  * Created by lior.perry on 27/02/2017.

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/AsgNamedParametersStrategy.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/AsgNamedParametersStrategy.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L
@@ -21,31 +21,27 @@
  */
 
 import com.googlecode.aviator.AviatorEvaluator;
-import com.googlecode.aviator.Expression;
-import com.kayhut.fuse.asg.util.OntologyPropertyTypeFactory;
-import com.kayhut.fuse.model.asgQuery.AsgEBase;
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgQueryUtil;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
-import com.kayhut.fuse.model.ontology.Property;
-import com.kayhut.fuse.model.query.EBase;
-import com.kayhut.fuse.model.query.entity.EEntityBase;
-import com.kayhut.fuse.model.query.entity.ETyped;
-import com.kayhut.fuse.model.query.properties.EProp;
-import com.kayhut.fuse.model.query.properties.EPropGroup;
-import com.kayhut.fuse.model.query.properties.constraint.*;
-import com.kayhut.fuse.model.query.quant.Quant1;
-import com.kayhut.fuse.model.query.quant.QuantBase;
-import com.kayhut.fuse.model.query.quant.QuantType;
-import com.kayhut.fuse.model.results.Entity;
+import com.yangdb.fuse.asg.util.OntologyPropertyTypeFactory;
+import com.yangdb.fuse.model.asgQuery.AsgEBase;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.asgQuery.AsgQueryUtil;
+import com.yangdb.fuse.model.asgQuery.AsgStrategyContext;
+import com.yangdb.fuse.model.ontology.Property;
+import com.yangdb.fuse.model.query.EBase;
+import com.yangdb.fuse.model.query.entity.ETyped;
+import com.yangdb.fuse.model.query.properties.EProp;
+import com.yangdb.fuse.model.query.properties.EPropGroup;
+import com.yangdb.fuse.model.query.properties.constraint.*;
+import com.yangdb.fuse.model.query.quant.Quant1;
+import com.yangdb.fuse.model.query.quant.QuantType;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import static com.kayhut.fuse.model.asgQuery.AsgQueryUtil.getEprops;
-import static com.kayhut.fuse.model.query.properties.constraint.ConstraintOp.*;
-import static com.kayhut.fuse.model.query.properties.constraint.NamedParameter.$VAL;
+import static com.yangdb.fuse.model.asgQuery.AsgQueryUtil.getEprops;
+import static com.yangdb.fuse.model.query.properties.constraint.ConstraintOp.*;
+import static com.yangdb.fuse.model.query.properties.constraint.NamedParameter.$VAL;
 import static java.util.Collections.singletonMap;
 
 public class AsgNamedParametersStrategy implements AsgStrategy {

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/AsgPredicateRoutingStrategy.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/AsgPredicateRoutingStrategy.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L
@@ -20,16 +20,12 @@
  * #L%
  */
 
-import com.kayhut.fuse.model.asgQuery.AsgEBase;
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
-import com.kayhut.fuse.model.query.EBase;
-import javaslang.Tuple2;
+import com.yangdb.fuse.model.asgQuery.AsgEBase;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.asgQuery.AsgStrategyContext;
+import com.yangdb.fuse.model.query.EBase;
 import javaslang.collection.Stream;
-import javaslang.control.Option;
 
-import java.util.List;
-import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/AsgStrategy.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/AsgStrategy.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L
@@ -20,10 +20,8 @@
  * #L%
  */
 
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
-
-import java.util.Set;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.asgQuery.AsgStrategyContext;
 
 /**
  * Created by lior.perry on 27/02/2017.

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/AsgStrategyContainer.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/AsgStrategyContainer.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@
  * #L%
  */
 
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.asgQuery.AsgStrategyContext;
 
 import java.util.Arrays;
 

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/AsgStrategyRegistrar.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/AsgStrategyRegistrar.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/CypherAsgStrategyRegistrar.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/CypherAsgStrategyRegistrar.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@
  * #L%
  */
 
-import com.kayhut.fuse.asg.translator.cypher.strategies.CypherTranslatorStrategy;
+import com.yangdb.fuse.asg.translator.cypher.strategies.CypherTranslatorStrategy;
 
 /**
  * Created by lior.perry on 27/02/2017.

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/DefaultAsgStrategyRegistrar.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/DefaultAsgStrategyRegistrar.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L

fuse-asg/src/main/java/com/kayhut/fuse/asg/strategy/DummyAsgStrategy.java → fuse-asg/src/main/java/com/yangdb/fuse/asg/strategy/DummyAsgStrategy.java

@@ -1,4 +1,4 @@
-package com.kayhut.fuse.asg.strategy;
+package com.yangdb.fuse.asg.strategy;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@
  * #L%
  */
 
-import com.kayhut.fuse.model.asgQuery.AsgQuery;
-import com.kayhut.fuse.model.asgQuery.AsgStrategyContext;
+import com.yangdb.fuse.model.asgQuery.AsgQuery;
+import com.yangdb.fuse.model.asgQuery.AsgStrategyContext;
 
 /**
  * Created by lior.perry on 05/03/2017.