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 2017/05/15 11:03:26 UTC
[21/50] polygene-java git commit: :libraries:rest refine
:libraries:rest 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/50448c1f
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/50448c1f
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/50448c1f
Branch: refs/heads/develop
Commit: 50448c1f0c0ba8b1d279f81233b6c0f32ddacc69
Parents: 65f0713
Author: Paul Merlin <pa...@apache.org>
Authored: Mon May 15 10:37:47 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon May 15 10:37:47 2017 +0200
----------------------------------------------------------------------
.../polygene/library/rest/admin/ExtensionMediaTypeFilter.java | 2 +-
.../library/rest/admin/PolygeneServerServletService.java | 3 +--
.../apache/polygene/library/rest/admin/RestServerComposite.java | 5 ++---
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/50448c1f/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ExtensionMediaTypeFilter.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ExtensionMediaTypeFilter.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ExtensionMediaTypeFilter.java
index ad06e0c..1ceffe0 100644
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ExtensionMediaTypeFilter.java
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ExtensionMediaTypeFilter.java
@@ -75,7 +75,7 @@ public class ExtensionMediaTypeFilter
if( metadata != null && metadata instanceof MediaType )
{
request.getClientInfo()
- .setAcceptedMediaTypes( Collections.singletonList( new Preference<MediaType>( (MediaType) metadata ) ) );
+ .setAcceptedMediaTypes( Collections.singletonList( new Preference<>( (MediaType) metadata ) ) );
String path = request.getResourceRef().getPath();
path = path.substring( 0, path.length() - extensions.length() - 1 );
request.getResourceRef().setPath( path );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/50448c1f/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java
index 16cf511..e024c02 100644
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java
@@ -22,13 +22,12 @@ package org.apache.polygene.library.rest.admin;
import javax.servlet.Servlet;
import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceComposite;
/**
* JAVADOC
*/
@Mixins( PolygeneServerServlet.class )
public interface PolygeneServerServletService
- extends Servlet, ServiceComposite
+ extends Servlet
{
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/50448c1f/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestServerComposite.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestServerComposite.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestServerComposite.java
index 4a3199b..9bb5fda 100644
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestServerComposite.java
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestServerComposite.java
@@ -23,13 +23,12 @@ package org.apache.polygene.library.rest.admin;
import org.apache.polygene.api.activation.ActivatorAdapter;
import org.apache.polygene.api.activation.Activators;
import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceComposite;
import org.apache.polygene.api.service.ServiceReference;
@Mixins( { RestServerMixin.class } )
@Activators( RestServerComposite.Activator.class )
public interface RestServerComposite
- extends ServiceComposite, RestServer
+ extends RestServer
{
void startServer()
@@ -38,7 +37,7 @@ public interface RestServerComposite
void stopServer()
throws Exception;
- static class Activator extends ActivatorAdapter<ServiceReference<RestServerComposite>>
+ class Activator extends ActivatorAdapter<ServiceReference<RestServerComposite>>
{
@Override