Take into account Sonar comments

Author: thboileau

org.restlet.ext.crypto/src/main/java/org/restlet/ext/crypto/DigestUtils.java

@@ -189,9 +189,10 @@ public static String toMd5(String target) {
     }
 
     /**
-     * Returns the MD5 digest of the target string. Target is decoded to bytes using the named charset.
-     * The returned hexadecimal String always contains 32 lowercase alphanumeric characters. For
-     * example, if the target is "HelloWorld", this method returns "68e109f0f40ca72a15e05cc22786f8e6".
+     * Returns the MD5 digest of the target string. Target is decoded to bytes using the named
+     * charset. The returned hexadecimal String always contains 32 lowercase alphanumeric
+     * characters. For example, if the target is "HelloWorld", this method returns
+     * "68e109f0f40ca72a15e05cc22786f8e6".
      *
      * @param target The string to encode.
      * @param charsetName The character set.
@@ -233,7 +234,8 @@ public static String toSha1(String target) {
     }
 
     /**
-     * Returns the SHA1 digest of the target string. Target is decoded to bytes using the named charset.
+     * Returns the SHA1 digest of the target string. Target is decoded to bytes using the named
+     * charset.
      *
      * @param target The string to encode.
      * @param charsetName The character set.

org.restlet.ext.crypto/src/main/java/org/restlet/ext/crypto/DigestVerifier.java

@@ -53,8 +53,8 @@ public DigestVerifier(String algorithm, T wrappedVerifier, String wrappedAlgorit
 
     /**
      * Computes the digest of a secret according to a specified algorithm. By default, MD5 hashes
-     * (represented as a sequence of 32 hexadecimal digits) and SHA-1 hashes are supported. For
-     *  an additional algorithm, override this method.
+     * (represented as a sequence of 32 hexadecimal digits) and SHA-1 hashes are supported. For an
+     * additional algorithm, override this method.
      *
      * @param identifier The user identifier.
      * @param secret The regular secret to digest.

org.restlet.ext.crypto/src/main/java/org/restlet/ext/crypto/internal/AwsUtils.java

@@ -306,11 +306,15 @@ public static String getS3StringToSign(Request request, Series<Header> headers)
                 contentType = "application/x-www-form-urlencoded";
         }
 
-        return (method != null ? method : "") + "\n" +
-                (contentMD5 != null ? contentMD5 : "") + "\n" +
-                (contentType != null ? contentType : "") + "\n" +
-                (date != null ? date : "") + "\n" +
-                (canonicalizedAmzHeaders != null ? canonicalizedAmzHeaders : "") +
-                (canonicalizedResource != null ? canonicalizedResource : "");
+        return (method != null ? method : "")
+                + "\n"
+                + (contentMD5 != null ? contentMD5 : "")
+                + "\n"
+                + (contentType != null ? contentType : "")
+                + "\n"
+                + (date != null ? date : "")
+                + "\n"
+                + (canonicalizedAmzHeaders != null ? canonicalizedAmzHeaders : "")
+                + (canonicalizedResource != null ? canonicalizedResource : "");
     }
 }

org.restlet.ext.crypto/src/main/java/org/restlet/ext/crypto/internal/AwsVerifier.java

@@ -1,9 +1,9 @@
 /**
  * Copyright 2005-2024 Qlik
- * <p>
+ *<p>
  * The content of this file is subject to the terms of the Apache 2.0 open
  * source license available at https://www.opensource.org/licenses/apache-2.0
- * <p>
+ *<p>
  * Restlet is a registered trademark of QlikTech International AB.
  */
 package org.restlet.ext.crypto.internal;
@@ -29,7 +29,7 @@
  *
  * @author Jean-Philippe Steinmetz <caskater47@gmail.com>
  * @see <a href="http://docs.amazonwebservices.com/AmazonS3/latest/RESTAuthentication.html">
