You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/08/27 11:39:10 UTC
[isis] branch master updated: ISIS-1635: resteasy plugin v3 fixed
to support 3.1.4.Final
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 02dd6ae ISIS-1635: resteasy plugin v3 fixed to support 3.1.4.Final
02dd6ae is described below
commit 02dd6ae7e2bf67d7fbc4cc13037f5db3a20f5389
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Aug 27 13:39:05 2018 +0200
ISIS-1635: resteasy plugin v3 fixed to support 3.1.4.Final
---
.../conneg/IsisPrettyPrintingProcessor.java | 6 ++--
.../PreProcessInterceptorForIsisSession.java | 40 ----------------------
2 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
index 79db422..39cfc45 100644
--- a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
+++ b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
@@ -22,7 +22,7 @@ import javax.ws.rs.core.MediaType;
import javax.xml.bind.Marshaller;
import org.jboss.resteasy.annotations.DecorateTypes;
-import org.jboss.resteasy.spi.interception.DecoratorProcessor;
+import org.jboss.resteasy.spi.DecoratorProcessor;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
@@ -35,7 +35,7 @@ public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshalle
public static final String KEY_PRETTY_PRINT = "isis.services." + ContentNegotiationServiceXRoDomainType.class.getSimpleName() + ".prettyPrint";
@Override
- public Marshaller decorate(final Marshaller target, final PrettyPrinting annotation, final Class type, final Annotation[] annotations, final MediaType mediaType) {
+ public Marshaller decorate(final Marshaller target, final PrettyPrinting annotation, @SuppressWarnings("rawtypes") final Class type, final Annotation[] annotations, final MediaType mediaType) {
return shouldPrettyPrint()
? doDecorate(target, annotation, type, annotations, mediaType)
: target;
@@ -50,7 +50,7 @@ public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshalle
}
}
- protected Marshaller doDecorate(Marshaller target, PrettyPrinting annotation, Class type, Annotation[] annotations, MediaType mediaType) {
+ protected Marshaller doDecorate(Marshaller target, PrettyPrinting annotation, @SuppressWarnings("rawtypes") Class type, Annotation[] annotations, MediaType mediaType) {
try {
target.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
return target;
diff --git a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/PreProcessInterceptorForIsisSession.java b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/PreProcessInterceptorForIsisSession.java
deleted file mode 100644
index 2effcda..0000000
--- a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/PreProcessInterceptorForIsisSession.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.restfulobjects.server.webapp;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.ext.Provider;
-
-import org.jboss.resteasy.annotations.interception.ServerInterceptor;
-import org.jboss.resteasy.core.ResourceMethodInvoker;
-import org.jboss.resteasy.core.ServerResponse;
-import org.jboss.resteasy.spi.Failure;
-import org.jboss.resteasy.spi.HttpRequest;
-import org.jboss.resteasy.spi.interception.PreProcessInterceptor;
-
-@Provider
-@ServerInterceptor
-@Deprecated // see PreProcessInterceptor
-public class PreProcessInterceptorForIsisSession implements PreProcessInterceptor {
-
- @Override
- public ServerResponse preProcess(HttpRequest httpRequest, ResourceMethodInvoker resourceMethodInvoker) throws Failure, WebApplicationException {
- return null;
- }
-}