You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/01/22 13:06:08 UTC
[cxf] branch master updated: Another round of minor fixes
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 8b2fae2 Another round of minor fixes
8b2fae2 is described below
commit 8b2fae26d3021086b8a7dc0e03ac97a3293e7df5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jan 22 13:05:49 2020 +0000
Another round of minor fixes
---
.../java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java | 3 ---
.../main/java/org/apache/cxf/microprofile/client/Validator.java | 2 --
.../rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java | 9 ---------
.../security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 6 ------
.../apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java | 2 +-
.../java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java | 9 ---------
.../main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java | 6 ------
7 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
index 6fd7e88..12cfa76 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
@@ -63,7 +63,6 @@ public class HandlerChainInvoker {
private List<LogicalHandler<?>> logicalHandlers = new ArrayList<>();
private final List<Handler<?>> invokedHandlers = new ArrayList<>();
- private final List<Handler<?>> closeHandlers = new ArrayList<>();
private boolean outbound;
private boolean isRequestor;
@@ -329,7 +328,6 @@ public class HandlerChainInvoker {
try {
for (Handler<?> h : handlerChain) {
if (invokeThisHandler(h)) {
- closeHandlers.add(h);
markHandlerInvoked(h);
Handler<MessageContext> lh = (Handler<MessageContext>)h;
continueProcessing = lh.handleFault(ctx);
@@ -353,7 +351,6 @@ public class HandlerChainInvoker {
try {
for (Handler<?> h : handlerChain) {
if (invokeThisHandler(h)) {
- closeHandlers.add(h);
markHandlerInvoked(h);
Handler<MessageContext> lh = (Handler<MessageContext>)h;
continueProcessing = lh.handleMessage(ctx);
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Validator.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Validator.java
index dfa7ce6..ffa1fb5 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Validator.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Validator.java
@@ -90,11 +90,9 @@ final class Validator {
Path classPathAnno = userType.getAnnotation(Path.class);
- final Set<String> classLevelVariables = new HashSet<>();
URITemplate classTemplate = null;
if (classPathAnno != null) {
classTemplate = new URITemplate(classPathAnno.value());
- classLevelVariables.addAll(classTemplate.getVariables());
}
URITemplate template;
for (Method method : methods) {
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java
index d5d4a1b..ae03c3b 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java
@@ -19,8 +19,6 @@
package org.apache.cxf.rs.security.jose.jwe;
import java.security.interfaces.ECPublicKey;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils;
import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
@@ -29,13 +27,6 @@ import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
public class EcdhAesWrapKeyEncryptionAlgorithm implements KeyEncryptionProvider {
- private static final Map<String, String> ECDH_AES_MAP;
- static {
- ECDH_AES_MAP = new HashMap<>();
- ECDH_AES_MAP.put(KeyAlgorithm.ECDH_ES_A128KW.getJwaName(), KeyAlgorithm.A128KW.getJwaName());
- ECDH_AES_MAP.put(KeyAlgorithm.ECDH_ES_A192KW.getJwaName(), KeyAlgorithm.A192KW.getJwaName());
- ECDH_AES_MAP.put(KeyAlgorithm.ECDH_ES_A256KW.getJwaName(), KeyAlgorithm.A256KW.getJwaName());
- }
private final KeyAlgorithm keyAlgo;
private final EcdhHelper helper;
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
index e70ed88..dcce44e 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
@@ -42,7 +42,6 @@ import org.bouncycastle.crypto.params.KeyParameter;
public class PbesHmacAesWrapKeyEncryptionAlgorithm implements KeyEncryptionProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(PbesHmacAesWrapKeyEncryptionAlgorithm.class);
private static final Map<String, Integer> PBES_HMAC_MAP;
- private static final Map<String, String> PBES_AES_MAP;
private static final Map<String, Integer> DERIVED_KEY_SIZE_MAP;
static {
PBES_HMAC_MAP = new HashMap<>();
@@ -50,11 +49,6 @@ public class PbesHmacAesWrapKeyEncryptionAlgorithm implements KeyEncryptionProvi
PBES_HMAC_MAP.put(KeyAlgorithm.PBES2_HS384_A192KW.getJwaName(), 384);
PBES_HMAC_MAP.put(KeyAlgorithm.PBES2_HS512_A256KW.getJwaName(), 512);
- PBES_AES_MAP = new HashMap<>();
- PBES_AES_MAP.put(KeyAlgorithm.PBES2_HS256_A128KW.getJwaName(), KeyAlgorithm.A128KW.getJwaName());
- PBES_AES_MAP.put(KeyAlgorithm.PBES2_HS384_A192KW.getJwaName(), KeyAlgorithm.A192KW.getJwaName());
- PBES_AES_MAP.put(KeyAlgorithm.PBES2_HS512_A256KW.getJwaName(), KeyAlgorithm.A256KW.getJwaName());
-
DERIVED_KEY_SIZE_MAP = new HashMap<>();
DERIVED_KEY_SIZE_MAP.put(KeyAlgorithm.PBES2_HS256_A128KW.getJwaName(), 16);
DERIVED_KEY_SIZE_MAP.put(KeyAlgorithm.PBES2_HS384_A192KW.getJwaName(), 24);
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index 1a9454d..3231982 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -138,7 +138,7 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
public class AhcWebSocketWrappedOutputStream extends WrappedOutputStream {
private AhcWebSocketConduitRequest entity;
- private Response response;
+ private volatile Response response;
protected AhcWebSocketWrappedOutputStream(Message message, boolean possibleRetransmit,
boolean isChunking, int chunkThreshold, String conduitName, URI url) {
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
index d9e0b419..33a911e 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
@@ -21,9 +21,7 @@ package org.apache.cxf.wsdl.interceptors;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
@@ -51,13 +49,6 @@ import org.apache.cxf.staxutils.StaxUtils;
public class BareInInterceptor extends AbstractInDatabindingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(BareInInterceptor.class);
- private static Set<String> filter = new HashSet<>();
-
- static {
- filter.add("void");
- filter.add("javax.activation.DataHandler");
- }
-
public BareInInterceptor() {
super(Phase.UNMARSHAL);
}
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
index 42e076d..5eb9b04 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -94,8 +93,6 @@ public abstract class AbstractNotificationBroker extends AbstractEndpoint
private Map<String, AbstractPublisher> publishers;
- private List<AbstractPublisher> nonContactPublishers;
-
private Map<String, AbstractSubscription> subscriptions;
public AbstractNotificationBroker(String name) {
@@ -103,7 +100,6 @@ public abstract class AbstractNotificationBroker extends AbstractEndpoint
idGenerator = new IdGenerator();
subscriptions = new ConcurrentHashMap<>();
publishers = new ConcurrentHashMap<>();
- nonContactPublishers = new CopyOnWriteArrayList<>();
}
@Override
@@ -342,8 +338,6 @@ public abstract class AbstractNotificationBroker extends AbstractEndpoint
publishers.put(WSNHelper.getInstance()
.getWSAAddress(publisher.getPublisherReference()),
publisher);
- } else {
- nonContactPublishers.add(publisher);
}
success = true;
return response;