Moved Axiom*Definition to axiom.api.schema

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · May 27, 2020 · d6c31c4 · d6c31c4
1 parent 63c7f4c
commit d6c31c4
Show file tree

Hide file tree

Showing 48 changed files with 99 additions and 82 deletions.
diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AbstractAxiomItem.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AbstractAxiomItem.java
@@ -2,6 +2,8 @@
 
 import java.util.Optional;
 
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+
 public abstract class AbstractAxiomItem<V> implements AxiomItem<V> {
 
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItem.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItem.java
@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.Optional;
 
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
 import com.google.common.collect.Iterables;
 
 public interface AxiomItem<V> {

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemBuilder.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemBuilder.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.function.Supplier;
 
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemFactory.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemFactory.java
@@ -2,6 +2,8 @@
 
 import java.util.Collection;
 
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+
 public interface AxiomItemFactory<V> {
 
     AxiomItem<V> create(AxiomItemDefinition def, Collection<? extends AxiomValue<?>> axiomItem);

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemImpl.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomItemImpl.java
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
 import com.google.common.collect.ImmutableList;
 
 class AxiomItemImpl<V> extends AbstractAxiomItem<V> {

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValue.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValue.java
@@ -5,6 +5,9 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
+
 
 public interface AxiomValue<V> extends Supplier<V> {
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValueBuilder.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValueBuilder.java
@@ -1,5 +1,6 @@
 package com.evolveum.axiom.api;
 
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.evolveum.axiom.concepts.Lazy;
 import com.evolveum.axiom.lang.impl.ItemValueImpl;
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValueFactory.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/AxiomValueFactory.java
@@ -2,6 +2,8 @@
 
 import java.util.Map;
 
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
+
 public interface AxiomValueFactory<V,T extends AxiomValue<V>> {
 
     T create(AxiomTypeDefinition def, V value, Map<AxiomIdentifier, AxiomItem<?>> items);

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/CompactAxiomItem.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/CompactAxiomItem.java
@@ -3,6 +3,8 @@
 import java.util.Collection;
 import java.util.Optional;
 
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.google.common.collect.ImmutableSet;
 
 class CompactAxiomItem<V> extends AbstractAxiomItem<V> implements AxiomValue<V> {

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/SimpleValue.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/SimpleValue.java
@@ -2,6 +2,8 @@
 
 import java.util.Optional;
 
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
+
 class SimpleValue<T> implements AxiomValue<T> {
 
     private final AxiomTypeDefinition type;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/api/meta/Inheritance.java b/infra/axiom/src/main/java/com/evolveum/axiom/api/meta/Inheritance.java
@@ -1,7 +1,7 @@
 package com.evolveum.axiom.api.meta;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
 
 public interface Inheritance {
 

diff --git a/...m/lang/api/AxiomIdentifierDefinition.java → ...api/schema/AxiomIdentifierDefinition.java b/...m/lang/api/AxiomIdentifierDefinition.java → ...api/schema/AxiomIdentifierDefinition.java
@@ -1,10 +1,9 @@
-package com.evolveum.axiom.lang.api;
+package com.evolveum.axiom.api.schema;
 
 import java.util.Collection;
 import java.util.Set;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
 import com.evolveum.axiom.api.AxiomValue;
 import com.google.common.collect.ImmutableSet;
 

diff --git a/...ng/api/AxiomIdentifierDefinitionImpl.java → ...schema/AxiomIdentifierDefinitionImpl.java b/...ng/api/AxiomIdentifierDefinitionImpl.java → ...schema/AxiomIdentifierDefinitionImpl.java
@@ -1,11 +1,9 @@
-package com.evolveum.axiom.lang.api;
+package com.evolveum.axiom.api.schema;
 
 import java.util.Optional;
 import java.util.Set;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.google.common.collect.ImmutableSet;
 
 class AxiomIdentifierDefinitionImpl implements AxiomIdentifierDefinition {

diff --git a/...olveum/axiom/api/AxiomItemDefinition.java → ...axiom/api/schema/AxiomItemDefinition.java b/...olveum/axiom/api/AxiomItemDefinition.java → ...axiom/api/schema/AxiomItemDefinition.java
@@ -4,9 +4,10 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.axiom.api;
+package com.evolveum.axiom.api.schema;
 
-import com.evolveum.axiom.lang.api.AxiomNamedDefinition;
+import com.evolveum.axiom.api.AxiomIdentifier;
+import com.evolveum.axiom.api.AxiomValue;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;

diff --git a/.../axiom/lang/api/AxiomNamedDefinition.java → ...xiom/api/schema/AxiomNamedDefinition.java b/.../axiom/lang/api/AxiomNamedDefinition.java → ...xiom/api/schema/AxiomNamedDefinition.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.axiom.lang.api;
+package com.evolveum.axiom.api.schema;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
 

diff --git a/...um/axiom/lang/api/AxiomSchemaContext.java → .../axiom/api/schema/AxiomSchemaContext.java b/...um/axiom/lang/api/AxiomSchemaContext.java → .../axiom/api/schema/AxiomSchemaContext.java
@@ -1,11 +1,9 @@
-package com.evolveum.axiom.lang.api;
+package com.evolveum.axiom.api.schema;
 
 import java.util.Collection;
 import java.util.Optional;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 
 public interface AxiomSchemaContext {
 
@@ -16,4 +14,6 @@ public interface AxiomSchemaContext {
     Optional<AxiomTypeDefinition> getType(AxiomIdentifier type);
 
     Collection<AxiomTypeDefinition> types();
+
+    //AxiomValueFactory<?, ?> factoryFor(AxiomTypeDefinition type);
 }
diff --git a/...olveum/axiom/api/AxiomTypeDefinition.java → ...axiom/api/schema/AxiomTypeDefinition.java b/...olveum/axiom/api/AxiomTypeDefinition.java → ...axiom/api/schema/AxiomTypeDefinition.java
@@ -4,16 +4,16 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.axiom.api;
+package com.evolveum.axiom.api.schema;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import com.evolveum.axiom.api.AxiomIdentifier;
+import com.evolveum.axiom.api.AxiomValue;
 import com.evolveum.axiom.api.meta.Inheritance;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition;
-import com.evolveum.axiom.lang.api.AxiomNamedDefinition;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.google.common.collect.ImmutableMap;
 

diff --git a/...um/axiom/api/DelegatedItemDefinition.java → ...m/api/schema/DelegatedItemDefinition.java b/...um/axiom/api/DelegatedItemDefinition.java → ...m/api/schema/DelegatedItemDefinition.java
@@ -1,8 +1,11 @@
-package com.evolveum.axiom.api;
+package com.evolveum.axiom.api.schema;
 
 import java.util.Collection;
 import java.util.Optional;
 
+import com.evolveum.axiom.api.AxiomIdentifier;
+import com.evolveum.axiom.api.AxiomItem;
+
 abstract class DelegatedItemDefinition implements AxiomItemDefinition {
 
     protected abstract AxiomItemDefinition delegate();

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBuilderStreamTarget.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBuilderStreamTarget.java
@@ -10,7 +10,7 @@
 import java.util.LinkedList;
 import java.util.Optional;
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierResolver;
 import com.evolveum.axiom.lang.spi.AxiomSyntaxException;
 import com.evolveum.axiom.lang.spi.SourceLocation;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBuiltIn.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomBuiltIn.java
@@ -12,8 +12,9 @@
 import java.util.Optional;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.evolveum.axiom.concepts.Lazy;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomItemTarget.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/api/AxiomItemTarget.java
@@ -6,10 +6,11 @@
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.api.AxiomItem;
 import com.evolveum.axiom.api.AxiomItemBuilder;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
 import com.evolveum.axiom.api.AxiomValueBuilder;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomSchemaContext;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierResolver;
 import com.evolveum.axiom.lang.spi.SourceLocation;
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AbstractContext.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AbstractContext.java
@@ -4,8 +4,8 @@
 import java.util.Optional;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition.Scope;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.evolveum.axiom.lang.spi.SourceLocation;
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSchemaContextImpl.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomSchemaContextImpl.java
@@ -5,11 +5,11 @@
 import java.util.Optional;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomSchemaContext;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn;
-import com.evolveum.axiom.lang.api.AxiomSchemaContext;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementRule.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementRule.java
@@ -2,9 +2,9 @@
 
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.api.AxiomItem;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.evolveum.axiom.lang.spi.AxiomSemanticException;
 import com.evolveum.axiom.reactor.Dependency;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomValueContext.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomValueContext.java
@@ -2,9 +2,9 @@
 
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.api.AxiomItem;
-import com.evolveum.axiom.api.AxiomItemDefinition;
 import com.evolveum.axiom.api.AxiomValue;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition.Scope;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.evolveum.axiom.lang.impl.AxiomStatementRule.ActionBuilder;
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/BasicStatementRule.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/BasicStatementRule.java
@@ -8,14 +8,14 @@
 import java.util.Set;
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.api.AxiomItem;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
 import com.evolveum.axiom.api.meta.Inheritance;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn.Item;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn.Type;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition;
 import com.evolveum.axiom.lang.api.AxiomModel;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.evolveum.axiom.lang.spi.AxiomSemanticException;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/CompositeIdentifierSpace.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/CompositeIdentifierSpace.java
@@ -5,8 +5,8 @@
 import java.util.Set;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition.Scope;
 
 class CompositeIdentifierSpace implements IdentifierSpaceHolder, NamespaceContext {
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/IdentifierSpaceHolder.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/IdentifierSpaceHolder.java
@@ -3,8 +3,8 @@
 import java.util.Map;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition.Scope;
 
 
 interface IdentifierSpaceHolder {

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/IdentifierSpaceHolderImpl.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/IdentifierSpaceHolderImpl.java
@@ -8,8 +8,8 @@
 
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.api.AxiomValue;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.spi.AxiomSemanticException;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ItemContext.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ItemContext.java
@@ -8,9 +8,9 @@
 
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.api.AxiomItem;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.impl.ItemStreamContextBuilder.ItemBuilder;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierResolver;
 import com.evolveum.axiom.lang.spi.SourceLocation;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ItemStreamContextBuilder.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ItemStreamContextBuilder.java
@@ -10,7 +10,7 @@
 import java.util.LinkedList;
 import java.util.Optional;
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
 import com.evolveum.axiom.lang.api.AxiomItemStream;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierResolver;
 import com.evolveum.axiom.lang.spi.AxiomSyntaxException;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ItemValueImpl.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ItemValueImpl.java
@@ -6,10 +6,10 @@
 
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.api.AxiomItem;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
 import com.evolveum.axiom.api.AxiomValueFactory;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
 
 public class ItemValueImpl<V> implements AxiomValue<V> {
 

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ModelReactorContext.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ModelReactorContext.java
@@ -11,16 +11,16 @@
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
 import com.evolveum.axiom.api.AxiomValueFactory;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomSchemaContext;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.concepts.Lazy;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn.Type;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.antlr.AxiomModelStatementSource;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn;
-import com.evolveum.axiom.lang.api.AxiomSchemaContext;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierDefinitionImpl;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierResolver;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/SourceContext.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/SourceContext.java
@@ -5,13 +5,13 @@
 import java.util.Optional;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
-import com.evolveum.axiom.api.AxiomItemDefinition;
-import com.evolveum.axiom.api.AxiomTypeDefinition;
 import com.evolveum.axiom.api.AxiomValue;
 import com.evolveum.axiom.api.AxiomValueFactory;
+import com.evolveum.axiom.api.schema.AxiomItemDefinition;
+import com.evolveum.axiom.api.schema.AxiomTypeDefinition;
+import com.evolveum.axiom.api.schema.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.antlr.AxiomModelStatementSource;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
-import com.evolveum.axiom.lang.api.AxiomIdentifierDefinition.Scope;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierResolver;
 import com.evolveum.axiom.lang.impl.ItemStreamContextBuilder.ValueBuilder;
 import com.evolveum.axiom.lang.spi.SourceLocation;