Merge pull request #9374 from rsvoboda/SmallRye.name.fix

Rename Smallrye to SmallRye

Author: gsmet

.dependabot/config.yml

@@ -87,7 +87,7 @@ update_configs:
           dependency_name: "org.scala-lang:scala-compiler"
       - match:
           dependency_name: "net.alchim31.maven:scala-maven-plugin"
-      # Smallrye
+      # SmallRye
       - match:
           dependency_name: "io.smallrye:smallrye-jwt"
       - match:

docs/src/main/asciidoc/microprofile-fault-tolerance.adoc

@@ -56,7 +56,7 @@ cd microprofile-fault-tolerance-quickstart
 ----
 
 This command generates a Maven structure, importing the extensions for RESTEasy/JAX-RS
-and Smallrye Fault Tolerance, which is an implementation of the MicroProfile Fault Tolerance spec that Quarkus uses.
+and SmallRye Fault Tolerance, which is an implementation of the MicroProfile Fault Tolerance spec that Quarkus uses.
 
 == Preparing an Application: REST Endpoint and CDI Bean
 

docs/src/main/asciidoc/security-jwt.adoc

@@ -6,7 +6,7 @@ https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
 = Quarkus - Using JWT RBAC
 
 include::./attributes.adoc[]
-:extension-name: Smallrye JWT
+:extension-name: SmallRye JWT
 :mp-jwt: MicroProfile JWT RBAC
 
 This guide explains how your Quarkus application can utilize MicroProfile Json Web Token (link:https://jwt.io/[JWT]) 
@@ -298,7 +298,7 @@ nQIDAQAB
 
 === Generating a JWT
 
-Often one obtains a JWT from an identity manager like https://www.keycloak.org/[Keycloak], but for this quickstart we will generate our own using the JWT generation API provided by `smallrye-jwt` (see <<generate-jwt-tokens, Generate JWT tokens with Smallrye JWT>> for more infomation) and the TokenUtils class shown in the following listing. Take this source and place it into `security-jwt-quickstart/src/test/java/org/acme/security/jwt/TokenUtils.java`.
+Often one obtains a JWT from an identity manager like https://www.keycloak.org/[Keycloak], but for this quickstart we will generate our own using the JWT generation API provided by `smallrye-jwt` (see <<generate-jwt-tokens, Generate JWT tokens with SmallRye JWT>> for more infomation) and the TokenUtils class shown in the following listing. Take this source and place it into `security-jwt-quickstart/src/test/java/org/acme/security/jwt/TokenUtils.java`.
 
 
 .JWT utility class
@@ -937,9 +937,9 @@ precedence:
  - JSON Web Key (JWK) Base64 URL encoded
  - JSON Web Key Set (JWKS) Base64 URL encoded
 
-=== Additional Smallrye JWT configuration
+=== Additional SmallRye JWT configuration
 
-Smallrye JWT provides more properties which can be used to customize the token processing:
+SmallRye JWT provides more properties which can be used to customize the token processing:
 
 [cols="<m,<m,<2",options="header"]
 |===
@@ -951,7 +951,7 @@ Smallrye JWT provides more properties which can be used to customize the token p
 |smallrye.jwt.token.schemes|`Bearer`|Comma-separated list containing an alternative single or multiple schemes, for example, `DPoP`.
 |smallrye.jwt.token.kid|none|Key identifier. If it is set then the verification JWK key as well every JWT token must have a matching `kid` header.
 |smallrye.jwt.time-to-live|none|The maximum number of seconds that a JWT may be issued for use. Effectively, the difference between the expiration date of the JWT and the issued at date must not exceed this value.
-|smallrye.jwt.require.named-principal|`false`|If an application relies on `java.security.Principal` returning a name then a token must have a `upn` or `preferred_username` or `sub` claim set. Setting this property will result in Smallrye JWT throwing an exception if none of these claims is available for the application code to reliably deal with a non-null `Principal` name.
+|smallrye.jwt.require.named-principal|`false`|If an application relies on `java.security.Principal` returning a name then a token must have a `upn` or `preferred_username` or `sub` claim set. Setting this property will result in SmallRye JWT throwing an exception if none of these claims is available for the application code to reliably deal with a non-null `Principal` name.
 |smallrye.jwt.path.sub|none|Path to the claim containing the subject name. It starts from the top level JSON object and can contain multiple segments where each segment represents a JSON object name only, example: `realms/subject`. This property can be used if a token has no 'sub' claim but has the subject set in a different claim. Use double quotes with the namespace qualified claims.
 |smallrye.jwt.claims.sub|none| This property can be used to set a default sub claim value when the current token has no standard or custom `sub` claim available. Effectively this property can be used to customize `java.security.Principal` name if no `upn` or `preferred_username` or `sub` claim is set.
 |smallrye.jwt.path.groups|none|Path to the claim containing the groups. It starts from the top level JSON object and can contain multiple segments where each segment represents a JSON object name only, example: `realm/groups`. This property can be used if a token has no 'groups' claim but has the groups set in a different claim. Use double quotes with the namespace qualified claims.
@@ -963,7 +963,7 @@ Smallrye JWT provides more properties which can be used to customize the token p
 |===
 
 [[generate-jwt-tokens]]
-== Generate JWT tokens with Smallrye JWT
+== Generate JWT tokens with SmallRye JWT
 
 JWT claims can be signed or encrypted or signed first and the nested JWT token encrypted.
 Signing the claims is used most often to secure the claims. What is known today as a JWT token is typically produced by signing the claims in a JSON format using the steps described in the link:https://tools.ietf.org/html/rfc7515[JSON Web Signature] specification.
@@ -1050,7 +1050,7 @@ String jwt = Jwt.claims("/tokenClaims.json").innerSign().encrypt();
 == References
 
 * link:https://github.com/eclipse/microprofile-jwt-auth/releases/download/1.1.1/microprofile-jwt-auth-spec.html[MP JWT 1.1.1]
-* link:https://github.com/smallrye/smallrye-jwt[Smallrye JWT]
+* link:https://github.com/smallrye/smallrye-jwt[SmallRye JWT]
 * link:https://tools.ietf.org/html/rfc7519[JSON Web Token]
 * link:https://tools.ietf.org/html/rfc7515[JSON Web Signature]
 * link:https://tools.ietf.org/html/rfc7516[JSON Web Encryption]

extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java

@@ -139,7 +139,7 @@ static ResultHandle createConversionToFinalValue(DotName resultTypeDotName,
                 throw new IllegalStateException("Result type " + resultTypeDotName + " is not handled");
             }
         } else if (!resultTypeDotName.equals(typeUsedToLoadValue) && DotNames.STRING.equals(typeUsedToLoadValue)) {
-            // in this case we just need to delegate to SmallryeConfig to convert the value for us
+            // in this case we just need to delegate to SmallRyeConfig to convert the value for us
             ResultHandle smallryeConfig = bytecodeCreator.checkCast(config, SmallRyeConfig.class);
 
             return bytecodeCreator.invokeVirtualMethod(

extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java

@@ -50,7 +50,7 @@
 import io.quarkus.smallrye.faulttolerance.runtime.NoopMetricRegistry;
 import io.quarkus.smallrye.faulttolerance.runtime.QuarkusFallbackHandlerProvider;
 import io.quarkus.smallrye.faulttolerance.runtime.QuarkusFaultToleranceOperationProvider;
-import io.quarkus.smallrye.faulttolerance.runtime.SmallryeFaultToleranceRecorder;
+import io.quarkus.smallrye.faulttolerance.runtime.SmallRyeFaultToleranceRecorder;
 import io.smallrye.faulttolerance.ExecutorFactory;
 import io.smallrye.faulttolerance.ExecutorProvider;
 import io.smallrye.faulttolerance.FaultToleranceBinding;
@@ -188,7 +188,7 @@ public void transform(TransformationContext ctx) {
     @BuildStep
     // needs to be RUNTIME_INIT because we need to read MP Config
     @Record(ExecutionTime.RUNTIME_INIT)
-    void validateFaultToleranceAnnotations(SmallryeFaultToleranceRecorder recorder,
+    void validateFaultToleranceAnnotations(SmallRyeFaultToleranceRecorder recorder,
             ValidationPhaseBuildItem validationPhase,
             BeanArchiveIndexBuildItem beanArchiveIndexBuildItem) {
         AnnotationStore annotationStore = validationPhase.getContext().get(BuildExtension.Key.ANNOTATION_STORE);

extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFaultToleranceOperationProvider.java

@@ -30,7 +30,7 @@ public FaultToleranceOperation apply(CacheKey key) {
     };
 
     /**
-     * Called by SmallryeFaultToleranceRecorder to init the operation cache.
+     * Called by SmallRyeFaultToleranceRecorder to init the operation cache.
      */
     void init(Map<CacheKey, FaultToleranceOperation> operationCache) {
         this.operationCache.putAll(operationCache);

extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/SmallryeFaultToleranceRecorder.java renamed to extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/SmallRyeFaultToleranceRecorder.java

@@ -17,7 +17,7 @@
 import io.smallrye.faulttolerance.config.FaultToleranceOperation;
 
 @Recorder
-public class SmallryeFaultToleranceRecorder {
+public class SmallRyeFaultToleranceRecorder {
 
     public void createFaultToleranceOperation(Set<String> beanNames) {
         List<Throwable> allExceptions = new ArrayList<>();
@@ -27,7 +27,7 @@ public void createFaultToleranceOperation(Set<String> beanNames) {
             try {
                 ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
                 if (classLoader == null) {
-                    classLoader = SmallryeFaultToleranceRecorder.class.getClassLoader();
+                    classLoader = SmallRyeFaultToleranceRecorder.class.getClassLoader();
                 }
                 Class<?> beanClass = Class.forName(beanName, true, classLoader);
 

extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallryeJWTConfig.java renamed to extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJWTConfig.java

@@ -7,7 +7,7 @@
  * deployment configuration
  */
 @ConfigRoot(name = "smallrye-jwt")
-public class SmallryeJWTConfig {
+public class SmallRyeJWTConfig {
 
     /**
      * The MP-JWT configuration object

extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java

@@ -53,7 +53,7 @@ class SmallRyeJwtProcessor {
     private static final DotName CLAIM_NAME = DotName.createSimple(Claim.class.getName());
     private static final DotName CLAIMS_NAME = DotName.createSimple(Claims.class.getName());
 
-    SmallryeJWTConfig config;
+    SmallRyeJWTConfig config;
 
     @BuildStep
     CapabilityBuildItem capability() {

extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallryeJwtDisabledTest.java renamed to extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java

@@ -11,7 +11,7 @@
 import io.quarkus.test.QuarkusUnitTest;
 import io.restassured.RestAssured;
 
-public class SmallryeJwtDisabledTest {
+public class SmallRyeJwtDisabledTest {
     private static Class<?>[] testClasses = {
             DefaultGroupsEndpoint.class
     };