You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/12/09 16:28:37 UTC
[6/7] zest-java git commit: Remove core/functional
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServiceModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServiceModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServiceModel.java
index 2bcfc54..76a3c52 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServiceModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServiceModel.java
@@ -29,8 +29,8 @@ import org.apache.zest.api.service.ImportedServiceDescriptor;
import org.apache.zest.api.service.ServiceImporter;
import org.apache.zest.api.service.ServiceImporterException;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import org.apache.zest.runtime.activation.ActivatorsInstance;
import org.apache.zest.runtime.activation.ActivatorsModel;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesModel.java
index b7d9162..9a07ebe 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/service/ImportedServicesModel.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.zest.api.service.ServiceReference;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
/**
* JAVADOC
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
index 2083c94..d5e4c4a 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServiceModel.java
@@ -35,7 +35,7 @@ import org.apache.zest.api.property.Property;
import org.apache.zest.api.service.ServiceDescriptor;
import org.apache.zest.api.structure.ModuleDescriptor;
import org.apache.zest.api.util.Classes;
-import org.apache.zest.functional.HierarchicalVisitor;
+import org.apache.zest.api.util.HierarchicalVisitor;
import org.apache.zest.runtime.activation.ActivatorsInstance;
import org.apache.zest.runtime.activation.ActivatorsModel;
import org.apache.zest.runtime.composite.CompositeMethodsModel;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesModel.java
index 3a926d0..d72d58e 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/service/ServicesModel.java
@@ -26,8 +26,8 @@ import java.util.stream.Stream;
import org.apache.zest.api.service.ServiceDescriptor;
import org.apache.zest.api.service.ServiceReference;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
/**
* JAVADOC
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
index 29c78fb..85c38a2 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ApplicationModel.java
@@ -30,8 +30,8 @@ import org.apache.zest.api.common.MetaInfo;
import org.apache.zest.api.structure.Application;
import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.LayerDescriptor;
+import org.apache.zest.api.util.HierarchicalVisitor;
import org.apache.zest.bootstrap.ZestRuntime;
-import org.apache.zest.functional.HierarchicalVisitor;
import org.apache.zest.runtime.activation.ActivatorsInstance;
import org.apache.zest.runtime.activation.ActivatorsModel;
import org.apache.zest.runtime.injection.InjectionProviderFactory;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/structure/LayerModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/LayerModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/LayerModel.java
index d0f3321..16f7a51 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/LayerModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/LayerModel.java
@@ -30,9 +30,9 @@ import org.apache.zest.api.entity.EntityDescriptor;
import org.apache.zest.api.object.ObjectDescriptor;
import org.apache.zest.api.structure.Layer;
import org.apache.zest.api.structure.LayerDescriptor;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import org.apache.zest.api.value.ValueDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
import org.apache.zest.runtime.activation.ActivatorsInstance;
import org.apache.zest.runtime.activation.ActivatorsModel;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleModel.java
index 2c7be06..cf0b4a9 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/ModuleModel.java
@@ -33,9 +33,9 @@ import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.Module;
import org.apache.zest.api.structure.ModuleDescriptor;
import org.apache.zest.api.structure.TypeLookup;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import org.apache.zest.api.value.ValueDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
import org.apache.zest.runtime.activation.ActivatorsInstance;
import org.apache.zest.runtime.activation.ActivatorsModel;
import org.apache.zest.runtime.composite.TransientsModel;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/structure/UsedLayersModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/structure/UsedLayersModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/structure/UsedLayersModel.java
index e12258c..d13704f 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/structure/UsedLayersModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/structure/UsedLayersModel.java
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.UsedLayersDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
/**
* JAVADOC
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/types/ValueTypeFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/types/ValueTypeFactory.java b/core/runtime/src/main/java/org/apache/zest/runtime/types/ValueTypeFactory.java
index 427ce43..a957809 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/types/ValueTypeFactory.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/types/ValueTypeFactory.java
@@ -35,8 +35,8 @@ import org.apache.zest.api.type.Serialization;
import org.apache.zest.api.type.ValueCompositeType;
import org.apache.zest.api.type.ValueType;
import org.apache.zest.api.util.Classes;
+import org.apache.zest.api.util.HierarchicalVisitorAdapter;
import org.apache.zest.api.value.ValueComposite;
-import org.apache.zest.functional.HierarchicalVisitorAdapter;
import org.apache.zest.runtime.association.AssociationsModel;
import org.apache.zest.runtime.association.ManyAssociationsModel;
import org.apache.zest.runtime.association.NamedAssociationsModel;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/value/ValueStateModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/value/ValueStateModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/value/ValueStateModel.java
index cb2a093..b8be640 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/value/ValueStateModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/value/ValueStateModel.java
@@ -23,8 +23,8 @@ import java.util.stream.Stream;
import org.apache.zest.api.association.AssociationDescriptor;
import org.apache.zest.api.association.AssociationStateDescriptor;
import org.apache.zest.api.common.QualifiedName;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import org.apache.zest.runtime.association.AssociationModel;
import org.apache.zest.runtime.association.AssociationsModel;
import org.apache.zest.runtime.association.ManyAssociationModel;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/main/java/org/apache/zest/runtime/value/ValuesModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/value/ValuesModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/value/ValuesModel.java
index a8b95f2..1988101 100644
--- a/core/runtime/src/main/java/org/apache/zest/runtime/value/ValuesModel.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/value/ValuesModel.java
@@ -22,9 +22,9 @@ package org.apache.zest.runtime.value;
import java.util.List;
import java.util.stream.Stream;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import org.apache.zest.api.value.ValueDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
/**
* JAVADOC
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/test/java/org/apache/zest/bootstrap/ApplicationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/bootstrap/ApplicationAssemblerTest.java b/core/runtime/src/test/java/org/apache/zest/bootstrap/ApplicationAssemblerTest.java
index 7dad851..eeaef1a 100644
--- a/core/runtime/src/test/java/org/apache/zest/bootstrap/ApplicationAssemblerTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/bootstrap/ApplicationAssemblerTest.java
@@ -29,7 +29,7 @@ import org.apache.zest.api.entity.EntityDescriptor;
import org.apache.zest.api.service.ServiceComposite;
import org.apache.zest.api.service.ServiceDescriptor;
import org.apache.zest.api.structure.ApplicationDescriptor;
-import org.apache.zest.functional.HierarchicalVisitorAdapter;
+import org.apache.zest.api.util.HierarchicalVisitorAdapter;
/**
* TODO
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java b/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
index ed69d70..a92816d 100644
--- a/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/regression/qi78/IssueTest.java
@@ -22,13 +22,13 @@ package org.apache.zest.regression.qi78;
import org.apache.zest.api.structure.Application;
import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.LayerDescriptor;
+import org.apache.zest.api.util.HierarchicalVisitorAdapter;
import org.apache.zest.bootstrap.ApplicationAssembler;
import org.apache.zest.bootstrap.ApplicationAssembly;
import org.apache.zest.bootstrap.ApplicationAssemblyFactory;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.Energy4Java;
import org.apache.zest.bootstrap.LayerAssembly;
-import org.apache.zest.functional.HierarchicalVisitorAdapter;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
index 671785a..1677027 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLStartup.java
@@ -65,8 +65,8 @@ import org.apache.zest.api.structure.Application;
import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.ModuleDescriptor;
+import org.apache.zest.api.util.HierarchicalVisitorAdapter;
import org.apache.zest.api.value.ValueDescriptor;
-import org.apache.zest.functional.HierarchicalVisitorAdapter;
import org.apache.zest.index.reindexer.Reindexer;
import org.apache.zest.index.sql.support.api.SQLAppStartup;
import org.apache.zest.index.sql.support.api.SQLTypeInfo;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Browser.java
----------------------------------------------------------------------
diff --git a/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Browser.java b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Browser.java
index de290c8..5757df9 100644
--- a/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Browser.java
+++ b/libraries/appbrowser/src/main/java/org/apache/zest/library/appbrowser/Browser.java
@@ -21,7 +21,7 @@ package org.apache.zest.library.appbrowser;
import java.util.Stack;
import org.json.JSONException;
import org.apache.zest.api.structure.ApplicationDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
+import org.apache.zest.api.util.HierarchicalVisitor;
public class Browser
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/libraries/circuitbreaker/src/docs/circuitbreaker.txt
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/src/docs/circuitbreaker.txt b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
index b30cf47..b6779c6 100644
--- a/libraries/circuitbreaker/src/docs/circuitbreaker.txt
+++ b/libraries/circuitbreaker/src/docs/circuitbreaker.txt
@@ -44,7 +44,7 @@ of exceptions cause the circuit to break. The most crude is "all", more
advanced ones allow exceptions that be excepted to be registered, but in
real cases this is not enough. Case in point is JDBC exceptions where
you want to fail on "connect exception" but not necessarily "invalid SQL
-syntax". So instead we've leveraged `Specification` from <<core-functional,Core Functional API>> where
+syntax". So instead we've leveraged `Predicate` where
you get to provide your own specification that can use any logic to
determine whether a particular exception is ok or not.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java
----------------------------------------------------------------------
diff --git a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java
index 137b428..8ad1b21 100644
--- a/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java
+++ b/libraries/jmx/src/main/java/org/apache/zest/library/jmx/ApplicationManagerService.java
@@ -45,7 +45,7 @@ import org.apache.zest.api.structure.Layer;
import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.Module;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitorAdapter;
+import org.apache.zest.api.util.HierarchicalVisitorAdapter;
import static org.apache.zest.api.service.qualifier.ServiceQualifier.withId;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
index 7ff88a9..419f4e2 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
@@ -27,7 +27,7 @@ import org.apache.zest.api.object.ObjectDescriptor;
import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitorAdapter;
+import org.apache.zest.api.util.HierarchicalVisitorAdapter;
import org.apache.zest.library.rdf.ZestRdf;
import org.apache.zest.library.rdf.serializer.SerializerContext;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/Model2XML.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/Model2XML.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/Model2XML.java
index 388d005..e9c1d78 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/Model2XML.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/Model2XML.java
@@ -32,7 +32,7 @@ import org.apache.zest.api.mixin.MixinDescriptor;
import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
+import org.apache.zest.api.util.HierarchicalVisitor;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/libraries/spring/src/main/java/org/apache/zest/library/spring/bootstrap/internal/service/ServiceLocator.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/main/java/org/apache/zest/library/spring/bootstrap/internal/service/ServiceLocator.java b/libraries/spring/src/main/java/org/apache/zest/library/spring/bootstrap/internal/service/ServiceLocator.java
index 885b515..6dbaf3c 100644
--- a/libraries/spring/src/main/java/org/apache/zest/library/spring/bootstrap/internal/service/ServiceLocator.java
+++ b/libraries/spring/src/main/java/org/apache/zest/library/spring/bootstrap/internal/service/ServiceLocator.java
@@ -28,7 +28,7 @@ import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.Module;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
+import org.apache.zest.api.util.HierarchicalVisitor;
final class ServiceLocator
implements HierarchicalVisitor<Object, Object, RuntimeException>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/libraries/sql/src/main/java/org/apache/zest/library/sql/common/Databases.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/zest/library/sql/common/Databases.java b/libraries/sql/src/main/java/org/apache/zest/library/sql/common/Databases.java
index 4d66954..a27f445 100644
--- a/libraries/sql/src/main/java/org/apache/zest/library/sql/common/Databases.java
+++ b/libraries/sql/src/main/java/org/apache/zest/library/sql/common/Databases.java
@@ -24,7 +24,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import javax.sql.DataSource;
-import org.apache.zest.functional.Visitor;
+import org.apache.zest.api.util.Visitor;
/**
* Utility methods for performing SQL calls wrapping a given DataSource.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/manual/src/docs/userguide/core.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/core.txt b/manual/src/docs/userguide/core.txt
index 588de3c..9c02353 100644
--- a/manual/src/docs/userguide/core.txt
+++ b/manual/src/docs/userguide/core.txt
@@ -64,17 +64,6 @@ if ever, needed.
<<core-testsupport,Learn more>>
//____
-//*<<core-functional,Core Functional API>>*
-=== Core Functional API ===
-//____
-The Zest\u2122 Core Functional API is a generic package to work with Iterables in a "functional programming language" style.
-
-This package is completely independent of everything else in Zest\u2122 and may be used on its own in any kind of environment
-such as Spring or Java EE applications.
-
-<<core-functional,Learn more>>
-//____
-
//*<<core-spi,Core Extension SPI>>*
=== Core Extension SPI ===
//____
@@ -110,10 +99,6 @@ include::../../../../core/testsupport/src/docs/testsupport.txt[]
:leveloffset: 2
-include::../../../../core/functional/src/docs/functional.txt[]
-
-:leveloffset: 2
-
include::../../../../core/spi/src/docs/spi.txt[]
:leveloffset: 2
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 97a817f..2e4589b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,8 +18,7 @@
*
*/
-include 'core:functional',
- 'core:api',
+include 'core:api',
'core:spi',
'core:testsupport',
'core:bootstrap',
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ActivatorDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ActivatorDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ActivatorDetailDescriptor.java
index 5522116..5a3ed30 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ActivatorDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ActivatorDetailDescriptor.java
@@ -22,8 +22,8 @@ package org.apache.zest.tools.model.descriptor;
import java.util.LinkedList;
import java.util.List;
import org.apache.zest.api.activation.ActivatorDescriptor;
-import org.apache.zest.functional.Visitable;
-import org.apache.zest.functional.Visitor;
+import org.apache.zest.api.util.Visitable;
+import org.apache.zest.api.util.Visitor;
import static org.apache.zest.api.util.NullArgumentException.validateNotNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptor.java
index d4d73bb..f961871 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptor.java
@@ -22,8 +22,8 @@ package org.apache.zest.tools.model.descriptor;
import java.util.LinkedList;
import java.util.List;
import org.apache.zest.api.structure.ApplicationDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import static org.apache.zest.api.util.NullArgumentException.validateNotNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptorBuilder.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptorBuilder.java
index 25f5e71..ac373c3 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptorBuilder.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ApplicationDetailDescriptorBuilder.java
@@ -42,8 +42,8 @@ import org.apache.zest.api.sideeffect.SideEffectsDescriptor;
import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.LayerDescriptor;
import org.apache.zest.api.structure.ModuleDescriptor;
+import org.apache.zest.api.util.HierarchicalVisitor;
import org.apache.zest.api.value.ValueDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
public final class ApplicationDetailDescriptorBuilder
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/EntityDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/EntityDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/EntityDetailDescriptor.java
index 5d5fac2..fb61684 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/EntityDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/EntityDetailDescriptor.java
@@ -20,8 +20,8 @@
package org.apache.zest.tools.model.descriptor;
import org.apache.zest.api.entity.EntityDescriptor;
-import org.apache.zest.functional.Visitable;
-import org.apache.zest.functional.Visitor;
+import org.apache.zest.api.util.Visitable;
+import org.apache.zest.api.util.Visitor;
/**
* Entity Detail Descriptor.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ImportedServiceDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ImportedServiceDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ImportedServiceDetailDescriptor.java
index 4b9c852..81f7048 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ImportedServiceDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ImportedServiceDetailDescriptor.java
@@ -21,8 +21,8 @@ package org.apache.zest.tools.model.descriptor;
import java.util.LinkedList;
import java.util.List;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import static org.apache.zest.api.util.NullArgumentException.validateNotNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/LayerDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/LayerDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/LayerDetailDescriptor.java
index 7db0ae0..4b96369 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/LayerDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/LayerDetailDescriptor.java
@@ -22,8 +22,8 @@ package org.apache.zest.tools.model.descriptor;
import java.util.LinkedList;
import java.util.List;
import org.apache.zest.api.structure.LayerDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import static org.apache.zest.api.util.NullArgumentException.validateNotNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ModuleDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ModuleDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ModuleDetailDescriptor.java
index 6bcb8b3..e34c6ff 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ModuleDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ModuleDetailDescriptor.java
@@ -22,8 +22,8 @@ package org.apache.zest.tools.model.descriptor;
import java.util.LinkedList;
import java.util.List;
import org.apache.zest.api.structure.ModuleDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import static org.apache.zest.api.util.NullArgumentException.validateNotNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ObjectDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ObjectDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ObjectDetailDescriptor.java
index a878222..5e05a9c 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ObjectDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ObjectDetailDescriptor.java
@@ -22,8 +22,8 @@ package org.apache.zest.tools.model.descriptor;
import java.util.LinkedList;
import java.util.List;
import org.apache.zest.api.object.ObjectDescriptor;
-import org.apache.zest.functional.Visitable;
-import org.apache.zest.functional.Visitor;
+import org.apache.zest.api.util.Visitable;
+import org.apache.zest.api.util.Visitor;
import static org.apache.zest.api.util.NullArgumentException.validateNotNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ServiceDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ServiceDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ServiceDetailDescriptor.java
index 764b22e..e9ff57d 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ServiceDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ServiceDetailDescriptor.java
@@ -23,8 +23,8 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.api.service.ServiceDescriptor;
-import org.apache.zest.functional.HierarchicalVisitor;
-import org.apache.zest.functional.VisitableHierarchy;
+import org.apache.zest.api.util.HierarchicalVisitor;
+import org.apache.zest.api.util.VisitableHierarchy;
import static org.apache.zest.api.util.NullArgumentException.validateNotNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/TransientDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/TransientDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/TransientDetailDescriptor.java
index 27e6391..598f850 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/TransientDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/TransientDetailDescriptor.java
@@ -20,8 +20,8 @@
package org.apache.zest.tools.model.descriptor;
import org.apache.zest.api.composite.TransientDescriptor;
-import org.apache.zest.functional.Visitable;
-import org.apache.zest.functional.Visitor;
+import org.apache.zest.api.util.Visitable;
+import org.apache.zest.api.util.Visitor;
/**
* Transient Detail Descriptor.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ValueDetailDescriptor.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ValueDetailDescriptor.java b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ValueDetailDescriptor.java
index c8d71fb..e1c7767 100644
--- a/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ValueDetailDescriptor.java
+++ b/tools/model-detail/src/main/java/org/apache/zest/tools/model/descriptor/ValueDetailDescriptor.java
@@ -20,8 +20,8 @@
package org.apache.zest.tools.model.descriptor;
import org.apache.zest.api.value.ValueDescriptor;
-import org.apache.zest.functional.Visitable;
-import org.apache.zest.functional.Visitor;
+import org.apache.zest.api.util.Visitable;
+import org.apache.zest.api.util.Visitor;
/**
* Value Detail Descriptor.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0b4cca06/tools/model-detail/src/test/java/org/apache/zest/tools/model/VisitableDetailTest.java
----------------------------------------------------------------------
diff --git a/tools/model-detail/src/test/java/org/apache/zest/tools/model/VisitableDetailTest.java b/tools/model-detail/src/test/java/org/apache/zest/tools/model/VisitableDetailTest.java
index 177eac2..00112c6 100644
--- a/tools/model-detail/src/test/java/org/apache/zest/tools/model/VisitableDetailTest.java
+++ b/tools/model-detail/src/test/java/org/apache/zest/tools/model/VisitableDetailTest.java
@@ -31,14 +31,12 @@ import org.apache.zest.api.structure.Application;
import org.apache.zest.api.structure.ApplicationDescriptor;
import org.apache.zest.api.structure.Layer;
import org.apache.zest.api.structure.Module;
-import org.apache.zest.bootstrap.ApplicationAssembler;
+import org.apache.zest.api.util.HierarchicalVisitor;
import org.apache.zest.bootstrap.ApplicationAssembly;
-import org.apache.zest.bootstrap.ApplicationAssemblyFactory;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.Energy4Java;
import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.functional.HierarchicalVisitor;
import org.apache.zest.tools.model.descriptor.ApplicationDetailDescriptor;
import static org.hamcrest.CoreMatchers.equalTo;