:libraries:http refine
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/69d82293 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/69d82293 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/69d82293 Branch: refs/heads/master Commit: 69d82293f3563f5ab50f58017dc48c95a77d2ccb Parents: 874038f Author: Paul Merlin <[email protected]> Authored: Mon May 15 10:53:16 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon May 15 10:53:16 2017 +0200 ---------------------------------------------------------------------- .../org/apache/polygene/library/http/ConstraintService.java | 6 +----- .../main/java/org/apache/polygene/library/http/Interface.java | 2 +- .../java/org/apache/polygene/library/http/JettyActivation.java | 2 +- .../org/apache/polygene/library/http/JettyConfiguration.java | 2 -- .../java/org/apache/polygene/library/http/JettyService.java | 3 +-- .../apache/polygene/library/http/UnitOfWorkFilterService.java | 3 +-- .../apache/polygene/library/http/WelcomeServletService.java | 3 +-- 7 files changed, 6 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/69d82293/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintService.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintService.java b/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintService.java index 90634ad..10ab1b9 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintService.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintService.java @@ -23,18 +23,16 @@ import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.util.security.Constraint; import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.service.ServiceReference; import org.apache.polygene.library.http.ConstraintInfo.HttpMethod; @Mixins( ConstraintService.Mixin.class ) public interface ConstraintService - extends ServiceComposite { ConstraintMapping buildConstraintMapping(); - static abstract class Mixin + abstract class Mixin implements ConstraintService { @@ -48,8 +46,6 @@ public interface ConstraintService ConstraintInfo constraintInfo = myRef.metaInfo( ConstraintInfo.class ); if ( constraintInfo != null && constraintInfo.getConstraint() != null ) { Constraint constraint = new Constraint(); - switch ( constraintInfo.getConstraint() ) { - } csMapping = new ConstraintMapping(); csMapping.setConstraint( constraint ); csMapping.setPathSpec( constraintInfo.getPath() ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/69d82293/libraries/http/src/main/java/org/apache/polygene/library/http/Interface.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/Interface.java b/libraries/http/src/main/java/org/apache/polygene/library/http/Interface.java index b6c34ea..a61e4da 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/Interface.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/Interface.java @@ -27,7 +27,7 @@ public interface Interface Protocol protocol(); - public enum Protocol + enum Protocol { http, https } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/69d82293/libraries/http/src/main/java/org/apache/polygene/library/http/JettyActivation.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyActivation.java b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyActivation.java index 082dd70..d1088c1 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyActivation.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyActivation.java @@ -32,7 +32,7 @@ public interface JettyActivation void stopJetty() throws Exception; - public class Activator + class Activator extends ActivatorAdapter<ServiceReference<JettyActivation>> { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/69d82293/libraries/http/src/main/java/org/apache/polygene/library/http/JettyConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyConfiguration.java b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyConfiguration.java index 2f29ad9..4e1b2c4 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyConfiguration.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyConfiguration.java @@ -21,7 +21,6 @@ package org.apache.polygene.library.http; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.common.UseDefaults; -import org.apache.polygene.api.configuration.ConfigurationComposite; import org.apache.polygene.api.property.Property; import org.apache.polygene.library.constraints.annotation.GreaterThan; import org.apache.polygene.library.constraints.annotation.Range; @@ -34,7 +33,6 @@ import org.apache.polygene.library.constraints.annotation.Range; */ // START SNIPPET: config public interface JettyConfiguration - extends ConfigurationComposite { // ## Connector Configuration Properties ################################## http://git-wip-us.apache.org/repos/asf/polygene-java/blob/69d82293/libraries/http/src/main/java/org/apache/polygene/library/http/JettyService.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyService.java b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyService.java index 37efe41..683ac8e 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyService.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyService.java @@ -21,11 +21,10 @@ package org.apache.polygene.library.http; import org.apache.polygene.api.activation.Activators; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; @Mixins( JettyMixin.class ) @Activators( JettyActivation.Activator.class ) public interface JettyService - extends HttpService, JettyActivation, ServiceComposite + extends HttpService, JettyActivation { } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/69d82293/libraries/http/src/main/java/org/apache/polygene/library/http/UnitOfWorkFilterService.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/UnitOfWorkFilterService.java b/libraries/http/src/main/java/org/apache/polygene/library/http/UnitOfWorkFilterService.java index 510ec4b..a52058a 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/UnitOfWorkFilterService.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/UnitOfWorkFilterService.java @@ -22,14 +22,13 @@ package org.apache.polygene.library.http; import javax.servlet.Filter; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; /** * JAVADOC */ // START SNIPPET: filterservice @Mixins( UnitOfWorkFilter.class ) -public interface UnitOfWorkFilterService extends Filter, ServiceComposite +public interface UnitOfWorkFilterService extends Filter { } // END SNIPPET: filterservice http://git-wip-us.apache.org/repos/asf/polygene-java/blob/69d82293/libraries/http/src/main/java/org/apache/polygene/library/http/WelcomeServletService.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/WelcomeServletService.java b/libraries/http/src/main/java/org/apache/polygene/library/http/WelcomeServletService.java index 6852c70..fa4ce38 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/WelcomeServletService.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/WelcomeServletService.java @@ -22,12 +22,11 @@ package org.apache.polygene.library.http; import javax.servlet.Servlet; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; /** * JAVADOC */ @Mixins( WelcomeServlet.class ) -public interface WelcomeServletService extends Servlet, ServiceComposite +public interface WelcomeServletService extends Servlet { } \ No newline at end of file
