move stuff around so customer used stuff is in the *.api.* packages f…

…or clarity making it easier to understand the components
deanhiller · Mar 30, 2019 · f0084fb · f0084fb
1 parent ed665fa
commit f0084fb
Show file tree

Hide file tree

Showing 266 changed files with 723 additions and 731 deletions.
diff --git a/...plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/BackendController.java b/...plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/BackendController.java
@@ -5,9 +5,9 @@
 
 import org.webpieces.plugins.backend.login.BackendLoginRouteId;
 import org.webpieces.plugins.backend.menu.MenuCreator;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.actions.Redirect;
-import org.webpieces.router.api.actions.Render;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.controller.actions.Redirect;
+import org.webpieces.router.api.controller.actions.Render;
 
 @Singleton
 public class BackendController {

diff --git a/...ver-plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/BackendPlugin.java b/...ver-plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/BackendPlugin.java
@@ -3,8 +3,8 @@
 import java.util.List;
 
 import org.webpieces.plugins.backend.login.BackendLoginRoutes;
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Module;

diff --git a/...ver-plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/BackendRoutes.java b/...ver-plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/BackendRoutes.java
@@ -1,6 +1,6 @@
 package org.webpieces.plugins.backend;
 
-import org.webpieces.router.api.routing.ScopedRoutes;
+import org.webpieces.router.api.routes.ScopedRoutes;
 
 public abstract class BackendRoutes extends ScopedRoutes {
 

diff --git a/...gin-backend/src/main/java/org/webpieces/plugins/backend/login/BackendLoginController.java b/...gin-backend/src/main/java/org/webpieces/plugins/backend/login/BackendLoginController.java
@@ -5,9 +5,9 @@
 
 import org.webpieces.ctx.api.Current;
 import org.webpieces.plugins.backend.menu.MenuCreator;
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.routes.RouteId;
 import org.webpieces.webserver.api.login.AbstractLoginController;
 
 @Singleton

diff --git a/...plugin-backend/src/main/java/org/webpieces/plugins/backend/login/BackendLoginRouteId.java b/...plugin-backend/src/main/java/org/webpieces/plugins/backend/login/BackendLoginRouteId.java
@@ -1,6 +1,6 @@
 package org.webpieces.plugins.backend.login;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public enum BackendLoginRouteId implements RouteId{
 	BACKEND_LOGIN, POST_BACKEND_LOGIN, BACKEND_LOGOUT, BACKEND_LOGGED_IN_HOME, LOGGED_OUT_LANDING

diff --git a/.../plugin-backend/src/main/java/org/webpieces/plugins/backend/login/BackendLoginRoutes.java b/.../plugin-backend/src/main/java/org/webpieces/plugins/backend/login/BackendLoginRoutes.java
@@ -1,10 +1,10 @@
 package org.webpieces.plugins.backend.login;
 
 import org.webpieces.ctx.api.HttpMethod;
-import org.webpieces.router.api.routing.Port;
-import org.webpieces.router.api.routing.RouteId;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
-import org.webpieces.router.impl.model.bldr.ScopedRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routebldr.ScopedRouteBuilder;
+import org.webpieces.router.api.routes.Port;
+import org.webpieces.router.api.routes.RouteId;
 import org.webpieces.webserver.api.login.AbstractLoginRoutes;
 
 public class BackendLoginRoutes extends AbstractLoginRoutes {

diff --git a/...-plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/menu/MenuCreator.java b/...-plugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/menu/MenuCreator.java
@@ -13,7 +13,7 @@
 import org.webpieces.plugins.backend.spi.BackendGuiDescriptor;
 import org.webpieces.plugins.backend.spi.MenuCategory;
 import org.webpieces.plugins.backend.spi.PageDescriptor;
-import org.webpieces.router.api.routing.ReverseRouteLookup;
+import org.webpieces.router.api.plugins.ReverseRouteLookup;
 import org.webpieces.router.impl.RoutingHolder;
 
 @Singleton

diff --git a/...lugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/spi/PageDescriptor.java b/...lugins/plugin-backend/src/main/java/org/webpieces/plugins/backend/spi/PageDescriptor.java
@@ -1,6 +1,6 @@
 package org.webpieces.plugins.backend.spi;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public class PageDescriptor {
 

diff --git a/...erver-plugins/plugin-backend/src/test/java/org/webpieces/plugins/backend/BackendMeta.java b/...erver-plugins/plugin-backend/src/test/java/org/webpieces/plugins/backend/BackendMeta.java
@@ -5,9 +5,9 @@
 
 import org.webpieces.plugins.fortesting.EmptyModule;
 import org.webpieces.plugins.fortesting.FillerRoutes;
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.api.routing.WebAppMeta;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
+import org.webpieces.router.api.routes.WebAppMeta;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Module;

diff --git a/...umentation/src/main/java/org/webpieces/plugins/documentation/DocumentationController.java b/...umentation/src/main/java/org/webpieces/plugins/documentation/DocumentationController.java
@@ -4,8 +4,8 @@
 import javax.inject.Singleton;
 
 import org.webpieces.plugins.backend.menu.MenuCreator;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.actions.Render;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.controller.actions.Render;
 
 @Singleton
 public class DocumentationController {

diff --git a/...documentation/src/main/java/org/webpieces/plugins/documentation/DocumentationRouteId.java b/...documentation/src/main/java/org/webpieces/plugins/documentation/DocumentationRouteId.java
@@ -1,6 +1,6 @@
 package org.webpieces.plugins.documentation;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public enum DocumentationRouteId implements RouteId {
 

diff --git a/...-documentation/src/main/java/org/webpieces/plugins/documentation/DocumentationRoutes.java b/...-documentation/src/main/java/org/webpieces/plugins/documentation/DocumentationRoutes.java
@@ -1,11 +1,11 @@
 package org.webpieces.plugins.documentation;
 
-import static org.webpieces.router.api.routing.Port.BOTH;
+import static org.webpieces.router.api.routes.Port.BOTH;
 
 import org.webpieces.ctx.api.HttpMethod;
-import org.webpieces.router.api.routing.ScopedRoutes;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
-import org.webpieces.router.impl.model.bldr.ScopedRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routebldr.ScopedRouteBuilder;
+import org.webpieces.router.api.routes.ScopedRoutes;
 
 public class DocumentationRoutes extends ScopedRoutes {
 

diff --git a/...ation/src/main/java/org/webpieces/plugins/documentation/WebpiecesDocumentationPlugin.java b/...ation/src/main/java/org/webpieces/plugins/documentation/WebpiecesDocumentationPlugin.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Module;

diff --git a/...mentation/src/main/java/org/webpieces/plugins/documentation/plugins/PluginController.java b/...mentation/src/main/java/org/webpieces/plugins/documentation/plugins/PluginController.java
@@ -4,8 +4,8 @@
 import javax.inject.Singleton;
 
 import org.webpieces.plugins.backend.menu.MenuCreator;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.actions.Render;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.controller.actions.Render;
 
 @Singleton
 public class PluginController {

diff --git a/...gins/plugin-documentation/src/test/java/org/webpieces/plugins/documentation/DocsMeta.java b/...gins/plugin-documentation/src/test/java/org/webpieces/plugins/documentation/DocsMeta.java
@@ -7,9 +7,9 @@
 import org.webpieces.plugins.backend.BackendPlugin;
 import org.webpieces.plugins.fortesting.EmptyModule;
 import org.webpieces.plugins.fortesting.FillerRoutes;
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.api.routing.WebAppMeta;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
+import org.webpieces.router.api.routes.WebAppMeta;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Module;

diff --git a/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbController.java b/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbController.java
@@ -5,8 +5,8 @@
 
 import org.webpieces.ctx.api.Current;
 import org.webpieces.ctx.api.RouterRequest;
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
 
 @Singleton
 public class H2DbController {

diff --git a/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbPlugin.java b/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbPlugin.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Module;

diff --git a/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbRouteId.java b/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbRouteId.java
@@ -1,6 +1,6 @@
 package org.webpieces.plugins.hsqldb;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public enum H2DbRouteId implements RouteId {
 

diff --git a/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbRoutes.java b/webserver-plugins/plugin-h2db/src/main/java/org/webpieces/plugins/hsqldb/H2DbRoutes.java
@@ -1,11 +1,11 @@
 package org.webpieces.plugins.hsqldb;
 
-import static org.webpieces.router.api.routing.Port.BOTH;
+import static org.webpieces.router.api.routes.Port.BOTH;
 
 import org.webpieces.ctx.api.HttpMethod;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.impl.model.bldr.DomainRouteBuilder;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
+import org.webpieces.router.api.routebldr.DomainRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routes.Routes;
 
 public class H2DbRoutes implements Routes {
 

diff --git a/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernateLookup.java b/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernateLookup.java
@@ -11,8 +11,8 @@
 import javax.persistence.metamodel.SingularAttribute;
 
 import org.hibernate.metamodel.internal.EntityTypeImpl;
-import org.webpieces.router.api.EntityLookup;
-import org.webpieces.router.api.ObjectStringConverter;
+import org.webpieces.router.api.extensions.EntityLookup;
+import org.webpieces.router.api.extensions.ObjectStringConverter;
 import org.webpieces.router.impl.params.Meta;
 import org.webpieces.router.impl.params.ObjectTranslator;
 import org.webpieces.router.impl.params.ParamMeta;

diff --git a/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernateModule.java b/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernateModule.java
@@ -11,7 +11,7 @@
 import javax.persistence.Persistence;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.webpieces.router.api.EntityLookup;
+import org.webpieces.router.api.extensions.EntityLookup;
 import org.webpieces.util.logging.Logger;
 import org.webpieces.util.logging.LoggerFactory;
 

diff --git a/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernatePlugin.java b/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernatePlugin.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
 import org.webpieces.util.logging.Logger;
 import org.webpieces.util.logging.LoggerFactory;
 

diff --git a/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernateRoutes.java b/...ugins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/HibernateRoutes.java
@@ -1,9 +1,9 @@
 package org.webpieces.plugins.hibernate;
 
-import org.webpieces.router.api.routing.PortType;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.impl.model.bldr.DomainRouteBuilder;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
+import org.webpieces.router.api.routebldr.DomainRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routes.FilterPortType;
+import org.webpieces.router.api.routes.Routes;
 
 public class HibernateRoutes implements Routes {
 
@@ -14,7 +14,7 @@ public void configure(DomainRouteBuilder domainRouteBldr) {
 		//as if the database goes down, you will end up with error to error to webpieces fail-safe 500 page which
 		//does not look like your website
 		//Also, we don't wrap NotFound but you could do that as well
-		bldr.addFilter(".*", TransactionFilter.class, null, PortType.ALL_FILTER);
+		bldr.addFilter(".*", TransactionFilter.class, null, FilterPortType.ALL_FILTER);
 	}
 
 }
diff --git a/...ins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/TransactionFilter.java b/...ins/plugin-hibernate/src/main/java/org/webpieces/plugins/hibernate/TransactionFilter.java
@@ -9,11 +9,11 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.dto.MethodMeta;
+import org.webpieces.router.api.controller.actions.Action;
 import org.webpieces.router.api.exceptions.HttpException;
 import org.webpieces.router.api.exceptions.NotFoundException;
-import org.webpieces.router.api.routing.RouteFilter;
+import org.webpieces.router.api.routes.RouteFilter;
+import org.webpieces.router.impl.dto.MethodMeta;
 import org.webpieces.util.filters.Service;
 import org.webpieces.util.logging.Logger;
 import org.webpieces.util.logging.LoggerFactory;

diff --git a/...install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertController.java b/...install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertController.java
@@ -29,12 +29,12 @@
 import org.webpieces.plugins.sslcert.acme.AcmeInfo;
 import org.webpieces.plugins.sslcert.acme.ProxyAuthorization;
 import org.webpieces.plugins.sslcert.acme.ProxyOrder;
-import org.webpieces.router.api.SimpleStorage;
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.actions.Redirect;
-import org.webpieces.router.api.actions.Render;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.controller.actions.Redirect;
+import org.webpieces.router.api.controller.actions.Render;
 import org.webpieces.router.api.exceptions.NotFoundException;
+import org.webpieces.router.api.extensions.SimpleStorage;
 
 import com.webpieces.hpack.api.dto.Http2Response;
 import com.webpieces.http2parser.api.dto.lib.Http2Header;

diff --git a/...gin-install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertPlugin.java b/...gin-install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertPlugin.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import org.webpieces.router.api.routing.BackendPlugin;
-import org.webpieces.router.api.routing.Routes;
+import org.webpieces.router.api.plugins.BackendPlugin;
+import org.webpieces.router.api.routes.Routes;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Module;

diff --git a/...in-install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertRouteId.java b/...in-install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertRouteId.java
@@ -1,6 +1,6 @@
 package org.webpieces.plugins.sslcert;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public enum InstallSslCertRouteId implements RouteId {
 

diff --git a/...gin-install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertRoutes.java b/...gin-install-sslcert/src/main/java/org/webpieces/plugins/sslcert/InstallSslCertRoutes.java
@@ -1,12 +1,12 @@
 package org.webpieces.plugins.sslcert;
 
-import static org.webpieces.router.api.routing.Port.BOTH;
-import static org.webpieces.router.api.routing.Port.HTTPS;
+import static org.webpieces.router.api.routes.Port.BOTH;
+import static org.webpieces.router.api.routes.Port.HTTPS;
 
 import org.webpieces.ctx.api.HttpMethod;
 import org.webpieces.plugins.backend.BackendRoutes;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
-import org.webpieces.router.impl.model.bldr.ScopedRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routebldr.ScopedRouteBuilder;
 
 public class InstallSslCertRoutes extends BackendRoutes {
 

diff --git a/...plugin-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/MockSimpleStorage.java b/...plugin-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/MockSimpleStorage.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import org.webpieces.router.api.SimpleStorage;
+import org.webpieces.router.api.extensions.SimpleStorage;
 
 public class MockSimpleStorage implements SimpleStorage {
 

diff --git a/...ugins/plugin-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/SslCertMeta.java b/...ugins/plugin-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/SslCertMeta.java
@@ -7,9 +7,9 @@
 import org.webpieces.plugins.backend.BackendPlugin;
 import org.webpieces.plugins.fortesting.EmptyModule;
 import org.webpieces.plugins.fortesting.FillerRoutes;
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.api.routing.WebAppMeta;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
+import org.webpieces.router.api.routes.WebAppMeta;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Module;

diff --git a/...n-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/TestFullSslSetupWizard.java b/...n-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/TestFullSslSetupWizard.java
@@ -29,7 +29,7 @@
 import org.webpieces.plugins.sslcert.acme.AcmeInfo;
 import org.webpieces.plugins.sslcert.acme.ProxyAuthorization;
 import org.webpieces.plugins.sslcert.acme.ProxyOrder;
-import org.webpieces.router.api.SimpleStorage;
+import org.webpieces.router.api.extensions.SimpleStorage;
 import org.webpieces.util.file.VirtualFileClasspath;
 import org.webpieces.webserver.test.AbstractWebpiecesTest;
 import org.webpieces.webserver.test.ResponseExtract;

diff --git a/...gins/plugin-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/TestSslSetup.java b/...gins/plugin-install-sslcert/src/test/java/org/webpieces/plugins/sslcert/TestSslSetup.java
@@ -19,7 +19,7 @@
 import org.webpieces.plugins.backend.login.BackendLogin;
 import org.webpieces.plugins.fortesting.TestConfig;
 import org.webpieces.plugins.fortesting.WebserverForTest;
-import org.webpieces.router.api.SimpleStorage;
+import org.webpieces.router.api.extensions.SimpleStorage;
 import org.webpieces.util.file.VirtualFileClasspath;
 import org.webpieces.webserver.test.AbstractWebpiecesTest;
 import org.webpieces.webserver.test.ResponseExtract;

diff --git a/...s/plugin-json-jackson/src/main/java/org/webpieces/plugins/json/JacksonCatchAllFilter.java b/...s/plugin-json-jackson/src/main/java/org/webpieces/plugins/json/JacksonCatchAllFilter.java
@@ -10,13 +10,13 @@
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.webpieces.httpparser.api.dto.KnownStatusCode;
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.RenderContent;
-import org.webpieces.router.api.dto.MethodMeta;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.RenderContent;
 import org.webpieces.router.api.exceptions.ClientDataError;
 import org.webpieces.router.api.exceptions.NotFoundException;
-import org.webpieces.router.api.routing.RouteFilter;
+import org.webpieces.router.api.routes.RouteFilter;
 import org.webpieces.router.impl.compression.MimeTypes.MimeTypeResult;
+import org.webpieces.router.impl.dto.MethodMeta;
 import org.webpieces.util.filters.Service;
 import org.webpieces.util.logging.Logger;
 import org.webpieces.util.logging.LoggerFactory;