Skip to content

Commit bca74c0

Browse files
SaintierFrSaintierFr
committed
Sonar smell code correction
Signed-off-by: SAINTIER FRANCOIS <[email protected]>
1 parent 5e9ac6e commit bca74c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+136
-163
lines changed

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/Utils.java‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import lombok.extern.slf4j.Slf4j;
88

99
import java.lang.reflect.Field;
10-
import java.util.Locale;
11-
import java.util.ResourceBundle;
1210

1311
@Slf4j
1412
public class Utils {
@@ -18,27 +16,23 @@ private Utils() {
1816
}
1917

2018
public static String entering(){
21-
StringBuilder stringBuilder = new StringBuilder();
22-
stringBuilder.append(">>> ");
23-
stringBuilder.append("Entering: ");
24-
stringBuilder.append("-::");
25-
stringBuilder.append(getMethodName());
26-
return stringBuilder.toString();
19+
return ">>> " +
20+
"Entering: " +
21+
"-::" +
22+
getMethodName();
2723
}
2824

2925
public static String leaving(Long startTime){
3026
if(startTime == null || startTime <= 0){
3127
return leaving();
3228
}
33-
StringBuilder stringBuilder = new StringBuilder();
34-
stringBuilder.append("<<< ");
35-
stringBuilder.append("Leaving: ");
36-
stringBuilder.append("-::");
37-
stringBuilder.append(getMethodName());
38-
stringBuilder.append(" - Timer duration: ");
39-
stringBuilder.append((System.nanoTime() - startTime)/Math.pow(10,9));
40-
stringBuilder.append(" sec.");
41-
return stringBuilder.toString();
29+
return "<<< " +
30+
"Leaving: " +
31+
"-::" +
32+
getMethodName() +
33+
" - Timer duration: " +
34+
(System.nanoTime() - startTime) / Math.pow(10, 9) +
35+
" sec.";
4236
}
4337

4438
public static String getMethodName() {
@@ -50,12 +44,10 @@ public static String getMethodName() {
5044
}
5145

5246
public static String leaving(){
53-
StringBuilder stringBuilder = new StringBuilder();
54-
stringBuilder.append("<<< ");
55-
stringBuilder.append("Leaving: ");
56-
stringBuilder.append("::");
57-
stringBuilder.append(getMethodName());
58-
return stringBuilder.toString();
47+
return "<<< " +
48+
"Leaving: " +
49+
"::" +
50+
getMethodName();
5951
}
6052

6153
/**
@@ -67,6 +59,7 @@ public static Field getField(Class<?> clazz, String name) {
6759
try {
6860
field = clazz.getDeclaredField(name);
6961
} catch (Exception e) {
62+
log.error("Cannot find field name {}", name, e);
7063
}
7164
clazz = clazz.getSuperclass();
7265
}

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/DataSetInfo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static DataSetInfo from(TDataSet tDataSet) {
4141

4242
public static Set<DataSetInfo> getDataSets(AbstractLNAdapter<? extends TAnyLN> lnAdapter){
4343
return lnAdapter.getDataSet(null)
44-
.stream().map(tDataSet -> DataSetInfo.from(tDataSet)).collect(Collectors.toSet());
44+
.stream().map(DataSetInfo::from).collect(Collectors.toSet());
4545
}
4646

4747
public void addFCDAInfo(FCDAInfo fcdaInfo){
@@ -60,6 +60,6 @@ public boolean isValid(){
6060
if(name.length() > 32 || fcdaInfos.isEmpty()){
6161
return false;
6262
}
63-
return fcdaInfos.stream().allMatch(fcdaInfo -> fcdaInfo.isValid());
63+
return fcdaInfos.stream().allMatch(FCDAInfo::isValid);
6464
}
6565
}

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/DataTypeName.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
import java.util.ArrayList;
1616
import java.util.Arrays;
17-
18-
import java.util.Collections;
1917
import java.util.List;
2018
import java.util.Objects;
2119
import java.util.stream.Collectors;

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ExtRefBindingInfo.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import lombok.Setter;
1010
import org.apache.commons.lang3.StringUtils;
1111
import org.lfenergy.compas.scl2007b4.model.TExtRef;
12-
import org.lfenergy.compas.scl2007b4.model.TFCDA;
1312
import org.lfenergy.compas.scl2007b4.model.TLLN0Enum;
1413
import org.lfenergy.compas.scl2007b4.model.TServiceType;
1514

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ExtRefInfo.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,38 +47,39 @@ public static ExtRefInfo from(TExtRef tExtRef, String iedName, String ldInst,
4747
}
4848

4949
public boolean matchFCDA(@NonNull TFCDA tfcda){
50+
boolean returnValue = true;
5051
if(AbstractLNAdapter.isNull(tfcda)) {
51-
return false;
52+
returnValue = false;
5253
}
5354

5455
if(tfcda.getLdInst() != null &&
5556
(bindingInfo == null || !tfcda.getLdInst().equals(bindingInfo.getLdInst()))){
56-
return false;
57+
returnValue = false;
5758
}
5859
if (!tfcda.getLnClass().isEmpty() &&
5960
( bindingInfo == null || !tfcda.getLnClass().contains(bindingInfo.getLnClass())) ){
60-
return false;
61+
returnValue = false;
6162
}
6263

6364
boolean isLN0 = tfcda.getLnClass().contains(TLLN0Enum.LLN_0.value());
6465
if (!isLN0 && tfcda.getLnInst() != null &&
6566
(bindingInfo == null || !tfcda.getLnInst().equals(bindingInfo.getLnInst()))) {
66-
return false;
67+
returnValue = false;
6768
}
6869
if (!isLN0 && !StringUtils.isBlank(tfcda.getPrefix()) &&
6970
(bindingInfo == null || !tfcda.getPrefix().equals(bindingInfo.getPrefix()))) {
70-
return false;
71+
returnValue = false;
7172
}
7273

7374
if(!StringUtils.isBlank(tfcda.getDoName()) &&
7475
(signalInfo == null || !Objects.equals(signalInfo.getPDO(),tfcda.getDoName())) ){
75-
return false;
76+
returnValue = false;
7677
}
7778

7879
if(!StringUtils.isBlank(tfcda.getDaName()) &&
7980
(signalInfo == null || !Objects.equals(signalInfo.getPDA(),tfcda.getDaName())) ){
80-
return false;
81+
returnValue = false;
8182
}
82-
return true;
83+
return returnValue;
8384
}
8485
}

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LNodeMetaDataEmbedder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
package org.lfenergy.compas.sct.commons.dto;
66

7-
import com.fasterxml.jackson.annotation.JsonIgnore;
87
import lombok.AllArgsConstructor;
98

109

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LogicalNodeOptions.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66

77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
9-
import lombok.NonNull;
109
import lombok.Setter;
1110

12-
import javax.validation.constraints.NotNull;
13-
1411
@Getter
1512
@Setter
1613
@NoArgsConstructor

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ReportControlBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ReportControlBlock(TReportControl reportControl) {
4848
if(rptEnabled != null) {
4949
iedNames = rptEnabled.getClientLN()
5050
.stream()
51-
.map(clientLN -> toIEDName(clientLN))
51+
.map(ControlBlock::toIEDName)
5252
.collect(Collectors.toList());
5353
}
5454
}

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ResumedDataTemplate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static ResumedDataTemplate copyFrom(ResumedDataTemplate dtt){
4141
}
4242

4343
public boolean isUpdatable(){
44-
return daName.isDefined() ? daName.isUpdatable() : false;
44+
return daName.isDefined() && daName.isUpdatable();
4545
}
4646

4747
@JsonIgnore

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ObjectReference.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@Getter
1212
public class ObjectReference {
13-
private final String MALFORMED_OBJ_REF = "Malformed ObjRef : %s" ;
13+
private static final String MALFORMED_OBJ_REF = "Malformed ObjRef : %s" ;
1414

1515
private final String reference;
1616
//IEDName.LDInst

0 commit comments

Comments
 (0)