You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2021/04/22 20:34:15 UTC
[cxf] branch master updated (dc2b6cc -> b8a2f13)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from dc2b6cc cxf-services-sts-core: fix PMD rule: UnusedAssignment
new 9940b6f fix PMD rule: UnusedAssignment
new e671095 Upgrade to Glassfish JAXB 2.3.4
new b8a2f13 Upgrade to SAAJ Impl 1.5.3
The 3 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:
distribution/src/main/release/samples/pom.xml | 2 +-
.../java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java | 7 +++----
parent/pom.xml | 4 ++--
.../main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java | 3 +--
.../src/main/java/org/apache/cxf/wsn/AbstractSubscription.java | 4 +---
.../src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java | 2 +-
.../src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java | 2 +-
.../org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java | 5 ++---
.../org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java | 5 ++---
.../org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java | 3 +--
10 files changed, 15 insertions(+), 22 deletions(-)
[cxf] 02/03: Upgrade to Glassfish JAXB 2.3.4
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e671095fbb2576e6e5a01d860951c3aa84968c80
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Apr 22 23:32:53 2021 +0300
Upgrade to Glassfish JAXB 2.3.4
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3b05d5f..6a47a15 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -138,7 +138,7 @@
<cxf.javassist.version>3.25.0-GA</cxf.javassist.version>
<cxf.javax.annotation-api.version>1.3.5</cxf.javax.annotation-api.version>
<cxf.javax.ws.rs.version>2.1.6</cxf.javax.ws.rs.version>
- <cxf.jaxb.runtime.version>${cxf.jaxb.version}</cxf.jaxb.runtime.version>
+ <cxf.jaxb.runtime.version>2.3.4</cxf.jaxb.runtime.version>
<cxf.jaxb.version>2.3.3</cxf.jaxb.version>
<cxf.jaxb.xjc.version>${cxf.jaxb.runtime.version}</cxf.jaxb.xjc.version>
<cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version>
[cxf] 01/03: fix PMD rule: UnusedAssignment
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9940b6f38d5380fc150cf6409c99197a595c840a
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Apr 22 23:31:40 2021 +0300
fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java | 7 +++----
.../main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java | 3 +--
.../src/main/java/org/apache/cxf/wsn/AbstractSubscription.java | 4 +---
.../src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java | 2 +-
.../src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java | 2 +-
.../org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java | 5 ++---
.../org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java | 5 ++---
.../org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java | 3 +--
8 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
index 5f8d78e..cd7e16c 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
@@ -112,10 +112,9 @@ public class ListEndpointsCommand extends CXFController implements Action {
private String toFullAddress(String address) throws IOException, InvalidSyntaxException {
ConfigurationAdmin configAdmin = getConfigAdmin();
if (address.startsWith("/") && configAdmin != null) {
- String httpPort = null;
- String cxfContext = null;
- httpPort = extractConfigProperty(configAdmin, "org.ops4j.pax.web", "org.osgi.service.http.port");
- cxfContext = extractConfigProperty(configAdmin, "org.apache.cxf.osgi", "org.apache.cxf.servlet.context");
+ String httpPort = extractConfigProperty(configAdmin, "org.ops4j.pax.web", "org.osgi.service.http.port");
+ String cxfContext =
+ extractConfigProperty(configAdmin, "org.apache.cxf.osgi", "org.apache.cxf.servlet.context");
if (StringUtils.isEmpty(cxfContext)) {
cxfContext = getCXFOSGiServletContext();
}
diff --git a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
index 4cfb292..da5b8ff 100644
--- a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
+++ b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
@@ -214,8 +214,7 @@ public class WSDiscoveryClient implements Closeable {
if (StringUtils.isEmpty(uri.getHost())) {
adHoc = true;
} else {
- InetSocketAddress isa = null;
- isa = new InetSocketAddress(uri.getHost(), uri.getPort());
+ InetSocketAddress isa = new InetSocketAddress(uri.getHost(), uri.getPort());
if (isa.getAddress().isMulticastAddress()) {
adHoc = true;
}
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
index f8af823..2984f03 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
@@ -375,10 +375,8 @@ public abstract class AbstractSubscription extends AbstractEndpoint implements P
// Check policy
if (subscribeRequest.getSubscriptionPolicy() != null) {
for (Object p : subscribeRequest.getSubscriptionPolicy().getAny()) {
- JAXBElement<?> e = null;
if (p instanceof JAXBElement) {
- e = (JAXBElement<?>) p;
- p = e.getValue();
+ p = ((JAXBElement<?>) p).getValue();
}
if (p instanceof UseRaw) {
useRaw = true;
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java
index a915d12..e6af9a0 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsCreatePullPoint.java
@@ -58,7 +58,7 @@ public class JmsCreatePullPoint extends AbstractCreatePullPoint {
@Override
protected String createPullPointName(CreatePullPoint createPullPointRequest) {
- String name = null;
+ String name;
if (createPullPointRequest.getOtherAttributes().get(
NotificationBroker.QNAME_PULLPOINT_QUEUE_NAME) != null) {
//try use the sepcified pullpoint queue instead a generated one
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
index 9e3420c..29a6e9c 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
@@ -137,7 +137,7 @@ public class JmsPullPoint extends AbstractPullPoint {
initSession();
List<NotificationMessageHolderType> messages = new ArrayList<>();
for (int i = 0; i < max; i++) {
- Message msg = null;
+ final Message msg;
synchronized (consumerSession) {
msg = consumer.receiveNoWait();
}
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
index 0ce93c9..bf29e69 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
@@ -186,9 +186,8 @@ public class XkmsCryptoProvider extends CryptoBase {
} else if (type == TYPE.ENDPOINT) {
return getX509FromXKMSByEndpoint(cryptoType.getEndpoint());
} else if (type == TYPE.ALIAS) {
- Applications appId = null;
- boolean isServiceName = isServiceName(cryptoType);
- if (!isServiceName) {
+ final Applications appId;
+ if (!isServiceName(cryptoType)) {
appId = Applications.PKIX;
} else {
appId = Applications.SERVICE_NAME;
diff --git a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java
index 5a1d569..f1c9bb1 100644
--- a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java
+++ b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java
@@ -133,17 +133,16 @@ public class FileCertificateRepo implements CertificateRepo {
public String getCertPath(X509Certificate cert, UseKeyWithType id)
throws URISyntaxException {
Applications application = null;
- String path = null;
if (id != null) {
application = Applications.fromUri(id.getApplication());
}
+ final String path;
if (application == Applications.SERVICE_ENDPOINT) {
path = id.getIdentifier();
} else {
path = cert.getSubjectDN().getName();
}
- path = convertIdForFileSystem(path) + ".cer";
- return path;
+ return convertIdForFileSystem(path) + ".cer";
}
private File[] getX509Files() {
diff --git a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java
index 2445ba8..a588e5c 100644
--- a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java
+++ b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java
@@ -64,7 +64,6 @@ public class LdapCertificateRepo implements CertificateRepo {
*/
public LdapCertificateRepo(LdapSearch ldapSearch, LdapSchemaConfig ldapConfig, String rootDN) {
this.ldapSearch = ldapSearch;
- this.ldapSearch = ldapSearch;
this.ldapConfig = ldapConfig;
this.rootDN = rootDN;
try {
@@ -278,7 +277,7 @@ public class LdapCertificateRepo implements CertificateRepo {
@Override
public void saveCertificate(X509Certificate cert, UseKeyWithType key) {
Applications application = Applications.fromUri(key.getApplication());
- String dn = null;
+ final String dn;
Map<String, String> attrs = new HashMap<>();
if (application == Applications.PKIX) {
dn = key.getIdentifier() + "," + rootDN;
[cxf] 03/03: Upgrade to SAAJ Impl 1.5.3
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b8a2f139f8a4f80a90ef49c2a0757395cb303be6
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Apr 22 23:33:31 2021 +0300
Upgrade to SAAJ Impl 1.5.3
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 296d8c4..1936866 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -280,7 +280,7 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.5.2</version>
+ <version>1.5.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a47a15..94904d5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -187,7 +187,7 @@
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
<cxf.rxjava2.version>2.2.21</cxf.rxjava2.version>
<cxf.rxjava3.version>3.0.12</cxf.rxjava3.version>
- <cxf.saaj-impl.version>1.5.2</cxf.saaj-impl.version>
+ <cxf.saaj-impl.version>1.5.3</cxf.saaj-impl.version>
<cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>4.0.4</cxf.servlet-api.version>