Merge pull request #49 from gdgib/G2-1644-CreatePath

G2-1644 Create ax-path module & sketch API
g2forge · Sep 21, 2024 · 4257c47 · 4257c47
2 parents 28290ad + 6513ab9
commit 4257c47
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 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
@@ -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/...src/main/java/com/g2forge/habitat/metadata/annotations/ContainerAnnotationReflection.java b/...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/...a/com/g2forge/habitat/metadata/type/implementations/AnnotationContainerPredicateType.java b/...a/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/...ta/src/main/java/com/g2forge/habitat/metadata/type/predicate/IContainerPredicateType.java b/...ta/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<T, U> extends IPredicateType<T> {
 	public ICollectionStrategy<T, U> 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
@@ -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<P> {
 	public ICollection<? extends P> 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
@@ -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<PluginDescriptor<?, ?>> 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
@@ -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
@@ -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
@@ -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
@@ -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;