Moved Statement, Item, Type implementations to axiom.lang.spi

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · May 19, 2020 · d3ea298 · d3ea298
1 parent ac85a7e
commit d3ea298
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 20 deletions.
diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementFactoryContext.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/AxiomStatementFactoryContext.java
@@ -6,15 +6,14 @@
  */
 package com.evolveum.axiom.lang.impl;
 
-import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.lang.api.AxiomTypeDefinition;
-import com.evolveum.axiom.lang.impl.AxiomStatementImpl.Factory;
+import com.evolveum.axiom.lang.spi.AxiomStatementImpl;
 
 public interface AxiomStatementFactoryContext {
 
     AxiomStatementImpl.Factory<?, ?> factoryFor(AxiomTypeDefinition identifier);
 
-    static AxiomStatementFactoryContext defaultFactory(AxiomStatementImpl.Factory factory) {
+    static AxiomStatementFactoryContext defaultFactory(AxiomStatementImpl.Factory<?,?> factory) {
         return (identifier) -> factory;
     }
 

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
@@ -20,10 +20,13 @@
 import com.evolveum.axiom.lang.api.AxiomSchemaContext;
 import com.evolveum.axiom.lang.api.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
-import com.evolveum.axiom.lang.impl.AxiomStatementImpl.Factory;
 import com.evolveum.axiom.lang.spi.AxiomIdentifierResolver;
+import com.evolveum.axiom.lang.spi.AxiomItemDefinitionImpl;
 import com.evolveum.axiom.lang.spi.AxiomSemanticException;
+import com.evolveum.axiom.lang.spi.AxiomStatementImpl;
+import com.evolveum.axiom.lang.spi.AxiomTypeDefinitionImpl;
 import com.evolveum.axiom.lang.spi.SourceLocation;
+import com.evolveum.axiom.lang.spi.AxiomStatementImpl.Factory;
 import com.evolveum.axiom.reactor.Requirement;
 
 import org.jetbrains.annotations.Nullable;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextImpl.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextImpl.java
@@ -15,10 +15,11 @@
 import com.evolveum.axiom.lang.api.AxiomItemDefinition;
 import com.evolveum.axiom.lang.api.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.api.IdentifierSpaceKey;
-import com.evolveum.axiom.lang.impl.AxiomStatementImpl.Factory;
 import com.evolveum.axiom.lang.spi.AxiomSemanticException;
 import com.evolveum.axiom.lang.spi.AxiomStatement;
+import com.evolveum.axiom.lang.spi.AxiomStatementBuilder;
 import com.evolveum.axiom.lang.spi.SourceLocation;
+import com.evolveum.axiom.lang.spi.AxiomStatementImpl.Factory;
 import com.evolveum.axiom.reactor.Requirement;
 
 public abstract class StatementContextImpl<V> implements StatementContext<V>, StatementTreeBuilder, IdentifierSpaceHolder {

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextResult.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/StatementContextResult.java
@@ -8,6 +8,7 @@
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.lang.api.AxiomItemDefinition;
 import com.evolveum.axiom.lang.spi.AxiomStatement;
+import com.evolveum.axiom.lang.spi.AxiomStatementBuilder;
 import com.evolveum.axiom.reactor.Requirement;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;

diff --git a/...ang/impl/AbstractAxiomBaseDefinition.java → ...lang/spi/AbstractAxiomBaseDefinition.java b/...ang/impl/AbstractAxiomBaseDefinition.java → ...lang/spi/AbstractAxiomBaseDefinition.java
@@ -1,4 +1,4 @@
-package com.evolveum.axiom.lang.impl;
+package com.evolveum.axiom.lang.spi;
 
 import java.util.List;
 
@@ -7,7 +7,6 @@
 import com.evolveum.axiom.lang.api.AxiomBuiltIn;
 import com.evolveum.axiom.lang.api.AxiomItemDefinition;
 import com.evolveum.axiom.lang.api.AxiomTypeDefinition;
-import com.evolveum.axiom.lang.spi.AxiomStatement;
 import com.google.common.collect.Multimap;
 
 public class AbstractAxiomBaseDefinition extends AxiomStatementImpl<AxiomIdentifier> implements AxiomBaseDefinition {

diff --git a/...om/lang/impl/AxiomItemDefinitionImpl.java → ...iom/lang/spi/AxiomItemDefinitionImpl.java b/...om/lang/impl/AxiomItemDefinitionImpl.java → ...iom/lang/spi/AxiomItemDefinitionImpl.java
@@ -1,12 +1,11 @@
-package com.evolveum.axiom.lang.impl;
+package com.evolveum.axiom.lang.spi;
 
 import java.util.List;
 
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn;
 import com.evolveum.axiom.lang.api.AxiomItemDefinition;
 import com.evolveum.axiom.lang.api.AxiomTypeDefinition;
-import com.evolveum.axiom.lang.spi.AxiomStatement;
 import com.google.common.collect.Multimap;
 
 public class AxiomItemDefinitionImpl extends AbstractAxiomBaseDefinition implements AxiomItemDefinition {

diff --git a/...xiom/lang/impl/AxiomStatementBuilder.java → ...axiom/lang/spi/AxiomStatementBuilder.java b/...xiom/lang/impl/AxiomStatementBuilder.java → ...axiom/lang/spi/AxiomStatementBuilder.java
@@ -1,4 +1,4 @@
-package com.evolveum.axiom.lang.impl;
+package com.evolveum.axiom.lang.spi;
 
 import com.evolveum.axiom.concepts.Lazy;
 
@@ -10,8 +10,7 @@
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn;
 import com.evolveum.axiom.lang.api.AxiomItemDefinition;
-import com.evolveum.axiom.lang.impl.AxiomStatementImpl.Factory;
-import com.evolveum.axiom.lang.spi.AxiomStatement;
+import com.evolveum.axiom.lang.spi.AxiomStatementImpl.Factory;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;

diff --git a/...m/axiom/lang/impl/AxiomStatementImpl.java → ...um/axiom/lang/spi/AxiomStatementImpl.java b/...m/axiom/lang/impl/AxiomStatementImpl.java → ...um/axiom/lang/spi/AxiomStatementImpl.java
@@ -4,13 +4,12 @@
  * 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.impl;
+package com.evolveum.axiom.lang.spi;
 
 import java.util.Collection;
 import java.util.List;
 import com.evolveum.axiom.api.AxiomIdentifier;
 import com.evolveum.axiom.lang.api.AxiomItemDefinition;
-import com.evolveum.axiom.lang.spi.AxiomStatement;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
@@ -57,7 +56,7 @@ public String toString() {
         return keyword + "{value=" + value + "}";
     }
 
-    interface Factory<V, I extends AxiomStatement<V>> {
+    public interface Factory<V, I extends AxiomStatement<V>> {
 
         I create(AxiomIdentifier type, V value, List<AxiomStatement<?>> children,
             Multimap<AxiomIdentifier, AxiomStatement<?>> keywordMap);

diff --git a/...om/lang/impl/AxiomTypeDefinitionImpl.java → ...iom/lang/spi/AxiomTypeDefinitionImpl.java b/...om/lang/impl/AxiomTypeDefinitionImpl.java → ...iom/lang/spi/AxiomTypeDefinitionImpl.java
@@ -1,4 +1,4 @@
-package com.evolveum.axiom.lang.impl;
+package com.evolveum.axiom.lang.spi;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,7 +16,6 @@
 import com.evolveum.axiom.lang.api.AxiomTypeDefinition;
 import com.evolveum.axiom.lang.api.Identifiable;
 import com.evolveum.axiom.lang.api.AxiomBuiltIn.Item;
-import com.evolveum.axiom.lang.spi.AxiomStatement;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Multimap;

diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/reactor/Requirement.java b/infra/axiom/src/main/java/com/evolveum/axiom/reactor/Requirement.java
@@ -3,10 +3,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import org.jetbrains.annotations.Nullable;
-
 import com.evolveum.axiom.lang.impl.RuleErrorMessage;
-import com.evolveum.axiom.lang.spi.AxiomStatement;
 import com.google.common.base.Preconditions;