Skip to content

Commit 81e97c5

Browse files
committed
Take into account Sonar comments
1 parent 5418c68 commit 81e97c5

32 files changed

Lines changed: 63 additions & 63 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -477,14 +477,14 @@ protected int logout(Request request, Response response) {
477477
* @return The credentials as a proper challenge response.
478478
*/
479479
protected ChallengeResponse parseCredentials(String cookieValue) {
480+
if (cookieValue == null) {
481+
return null;
482+
}
483+
480484
try {
481485
// 1) Decode Base64 string
482486
byte[] encrypted = Base64.getDecoder().decode(cookieValue);
483487

484-
if (encrypted == null) {
485-
getLogger().warning("Cannot decode cookie credentials : " + cookieValue);
486-
}
487-
488488
// 2) Decrypt the credentials
489489
String decrypted =
490490
CryptoUtils.decrypt(getEncryptAlgorithm(), getEncryptSecretKey(), encrypted);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class TemplateFilter extends Filter {
4242
private volatile Resolver<Object> resolverDataModel;
4343

4444
/** Constructor. */
45-
public TemplateFilter() {
45+
protected TemplateFilter() {
4646
super();
4747
}
4848

@@ -51,7 +51,7 @@ public TemplateFilter() {
5151
*
5252
* @param context The context.
5353
*/
54-
public TemplateFilter(Context context) {
54+
protected TemplateFilter(Context context) {
5555
super(context);
5656
}
5757

@@ -61,7 +61,7 @@ public TemplateFilter(Context context) {
6161
* @param context The context.
6262
* @param next The next Restlet.
6363
*/
64-
public TemplateFilter(Context context, Restlet next) {
64+
protected TemplateFilter(Context context, Restlet next) {
6565
super(context, next);
6666
this.mapDataModel = null;
6767
this.resolverDataModel = null;
@@ -74,7 +74,7 @@ public TemplateFilter(Context context, Restlet next) {
7474
* @param next The next Restlet.
7575
* @param dataModel The filter's data model.
7676
*/
77-
public TemplateFilter(Context context, Restlet next, Map<String, Object> dataModel) {
77+
protected TemplateFilter(Context context, Restlet next, Map<String, Object> dataModel) {
7878
super(context, next);
7979
this.mapDataModel = dataModel;
8080
this.resolverDataModel = null;
@@ -87,7 +87,7 @@ public TemplateFilter(Context context, Restlet next, Map<String, Object> dataMod
8787
* @param next The next Restlet.
8888
* @param dataModel The filter's data model.
8989
*/
90-
public TemplateFilter(Context context, Restlet next, Resolver<Object> dataModel) {
90+
protected TemplateFilter(Context context, Restlet next, Resolver<Object> dataModel) {
9191
super(context, next);
9292
this.mapDataModel = null;
9393
this.resolverDataModel = dataModel;

org.restlet.ext.xml/src/main/java/org/restlet/ext/xml/XmlRepresentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public static String getTextContent(Node node) {
250250
*
251251
* @param mediaType The representation's mediaType.
252252
*/
253-
public XmlRepresentation(MediaType mediaType) {
253+
protected XmlRepresentation(MediaType mediaType) {
254254
this(mediaType, UNKNOWN_SIZE);
255255
}
256256

@@ -260,7 +260,7 @@ public XmlRepresentation(MediaType mediaType) {
260260
* @param mediaType The representation's mediaType.
261261
* @param expectedSize The expected input stream size.
262262
*/
263-
public XmlRepresentation(MediaType mediaType, long expectedSize) {
263+
protected XmlRepresentation(MediaType mediaType, long expectedSize) {
264264
super(mediaType, expectedSize);
265265
this.coalescing = false;
266266
this.entityResolver = null;

org.restlet.ext.xml/src/main/java/org/restlet/ext/xml/internal/AbstractXmlReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public abstract class AbstractXmlReader implements XMLReader {
4141
private final HashMap<String, Object> properties;
4242

4343
/** Default constructor. */
44-
public AbstractXmlReader() {
44+
protected AbstractXmlReader() {
4545
this.features = new HashMap<>();
4646
this.properties = new HashMap<>();
4747
this.contentHandler = null;

org.restlet/src/main/java/org/restlet/Connector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class Connector extends Restlet {
4242
*
4343
* @param context The context.
4444
*/
45-
public Connector(Context context) {
45+
protected Connector(Context context) {
4646
this(context, null);
4747
}
4848

@@ -52,7 +52,7 @@ public Connector(Context context) {
5252
* @param context The context.
5353
* @param protocols The supported protocols.
5454
*/
55-
public Connector(Context context, List<Protocol> protocols) {
55+
protected Connector(Context context, List<Protocol> protocols) {
5656
super(context);
5757

5858
if (protocols == null) {

org.restlet/src/main/java/org/restlet/Message.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public abstract class Message {
6262
private volatile List<Warning> warnings;
6363

6464
/** Constructor. */
65-
public Message() {
65+
protected Message() {
6666
this(null);
6767
}
6868

@@ -71,7 +71,7 @@ public Message() {
7171
*
7272
* @param entity The payload of the message.
7373
*/
74-
public Message(Representation entity) {
74+
protected Message(Representation entity) {
7575
this.attributes = null;
7676
this.cacheDirectives = null;
7777
this.date = null;

org.restlet/src/main/java/org/restlet/Restlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private static void fireContextChanged(Restlet restlet, Context context) {
7474
private volatile boolean started;
7575

7676
/** Constructor with null context. */
77-
public Restlet() {
77+
protected Restlet() {
7878
this(null);
7979
}
8080

@@ -85,7 +85,7 @@ public Restlet() {
8585
* @see Context#createChildContext()
8686
* @param context The context of the Restlet.
8787
*/
88-
public Restlet(Context context) {
88+
protected Restlet(Context context) {
8989
this.context = context;
9090
this.started = false;
9191
this.name = toString();

org.restlet/src/main/java/org/restlet/engine/CompositeHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public abstract class CompositeHelper<T extends Restlet> extends RestletHelper<T
4545
*
4646
* @param helped The helped Restlet.
4747
*/
48-
public CompositeHelper(T helped) {
48+
protected CompositeHelper(T helped) {
4949
super(helped);
5050
this.inboundNext = null;
5151
this.firstInboundFilter = null;

org.restlet/src/main/java/org/restlet/engine/RestletHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public abstract class RestletHelper<T extends Restlet> extends Helper {
3838
*
3939
* @param helped The helped Restlet.
4040
*/
41-
public RestletHelper(T helped) {
41+
protected RestletHelper(T helped) {
4242
this.attributes = new ConcurrentHashMap<>();
4343
this.helped = helped;
4444
}

org.restlet/src/main/java/org/restlet/engine/connector/ConnectorHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static org.restlet.service.ConnectorService getConnectorService() {
4343
private final List<Protocol> protocols;
4444

4545
/** Constructor. */
46-
public ConnectorHelper(T connector) {
46+
protected ConnectorHelper(T connector) {
4747
super(connector);
4848
this.protocols = new CopyOnWriteArrayList<>();
4949
}

0 commit comments

Comments
 (0)