This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 7f17e03 Removing a few methods that just call super
7f17e03 is described below
commit 7f17e03737171237c0b91f0af4d5adf5333fd68b
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Nov 20 14:48:59 2018 +0000
Removing a few methods that just call super
---
.../binding/xml/interceptor/XMLFaultOutInterceptorTest.java | 6 ------
.../apache/cxf/clustering/CircuitBreakerTargetSelector.java | 5 -----
.../org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 5 -----
.../org/apache/cxf/jaxrs/provider/JAXBElementProvider.java | 12 ------------
.../org/apache/cxf/jaxrs/provider/json/JSONProvider.java | 12 ------------
.../rs/security/oidc/idp/OidcDynamicRegistrationService.java | 8 +-------
.../transport/http/asyncclient/AsyncHTTPConduitFactory.java | 12 ++----------
.../cxf/transport/http_undertow/UndertowHTTPDestination.java | 6 ------
.../org/apache/cxf/ws/rm/persistence/RMLargeMessageTest.java | 6 ------
.../cxf/ws/security/trust/STSSamlAssertionValidator.java | 12 ------------
.../cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java | 5 -----
.../cxf/systest/ws/rm/CachedOutClientPersistenceTest.java | 6 ------
.../cxf/systest/ws/rm/CachedOutServerPersistenceTest.java | 6 ------
.../org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java | 6 ------
.../apache/cxf/systest/ws/addressing/DecoupledJMSTest.java | 7 -------
.../cxf/systest/ws/addressing/NonDecoupledJMSTest.java | 7 -------
16 files changed, 3 insertions(+), 118 deletions(-)
diff --git
a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
index 9aeba1b..aaa5f26 100644
---
a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
+++
b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
@@ -39,18 +39,12 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_doc_lit.PingMeFault;
import org.apache.hello_world_doc_lit.types.FaultDetail;
-import org.junit.Before;
import org.junit.Test;
public class XMLFaultOutInterceptorTest extends TestBase {
XMLFaultOutInterceptor out = new XMLFaultOutInterceptor();
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
-
@Test
public void testFault() throws Exception {
FaultDetail detail = new FaultDetail();
diff --git
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
index 3e8e68b..df30a67 100644
---
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
+++
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
@@ -193,11 +193,6 @@ public class CircuitBreakerTargetSelector extends
FailoverTargetSelector {
}
@Override
- public void prepare(Message message) {
- super.prepare(message);
- }
-
- @Override
protected void onFailure(InvocationContext context, Exception ex) {
super.onFailure(context, ex);
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index dac6f10..948b9f2 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -256,11 +256,6 @@ public class JAXRSInInterceptor extends
AbstractPhaseInterceptor<Message> {
}
}
- @Override
- public void handleFault(Message message) {
- super.handleFault(message);
- }
-
private Message createOutMessage(Message inMessage, Response r) {
Endpoint e = inMessage.getExchange().getEndpoint();
Message mout = e.getBinding().createMessage();
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
index e03a8b4..0341c87 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
@@ -137,18 +137,6 @@ public class JAXBElementProvider<T> extends
AbstractJAXBProvider<T> {
super.setContext(mc);
}
- public void setEnableBuffering(boolean enableBuf) {
- super.setEnableBuffering(enableBuf);
- }
-
- public void setConsumeMediaTypes(List<String> types) {
- super.setConsumeMediaTypes(types);
- }
-
- public void setProduceMediaTypes(List<String> types) {
- super.setProduceMediaTypes(types);
- }
-
public void setMarshallerProperties(Map<String, Object>
marshallProperties) {
mProperties = marshallProperties;
}
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
index b710728..2e8dd06 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
@@ -175,18 +175,6 @@ public class JSONProvider<T> extends
AbstractJAXBProvider<T> {
wrapperMap = map;
}
- public void setEnableBuffering(boolean enableBuf) {
- super.setEnableBuffering(enableBuf);
- }
-
- public void setConsumeMediaTypes(List<String> types) {
- super.setConsumeMediaTypes(types);
- }
-
- public void setProduceMediaTypes(List<String> types) {
- super.setProduceMediaTypes(types);
- }
-
public void setSerializeAsArray(boolean asArray) {
this.serializeAsArray = asArray;
}
diff --git
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java
index 80f6028..21df3f8 100644
---
a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java
+++
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.services.ClientRegistration;
-import org.apache.cxf.rs.security.oauth2.services.ClientRegistrationResponse;
import org.apache.cxf.rs.security.oauth2.services.DynamicRegistrationService;
public class OidcDynamicRegistrationService extends DynamicRegistrationService
{
@@ -47,17 +46,12 @@ public class OidcDynamicRegistrationService extends
DynamicRegistrationService {
}
@Override
- protected ClientRegistrationResponse
fromClientToRegistrationResponse(Client client) {
- return super.fromClientToRegistrationResponse(client);
- }
-
- @Override
protected ClientRegistration fromClientToClientRegistration(Client client)
{
ClientRegistration resp = super.fromClientToClientRegistration(client);
String logoutUris =
client.getProperties().get(POST_LOGOUT_LOGOUT_URIS);
if (logoutUris != null) {
List<String> list = new LinkedList<>();
- for (String s : logoutUris.split(" ")) {
+ for (String s : logoutUris.split(" ")) {
list.add(s);
}
resp.setProperty(POST_LOGOUT_LOGOUT_URIS, list);
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
index 5702168..f0c88a8 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
@@ -53,12 +53,10 @@ import
org.apache.http.impl.nio.conn.ManagedNHttpClientConnectionFactory;
import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
import org.apache.http.impl.nio.reactor.IOReactorConfig;
-import org.apache.http.nio.conn.ManagedNHttpClientConnection;
import org.apache.http.nio.conn.NoopIOSessionStrategy;
import org.apache.http.nio.conn.SchemeIOSessionStrategy;
import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy;
import org.apache.http.nio.reactor.IOReactorException;
-import org.apache.http.nio.reactor.IOSession;
import org.apache.http.protocol.HttpContext;
/**
@@ -322,13 +320,7 @@ public class AsyncHTTPConduitFactory implements
HTTPConduitFactory {
.build();
- ManagedNHttpClientConnectionFactory connectionFactory = new
ManagedNHttpClientConnectionFactory() {
-
- @Override
- public ManagedNHttpClientConnection create(final IOSession
iosession, final ConnectionConfig config) {
- return super.create(iosession, config);
- }
- };
+ ManagedNHttpClientConnectionFactory connectionFactory = new
ManagedNHttpClientConnectionFactory();
DefaultConnectingIOReactor ioreactor = new
DefaultConnectingIOReactor(config);
connectionManager = new PoolingNHttpClientConnectionManager(
@@ -414,7 +406,7 @@ public class AsyncHTTPConduitFactory implements
HTTPConduitFactory {
// not just when a connection becomes available
connMgr.validatePendingRequests();
- if (connectionTTL == 0
+ if (connectionTTL == 0
&& connectionMaxIdle > 0 &&
System.currentTimeMillis() >= nextIdleCheck) {
nextIdleCheck += connectionMaxIdle;
// close connections
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
index 17603e0..63256dd 100644
---
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
@@ -20,7 +20,6 @@
package org.apache.cxf.transport.http_undertow;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.GeneralSecurityException;
@@ -231,11 +230,6 @@ public class UndertowHTTPDestination extends
ServletDestination {
}
}
- protected OutputStream flushHeaders(Message outMessage, boolean getStream)
throws IOException {
- return super.flushHeaders(outMessage, getStream);
- }
-
-
protected String getAddress(EndpointInfo endpointInfo) {
return endpointInfo.getAddress();
}
diff --git
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMLargeMessageTest.java
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMLargeMessageTest.java
index e2a46b1..1113968 100644
---
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMLargeMessageTest.java
+++
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/RMLargeMessageTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.rm.persistence;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
@@ -46,9 +45,4 @@ public class RMLargeMessageTest extends RMMessageTest {
}
}
-
- @Test
- public void testContentCachedOutputStream() throws Exception {
- super.testContentCachedOutputStream();
- }
}
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
index 0f4bba1..662849b 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSSamlAssertionValidator.java
@@ -41,18 +41,6 @@ public class STSSamlAssertionValidator extends
SamlAssertionValidator {
private boolean trustVerificationSucceeded;
/**
- * Validate the credential argument. It must contain a non-null
AssertionWrapper.
- * A Crypto and a CallbackHandler implementation is also required to be
set.
- *
- * @param credential the Credential to be validated
- * @param data the RequestData associated with the request
- * @throws WSSecurityException on a failed validation
- */
- public Credential validate(Credential credential, RequestData data) throws
WSSecurityException {
- return super.validate(credential, data);
- }
-
- /**
* Try to verify trust on the assertion. If it fails, then set a boolean
and return.
* @param assertion The signed Assertion
* @param data The RequestData context
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
index 7968f51..7e0a669 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
@@ -111,11 +111,6 @@ public class WSS4JStaxOutInterceptor extends
AbstractWSS4JStaxInterceptor {
this.mtomEnabled = allowMTOM;
}
- @Override
- public Object getProperty(Object msgContext, String key) {
- return super.getProperty(msgContext, key);
- }
-
protected void handleSecureMTOM(SoapMessage mc, WSSSecurityProperties
secProps) {
if (mtomEnabled) {
return;
diff --git
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java
index 4e38a14..7ccf3b0 100644
---
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java
+++
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
* A simulated-large message version of ClientPersistenceTest.
@@ -47,11 +46,6 @@ public class CachedOutClientPersistenceTest extends
AbstractClientPersistenceTes
RMTxStore.deleteDatabaseFiles("cocpt-client", false);
}
- @Test
- public void testRecovery() throws Exception {
- super.testRecovery();
- }
-
@Override
public String getPort() {
return PORT;
diff --git
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
index 8097a64..cf589b5 100644
---
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
+++
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
* A simulated-large message version of ServerPersistenceTest.
@@ -48,11 +47,6 @@ public class CachedOutServerPersistenceTest extends
AbstractServerPersistenceTes
RMTxStore.deleteDatabaseFiles("cospt-server", false);
}
- @Test
- public void testRecovery() throws Exception {
- super.testRecovery();
- }
-
public String getPort() {
return PORT;
}
diff --git
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
index 7094c24..9bb02d0 100644
---
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
+++
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
* Tests the addition of WS-RM properties to application messages and the
@@ -47,11 +46,6 @@ public class ClientPersistenceTest extends
AbstractClientPersistenceTest {
RMTxStore.deleteDatabaseFiles("cpt-client", false);
}
- @Test
- public void testRecovery() throws Exception {
- super.testRecovery();
- }
-
@Override
public String getPort() {
return PORT;
diff --git
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
index 43cad0b..d4fd6f8 100644
---
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
+++
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
@@ -29,7 +29,6 @@ import javax.jws.WebService;
import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
@@ -56,12 +55,6 @@ public class DecoupledJMSTest extends MAPTestBase {
return PORT;
}
- @Test
- @Override
- public void testImplicitMAPs() throws Exception {
- super.testImplicitMAPs();
- }
-
public String getAddress() {
return ADDRESS;
}
diff --git
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
index d3e4e88..66199b0 100644
---
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
+++
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
@@ -29,7 +29,6 @@ import javax.jws.WebService;
import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
@@ -54,12 +53,6 @@ public class NonDecoupledJMSTest extends MAPTestBase {
return PORT;
}
- @Test
- @Override
- public void testImplicitMAPs() throws Exception {
- super.testImplicitMAPs();
- }
-
public String getAddress() {
return ADDRESS;
}
