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/03 17:38:30 UTC
[cxf] branch 3.3.x-fixes updated (3306b06 -> 3e874be)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 3306b06 Recording .gitmergeinfo Changes
new 2dd40f3 Update Bouncycastle version
new 8cb13aa improved test assertions
new 5b8d565 CXF-8185 Generated Ephemeral Public Key missing in JWE Headers when Json Serialization is used (#617)
new c616e1c Some javadoc fixes
new e78553f CXF-8185 - Tidy up
new 3e874be Recording .gitmergeinfo Changes
The 6 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:
.gitmergeinfo | 6 ++++
.../cxf/attachment/AttachmentDeserializer.java | 19 +++++-----
parent/pom.xml | 4 +--
.../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 21 ++++++-----
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 41 +++++++++++-----------
.../security/jose/jwe/AbstractJweEncryption.java | 4 +--
.../cxf/rs/security/jose/jwe/JweJsonProducer.java | 20 +++++++++--
.../rs/security/jose/jwe/JweJsonProducerTest.java | 5 +--
.../apache/cxf/transport/servlet/CXFServlet.java | 12 +++----
.../apache/cxf/transport/jms/JMSConfiguration.java | 10 +++---
.../apache/cxf/transport/jms/uri/JMSEndpoint.java | 11 +++---
.../org/apache/cxf/transport/jms/util/JMSUtil.java | 6 ++--
.../systest/jaxrs/JAXRSRequestDispatcherTest.java | 9 +++--
.../internal/SpringServiceBuilderFactory.java | 6 ++--
14 files changed, 100 insertions(+), 74 deletions(-)
[cxf] 02/06: improved test assertions
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8cb13aa10a2f6426548cb942c893d00fba8cb606
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Thu Jan 2 09:06:16 2020 +0100
improved test assertions
(cherry picked from commit 325ed0436bc9cfa9150b3504a54b5911b47e3266)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 391eca5..b448b2f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,7 +147,7 @@
<cxf.jettison.version>1.4.0</cxf.jettison.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
- <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version><!-- 9.4.25 will break JAXRSRequestDispatcherTest.testGetBookHTMLInclude -->
<cxf.jexl.version>2.1.1</cxf.jexl.version>
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.johnzon.version>1.1.13</cxf.johnzon.version>
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
index d2f5c2c..ce005aa 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.systest.jaxrs;
import java.util.HashMap;
import java.util.Map;
+import javax.ws.rs.core.MediaType;
+
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.xml.XMLSource;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -31,6 +33,7 @@ import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class JAXRSRequestDispatcherTest extends AbstractBusClientServerTestBase {
@@ -65,8 +68,10 @@ public class JAXRSRequestDispatcherTest extends AbstractBusClientServerTestBase
namespaces.put("books", "http://www.w3.org/books");
String value = source.getValue("xhtml:html/xhtml:body/xhtml:ul/books:bookTag", namespaces);
assertEquals("CXF Rocks", value);
- String ct = client.getResponse().getMetadata().getFirst("Content-Type").toString();
- assertEquals("text/html", ct);
+ Object contentType = client.getResponse().getMetadata().getFirst("Content-Type");
+ assertNotNull("Content-Type should be present", contentType);
+ assertEquals("text/html", contentType.toString());
+ assertEquals(MediaType.TEXT_HTML_TYPE, client.getResponse().getMediaType());
}
@Test
[cxf] 03/06: CXF-8185 Generated Ephemeral Public Key missing in JWE
Headers when Json Serialization is used (#617)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5b8d565e424db6413d2e6ab92d2d59a63ba6bc92
Author: frelibert <fr...@yahoo.com>
AuthorDate: Fri Jan 3 16:50:56 2020 +0100
CXF-8185 Generated Ephemeral Public Key missing in JWE Headers when Json Serialization is used (#617)
(cherry picked from commit c32c69a522ef1c5d5f2845b079a6b754025be846)
---
.../rs/security/jose/jwe/AbstractJweEncryption.java | 4 ++--
.../cxf/rs/security/jose/jwe/JweJsonProducer.java | 20 ++++++++++++++++++--
.../rs/security/jose/jwe/JweJsonProducerTest.java | 5 +++--
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index a1b226e..0089224 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -198,7 +198,8 @@ public abstract class AbstractJweEncryption implements JweEncryptionProvider {
JweEncryptionInternal state = new JweEncryptionInternal();
state.jweContentEncryptionKey = getEncryptedContentEncryptionKey(theHeaders, theCek);
-
+ state.theHeaders = theHeaders;
+
if (jweInput.isContentEncryptionRequired()) {
String contentEncryptionAlgoJavaName = getContentEncryptionAlgoJava();
KeyProperties keyProps = new KeyProperties(contentEncryptionAlgoJavaName);
@@ -216,7 +217,6 @@ public abstract class AbstractJweEncryption implements JweEncryptionProvider {
state.keyProps = keyProps;
state.theIv = theIv;
- state.theHeaders = theHeaders;
state.protectedHeadersJson = protectedHeadersJson;
state.aad = jweInput.getAad();
state.secretKey = theCek;
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
index 6bb5fe7..f3dde4e 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
@@ -128,6 +128,22 @@ public class JweJsonProducer {
input.setContentEncryptionRequired(false);
}
JweEncryptionOutput state = encryptor.getEncryptionOutput(input);
+
+ if (state.getHeaders() != null && state.getHeaders().asMap().size() != jsonHeaders.asMap().size()) {
+ // New headers were generated during encryption for recipient
+ Map<String, Object> newHeaders = new LinkedHashMap<String, Object>();
+ state.getHeaders().asMap().forEach((name, value) -> {
+ if (!unionHeaders.containsHeader(name)) {
+ // store recipient header
+ newHeaders.put(name, value);
+ }
+ });
+ Map<String, Object> perRecipientUnprotectedHeaders = (perRecipientUnprotected != null)
+ ? new LinkedHashMap<String, Object>(perRecipientUnprotected.asMap())
+ : new LinkedHashMap<String, Object>();
+ perRecipientUnprotectedHeaders.putAll(newHeaders);
+ perRecipientUnprotected = new JweHeaders(perRecipientUnprotectedHeaders);
+ }
byte[] currentCipherText = state.getEncryptedContent();
byte[] currentAuthTag = state.getAuthTag();
byte[] currentIv = state.getIv();
@@ -152,11 +168,11 @@ public class JweJsonProducer {
entries.add(new JweJsonEncryptionEntry(perRecipientUnprotected, encodedCek));
}
- if (protectedHeader != null) {
+ if (protectedHeader != null && !protectedHeader.asMap().isEmpty()) {
jweJsonMap.put("protected",
Base64UrlUtility.encode(writer.toJson(protectedHeader)));
}
- if (unprotectedHeader != null) {
+ if (unprotectedHeader != null && !unprotectedHeader.asMap().isEmpty()) {
jweJsonMap.put("unprotected", unprotectedHeader);
}
if (entries.size() == 1 && canBeFlat) {
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
index c1a2f35..164dc33 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
@@ -71,7 +71,7 @@ public class JweJsonProducerTest {
+ "\"protected\":\"eyJlbmMiOiJBMTI4R0NNIn0\","
+ "\"recipients\":"
+ "["
- + "{}"
+ + "{\"header\":{\"alg\":\"dir\"}}"
+ "],"
+ "\"iv\":\"48V1_ALb6US04U3b\","
+ "\"ciphertext\":\"KTuJBMk9QG59xPB-c_YLM5-J7VG40_eMPvyHDD7eB-WHj_34YiWgpBOydTBm4RW0zUCJZ09xqorhWJME-DcQ\","
@@ -80,6 +80,7 @@ public class JweJsonProducerTest {
static final String SINGLE_RECIPIENT_DIRECT_FLAT_OUTPUT =
"{"
+ "\"protected\":\"eyJlbmMiOiJBMTI4R0NNIn0\","
+ + "\"header\":{\"alg\":\"dir\"},"
+ "\"iv\":\"48V1_ALb6US04U3b\","
+ "\"ciphertext\":\"KTuJBMk9QG59xPB-c_YLM5-J7VG40_eMPvyHDD7eB-WHj_34YiWgpBOydTBm4RW0zUCJZ09xqorhWJME-DcQ\","
+ "\"tag\":\"Te59ApbK8wNBDY_1_dgYSw\""
@@ -146,7 +147,7 @@ public class JweJsonProducerTest {
+ "\"protected\":\"eyJlbmMiOiJBMTI4Q0JDLUhTMjU2In0\","
+ "\"recipients\":"
+ "["
- + "{}"
+ + "{\"header\":{\"alg\":\"dir\"}}"
+ "],"
+ "\"iv\":\"AxY8DCtDaGlsbGljb3RoZQ\","
+ "\"ciphertext\":\"KDlTtXchhZTGufMYmOYGS4HffxPSUrfmqCHXaI9wOGY\","
[cxf] 01/06: Update Bouncycastle version
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2dd40f3371e8c8ad1058be0f8f261af10f4eaff3
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Wed Jan 1 20:29:08 2020 +0100
Update Bouncycastle version
(cherry picked from commit d3c23afc74d604e17e5a45843fca0ce906b9c214)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4bbb2cc..391eca5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -87,7 +87,7 @@
<cxf.aspectj.version>1.9.1</cxf.aspectj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
- <cxf.bcprov.version>1.62</cxf.bcprov.version>
+ <cxf.bcprov.version>1.64</cxf.bcprov.version>
<cxf.brave.reporter.version>2.10.0</cxf.brave.reporter.version>
<cxf.brave.version>5.6.9</cxf.brave.version>
<cxf.brave.zipkin.version>2.14.2</cxf.brave.zipkin.version>
[cxf] 06/06: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3e874be4b740c575d1ad9ec99a891e8b98769724
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jan 3 16:39:16 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b5b083d..34db7bf 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -16,6 +16,7 @@ B 26212d8581b27825fd9ccaf2894c1ce3c8854743
B 277430f6673140643a5593b979316ff981839b2b
B 2d159906f9b9fd756a4a94053b360552a679cf9d
B 2e7278c35f3fadc94e03dcf8c9b10a5f46053fce
+B 2f47c807b37758e10fb2d6c7746fd3f40451b566
B 324e838b6faf233f9d0c5b2ad618cbe92c39bbcf
B 3886940ff54ca85aa989296b0c11f4941ccc5faa
B 39e26e3b2d3059664cc9aca6c8a4ea7f60bab3f1
@@ -27,6 +28,7 @@ B 411fb51bccd3869a97e9e807f14f50ca6b1f2a10
B 47ac71e69df225baf6dbf2e201810c5b87072af8
B 48706603e30f076362ffd4f87b5d36b6ef83dbf5
B 4b1c1cb13fe6fa05eb27c6ad7a3393d1c3ec1ec1
+B 4c39a21a06edc779a91d5dc86cf85257d7a7d5d4
B 4d46618c17cb5c1386d493c75faf0f89dbece267
B 62e828c7e74d0dd5d4e337a090344a13501d8aeb
B 64915c3d36d6ef2bef8168e912a9b8977b5b2330
@@ -60,17 +62,21 @@ B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
B de03dfae71010bd3719430d8d7453732f4c151ea
B de393404c3c2e6b0f2d93f11f5fef0c53385d57d
B e6d432be93022b5b4ac1998a546d0652861fdff3
+B ef7f9b1d16ec71ea1186701e20818607ce7d2bba
B f0ad8c3079c37c7f1b9eaf0be0ee42ff5ddf5325
B f54062eb331fcf35d9f3a840f532417fccbb2673
B f9f5d45bbe302697224128d78e8b698928a7514d
+B fab7fc9e2dfbe32cc9988b16f2aa03e4bfff28e3
M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
M 160f50ed9bd9391b61417716b3a67653c9e81a98
M 2275d49772676ac72bc14ebbc3173719cd72e635
+M 325ed0436bc9cfa9150b3504a54b5911b47e3266
M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
M 55abc6f8416fd81f26627fa42a37f903f9ef7965
M 589e321622b72ae57fab910d76b3e4fb0c160979
M 59ba4821c92146723df063f9eb6e1c3ae0be5834
M 5aa0660a9fe324e5c8f36e47e270971d0e85b6f8
+M 61aeaff2d747379c64cdad40f82cf51e3bfaecf6
M 6b7e50b87d74dc6b7d1e830b373c7e30c04e14a2
M 7b50181ebc445bb84d3463b284643432399bc0f8
M 7ef814556d727c147d6f625cbb1170edfd24a752
[cxf] 05/06: CXF-8185 - Tidy up
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e78553f7e32c36f9ec3c489b71ac1291139bb07e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jan 3 15:52:26 2020 +0000
CXF-8185 - Tidy up
(cherry picked from commit cac05c69de21d6c46668442d52c0d7096eab129f)
---
.../java/org/apache/cxf/attachment/AttachmentDeserializer.java | 3 ++-
.../org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 97a6e86..d3f9895 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -269,7 +269,8 @@ public class AttachmentDeserializer {
* @param boundary
* @throws IOException
*/
- private static boolean readTillFirstBoundary(PushbackInputStream pushbackInStream, byte[] boundary) throws IOException {
+ private static boolean readTillFirstBoundary(PushbackInputStream pushbackInStream,
+ byte[] boundary) throws IOException {
// work around a bug in PushBackInputStream where the buffer isn't
// initialized
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
index f3dde4e..0bae587 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
@@ -128,19 +128,19 @@ public class JweJsonProducer {
input.setContentEncryptionRequired(false);
}
JweEncryptionOutput state = encryptor.getEncryptionOutput(input);
-
+
if (state.getHeaders() != null && state.getHeaders().asMap().size() != jsonHeaders.asMap().size()) {
// New headers were generated during encryption for recipient
- Map<String, Object> newHeaders = new LinkedHashMap<String, Object>();
+ Map<String, Object> newHeaders = new LinkedHashMap<>();
state.getHeaders().asMap().forEach((name, value) -> {
if (!unionHeaders.containsHeader(name)) {
// store recipient header
newHeaders.put(name, value);
}
});
- Map<String, Object> perRecipientUnprotectedHeaders = (perRecipientUnprotected != null)
- ? new LinkedHashMap<String, Object>(perRecipientUnprotected.asMap())
- : new LinkedHashMap<String, Object>();
+ Map<String, Object> perRecipientUnprotectedHeaders = (perRecipientUnprotected != null)
+ ? new LinkedHashMap<>(perRecipientUnprotected.asMap())
+ : new LinkedHashMap<>();
perRecipientUnprotectedHeaders.putAll(newHeaders);
perRecipientUnprotected = new JweHeaders(perRecipientUnprotectedHeaders);
}
[cxf] 04/06: Some javadoc fixes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c616e1cfe0f1f132e1c0edac95d62ba88c27b089
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jan 3 15:36:01 2020 +0000
Some javadoc fixes
(cherry picked from commit 61aeaff2d747379c64cdad40f82cf51e3bfaecf6)
# Conflicts:
# tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
---
.../cxf/attachment/AttachmentDeserializer.java | 18 +++++-----
.../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 21 ++++++-----
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 41 +++++++++++-----------
.../apache/cxf/transport/servlet/CXFServlet.java | 12 +++----
.../apache/cxf/transport/jms/JMSConfiguration.java | 10 +++---
.../apache/cxf/transport/jms/uri/JMSEndpoint.java | 11 +++---
.../org/apache/cxf/transport/jms/util/JMSUtil.java | 6 ++--
.../internal/SpringServiceBuilderFactory.java | 6 ++--
8 files changed, 61 insertions(+), 64 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index aaa299d..97a6e86 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -269,29 +269,29 @@ public class AttachmentDeserializer {
* @param boundary
* @throws IOException
*/
- private static boolean readTillFirstBoundary(PushbackInputStream pbs, byte[] bp) throws IOException {
+ private static boolean readTillFirstBoundary(PushbackInputStream pushbackInStream, byte[] boundary) throws IOException {
// work around a bug in PushBackInputStream where the buffer isn't
// initialized
// and available always returns 0.
- int value = pbs.read();
- pbs.unread(value);
+ int value = pushbackInStream.read();
+ pushbackInStream.unread(value);
while (value != -1) {
- value = pbs.read();
- if ((byte) value == bp[0]) {
+ value = pushbackInStream.read();
+ if ((byte) value == boundary[0]) {
int boundaryIndex = 0;
- while (value != -1 && (boundaryIndex < bp.length) && ((byte) value == bp[boundaryIndex])) {
+ while (value != -1 && (boundaryIndex < boundary.length) && ((byte) value == boundary[boundaryIndex])) {
- value = pbs.read();
+ value = pushbackInStream.read();
if (value == -1) {
throw new IOException("Unexpected End while searching for first Mime Boundary");
}
boundaryIndex++;
}
- if (boundaryIndex == bp.length) {
+ if (boundaryIndex == boundary.length) {
// boundary found, read the newline
if (value == 13) {
- pbs.read();
+ pushbackInStream.read();
}
return true;
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index d95bdbf..8de34fb 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -47,7 +47,7 @@ import org.apache.cxf.jaxrs.utils.JAXRSUtils;
public class UriBuilderImpl extends UriBuilder implements Cloneable {
private static final String EXPAND_QUERY_VALUE_AS_COLLECTION = "expand.query.value.as.collection";
-
+
private String scheme;
private String userInfo;
private int port = -1;
@@ -63,9 +63,9 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
private Map<String, Object> resolvedTemplates;
private Map<String, Object> resolvedTemplatesPathEnc;
private Map<String, Object> resolvedEncodedTemplates;
-
+
private boolean queryValueIsCollection;
-
+
/**
* Creates builder with empty URI.
*/
@@ -846,7 +846,6 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
*
* @param map query or matrix multivalued map
* @param separator params separator, '&' for query ';' for matrix
- * @param fromEncoded if true then values will be decoded
* @return stringified params.
*/
private String buildParams(MultivaluedMap<String, String> map, char separator) {
@@ -854,14 +853,14 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
StringBuilder b = new StringBuilder();
for (Iterator<Map.Entry<String, List<String>>> it = map.entrySet().iterator(); it.hasNext();) {
Map.Entry<String, List<String>> entry = it.next();
-
- // Expand query parameter as "name=v1,v2,v3"
+
+ // Expand query parameter as "name=v1,v2,v3"
if (isQuery && queryValueIsCollection) {
b.append(entry.getKey()).append('=');
-
+
for (Iterator<String> sit = entry.getValue().iterator(); sit.hasNext();) {
String val = sit.next();
-
+
if (val != null) {
boolean templateValue = val.startsWith("{") && val.endsWith("}");
if (!templateValue) {
@@ -872,7 +871,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
} else {
val = URITemplate.createExactTemplate(val).encodeLiteralCharacters(isQuery);
}
-
+
if (!val.isEmpty()) {
b.append(val);
}
@@ -881,12 +880,12 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
b.append(',');
}
}
-
+
if (it.hasNext()) {
b.append(separator);
}
} else {
- // Expand query parameter as "name=v1&name=v2&name=v3", or use dedicated
+ // Expand query parameter as "name=v1&name=v2&name=v3", or use dedicated
// separator for matrix parameters
for (Iterator<String> sit = entry.getValue().iterator(); sit.hasNext();) {
String val = sit.next();
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 7a16df5..9e6154c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -181,12 +181,12 @@ public final class JAXRSUtils {
public static List<PathSegment> getPathSegments(String thePath, boolean decode,
boolean ignoreLastSlash) {
- List<PathSegment> theList =
+ List<PathSegment> theList =
Arrays.asList(thePath.split("/")).stream()
.filter(StringUtils.notEmpty())
.map(p -> new PathSegmentImpl(p, decode))
.collect(Collectors.toList());
-
+
int len = thePath.length();
if (len > 0 && thePath.charAt(len - 1) == '/') {
String value = ignoreLastSlash ? "" : "/";
@@ -401,7 +401,7 @@ public final class JAXRSUtils {
LOG.fine(() -> new org.apache.cxf.common.i18n.Message("START_OPER_MATCH",
BUNDLE,
resource.getServiceClass().getName()).toString());
-
+
for (OperationResourceInfo ori : resource.getMethodDispatcher().getOperationResourceInfos()) {
boolean added = false;
@@ -515,8 +515,8 @@ public final class JAXRSUtils {
}
-
-
+
+
public static Level getExceptionLogLevel(Message message, Class<? extends WebApplicationException> exClass) {
Level logLevel = null;
Object logLevelProp = message.get(exClass.getName() + ".log.level");
@@ -585,7 +585,7 @@ public final class JAXRSUtils {
private static Supplier<String> matchMessageLogSupplier(OperationResourceInfo ori,
String path, String httpMethod, MediaType requestType, List<MediaType> acceptContentTypes,
boolean added) {
- org.apache.cxf.common.i18n.Message errorMsg = added
+ org.apache.cxf.common.i18n.Message errorMsg = added
? new org.apache.cxf.common.i18n.Message("OPER_SELECTED_POSSIBLY",
BUNDLE, ori.getMethodToInvoke().getName())
: new org.apache.cxf.common.i18n.Message("OPER_NO_MATCH",
@@ -649,7 +649,7 @@ public final class JAXRSUtils {
public static List<MediaType> getConsumeTypes(Consumes cm) {
return getConsumeTypes(cm, Collections.singletonList(ALL_TYPES));
}
-
+
public static List<MediaType> getConsumeTypes(Consumes cm, List<MediaType> defaultTypes) {
return cm == null ? defaultTypes
: getMediaTypes(cm.value());
@@ -658,7 +658,7 @@ public final class JAXRSUtils {
public static List<MediaType> getProduceTypes(Produces pm) {
return getProduceTypes(pm, Collections.singletonList(ALL_TYPES));
}
-
+
public static List<MediaType> getProduceTypes(Produces pm, List<MediaType> defaultTypes) {
return pm == null ? defaultTypes
: getMediaTypes(pm.value());
@@ -714,13 +714,13 @@ public final class JAXRSUtils {
}
return size1 == size2 ? 0 : size1 < size2 ? -1 : 1;
}
-
+
public static int compareMethodParameters(Class<?>[] paraList1, Class<?>[] paraList2) {
int size1 = paraList1.length;
int size2 = paraList2.length;
for (int i = 0; i < size1 && i < size2; i++) {
if (!paraList1[i].equals(paraList2[i])) {
- // Handling the case when bridge / synthetic methods may be taken
+ // Handling the case when bridge / synthetic methods may be taken
// into account (f.e. when service implements generic interfaces or
// extends the generic classes).
if (paraList1[i].isAssignableFrom(paraList2[i])) {
@@ -818,7 +818,7 @@ public final class JAXRSUtils {
tuple[i].param = parameterTypes[i];
tuple[i].genericParam = InjectionUtils.processGenericTypeIfNeeded(
ori.getClassResourceInfo().getServiceClass(), tuple[i].param, genericParameterTypes[i]);
- tuple[i].param = InjectionUtils.updateParamClassToTypeIfNeeded(tuple[i].param,
+ tuple[i].param = InjectionUtils.updateParamClassToTypeIfNeeded(tuple[i].param,
tuple[i].genericParam);
tuple[i].paramAnns = anns == null ? EMPTY_ANNOTATIONS : anns[i];
} else {
@@ -827,8 +827,8 @@ public final class JAXRSUtils {
tuple[i].paramAnns = EMPTY_ANNOTATIONS;
}
if (paramsInfo.get(i).getType() == ParameterType.REQUEST_BODY) {
- params[i] = processRequestBodyParameter(tuple[i].param,
- tuple[i].genericParam,
+ params[i] = processRequestBodyParameter(tuple[i].param,
+ tuple[i].genericParam,
tuple[i].paramAnns,
message,
ori);
@@ -1219,7 +1219,7 @@ public final class JAXRSUtils {
return createContextValue(m, genericType, clazz);
}
-
+
//CHECKSTYLE:OFF
private static Object readFromUriParam(Message m,
String parameterName,
@@ -1436,7 +1436,7 @@ public final class JAXRSUtils {
//cache the OutputStream when it's reactive response
entityStream = new CacheAndWriteOutputStream(entityStream);
}
-
+
if (writers.size() > 1) {
WriterInterceptor first = writers.remove(0);
WriterInterceptorContext context = new WriterInterceptorContextImpl(entity,
@@ -1520,8 +1520,9 @@ public final class JAXRSUtils {
/**
* intersect two mime types
*
- * @param mimeTypesA
- * @param mimeTypesB
+ * @param requiredMediaTypes
+ * @param userMediaTypes
+ * @param addRequiredParamsIfPossible
* @return return a list of intersected mime types
*/
public static List<MediaType> intersectMimeTypes(List<MediaType> requiredMediaTypes,
@@ -1573,7 +1574,7 @@ public final class JAXRSUtils {
}
private static String stripDoubleQuotesIfNeeded(String value) {
- if (value != null && value.startsWith("\"")
+ if (value != null && value.startsWith("\"")
&& value.endsWith("\"") && value.length() > 1) {
value = value.substring(1, value.length() - 1);
}
@@ -1789,7 +1790,7 @@ public final class JAXRSUtils {
public static ResponseBuilder fromResponse(Response response) {
return fromResponse(response, true);
}
-
+
public static ResponseBuilder fromResponse(Response response, boolean copyEntity) {
ResponseBuilder rb = toResponseBuilder(response.getStatus());
if (copyEntity) {
@@ -1856,7 +1857,7 @@ public final class JAXRSUtils {
stack.push(new MethodInvocationInfo(ori, realClass, values));
}
- private static void addTemplateVarValues(List<String> values,
+ private static void addTemplateVarValues(List<String> values,
MultivaluedMap<String, String> params,
URITemplate template) {
if (template != null) {
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
index 610fe20..74c950c 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
@@ -88,16 +88,16 @@ public class CXFServlet extends CXFNonSpringServlet
protected void addListener(AbstractApplicationContext wac) {
/**
- * The change in the way application listeners are maintained during the context refresh
+ * The change in the way application listeners are maintained during the context refresh
* since Spring Framework 5.1.5 (https://github.com/spring-projects/spring-framework/issues/22325). The
* CXF adds listener **after** the context has been refreshed, not much control we have over it, but
- * it does matter now: the listeners registered after the context refresh disappear when
+ * it does matter now: the listeners registered after the context refresh disappear when
* context is refreshed. The ugly hack here, to stay in the loop, is to add CXF servlet
* to "earlyApplicationListeners" set, only than it will be kept between refreshes.
*/
try {
final Field f = ReflectionUtils.findField(wac.getClass(), "earlyApplicationListeners");
-
+
if (f != null) {
Collection<Object> c = CastUtils.cast((Collection<?>)ReflectionUtil.setAccessible(f).get(wac));
if (c != null) {
@@ -107,7 +107,7 @@ public class CXFServlet extends CXFNonSpringServlet
} catch (SecurityException | IllegalAccessException e) {
//ignore.
}
-
+
try {
//spring 2 vs spring 3 return type is different
Method m = wac.getClass().getMethod("getApplicationListeners");
@@ -125,8 +125,8 @@ public class CXFServlet extends CXFNonSpringServlet
* If that does not work then the location is given as is to spring
*
* @param ctx
- * @param sc
- * @param configLocation
+ * @param servletConfig
+ * @param location
* @return
*/
private ApplicationContext createSpringContext(ApplicationContext ctx,
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
index 31a53b7..a1034ba 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
@@ -79,7 +79,7 @@ public class JMSConfiguration {
*/
private String replyToDestination;
private volatile Destination replyToDestinationDest;
-
+
private String messageType = JMSConstants.TEXT_MESSAGE_TYPE;
private boolean pubSubDomain;
private boolean replyPubSubDomain;
@@ -380,9 +380,7 @@ public class JMSConfiguration {
/**
* Retrieve connection factory from JNDI
*
- * @param jmsConfig
- * @param jndiConfig
- * @return
+ * @return the connection factory from JNDI
*/
private ConnectionFactory getConnectionFactoryFromJndi() {
if (getJndiEnvironment() == null || getConnectionFactoryName() == null) {
@@ -488,7 +486,7 @@ public class JMSConfiguration {
? session.createTemporaryQueue()
: destinationResolver.resolveDestinationName(session, replyDestination, replyPubSubDomain);
}
-
+
public void resetCachedReplyDestination() {
synchronized (this) {
this.replyDestinationDest = null;
@@ -518,7 +516,7 @@ public class JMSConfiguration {
public int getRetryInterval() {
return this.retryInterval;
}
-
+
public void setRetryInterval(int retryInterval) {
this.retryInterval = retryInterval;
}
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index eaf810b..6c55c6e 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -92,8 +92,7 @@ public class JMSEndpoint {
private boolean ignoreTimeoutException;
/**
- * @param uri
- * @param subject
+ * @param endpointUri
*/
public JMSEndpoint(String endpointUri) {
this(null, endpointUri);
@@ -102,6 +101,7 @@ public class JMSEndpoint {
/**
* Get the extensors from the wsdl and/or configuration that will
* then be used to configure the JMSConfiguration object
+ * @param endpointUri
* @param target
*/
public JMSEndpoint(EndpointInfo endpointInfo, EndpointReferenceType target) {
@@ -109,8 +109,8 @@ public class JMSEndpoint {
}
/**
- * @param uri
- * @param subject
+ * @param ei
+ * @param endpointUri
*/
public JMSEndpoint(EndpointInfo ei, String endpointUri) {
this.jmsVariant = JMSEndpoint.QUEUE;
@@ -174,7 +174,6 @@ public class JMSEndpoint {
* depending on the prefix of the key. If it matches JNDI_PARAMETER_NAME_PREFIX it is stored in the
* jndiParameters else in the parameters
*
- * @param endpoint
* @param params
*/
private void configureProperties(Map<String, Object> params) {
@@ -239,7 +238,7 @@ public class JMSEndpoint {
}
/**
- * @param targetserviceParameterName
+ * @param key
* @return
*/
public String getParameter(String key) {
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSUtil.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSUtil.java
index 6f0d97e..9ce6cf1 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSUtil.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSUtil.java
@@ -35,7 +35,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.transport.jms.JMSConstants;
public final class JMSUtil {
-
+
public static final String JMS_MESSAGE_CONSUMER = "jms_message_consumer";
public static final String JMS_IGNORE_TIMEOUT = "jms_ignore_timeout";
private static final char[] CORRELATTION_ID_PADDING = {
@@ -64,7 +64,7 @@ public final class JMSUtil {
throw convertJmsException(e);
}
}
-
+
public static Message receive(Session session,
Destination replyToDestination,
String correlationId,
@@ -112,7 +112,7 @@ public final class JMSUtil {
* @param payload the message payload, expected to be either of type String or byte[] depending on payload
* type
* @param session the JMS session
- * @param replyTo the ReplyTo destination if any
+ * @param messageType the JMS message type
* @return a JMS of the appropriate type populated with the given payload
*/
public static Message createAndSetPayload(Object payload, Session session, String messageType)
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
index 41814a3..6896aa5 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
@@ -64,8 +64,8 @@ public final class SpringServiceBuilderFactory extends ServiceBuilderFactory {
* @param databindingName
* @return
*/
- public static String databindingNameToBeanName(String dbName) {
- return NameUtil.capitalize(dbName.toLowerCase()) + ToolConstants.DATABIND_BEAN_NAME_SUFFIX;
+ public static String databindingNameToBeanName(String databindingName) {
+ return NameUtil.capitalize(databindingName.toLowerCase()) + ToolConstants.DATABIND_BEAN_NAME_SUFFIX;
}
@Override
@@ -110,7 +110,7 @@ public final class SpringServiceBuilderFactory extends ServiceBuilderFactory {
/**
* This is factored out to permit use in a unit test.
*
- * @param bus
+ * @param additionalFilePathnames
* @return
*/
public static ApplicationContext getApplicationContext(List<String> additionalFilePathnames) {