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/21 12:40:05 UTC
[cxf] branch master updated (e68d173 -> cc4ea93)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from e68d173 samples: organize description_openapi_v3 dependencies
new 4699995 Updating Jackson
new cc4ea93 Fixing a few minor issues
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cxf/configuration/spring/ConfigurerImpl.java | 9 ++++-----
parent/pom.xml | 4 ++--
.../cxf/aegis/util/stax/JDOMStreamWriter.java | 6 +-----
.../cxf/management/utils/ManagementConsole.java | 21 ++++++---------------
.../http/policy/impl/ClientPolicyCalculator.java | 22 +++++++++++-----------
.../common/toolspec/parser/TokenInputStream.java | 2 +-
6 files changed, 25 insertions(+), 39 deletions(-)
[cxf] 02/02: Fixing a few minor issues
Posted by co...@apache.org.
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
commit cc4ea93826655c45eb5dd65290300ee42fe8d596
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 21 12:39:48 2020 +0000
Fixing a few minor issues
---
.../cxf/configuration/spring/ConfigurerImpl.java | 9 ++++-----
.../cxf/aegis/util/stax/JDOMStreamWriter.java | 6 +-----
.../cxf/management/utils/ManagementConsole.java | 21 ++++++---------------
.../http/policy/impl/ClientPolicyCalculator.java | 22 +++++++++++-----------
.../common/toolspec/parser/TokenInputStream.java | 2 +-
5 files changed, 23 insertions(+), 37 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
index d4ba94d..c769f97 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
@@ -58,8 +58,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport
private static final Logger LOG = LogUtils.getL7dLogger(ConfigurerImpl.class);
private Set<ApplicationContext> appContexts;
- private final Map<String, List<MatcherHolder>> wildCardBeanDefinitions
- = new TreeMap<>();
+ private final Map<String, List<MatcherHolder>> wildCardBeanDefinitions = new TreeMap<>();
private BeanFactory beanFactory;
static class MatcherHolder implements Comparable<MatcherHolder> {
@@ -71,10 +70,10 @@ public class ConfigurerImpl extends BeanConfigurerSupport
}
@Override
public int compareTo(MatcherHolder mh) {
- Integer literalCharsLen1 = this.wildCardId.replace("*", "").length();
- Integer literalCharsLen2 = mh.wildCardId.replace("*", "").length();
+ int literalCharsLen1 = this.wildCardId.replace("*", "").length();
+ int literalCharsLen2 = mh.wildCardId.replace("*", "").length();
// The expression with more literal characters should end up on the top of the list
- return literalCharsLen1.compareTo(literalCharsLen2) * -1;
+ return Integer.compare(literalCharsLen1, literalCharsLen2) * -1;
}
}
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
index 066f763..7d9fd0e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
@@ -20,8 +20,6 @@ package org.apache.cxf.aegis.util.stax;
import java.util.ArrayDeque;
import java.util.Deque;
-import java.util.HashMap;
-import java.util.Map;
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamException;
@@ -44,8 +42,6 @@ public class JDOMStreamWriter implements XMLStreamWriter {
private NamespaceContext context;
- private Map<String, Object> properties = new HashMap<>();
-
public JDOMStreamWriter() {
}
@@ -201,7 +197,7 @@ public class JDOMStreamWriter implements XMLStreamWriter {
}
public Object getProperty(String prop) throws IllegalArgumentException {
- return properties.get(prop);
+ return null;
}
public Document getDocument() {
diff --git a/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java b/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
index c16b10a..3fa2fe2 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
@@ -157,32 +157,23 @@ public final class ManagementConsole {
operationName = "";
boolean result = false;
- int i;
- String arg;
try {
- for (i = 0; i < args.length; i++) {
- arg = args[i];
+ for (int i = 0; i < args.length; i++) {
+ String arg = args[i];
if ("--port".equals(arg) || "-p".equals(arg)) {
portName = args[++i];
- continue;
- }
- if ("--service".equals(arg) || "-s".equals(arg)) {
+ } else if ("--service".equals(arg) || "-s".equals(arg)) {
serviceName = args[++i];
- continue;
- }
- if ("--jmx".equals(arg) || "-j".equals(arg)) {
+ } else if ("--jmx".equals(arg) || "-j".equals(arg)) {
jmxServerURL = args[++i];
- continue;
- }
- if ("--operation".equals(arg) || "-o".equals(arg)) {
+ } else if ("--operation".equals(arg) || "-o".equals(arg)) {
operationName = args[++i];
// it is the key option
result = true;
- continue;
}
}
} catch (Exception ex) {
- // can't paraser the argument rightly
+ // can't parse the argument rightly
return false;
}
return result;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
index 87f573a..0f1f058 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
@@ -32,7 +32,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
/**
* Determines if two HTTPClientPolicy objects are equal. REVISIT: Check if
* this can be replaced by a generated equals method.
- *
+ *
* @param p1 one client policy
* @param p2 another client policy
* @return true iff the two policies are equal
@@ -64,7 +64,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
}
result &= StringUtils.equals(p1.getProxyServer(), p2.getProxyServer())
- && (p1.isSetProxyServerPort() ? p1.getProxyServerPort() == p2.getProxyServerPort() : !p2
+ && (p1.isSetProxyServerPort() ? p1.getProxyServerPort().equals(p2.getProxyServerPort()) : !p2
.isSetProxyServerPort())
&& p1.getProxyServerType().value().equals(p2.getProxyServerType().value())
&& (p1.getConnectionRequestTimeout() == p2.getConnectionRequestTimeout())
@@ -77,7 +77,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
/**
* Returns a new HTTPClientPolicy that is compatible with the two specified
* policies or null if no compatible policy can be determined.
- *
+ *
* @param p1 one policy
* @param p2 another policy
* @return the compatible policy
@@ -158,7 +158,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
/**
* Checks if two HTTPClientPolicy objects are compatible.
- *
+ *
* @param p1 one client policy
* @param p2 another client policy
* @return true iff policies are compatible
@@ -222,7 +222,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
if (compatible) {
compatible &= !p1.isSetProxyServerPort() || !p2.isSetProxyServerPort()
- || p1.getProxyServerPort() == p2.getProxyServerPort();
+ || p1.getProxyServerPort().equals(p2.getProxyServerPort());
}
if (compatible) {
@@ -235,20 +235,20 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
}
if (compatible) {
- compatible &= !p1.isSetAllowChunking()
- || !p2.isSetAllowChunking()
+ compatible &= !p1.isSetAllowChunking()
+ || !p2.isSetAllowChunking()
|| p1.isAllowChunking() == p2.isAllowChunking();
}
if (compatible) {
- compatible &= !p1.isSetAutoRedirect()
- || !p2.isSetAutoRedirect()
+ compatible &= !p1.isSetAutoRedirect()
+ || !p2.isSetAutoRedirect()
|| p1.isAutoRedirect() == p2.isAutoRedirect();
}
return compatible;
}
-
+
public boolean isAsserted(Message message, HTTPClientPolicy policy, HTTPClientPolicy refPolicy) {
boolean outbound = MessageUtils.isOutbound(message);
boolean compatible = compatible(policy, refPolicy);
@@ -262,7 +262,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
public QName getDataClassName() {
return new ObjectFactory().createClient(null).getName();
}
-
+
public static String toString(HTTPClientPolicy p) {
StringBuilder buf = new StringBuilder(64);
buf.append(p);
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/TokenInputStream.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/TokenInputStream.java
index d15f30b..eaa4fd9 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/TokenInputStream.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/TokenInputStream.java
@@ -80,7 +80,7 @@ public class TokenInputStream {
if (position < 0) {
return tokens[0];
}
- if (position > tokens.length) {
+ if (position >= tokens.length) {
return tokens[tokens.length - 1];
}
return tokens[position];
[cxf] 01/02: Updating Jackson
Posted by co...@apache.org.
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
commit 4699995c6ef392a98615382a5824dda0d1bbe9bf
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 21 12:39:42 2020 +0000
Updating Jackson
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 38cee7c..ed1fb13 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -130,8 +130,8 @@
<cxf.httpcomponents.client.version>4.5.11</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.httpcomponents.core.version>4.4.13</cxf.httpcomponents.core.version>
- <cxf.jackson.version>2.10.1</cxf.jackson.version>
- <cxf.jackson.databind.version>2.10.1</cxf.jackson.databind.version>
+ <cxf.jackson.version>2.10.2</cxf.jackson.version>
+ <cxf.jackson.databind.version>2.10.2</cxf.jackson.databind.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.0.0</cxf.jaeger.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>