This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/streamline-config-names in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git
commit 31f02b868890c6d088fdcaa8b22f220c4769f05e Author: Konrad Windszus <[email protected]> AuthorDate: Sun Sep 13 17:41:23 2026 +0200 Remove quotes from OSGi config names This follows the naming from other Sling OSGi config names Add suffix "(Deprecated)" to names of deprecated OSGi service configs --- .../internal/EnvironmentVariablePasswordProviderConfiguration.java | 2 +- .../commons/crypto/internal/FilePasswordProviderConfiguration.java | 2 +- .../commons/crypto/internal/PbeSecretKeyProviderConfiguration.java | 2 +- .../commons/crypto/internal/SecureRandomSaltProviderConfiguration.java | 2 +- .../jasypt/internal/JasyptRandomIvGeneratorRegistrarConfiguration.java | 2 +- .../internal/JasyptRandomSaltGeneratorRegistrarConfiguration.java | 2 +- .../internal/JasyptStandardPbeStringCryptoServiceConfiguration.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProviderConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProviderConfiguration.java index 4d991e2..be2c103 100644 --- a/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProviderConfiguration.java +++ b/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProviderConfiguration.java @@ -22,7 +22,7 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @ObjectClassDefinition( - name = "Apache Sling Commons Crypto “Environment Variable Password Provider”", + name = "Apache Sling Commons Crypto Environment Variable Password Provider", description = "Provides passwords from environment variables" ) @SuppressWarnings("java:S100") diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderConfiguration.java index a9d444c..684ff3c 100644 --- a/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderConfiguration.java +++ b/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderConfiguration.java @@ -22,7 +22,7 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @ObjectClassDefinition( - name = "Apache Sling Commons Crypto “File Password Provider”", + name = "Apache Sling Commons Crypto File Password Provider", description = "Provides passwords from files" ) @SuppressWarnings("java:S100") diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderConfiguration.java index f4ea18f..36cc1bd 100644 --- a/src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderConfiguration.java +++ b/src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderConfiguration.java @@ -22,7 +22,7 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @ObjectClassDefinition( - name = "Apache Sling Commons Crypto “PBE SecretKey Provider”", + name = "Apache Sling Commons Crypto PBE SecretKey Provider", description = "Provides secret keys for password-based encryption (PBE)" ) @SuppressWarnings("java:S100") diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProviderConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProviderConfiguration.java index 6ce1046..7b7ae3d 100644 --- a/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProviderConfiguration.java +++ b/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProviderConfiguration.java @@ -22,7 +22,7 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @ObjectClassDefinition( - name = "Apache Sling Commons Crypto “SecureRandom Salt Provider”", + name = "Apache Sling Commons Crypto SecureRandom Salt Provider", description = "Provides salts created from random bytes" ) @SuppressWarnings("java:S100") diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrarConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrarConfiguration.java index d8b320e..692a924 100644 --- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrarConfiguration.java +++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrarConfiguration.java @@ -23,7 +23,7 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @ObjectClassDefinition( - name = "Apache Sling Commons Crypto “Jasypt Random IV Generator Registrar”", + name = "Apache Sling Commons Crypto Jasypt Random IV Generator Registrar (Deprecated)", description = "Registers a Jasypt RandomIvGenerator as service" ) @SuppressWarnings("java:S100") diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrarConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrarConfiguration.java index 3d956c8..3a92ae8 100644 --- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrarConfiguration.java +++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrarConfiguration.java @@ -23,7 +23,7 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; @ObjectClassDefinition( - name = "Apache Sling Commons Crypto “Jasypt Random Salt Generator Registrar”", + name = "Apache Sling Commons Crypto Jasypt Random Salt Generator Registrar (Deprecated)", description = "Registers a Jasypt RandomSaltGenerator as service" ) @SuppressWarnings("java:S100") diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceConfiguration.java index c6f70c4..3cb409e 100644 --- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceConfiguration.java +++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceConfiguration.java @@ -27,7 +27,7 @@ import static org.jasypt.commons.CommonUtils.STRING_OUTPUT_TYPE_HEXADECIMAL; import static org.jasypt.encryption.pbe.StandardPBEByteEncryptor.DEFAULT_KEY_OBTENTION_ITERATIONS; @ObjectClassDefinition( - name = "Apache Sling Commons Crypto “Jasypt Standard PBE String Crypto Service”", + name = "Apache Sling Commons Crypto Jasypt Standard PBE String Crypto Service (Deprecated)", description = "Crypto service which uses Jasypt StandardPBEStringEncryptor for encryption and decryption" ) @SuppressWarnings("java:S100")
