marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [3/4] git commit: clean up interface for ExceptionMapper
Date Mon, 17 Mar 2014 14:31:21 GMT
clean up interface for ExceptionMapper


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8025e4ce
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8025e4ce
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8025e4ce

Branch: refs/heads/develop
Commit: 8025e4ce25d580deb68a203090db46aa956a6068
Parents: 30dd428
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Mon Mar 17 15:30:43 2014 +0100
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Mon Mar 17 15:30:43 2014 +0100

----------------------------------------------------------------------
 .../marmotta/platform/core/api/jaxrs/ExceptionMapperService.java | 4 +---
 .../platform/core/services/jaxrs/ExceptionMapperServiceImpl.java | 1 -
 .../apache/marmotta/platform/core/test/base/JettyMarmotta.java   | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/8025e4ce/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/jaxrs/ExceptionMapperService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/jaxrs/ExceptionMapperService.java
b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/jaxrs/ExceptionMapperService.java
index b305848..43bef5a 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/jaxrs/ExceptionMapperService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/jaxrs/ExceptionMapperService.java
@@ -17,8 +17,6 @@
 
 package org.apache.marmotta.platform.core.api.jaxrs;
 
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
-
 /**
  * This service auto-registers JAX-RS exception mappers implementing the CDIExceptionMapper
interface and
  * registers them with RESTEasy. This allows applications based on Marmotta to easily implement
and register their
@@ -30,5 +28,5 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
  * @author Sebastian Schaffert (sschaffert@apache.org)
  */
 public interface ExceptionMapperService {
-    void register(ResteasyProviderFactory factory);
+
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/8025e4ce/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
index 2306686..ca06ed6 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
@@ -60,7 +60,6 @@ public class ExceptionMapperServiceImpl implements ExceptionMapperService
{
     }
 
 
-    @Override
     public void register(ResteasyProviderFactory factory) {
         log.info("initialising JAX-RS exception mappers");
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/8025e4ce/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
index 979d89e..29640f9 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
@@ -17,7 +17,7 @@
  */
 package org.apache.marmotta.platform.core.test.base;
 
-import org.apache.marmotta.platform.core.api.jaxrs.ExceptionMapperService;
+import org.apache.marmotta.platform.core.services.jaxrs.ExceptionMapperServiceImpl;
 import org.apache.marmotta.platform.core.servlet.MarmottaResourceFilter;
 import org.apache.marmotta.platform.core.test.base.jetty.TestApplication;
 import org.apache.marmotta.platform.core.test.base.jetty.TestInjectorFactory;
@@ -136,7 +136,7 @@ public class JettyMarmotta extends AbstractMarmotta {
         }
 
         // make sure exception mappers are loaded and registered before jetty starts up
-        ExceptionMapperService mapperService = CDIContext.getInstance(ExceptionMapperService.class);
+        ExceptionMapperServiceImpl mapperService = CDIContext.getInstance(ExceptionMapperServiceImpl.class);
         try {
             mapperService.register(((HttpServletDispatcher) restEasyFilter.getServlet()).getDispatcher().getProviderFactory());
         } catch (ServletException e) {


Mime
View raw message