From b72ad1703cf7ec96df73ea2a4bd0bceabaf8e808 Mon Sep 17 00:00:00 2001 From: jzonthemtn Date: Thu, 21 Mar 2024 14:50:12 -0400 Subject: [PATCH] Fixing group names. --- docs/Users-Guide.md | 6 +- entitydb-app/pom.xml | 2 +- .../configuration/PersistenceJPAConfig.java | 2 +- .../services/RepositoryTestConfig.java | 6 +- .../entitydb-entity-store-cassandra/pom.xml | 6 +- .../entitydb-entity-store-dynamodb/pom.xml | 6 +- .../entitydb-entity-store-mongodb/pom.xml | 11 +- .../entitydb-entity-store-rdbms/pom.xml | 6 +- .../main/resources/RdbmsStoredEntity.hbm.xml | 2 +- .../RdbmsStoredEntityMetadata.hbm.xml | 2 +- .../test/resources/RdbmsStoredEntity.hbm.xml | 2 +- .../RdbmsStoredEntityMetadata.hbm.xml | 2 +- .../entitydb/eql/filters/EqlFilters.java | 2 +- .../test/eql/filters/EqlFiltersTest.java | 18 +- .../eql-filters/src/test/resources/log4j2.xml | 2 +- .../java/ai/philterd/entitydb/eql/Eql.java | 2 +- .../java/ai/idylnlp/test/eql/EqlTest.java | 529 ----------------- .../test/eql/model/test/EntityQueryTest.java | 67 --- .../test/eql/model/test/EntityQueryTest.java | 543 ++++++++++++++++++ .../src/test/resources/log4j2.xml | 2 +- .../entitydb/eql/pig/EqlFilterFunc.java | 2 +- .../entitydb/eql/pig/EqlMatchFunc.java | 19 +- .../test/eql/pig/EqlMatchFuncTest.java | 2 +- .../eql-pig-udf/src/test/resources/log4j2.xml | 2 +- .../entitydb/driver/EntityDbClient.java | 2 +- .../entitydb/driver/model/IndexedEntity.java | 2 +- .../entitydb/driver/model/QueryResult.java | 4 +- .../exceptions/EntityDbClientException.java | 4 +- entitydb-model/pom.xml | 9 +- .../entitydb/model/eql/ConfidenceRange.java | 2 +- .../model/eql/EntityMetadataFilter.java | 2 +- .../entitydb/model/eql/EntityOrder.java | 2 +- .../entitydb/model/eql/EntityQuery.java | 2 +- .../entitydb/model/eql/SortOrder.java | 2 +- entitydb-queues/pom.xml | 6 +- .../entitydb/queues/AbstractQueueTest.java | 26 +- .../publishers/SqsQueuePublisherIT.java | 22 +- .../pom.xml | 2 +- entitydb-search/pom.xml | 6 +- .../search/ElasticSearchIndexTest.java | 32 +- .../DefaultEntityQueryServiceTest.java | 2 +- entitydb-testing/pom.xml | 11 +- .../testing/AbstractEntityStoreTest.java | 38 +- pom.xml | 2 +- 44 files changed, 663 insertions(+), 758 deletions(-) rename entitydb-eql/eql-filters/src/test/java/ai/{idylnlp => philterd/entitydb}/test/eql/filters/EqlFiltersTest.java (93%) delete mode 100644 entitydb-eql/eql-language/src/test/java/ai/idylnlp/test/eql/EqlTest.java delete mode 100644 entitydb-eql/eql-language/src/test/java/ai/idylnlp/test/eql/model/test/EntityQueryTest.java create mode 100644 entitydb-eql/eql-language/src/test/java/ai/philterd/entitydb/test/eql/model/test/EntityQueryTest.java diff --git a/docs/Users-Guide.md b/docs/Users-Guide.md index ecba48d..b1e6d95 100644 --- a/docs/Users-Guide.md +++ b/docs/Users-Guide.md @@ -168,9 +168,9 @@ Drools implementation: ``` import ai.philterd.entitydb.model.entity.Entity; -import com.mtnfog.entity.EntityExtractionAttributes; -import com.mtnfog.idyl.sdk.rulesengine.drools.model.EntitiesHolder; -import com.mtnfog.idyl.e3.rules.Ses; +import ai.philterd.entity.EntityExtractionAttributes; +import ai.philterd.idyl.sdk.rulesengine.drools.model.EntitiesHolder; +import ai.philterd.idyl.e3.rules.Ses; // This is a sample rule that sends an email when an entity having the // text "George Washington" is extracted. To use this rule, set your diff --git a/entitydb-app/pom.xml b/entitydb-app/pom.xml index b89efe2..5dadf46 100644 --- a/entitydb-app/pom.xml +++ b/entitydb-app/pom.xml @@ -33,7 +33,7 @@ entitydb-app jar - com.mtnfog.entitydb.EntityDbApplication + ai.philterd.entitydb.EntityDbApplication entitydb diff --git a/entitydb-data-store/src/main/java/ai/philterd/entitydb/datastore/configuration/PersistenceJPAConfig.java b/entitydb-data-store/src/main/java/ai/philterd/entitydb/datastore/configuration/PersistenceJPAConfig.java index c30597a..a39d224 100644 --- a/entitydb-data-store/src/main/java/ai/philterd/entitydb/datastore/configuration/PersistenceJPAConfig.java +++ b/entitydb-data-store/src/main/java/ai/philterd/entitydb/datastore/configuration/PersistenceJPAConfig.java @@ -54,7 +54,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() { LocalContainerEntityManagerFactoryBean entityManager = new LocalContainerEntityManagerFactoryBean(); entityManager.setDataSource(dataSource()); - entityManager.setPackagesToScan(new String[] { "com.mtnfog.entitydb.model.datastore.entities" }); + entityManager.setPackagesToScan(new String[] { "ai.philterd.entitydb.model.datastore.entities" }); entityManager.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); entityManager.setJpaProperties(getProperties()); diff --git a/entitydb-data-store/src/test/java/ai/philterd/test/entitydb/datastore/services/RepositoryTestConfig.java b/entitydb-data-store/src/test/java/ai/philterd/test/entitydb/datastore/services/RepositoryTestConfig.java index a54ac86..94d019e 100644 --- a/entitydb-data-store/src/test/java/ai/philterd/test/entitydb/datastore/services/RepositoryTestConfig.java +++ b/entitydb-data-store/src/test/java/ai/philterd/test/entitydb/datastore/services/RepositoryTestConfig.java @@ -41,8 +41,8 @@ @Configuration @EnableTransactionManagement -@ComponentScan(basePackages = "com.mtnfog.entitydb") -@EnableJpaRepositories("com.mtnfog.entitydb") +@ComponentScan(basePackages = "ai.philterd.entitydb") +@EnableJpaRepositories("ai.philterd.entitydb") public class RepositoryTestConfig { private static final Logger LOGGER = LogManager.getLogger(RepositoryTestConfig.class); @@ -52,7 +52,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() { LocalContainerEntityManagerFactoryBean entityManager = new LocalContainerEntityManagerFactoryBean(); entityManager.setDataSource(dataSource()); - entityManager.setPackagesToScan(new String[] { "com.mtnfog.entitydb.model.datastore.entities" }); + entityManager.setPackagesToScan(new String[] { "ai.philterd.entitydb.model.datastore.entities" }); entityManager.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); entityManager.setJpaProperties(getProperties()); diff --git a/entitydb-entity-store/entitydb-entity-store-cassandra/pom.xml b/entitydb-entity-store/entitydb-entity-store-cassandra/pom.xml index c31144d..397e581 100644 --- a/entitydb-entity-store/entitydb-entity-store-cassandra/pom.xml +++ b/entitydb-entity-store/entitydb-entity-store-cassandra/pom.xml @@ -102,9 +102,9 @@ test - com.mtnfog - entity-model - ${entity.model.version} + ai.philterd.entitydb + entitydb-model + ${project.version} test-jar test diff --git a/entitydb-entity-store/entitydb-entity-store-dynamodb/pom.xml b/entitydb-entity-store/entitydb-entity-store-dynamodb/pom.xml index 6a867e1..b7861d2 100644 --- a/entitydb-entity-store/entitydb-entity-store-dynamodb/pom.xml +++ b/entitydb-entity-store/entitydb-entity-store-dynamodb/pom.xml @@ -147,9 +147,9 @@ test - com.mtnfog - entity-model - ${entity.model.version} + ai.philterd.entitydb + entitydb-model + ${project.version} test-jar test diff --git a/entitydb-entity-store/entitydb-entity-store-mongodb/pom.xml b/entitydb-entity-store/entitydb-entity-store-mongodb/pom.xml index 65017b5..61e9c06 100644 --- a/entitydb-entity-store/entitydb-entity-store-mongodb/pom.xml +++ b/entitydb-entity-store/entitydb-entity-store-mongodb/pom.xml @@ -38,7 +38,7 @@ org.mongodb mongo-java-driver - + org.apache.commons commons-collections4 @@ -47,7 +47,8 @@ org.apache.logging.log4j log4j-core - + ${log4j.version} + com.github.fakemongo fongo @@ -66,9 +67,9 @@ test - com.mtnfog - entity-model - ${entity.model.version} + ai.philterd.entitydb + entitydb-model + ${project.version} test-jar test diff --git a/entitydb-entity-store/entitydb-entity-store-rdbms/pom.xml b/entitydb-entity-store/entitydb-entity-store-rdbms/pom.xml index c20dceb..123b92c 100644 --- a/entitydb-entity-store/entitydb-entity-store-rdbms/pom.xml +++ b/entitydb-entity-store/entitydb-entity-store-rdbms/pom.xml @@ -68,9 +68,9 @@ test - com.mtnfog - entity-model - ${entity.model.version} + ai.philterd.entitydb + entitydb-model + ${project.version} test-jar test diff --git a/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntity.hbm.xml b/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntity.hbm.xml index 59baf2b..702bf52 100644 --- a/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntity.hbm.xml +++ b/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntity.hbm.xml @@ -21,7 +21,7 @@ --> - + diff --git a/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntityMetadata.hbm.xml b/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntityMetadata.hbm.xml index 53f99d7..873830e 100644 --- a/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntityMetadata.hbm.xml +++ b/entitydb-entity-store/entitydb-entity-store-rdbms/src/main/resources/RdbmsStoredEntityMetadata.hbm.xml @@ -21,7 +21,7 @@ --> - + diff --git a/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntity.hbm.xml b/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntity.hbm.xml index 59baf2b..702bf52 100644 --- a/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntity.hbm.xml +++ b/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntity.hbm.xml @@ -21,7 +21,7 @@ --> - + diff --git a/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntityMetadata.hbm.xml b/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntityMetadata.hbm.xml index 53f99d7..873830e 100644 --- a/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntityMetadata.hbm.xml +++ b/entitydb-entity-store/entitydb-entity-store-rdbms/src/test/resources/RdbmsStoredEntityMetadata.hbm.xml @@ -21,7 +21,7 @@ --> - + diff --git a/entitydb-eql/eql-filters/src/main/java/ai/philterd/entitydb/eql/filters/EqlFilters.java b/entitydb-eql/eql-filters/src/main/java/ai/philterd/entitydb/eql/filters/EqlFilters.java index 29ceaf2..b4ce74e 100644 --- a/entitydb-eql/eql-filters/src/main/java/ai/philterd/entitydb/eql/filters/EqlFilters.java +++ b/entitydb-eql/eql-filters/src/main/java/ai/philterd/entitydb/eql/filters/EqlFilters.java @@ -40,7 +40,7 @@ /** * Static functions for applying EQL statements to entities. * - * @author Mountain Fog, Inc. + * @author Philterd, LLC * */ public class EqlFilters { diff --git a/entitydb-eql/eql-filters/src/test/java/ai/idylnlp/test/eql/filters/EqlFiltersTest.java b/entitydb-eql/eql-filters/src/test/java/ai/philterd/entitydb/test/eql/filters/EqlFiltersTest.java similarity index 93% rename from entitydb-eql/eql-filters/src/test/java/ai/idylnlp/test/eql/filters/EqlFiltersTest.java rename to entitydb-eql/eql-filters/src/test/java/ai/philterd/entitydb/test/eql/filters/EqlFiltersTest.java index 83df3c2..67a03ab 100644 --- a/entitydb-eql/eql-filters/src/test/java/ai/idylnlp/test/eql/filters/EqlFiltersTest.java +++ b/entitydb-eql/eql-filters/src/test/java/ai/philterd/entitydb/test/eql/filters/EqlFiltersTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2019 Mountain Fog, Inc. + * Copyright 2024 Philterd, LLC * * Licensed 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 @@ -13,21 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. ******************************************************************************/ -/* - * (C) Copyright 2017 Mountain Fog, Inc. - * - * Licensed 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 ai.philterd.entitydb.test.eql.filters; import static org.junit.Assert.assertEquals; diff --git a/entitydb-eql/eql-filters/src/test/resources/log4j2.xml b/entitydb-eql/eql-filters/src/test/resources/log4j2.xml index 8a1918f..e90acde 100644 --- a/entitydb-eql/eql-filters/src/test/resources/log4j2.xml +++ b/entitydb-eql/eql-filters/src/test/resources/log4j2.xml @@ -1,6 +1,6 @@