(camel) branch main updated: (chores): fix SonarCloud S1845 naming convention issues in salesforce and crypto-pgp (#24860)

[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 73fe3089db15 (chores): fix SonarCloud S1845 naming convention issues 
in salesforce and crypto-pgp (#24860)
73fe3089db15 is described below

commit 73fe3089db15df5c093e6764cd38c07ebb3575a0
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 17 17:31:02 2026 +0200

    (chores): fix SonarCloud S1845 naming convention issues in salesforce and 
crypto-pgp (#24860)
    
    (chores): fix SonarCloud S1845 naming conflicts batch 2
    
    Rename conflicting identifiers to fix SonarCloud S1845 (names differing 
only by case):
    - PubSubApiProcessor: remove instance LOG field (parent class log field via 
LoggerFactory suffices)
    - PGPDataFormatUtil: remove deprecated findPrivateKeyWithkeyId wrapper (all 
callers use correctly-cased findPrivateKeyWithKeyId)
    
    Co-Authored-By: Claude Opus 4.6 <nore...@anthropic.com>
---
 .../apache/camel/converter/crypto/PGPDataFormatUtil.java    | 13 -------------
 .../salesforce/internal/processor/PubSubApiProcessor.java   |  5 +----
 2 files changed, 1 insertion(+), 17 deletions(-)

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 5dc8b6c4b467..b23a08eef00d 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
@@ -102,19 +102,6 @@ public final class PGPDataFormatUtil {
         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)
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 0456cb9bd2c4..1cbc4d468028 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
@@ -28,12 +28,9 @@ import 
org.apache.camel.component.salesforce.api.dto.pubsub.PublishResult;
 import org.apache.camel.component.salesforce.internal.OperationName;
 import org.apache.camel.component.salesforce.internal.client.PubSubApiClient;
 import org.apache.camel.support.service.ServiceHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class PubSubApiProcessor extends AbstractSalesforceProcessor {
 
-    private static final Logger LOG = 
LoggerFactory.getLogger(PubSubApiProcessor.class);
     private final String topic;
     private PubSubApiClient pubSubClient;
 
@@ -67,7 +64,7 @@ public class PubSubApiProcessor extends 
AbstractSalesforceProcessor {
 
     private void processPublish(Exchange exchange, AsyncCallback callback) 
throws SalesforceException {
         try {
-            LOG.debug("Publishing on topic: {}", topic);
+            log.debug("Publishing on topic: {}", topic);
             final List<?> body = exchange.getIn().getMandatoryBody(List.class);
             final List<PublishResult> results = 
pubSubClient.publishMessage(topic, body);
             exchange.getIn().setBody(results);