Skip to content

Commit 72326c4

Browse files
committed
update sonar smells
1 parent 5f326e0 commit 72326c4

File tree

1 file changed

+15
-28
lines changed
  • aemdesign-aem-services/src/main/java/design/aem/models/v2/common

1 file changed

+15
-28
lines changed

aemdesign-aem-services/src/main/java/design/aem/models/v2/common/Timing.java

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
1010

11-
import java.io.BufferedReader;
12-
import java.io.ByteArrayInputStream;
13-
import java.io.ByteArrayOutputStream;
14-
import java.io.InputStreamReader;
15-
import java.net.URLEncoder;
11+
import java.io.*;
1612
import java.nio.charset.StandardCharsets;
1713
import java.util.*;
1814
import java.util.concurrent.TimeUnit;
@@ -36,17 +32,6 @@ private static String basename(String path) {
3632
return result;
3733
}
3834

39-
private static String stringList(List<ChartBar> data, String separator, Getter g) {
40-
StringBuilder result = new StringBuilder();
41-
for (ChartBar t : data) {
42-
if (result.length() > 0) {
43-
result.append(separator);
44-
}
45-
result.append(URLEncoder.encode(g.get(t)));
46-
}
47-
return result.toString();
48-
}
49-
5035
private static boolean accept(String line) {
5136
boolean result = line.contains(TIMER_END);
5237
result &= !line.contains(",resolveServlet(");
@@ -55,9 +40,9 @@ private static boolean accept(String line) {
5540
return result;
5641
}
5742

58-
public static byte[] compress(String str) throws Exception {
43+
public static byte[] compress(String str) throws IOException {
5944
if (str == null || str.length() == 0) {
60-
return null;
45+
return new byte[]{};
6146
}
6247

6348
final String charsetName = "UTF-8";
@@ -69,26 +54,28 @@ public static byte[] compress(String str) throws Exception {
6954
return obj.toByteArray();
7055
}
7156

72-
public static String decompress(byte[] bytes) throws Exception {
57+
public static String decompress(byte[] bytes) throws IOException {
7358
if (bytes == null || bytes.length == 0) {
7459
return null;
7560
}
7661

7762
GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(bytes));
7863
BufferedReader bf = new BufferedReader(new InputStreamReader(gis, StandardCharsets.UTF_8));
79-
String outStr = "";
64+
8065
String line;
66+
StringBuilder output = new StringBuilder();
8167
while ((line = bf.readLine()) != null) {
82-
outStr += line;
68+
output.append(line);
8369
}
8470

85-
return outStr;
71+
return output.toString();
8672
}
8773

8874
public ComponentProperties getComponentProperties() {
8975
return this.componentProperties;
9076
}
9177

78+
@SuppressWarnings("squid:S1604")
9279
protected void ready() {
9380
setComponentFields(new Object[][]{
9481
{FIELD_VARIANT, DEFAULT_VARIANT},
@@ -101,7 +88,7 @@ protected void ready() {
10188

10289
// Convert RequestProgressTracker TIMER_END messages to timings and operation names
10390
RequestProgressTracker t = getRequest().getRequestProgressTracker();
104-
ArrayList<ChartBar> chartData = new ArrayList<ChartBar>();
91+
ArrayList<ChartBar> chartData = new ArrayList<>();
10592
int maxTime = 0;
10693
Iterator<String> messages = t.getMessages();
10794
if (messages != null) {
@@ -147,9 +134,9 @@ public int compare(ChartBar a, ChartBar b) {
147134

148135
dataObject.put("title", title);
149136

150-
ArrayList<Object> data = new ArrayList<Object>();
137+
ArrayList<Object> data = new ArrayList<>();
151138

152-
ArrayList<Object> dataInfo = new ArrayList<Object>();
139+
ArrayList<Object> dataInfo = new ArrayList<>();
153140

154141
dataInfo.add("name");
155142
Map<String, String> roleTooltip = new HashMap<>();
@@ -162,7 +149,7 @@ public int compare(ChartBar a, ChartBar b) {
162149

163150

164151
for (ChartBar d : chartData) {
165-
ArrayList<Object> bar = new ArrayList<Object>();
152+
ArrayList<Object> bar = new ArrayList<>();
166153
bar.add(d.name);
167154
bar.add(d.fullname);
168155
bar.add(d.start);
@@ -248,7 +235,7 @@ private String scan(char separator) {
248235
}
249236
}
250237

251-
static abstract class Getter {
252-
abstract String get(ChartBar t);
238+
public interface Getter {
239+
String get(ChartBar t);
253240
}
254241
}

0 commit comments

Comments
 (0)