This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new dc43675d69 Add sonar.cpd.exclusions for by-design annotation families;
SonarCloud fixes (Utils::cns method refs, ResponseBeanMeta null-guards,
OidcRelyingParty issuer rename).
dc43675d69 is described below
commit dc43675d69d905600e2eb490be8edbe38a25ee46
Author: James Bognar <[email protected]>
AuthorDate: Thu Jun 11 19:48:45 2026 -0400
Add sonar.cpd.exclusions for by-design annotation families; SonarCloud
fixes (Utils::cns method refs, ResponseBeanMeta null-guards, OidcRelyingParty
issuer rename).
---
.../org/apache/juneau/commons/inject/BeanInstantiator_Test.java | 5 +++--
.../java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java | 8 ++++----
.../apache/juneau/rest/server/auth/oidc/rp/OidcRelyingParty.java | 4 ++--
pom.xml | 2 ++
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java
index 19174a7cf8..4171978e0c 100644
---
a/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java
+++
b/juneau-core/juneau-commons/src/test/java/org/apache/juneau/commons/inject/BeanInstantiator_Test.java
@@ -29,6 +29,7 @@ import org.apache.juneau.commons.*;
import org.apache.juneau.commons.lang.*;
import org.apache.juneau.commons.logging.Logger;
import org.apache.juneau.commons.reflect.*;
+import org.apache.juneau.commons.utils.Utils;
import org.junit.jupiter.api.*;
import org.apache.juneau.commons.TestBase;
@@ -2412,7 +2413,7 @@ class BeanInstantiator_Test extends TestBase {
// Test Optional-like methods inherited from
NullableSupplier
assertTrue(supplier.isPresent());
- var mapped = supplier.map(b -> cns(b));
+ var mapped = supplier.map(Utils::cns);
assertEquals("SimpleBean", mapped.orElse(null));
}
}
@@ -3270,7 +3271,7 @@ class BeanInstantiator_Test extends TestBase {
void m15_asOptionalMap() {
var result = bc(SimpleBean.class)
.asOptional()
- .map(bean -> cns(bean));
+ .map(Utils::cns);
assertEquals("SimpleBean", result.get());
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index 541d56db3b..5633e48b87 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -196,15 +196,15 @@ public class ResponseBeanMeta {
statusMethod = b.statusMethod == null ? null :
b.statusMethod.build(opte(), opte());
var cMethod = contentMethod;
- if (nn(cMethod)) {
+ if (cMethod != null) {
var getter = cMethod.getGetter();
- if (nn(getter))
+ if (getter != null)
properties2.put(getter.getName(), cMethod);
}
var sMethod = statusMethod;
- if (nn(sMethod)) {
+ if (sMethod != null) {
var getter = sMethod.getGetter();
- if (nn(getter))
+ if (getter != null)
properties2.put(getter.getName(), sMethod);
}
diff --git
a/juneau-rest/juneau-rest-server-auth-oidc-rp/src/main/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingParty.java
b/juneau-rest/juneau-rest-server-auth-oidc-rp/src/main/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingParty.java
index 337018655b..28656db932 100644
---
a/juneau-rest/juneau-rest-server-auth-oidc-rp/src/main/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingParty.java
+++
b/juneau-rest/juneau-rest-server-auth-oidc-rp/src/main/java/org/apache/juneau/rest/server/auth/oidc/rp/OidcRelyingParty.java
@@ -943,11 +943,11 @@ public class OidcRelyingParty {
? new
LinkedHashSet<>(Arrays.asList(idTokenAlgorithms))
: new
LinkedHashSet<>(Arrays.asList(JWSAlgorithm.RS256, JWSAlgorithm.ES256));
var keySelector = new
JWSVerificationKeySelector<SecurityContext>(algs, jwkSource());
- var issuer = new Issuer(metadata().issuer().toString());
+ var expectedIssuer = new
Issuer(metadata().issuer().toString());
var processor = new
DefaultJWTProcessor<SecurityContext>();
processor.setJWSTypeVerifier(new
DefaultJOSEObjectTypeVerifier<>(LogoutTokenValidator.TYPE, JOSEObjectType.JWT,
null));
processor.setJWSKeySelector(keySelector);
- processor.setJWTClaimsSetVerifier(new
ClockAwareLogoutTokenClaimsVerifier(issuer, new ClientID(clientId), clock));
+ processor.setJWTClaimsSetVerifier(new
ClockAwareLogoutTokenClaimsVerifier(expectedIssuer, new ClientID(clientId),
clock));
logoutTokenProcessorCache = processor;
return logoutTokenProcessorCache;
}
diff --git a/pom.xml b/pom.xml
index fa7041ac80..a8114e8822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,8 @@
<!-- Aggregate report (cross-module integration-test coverage)
via reactor-root path, per-module report via basedir fallback. -->
<sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/juneau-integration-tests/target/site/jacoco-aggregate/jacoco.xml,${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<sonar.exclusions>**/target/**,**/doc/**,**/examples/**,**/src/main/resources/**,**/src/test/resources/**,**/generated/**,**/build/**</sonar.exclusions>
+ <!-- Exclude by-design parallel annotation families from
copy-paste detection: one @RestX annotation + companion *Annotation impl per
HTTP verb / lifecycle hook, near-verbatim clones by design (not debt). Unique
classes (RestContext/RestRequest/RestResponse/RestSession/...) keep full CPD
coverage. -->
+
<sonar.cpd.exclusions>**/rest/server/Rest*Annotation.java,**/rest/server/RestOp.java,**/rest/server/RestGet.java,**/rest/server/RestPut.java,**/rest/server/RestPost.java,**/rest/server/RestDelete.java,**/rest/server/RestPatch.java,**/rest/server/RestOptions.java,**/rest/server/RestPreCall.java,**/rest/server/RestPostCall.java,**/rest/server/RestStartCall.java,**/rest/server/RestEndCall.java,**/rest/server/RestInit.java,**/rest/server/RestDestroy.java,**/rest/server/RestPostInit.java</s
[...]
<sonar.coverage.exclusions>**/juneau-examples/**,**/juneau-petstore/**,**/*-microservice/**,**/juneau-sc-server/**,**/juneau-core/juneau-test-utils/**</sonar.coverage.exclusions>
<jena.version>5.6.0</jena.version>
</properties>
