(camel) branch main updated: (chores): fix SonarCloud S1845 naming case issues (#24853)

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new ecbcbb004d1b (chores): fix SonarCloud S1845 naming case issues (#24853)
ecbcbb004d1b is described below

commit ecbcbb004d1ba646be11d6b391df44d41c295b3c
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 17 16:38:51 2026 +0200

    (chores): fix SonarCloud S1845 naming case issues (#24853)
    
    (chores): fix SonarCloud S1845 naming convention issues
    
    Rename fields and local variables to avoid matching their parent class 
names,
    fixing SonarCloud BLOCKER rule S1845 in 2 core modules:
    
    - camel-core-model: renamed fields/vars to avoid class name collision
    - camel-support: renamed local variable to avoid class name collision
    
    Co-Authored-By: Claude Opus 4.6 <nore...@anthropic.com>
---
 .../converter/crypto/DefaultPGPSecretKeyAccessor.java     |  2 +-
 .../apache/camel/converter/crypto/PGPDataFormatUtil.java  | 15 ++++++++++++++-
 .../salesforce/internal/processor/PubSubApiProcessor.java |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
 
b/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
index ad7e84b500aa..4ffcd6a57be5 100644
--- 
a/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
+++ 
b/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
@@ -91,7 +91,7 @@ public class DefaultPGPSecretKeyAccessor implements 
PGPSecretKeyAccessor {
         Long keyIdLong = Long.valueOf(keyId);
         PGPPrivateKey result = keyId2PrivateKey.get(keyIdLong);
         if (result == null) {
-            result = PGPDataFormatUtil.findPrivateKeyWithkeyId(keyId, 
password, null, provider, pgpSecretKeyring);
+            result = PGPDataFormatUtil.findPrivateKeyWithKeyId(keyId, 
password, null, provider, pgpSecretKeyring);
             if (result != null) {
                 keyId2PrivateKey.put(keyIdLong, result);
             }
diff --git 
a/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
 
b/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
index 5679c6276766..5dc8b6c4b467 100644
--- 
a/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
+++ 
b/components/camel-crypto-pgp/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
@@ -99,13 +99,26 @@ public final class PGPDataFormatUtil {
         PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(
                 PGPUtil.getDecoderStream(keyringInput),
                 new BcKeyFingerprintCalculator());
-        return findPrivateKeyWithkeyId(keyid, passphrase, passphraseAccessor, 
provider, pgpSec);
+        return findPrivateKeyWithKeyId(keyid, passphrase, passphraseAccessor, 
provider, pgpSec);
     }
 
+    /**
+     * @deprecated Use
+     *             {@link #findPrivateKeyWithKeyId(long, String, 
PGPPassphraseAccessor, String, PGPSecretKeyRingCollection)}
+     *             instead (note the uppercase 'K' in 'KeyId').
+     */
+    @Deprecated(since = "4.22")
     public static PGPPrivateKey findPrivateKeyWithkeyId(
             long keyid, String passphrase, PGPPassphraseAccessor 
passphraseAccessor,
             String provider, PGPSecretKeyRingCollection pgpSec)
             throws PGPException {
+        return findPrivateKeyWithKeyId(keyid, passphrase, passphraseAccessor, 
provider, pgpSec);
+    }
+
+    public static PGPPrivateKey findPrivateKeyWithKeyId(
+            long keyid, String passphrase, PGPPassphraseAccessor 
passphraseAccessor,
+            String provider, PGPSecretKeyRingCollection pgpSec)
+            throws PGPException {
         for (Iterator<?> i = pgpSec.getKeyRings(); i.hasNext();) {
             Object data = i.next();
             if (data instanceof PGPSecretKeyRing) {
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/PubSubApiProcessor.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/PubSubApiProcessor.java
index d55bdbda07ba..0456cb9bd2c4 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/PubSubApiProcessor.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/PubSubApiProcessor.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 
 public class PubSubApiProcessor extends AbstractSalesforceProcessor {
 
-    private final Logger LOG = LoggerFactory.getLogger(getClass());
+    private static final Logger LOG = 
LoggerFactory.getLogger(PubSubApiProcessor.class);
     private final String topic;
     private PubSubApiClient pubSubClient;