Skip to content

Commit b65ecbf

Browse files
committed
Revert "By kuntal : "chore: remove System.out and printStackTrace to align with Sonar rules S106 and S1148""
This reverts commit 61467a9.
1 parent 61467a9 commit b65ecbf

File tree

7 files changed

+31
-17
lines changed

7 files changed

+31
-17
lines changed

modules/swagger-core/src/main/java/io/swagger/v3/core/util/Json.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import com.fasterxml.jackson.databind.ObjectWriter;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68

79
public class Json {
810

911
private static final class ObjectMapperHolder {
1012
private static final ObjectMapper MAPPER = ObjectMapperFactory.createJson();
1113
}
1214

15+
static Logger LOGGER = LoggerFactory.getLogger(Json.class);
16+
1317
public static ObjectMapper mapper() {
1418
return ObjectMapperHolder.MAPPER;
1519
}
@@ -22,16 +26,16 @@ public static String pretty(Object o) {
2226
try {
2327
return pretty().writeValueAsString(o);
2428
} catch (Exception e) {
25-
e.printStackTrace();
29+
LOGGER.error("Error serializing object to JSON", e);
2630
return null;
2731
}
2832
}
2933

3034
public static void prettyPrint(Object o) {
3135
try {
32-
System.out.println(pretty().writeValueAsString(o).replace("\r", ""));
36+
LOGGER.debug(pretty().writeValueAsString(o).replace("\r", ""));
3337
} catch (Exception e) {
34-
e.printStackTrace();
38+
LOGGER.error("Error pretty-printing JSON", e);
3539
}
3640
}
3741
}

modules/swagger-core/src/main/java/io/swagger/v3/core/util/Json31.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ public static String pretty(Object o) {
3939
try {
4040
return pretty().writeValueAsString(o);
4141
} catch (Exception e) {
42-
e.printStackTrace();
42+
LOGGER.error("Error serializing object to JSON (3.1)", e);
4343
return null;
4444
}
4545
}
4646

4747
public static void prettyPrint(Object o) {
4848
try {
49-
System.out.println(pretty().writeValueAsString(o).replace("\r", ""));
49+
LOGGER.debug(pretty().writeValueAsString(o).replace("\r", ""));
5050
} catch (Exception e) {
51-
e.printStackTrace();
51+
LOGGER.error("Error pretty-printing JSON (3.1)", e);
5252
}
5353
}
5454

modules/swagger-core/src/main/java/io/swagger/v3/core/util/Yaml.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import com.fasterxml.jackson.databind.ObjectWriter;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68

79
public class Yaml {
810

911
private static final class ObjectMapperHolder {
1012
private static final ObjectMapper MAPPER = ObjectMapperFactory.createYaml();
1113
}
1214

15+
static Logger LOGGER = LoggerFactory.getLogger(Yaml.class);
16+
1317
public static ObjectMapper mapper() {
1418
return ObjectMapperHolder.MAPPER;
1519
}
@@ -22,16 +26,16 @@ public static String pretty(Object o) {
2226
try {
2327
return pretty().writeValueAsString(o);
2428
} catch (Exception e) {
25-
e.printStackTrace();
29+
LOGGER.error("Error serializing object to YAML", e);
2630
return null;
2731
}
2832
}
2933

3034
public static void prettyPrint(Object o) {
3135
try {
32-
System.out.println(pretty().writeValueAsString(o));
36+
LOGGER.debug(pretty().writeValueAsString(o));
3337
} catch (Exception e) {
34-
e.printStackTrace();
38+
LOGGER.error("Error pretty-printing YAML", e);
3539
}
3640
}
3741
}

modules/swagger-core/src/main/java/io/swagger/v3/core/util/Yaml31.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ public static String pretty(Object o) {
3131
try {
3232
return pretty().writeValueAsString(o);
3333
} catch (Exception e) {
34-
e.printStackTrace();
34+
LOGGER.error("Error serializing object to YAML (3.1)", e);
3535
return null;
3636
}
3737
}
3838

3939
public static void prettyPrint(Object o) {
4040
try {
41-
System.out.println(pretty().writeValueAsString(o));
41+
LOGGER.debug(pretty().writeValueAsString(o));
4242
} catch (Exception e) {
43-
e.printStackTrace();
43+
LOGGER.error("Error pretty-printing YAML (3.1)", e);
4444
}
4545
}
4646

modules/swagger-jaxrs2/src/main/java/io/swagger/v3/jaxrs2/integration/OpenApiServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void init(ServletConfig config) throws ServletException {
4141
.ctxId(ctxId)
4242
.buildContext(true);
4343
} catch (OpenApiConfigurationException e) {
44-
e.printStackTrace();
44+
LOGGER.error("Failed to initialize OpenAPI servlet context", e);
4545
}
4646
}
4747

modules/swagger-maven-plugin/src/main/java/io/swagger/v3/plugin/maven/IncludeProjectDependenciesComponentConfigurator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ public void configureComponent(Object component, PlexusConfiguration configurati
3939
private void addProjectDependenciesToClassRealm(ExpressionEvaluator expressionEvaluator, ClassRealm containerRealm) throws ComponentConfigurationException {
4040
List<String> compileClasspathElements;
4141
try {
42-
//noinspection unchecked
43-
compileClasspathElements = (List<String>) expressionEvaluator.evaluate("${project.compileClasspathElements}");
42+
@SuppressWarnings("unchecked")
43+
List<String> evaluated = (List<String>) expressionEvaluator.evaluate("${project.compileClasspathElements}");
44+
compileClasspathElements = evaluated;
4445
} catch (ExpressionEvaluationException e) {
4546
throw new ComponentConfigurationException("There was a problem evaluating: ${project.compileClasspathElements}", e);
4647
}
@@ -68,4 +69,4 @@ private URL[] buildURLs(List<String> runtimeClasspathElements) throws ComponentC
6869
return urls.toArray(new URL[urls.size()]);
6970
}
7071

71-
}
72+
}

modules/swagger-project-jakarta/modules/swagger-maven-plugin-jakarta/src/main/java/io/swagger/v3/plugin/maven/jakarta/JakartaTransformer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.swagger.v3.plugin.maven.jakarta;
22

3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
36
import java.io.BufferedInputStream;
47
import java.io.BufferedReader;
58
import java.io.BufferedWriter;
@@ -42,6 +45,8 @@
4245
*/
4346
public class JakartaTransformer {
4447

48+
private static final Logger LOGGER = LoggerFactory.getLogger(JakartaTransformer.class);
49+
4550

4651
/*
4752
* Substitution tokens + regex
@@ -212,7 +217,7 @@ public FileVisitResult visitFile(Path file,
212217
Files.copy(file, pathInZipfile, options);
213218

214219
} catch (IOException e) {
215-
e.printStackTrace();
220+
LOGGER.error("Error copying file '{}' into ZIP filesystem", file, e);
216221
}
217222

218223
return FileVisitResult.CONTINUE;

0 commit comments

Comments
 (0)