Skip to content

Commit 2c45dd5

Browse files
tandraschkotandraschko
committed
warnings
1 parent b07f1f5 commit 2c45dd5

25 files changed

+72
-32
lines changed

‎src/main/java/org/primefaces/config/WebXmlParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private static Document toDocument(URL url) throws Exception {
177177

178178
private static Map<String, String> parseErrorPages(Element webXml) throws Exception {
179179

180-
Map<String, String> errorPages = new HashMap<String, String>();
180+
Map<String, String> errorPages = new HashMap<>();
181181

182182
XPath xpath = XPathFactory.newInstance().newXPath();
183183

‎src/main/java/org/primefaces/context/PrimeApplicationContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public PrimeApplicationContext(FacesContext context) {
5959
this.validator = validatorFactory.getValidator();
6060
}
6161

62-
enumCacheMap = new ConcurrentHashMap<Class<?>, Map<String, Object>>();
63-
constantsCacheMap = new ConcurrentHashMap<Class<?>, Map<String, Object>>();
62+
enumCacheMap = new ConcurrentHashMap<>();
63+
constantsCacheMap = new ConcurrentHashMap<>();
6464
}
6565

6666
public static PrimeApplicationContext getCurrentInstance(FacesContext facesContext) {

‎src/main/java/org/primefaces/context/PrimeRequestContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public Map<String, Object> getCallbackParams() {
9797
(Map<String, Object>) context.getAttributes().get(CALLBACK_PARAMS_KEY);
9898

9999
if (callbackParams == null) {
100-
callbackParams = new HashMap<String, Object>();
100+
callbackParams = new HashMap<>();
101101
context.getAttributes().put(CALLBACK_PARAMS_KEY, callbackParams);
102102
}
103103

@@ -113,7 +113,7 @@ public List<String> getScriptsToExecute() {
113113
(List<String>) context.getAttributes().get(EXECUTE_SCRIPT_KEY);
114114

115115
if (scriptsToExecute == null) {
116-
scriptsToExecute = new ArrayList<String>();
116+
scriptsToExecute = new ArrayList<>();
117117
context.getAttributes().put(EXECUTE_SCRIPT_KEY, scriptsToExecute);
118118
}
119119

‎src/main/java/org/primefaces/expression/SearchExpressionFacade.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static List<UIComponent> resolveComponents(FacesContext context, UICompon
6666
*/
6767
public static List<UIComponent> resolveComponents(FacesContext context, UIComponent source, String expressions, int hints) {
6868

69-
ArrayList<UIComponent> components = new ArrayList<UIComponent>();
69+
ArrayList<UIComponent> components = new ArrayList<>();
7070

7171
if (!ComponentUtils.isValueBlank(expressions)) {
7272
String[] splittedExpressions = splitExpressions(context, source, expressions);
@@ -212,7 +212,7 @@ public static String resolveClientIds(FacesContext context, UIComponent source,
212212
}
213213
}
214214
else if (resolver instanceof MultiSearchExpressionResolver) {
215-
ArrayList<UIComponent> result = new ArrayList<UIComponent>();
215+
ArrayList<UIComponent> result = new ArrayList<>();
216216
((MultiSearchExpressionResolver) resolver).resolveComponents(context, source, source, expression, result, hints);
217217
for (int j = 0; j < result.size(); j++) {
218218
UIComponent component = result.get(j);
@@ -372,6 +372,7 @@ static class ResolveClientIdCallback implements ContextCallback {
372372
this.expression = expression;
373373
}
374374

375+
@Override
375376
public void invokeContextCallback(FacesContext context, UIComponent target) {
376377
clientId = target.getClientId(context);
377378
validateRenderer(context, source, target, expression, hints);
@@ -386,6 +387,7 @@ static class ResolveComponentCallback implements ContextCallback {
386387

387388
private UIComponent component;
388389

390+
@Override
389391
public void invokeContextCallback(FacesContext context, UIComponent target) {
390392
component = target;
391393
}
@@ -538,13 +540,13 @@ private static ArrayList<UIComponent> resolveComponentsByExpressionChain(FacesCo
538540
expression = expression.substring(1);
539541
}
540542

541-
ArrayList<UIComponent> lastComponents = new ArrayList<UIComponent>();
543+
ArrayList<UIComponent> lastComponents = new ArrayList<>();
542544
lastComponents.add(source);
543545

544546
String[] subExpressions = split(context, expression, separatorChar);
545547
if (subExpressions != null && subExpressions.length > 0) {
546548

547-
ArrayList<UIComponent> tempComponents = new ArrayList<UIComponent>();
549+
ArrayList<UIComponent> tempComponents = new ArrayList<>();
548550

549551
for (int i = 0; i < subExpressions.length; i++) {
550552

@@ -610,15 +612,15 @@ private static String resolveClientIdsByExpressionChain(FacesContext context, UI
610612
expression = expression.substring(1);
611613
}
612614

613-
ArrayList<UIComponent> lastComponents = new ArrayList<UIComponent>();
615+
ArrayList<UIComponent> lastComponents = new ArrayList<>();
614616
lastComponents.add(source);
615617

616618
StringBuilder clientIdsBuilder = null;
617619

618620
String[] subExpressions = split(context, expression, separatorChar);
619621
if (subExpressions != null && subExpressions.length > 0) {
620622

621-
ArrayList<UIComponent> tempComponents = new ArrayList<UIComponent>();
623+
ArrayList<UIComponent> tempComponents = new ArrayList<>();
622624

623625
for (int i = 0; i < subExpressions.length; i++) {
624626

@@ -801,7 +803,7 @@ protected static String[] split(FacesContext context, String value, char... sepa
801803
return null;
802804
}
803805

804-
List<String> tokens = new ArrayList<String>();
806+
List<String> tokens = new ArrayList<>();
805807
StringBuilder buffer = SharedStringBuilder.get(context, SHARED_SPLIT_BUFFER_KEY);
806808

807809
int parenthesesCounter = 0;

‎src/main/java/org/primefaces/validate/DoubleRangeValidator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public class DoubleRangeValidator extends javax.faces.validator.DoubleRangeValid
2525
private boolean minimumSet;
2626
private boolean maximumSet;
2727

28+
@Override
2829
public Map<String, Object> getMetadata() {
29-
metadata = new HashMap<String, Object>();
30+
metadata = new HashMap<>();
3031
double min = this.getMinimum();
3132
double max = this.getMaximum();
3233

@@ -41,6 +42,7 @@ public Map<String, Object> getMetadata() {
4142
return metadata;
4243
}
4344

45+
@Override
4446
public String getValidatorId() {
4547
return DoubleRangeValidator.VALIDATOR_ID;
4648
}

‎src/main/java/org/primefaces/validate/LengthValidator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ public class LengthValidator extends javax.faces.validator.LengthValidator imple
2525
private boolean minimumSet;
2626
private boolean maximumSet;
2727

28+
@Override
2829
public Map<String, Object> getMetadata() {
2930
int min = this.getMinimum();
3031
int max = this.getMaximum();
3132

3233
if (metadata == null) {
33-
metadata = new HashMap<String, Object>();
34+
metadata = new HashMap<>();
3435

3536
if (minimumSet) {
3637
metadata.put(HTML.VALIDATION_METADATA.MIN_LENGTH, min);
@@ -44,6 +45,7 @@ public Map<String, Object> getMetadata() {
4445
return metadata;
4546
}
4647

48+
@Override
4749
public String getValidatorId() {
4850
return LengthValidator.VALIDATOR_ID;
4951
}

‎src/main/java/org/primefaces/validate/LongRangeValidator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public class LongRangeValidator extends javax.faces.validator.LongRangeValidator
2525
private boolean minimumSet;
2626
private boolean maximumSet;
2727

28+
@Override
2829
public Map<String, Object> getMetadata() {
29-
metadata = new HashMap<String, Object>();
30+
metadata = new HashMap<>();
3031
long min = this.getMinimum();
3132
long max = this.getMaximum();
3233

@@ -41,6 +42,7 @@ public Map<String, Object> getMetadata() {
4142
return metadata;
4243
}
4344

45+
@Override
4446
public String getValidatorId() {
4547
return LongRangeValidator.VALIDATOR_ID;
4648
}

‎src/main/java/org/primefaces/validate/RegexValidator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ public class RegexValidator extends javax.faces.validator.RegexValidator impleme
2323

2424
private Map<String, Object> metadata;
2525

26+
@Override
2627
public Map<String, Object> getMetadata() {
27-
metadata = new HashMap<String, Object>();
28+
metadata = new HashMap<>();
2829
String regex = this.getPattern();
2930

3031
if (regex != null) {
@@ -34,6 +35,7 @@ public Map<String, Object> getMetadata() {
3435
return metadata;
3536
}
3637

38+
@Override
3739
public String getValidatorId() {
3840
return RegexValidator.VALIDATOR_ID;
3941
}

‎src/main/java/org/primefaces/validate/bean/AssertFalseClientValidationConstraint.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public class AssertFalseClientValidationConstraint implements ClientValidationCo
2525
private static final String MESSAGE_METADATA = "data-p-afalse-msg";
2626
private static final String MESSAGE_ID = "{javax.validation.constraints.AssertFalse.message}";
2727

28+
@Override
2829
public Map<String, Object> getMetadata(ConstraintDescriptor constraintDescriptor) {
29-
Map<String, Object> metadata = new HashMap<String, Object>();
30+
Map<String, Object> metadata = new HashMap<>();
3031
Map attrs = constraintDescriptor.getAttributes();
3132
Object message = attrs.get(ATTR_MESSAGE);
3233

@@ -37,6 +38,7 @@ public Map<String, Object> getMetadata(ConstraintDescriptor constraintDescriptor
3738
return metadata;
3839
}
3940

41+
@Override
4042
public String getValidatorId() {
4143
return AssertFalse.class.getSimpleName();
4244
}

‎src/main/java/org/primefaces/validate/bean/AssertTrueClientValidationConstraint.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public class AssertTrueClientValidationConstraint implements ClientValidationCon
2525
private static final String MESSAGE_METADATA = "data-p-atrue-msg";
2626
private static final String MESSAGE_ID = "{javax.validation.constraints.AssertTrue.message}";
2727

28+
@Override
2829
public Map<String, Object> getMetadata(ConstraintDescriptor constraintDescriptor) {
29-
Map<String, Object> metadata = new HashMap<String, Object>();
30+
Map<String, Object> metadata = new HashMap<>();
3031
Map attrs = constraintDescriptor.getAttributes();
3132
Object message = attrs.get(ATTR_MESSAGE);
3233

@@ -37,6 +38,7 @@ public Map<String, Object> getMetadata(ConstraintDescriptor constraintDescriptor
3738
return metadata;
3839
}
3940

41+
@Override
4042
public String getValidatorId() {
4143
return AssertTrue.class.getSimpleName();
4244
}

0 commit comments

Comments
 (0)