- * Authenticating REST Requests</a>
+ *     Authenticating REST Requests</a>
  */
 public class AwsVerifier extends SecretVerifier {
     /** Default maximum request age (15 minutes) */
@@ -44,8 +44,7 @@ public class AwsVerifier extends SecretVerifier {
     /**
      * Creates a new HttpAwsS3Verifier instance.
      *
-     * @param wrappedVerifier
-     *         The wrapped verifier containing local identifier/secret couples
+     * @param wrappedVerifier The wrapped verifier containing local identifier/secret couples
      */
     public AwsVerifier(LocalVerifier wrappedVerifier) {
         this(wrappedVerifier, DEFAULT_MAX_REQUEST_AGE);
@@ -54,11 +53,9 @@ public AwsVerifier(LocalVerifier wrappedVerifier) {
     /**
      * Creates a new HttpAwsS3Verifier instance.
      *
-     * @param wrappedVerifier
-     *         The wrapped verifier containing local identifier/secret couples
-     * @param maxRequestAge
-     *         The maximum age of a request, in milliseconds, before it is considered
-     *         stale
+     * @param wrappedVerifier The wrapped verifier containing local identifier/secret couples
+     * @param maxRequestAge The maximum age of a request, in milliseconds, before it is considered
+     *     stale
      */
     public AwsVerifier(LocalVerifier wrappedVerifier, long maxRequestAge) {
         super();
@@ -79,16 +76,13 @@ protected String getIdentifier(Request request, Response response) {
 
         String[] parts = request.getChallengeResponse().getRawValue().split(":");
 
-        return (parts.length == 2)
-                ? parts[0]
-                : null;
+        return (parts.length == 2) ? parts[0] : null;
     }
 
     /**
      * Returns the local secret associated with a given identifier.
      *
-     * @param identifier
-     *         The identifier to lookup.
+     * @param identifier The identifier to lookup.
      * @return The secret associated with the identifier or null.
      */
     public char[] getLocalSecret(String identifier) {
@@ -119,9 +113,7 @@ protected char[] getSecret(Request request, Response response) {
 
         String[] parts = request.getChallengeResponse().getRawValue().split(":");
 
-        return (parts.length == 2)
-                ? parts[1].toCharArray()
-                : null;
+        return (parts.length == 2) ? parts[1].toCharArray() : null;
     }
 
     /**
@@ -146,8 +138,7 @@ public void setMaxRequestAge(long value) {
     /**
      * Sets the wrapped local secret verifier.
      *
-     * @param wrappedVerifier
-     *         The local secret verifier.
+     * @param wrappedVerifier The local secret verifier.
      */
     public void setWrappedVerifier(LocalVerifier wrappedVerifier) {
         this.wrappedVerifier = wrappedVerifier;

org.restlet.ext.crypto/src/main/java/org/restlet/ext/crypto/internal/CryptoUtils.java

@@ -1,21 +1,18 @@
 /**
  * Copyright 2005-2024 Qlik
- * <p>
+ *<p>
  * The content of this file is subject to the terms of the Apache 2.0 open
  * source license available at https://www.opensource.org/licenses/apache-2.0
- * <p>
+ *<p>
  * Restlet is a registered trademark of QlikTech International AB.
  */
 package org.restlet.ext.crypto.internal;
 
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.util.Base64;
-
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
-
 import org.restlet.ext.crypto.DigestUtils;
 
 /**
@@ -118,8 +115,8 @@ public static byte[] encrypt(String algo, String base64Secret, String content)
     }
 
     /**
-     * Generates nonce as recommended in section 3.2.1 of RFC-2617, but without the ETag field.
-     * The format is: <code><pre>
+     * Generates nonce as recommended in section 3.2.1 of RFC-2617, but without the ETag field. The
+     * format is: <code><pre>
      * Base64.encodeBytes(currentTimeMS + &quot;:&quot;
      *         + md5String(currentTimeMS + &quot;:&quot; + secretKey))
      * </pre></code>

org.restlet.ext.crypto/src/main/java/org/restlet/ext/crypto/internal/HttpAzureSharedKeyHelper.java

@@ -10,7 +10,6 @@
 
 import java.util.Base64;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import org.restlet.Request;
@@ -158,14 +157,19 @@ public void formatResponse(
         final String canonicalizedResource = getCanonicalizedResourceName(request.getResourceRef());
 
         // Set up the message part
-        final String rest = methodName + '\n' +
-                contentMd5 + '\n' +
-                contentType + '\n' +
-                date + '\n' +
-                canonicalizedAzureHeaders +
-                '/' +
-                challenge.getIdentifier() +
-                canonicalizedResource;
+        final String rest =
+                methodName
+                        + '\n'
+                        + contentMd5
+                        + '\n'
+                        + contentType
+                        + '\n'
+                        + date
+                        + '\n'
+                        + canonicalizedAzureHeaders
+                        + '/'
+                        + challenge.getIdentifier()
+                        + canonicalizedResource;
 
         // Append the SharedKey credentials
         cw.append(challenge.getIdentifier())

org.restlet.ext.crypto/src/main/java/org/restlet/ext/crypto/internal/HttpAzureSharedKeyLiteHelper.java

@@ -85,10 +85,7 @@ public void formatResponse(
         String canonicalizedResource = getCanonicalizedResourceName(request.getResourceRef());
 
         // Set up the message part
-        final String rest = date + '\n' +
-                '/' +
-                challenge.getIdentifier() +
-                canonicalizedResource;
+        final String rest = date + '\n' + '/' + challenge.getIdentifier() + canonicalizedResource;
 
         // Append the SharedKey credentials
         cw.append(challenge.getIdentifier())

org.restlet.ext.freemarker/src/main/java/org/restlet/ext/freemarker/FreemarkerConverter.java

@@ -9,7 +9,6 @@
 package org.restlet.ext.freemarker;
 
 import freemarker.template.Template;
-import java.io.IOException;
 import java.util.List;
 import org.restlet.engine.converter.ConverterHelper;
 import org.restlet.engine.resource.VariantInfo;

org.restlet.ext.freemarker/src/main/java/org/restlet/ext/freemarker/TemplateFilter.java

@@ -20,9 +20,9 @@
 import org.restlet.util.Resolver;
 
 /**
- * Filter the response's entity and wrap it with a FreeMarker's template representation. By default, the
- * template representation provides a data model based on the request and response objects. In order
- * for the wrapping to happen, the representations must have the {@link Encoding#FREEMARKER}
+ * Filter the response's entity and wrap it with a FreeMarker's template representation. By default,
+ * the template representation provides a data model based on the request and response objects. In
+ * order for the wrapping to happen, the representations must have the {@link Encoding#FREEMARKER}
  * encoding set.<br>
  * <br>
  * Concurrency note: instances of this class or its subclasses can be invoked by several threads at

org.restlet.ext.jackson/src/main/java/org/restlet/ext/jackson/JacksonRepresentation.java

@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import org.restlet.data.MediaType;
-import org.restlet.engine.Edition;
 import org.restlet.ext.jackson.internal.XmlFactoryProvider;
 import org.restlet.representation.OutputRepresentation;
 import org.restlet.representation.Representation;
@@ -171,17 +170,6 @@ protected ObjectMapper createObjectMapper() {
 
         } else if (MediaType.APPLICATION_XML.isCompatible(getMediaType())
                 || MediaType.TEXT_XML.isCompatible(getMediaType())) {
-            if (Edition.ANDROID.isCurrentEdition()
-                    && XmlFactoryProvider.inputFactoryProvider == null) {
-                XmlFactoryProvider.inputFactoryProvider =
-                        new com.ctc.wstx.osgi.InputFactoryProviderImpl();
-            }
-            if (Edition.ANDROID.isCurrentEdition()
-                    && XmlFactoryProvider.outputFactoryProvider == null) {
-                XmlFactoryProvider.outputFactoryProvider =
-                        new com.ctc.wstx.osgi.OutputFactoryProviderImpl();
-            }
-
             javax.xml.stream.XMLInputFactory xif = XmlFactoryProvider.newInputFactory();
             xif.setProperty(
                     javax.xml.stream.XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES,