From 6513ab90bf586929421450ea407052e27b83f2a7 Mon Sep 17 00:00:00 2001 From: Greg Gibeling Date: Fri, 20 Sep 2024 19:34:50 -0700 Subject: [PATCH] G2-1644 Create ax-path module & sketch API --- .../habitat/metadata/access/merged/MergedPredicate.java | 2 +- .../metadata/annotations/ContainerAnnotationReflection.java | 4 ++-- .../implementations/AnnotationContainerPredicateType.java | 2 +- .../metadata/type/predicate/IContainerPredicateType.java | 2 +- .../main/java/com/g2forge/habitat/plugin/IPluginLoader.java | 2 +- .../main/java/com/g2forge/habitat/plugin/IPluginService.java | 2 +- .../main/java/com/g2forge/habitat/plugin/PluginSystem.java | 4 ++-- .../g2forge/habitat/plugin/MultiDependentPluginService.java | 4 ++-- .../java/com/g2forge/habitat/plugin/SimplePluginService.java | 4 ++-- .../g2forge/habitat/plugin/SingleDependentPluginService.java | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/access/merged/MergedPredicate.java b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/access/merged/MergedPredicate.java index 08bdb94..65d658d 100644 --- a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/access/merged/MergedPredicate.java +++ b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/access/merged/MergedPredicate.java @@ -1,6 +1,6 @@ package com.g2forge.habitat.metadata.access.merged; -import com.g2forge.alexandria.adt.collection.collector.ICollectionBuilder; +import com.g2forge.alexandria.collection.collector.ICollectionBuilder; import com.g2forge.habitat.metadata.type.predicate.IContainerPredicateType; import com.g2forge.habitat.metadata.type.predicate.IPredicateType; import com.g2forge.habitat.metadata.value.predicate.IPredicate; diff --git a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/annotations/ContainerAnnotationReflection.java b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/annotations/ContainerAnnotationReflection.java index d76b099..e947fda 100644 --- a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/annotations/ContainerAnnotationReflection.java +++ b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/annotations/ContainerAnnotationReflection.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; -import com.g2forge.alexandria.adt.collection.collector.ICollectionBuilder; -import com.g2forge.alexandria.adt.collection.strategy.ICollectionStrategy; +import com.g2forge.alexandria.collection.collector.ICollectionBuilder; +import com.g2forge.alexandria.collection.strategy.ICollectionStrategy; import com.g2forge.alexandria.java.core.helpers.HCollection; import lombok.AccessLevel; diff --git a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/implementations/AnnotationContainerPredicateType.java b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/implementations/AnnotationContainerPredicateType.java index cf62ce5..8861ee4 100644 --- a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/implementations/AnnotationContainerPredicateType.java +++ b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/implementations/AnnotationContainerPredicateType.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import com.g2forge.alexandria.adt.collection.strategy.ICollectionStrategy; +import com.g2forge.alexandria.collection.strategy.ICollectionStrategy; import com.g2forge.habitat.metadata.annotations.ContainerAnnotationReflection; import com.g2forge.habitat.metadata.type.IMetadataTypeContext; import com.g2forge.habitat.metadata.type.predicate.IAnnotationPredicateType; diff --git a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/predicate/IContainerPredicateType.java b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/predicate/IContainerPredicateType.java index 9f22f63..fa6e44e 100644 --- a/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/predicate/IContainerPredicateType.java +++ b/ha-metadata/src/main/java/com/g2forge/habitat/metadata/type/predicate/IContainerPredicateType.java @@ -1,6 +1,6 @@ package com.g2forge.habitat.metadata.type.predicate; -import com.g2forge.alexandria.adt.collection.strategy.ICollectionStrategy; +import com.g2forge.alexandria.collection.strategy.ICollectionStrategy; public interface IContainerPredicateType extends IPredicateType { public ICollectionStrategy getCollectionStrategy(); diff --git a/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginLoader.java b/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginLoader.java index f6b7f70..bd91c77 100644 --- a/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginLoader.java +++ b/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginLoader.java @@ -1,6 +1,6 @@ package com.g2forge.habitat.plugin; -import com.g2forge.alexandria.adt.collection.ICollection; +import com.g2forge.alexandria.collection.ICollection; public interface IPluginLoader

{ public ICollection load(); diff --git a/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginService.java b/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginService.java index 1a80150..28db891 100644 --- a/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginService.java +++ b/ha-plugin/src/main/java/com/g2forge/habitat/plugin/IPluginService.java @@ -1,6 +1,6 @@ package com.g2forge.habitat.plugin; -import com.g2forge.alexandria.adt.collection.ICollection; +import com.g2forge.alexandria.collection.ICollection; public interface IPluginService { public ICollection> load(); diff --git a/ha-plugin/src/main/java/com/g2forge/habitat/plugin/PluginSystem.java b/ha-plugin/src/main/java/com/g2forge/habitat/plugin/PluginSystem.java index 31a7259..37c9335 100644 --- a/ha-plugin/src/main/java/com/g2forge/habitat/plugin/PluginSystem.java +++ b/ha-plugin/src/main/java/com/g2forge/habitat/plugin/PluginSystem.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import com.g2forge.alexandria.adt.collection.DStreamCollection; -import com.g2forge.alexandria.adt.collection.ICollection; import com.g2forge.alexandria.adt.graph.v2.DiGraphBuilder; import com.g2forge.alexandria.adt.graph.v2.member.ASingleGraphMember; import com.g2forge.alexandria.annotations.note.Note; import com.g2forge.alexandria.annotations.note.NoteType; +import com.g2forge.alexandria.collection.DStreamCollection; +import com.g2forge.alexandria.collection.ICollection; import com.g2forge.alexandria.java.function.ISupplier; import com.g2forge.alexandria.java.type.ref.ITypeRef; import com.g2forge.alexandria.service.BasicServiceLoader; diff --git a/ha-plugin/src/test/java/com/g2forge/habitat/plugin/MultiDependentPluginService.java b/ha-plugin/src/test/java/com/g2forge/habitat/plugin/MultiDependentPluginService.java index 3cca0cf..c35d4ef 100644 --- a/ha-plugin/src/test/java/com/g2forge/habitat/plugin/MultiDependentPluginService.java +++ b/ha-plugin/src/test/java/com/g2forge/habitat/plugin/MultiDependentPluginService.java @@ -2,9 +2,9 @@ import java.util.List; -import com.g2forge.alexandria.adt.collection.CollectionCollection; -import com.g2forge.alexandria.adt.collection.ICollection; import com.g2forge.alexandria.annotations.service.Service; +import com.g2forge.alexandria.collection.CollectionCollection; +import com.g2forge.alexandria.collection.ICollection; import lombok.Builder; import lombok.Data; diff --git a/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SimplePluginService.java b/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SimplePluginService.java index 26ff50c..cf207d4 100644 --- a/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SimplePluginService.java +++ b/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SimplePluginService.java @@ -1,8 +1,8 @@ package com.g2forge.habitat.plugin; -import com.g2forge.alexandria.adt.collection.ICollection; -import com.g2forge.alexandria.adt.collection.SingleCollection; import com.g2forge.alexandria.annotations.service.Service; +import com.g2forge.alexandria.collection.ICollection; +import com.g2forge.alexandria.collection.SingleCollection; @Service(IPluginService.class) public class SimplePluginService implements IPluginService { diff --git a/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SingleDependentPluginService.java b/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SingleDependentPluginService.java index a5ce157..19f13df 100644 --- a/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SingleDependentPluginService.java +++ b/ha-plugin/src/test/java/com/g2forge/habitat/plugin/SingleDependentPluginService.java @@ -1,8 +1,8 @@ package com.g2forge.habitat.plugin; -import com.g2forge.alexandria.adt.collection.CollectionCollection; -import com.g2forge.alexandria.adt.collection.ICollection; import com.g2forge.alexandria.annotations.service.Service; +import com.g2forge.alexandria.collection.CollectionCollection; +import com.g2forge.alexandria.collection.ICollection; import lombok.Builder; import lombok.Data;