Skip to content

Remove unused SpotBugs suppressions from dd-smoke-tests #11831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexeyKuznetsov-DD wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unused SpotBugs suppressions from dd-smoke-tests #11831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dd-smoke-tests/apm-tracing-disabled/application/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ if (hasProperty('apiJar')) {
}

dependencies {
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.8'
implementation 'org.springframework.boot:spring-boot-starter-web'
// OpenTracing 0.32.0 is the last release and is intentionally pinned: this smoke test
// exercises the legacy OpenTracing bridge in dd-trace-ot. Do not "upgrade" — there is
Expand Down
2 changes: 0 additions & 2 deletions ...g-disabled/application/src/main/java/datadog/smoketest/apmtracingdisabled/Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package datadog.smoketest.apmtracingdisabled;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.opentracing.Span;
import io.opentracing.util.GlobalTracer;
import java.io.IOException;
Expand Down Expand Up @@ -51,7 +50,6 @@ public String pathParam(
}

@GetMapping("/iast")
@SuppressFBWarnings
public void write(
@RequestParam(name = "injection", required = false) String injection,
@RequestParam(name = "url", required = false) String url,
Expand Down
3 changes: 0 additions & 3 deletions ...ts/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import datadog.smoketest.springboot.TestBean;
import datadog.smoketest.springboot.controller.mock.JakartaMockTransport;
import ddtest.client.sources.Hasher;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.File;
import java.io.IOException;
import java.io.ObjectInputStream;
Expand Down Expand Up @@ -186,14 +185,12 @@ public String commandInjectionProcessBuilder(final HttpServletRequest request) {
return "Command Injection page";
}

@SuppressFBWarnings("PT_ABSOLUTE_PATH_TRAVERSAL")
@GetMapping("/path_traversal/file")
public String pathTraversalFile(final HttpServletRequest request) {
new File(request.getParameter("path"));
return "Path Traversal page";
}

@SuppressFBWarnings("PT_ABSOLUTE_PATH_TRAVERSAL")
@GetMapping("/path_traversal/paths")
public String pathTraversalPaths(final HttpServletRequest request) {
Paths.get(request.getParameter("path"));
Expand Down
21 changes: 0 additions & 21 deletions ...-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/XssController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import ddtest.securitycontrols.InputValidator;
import ddtest.securitycontrols.Sanitizer;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
Expand All @@ -18,7 +17,6 @@
public class XssController {

@GetMapping("/write")
@SuppressFBWarnings
public void write(final HttpServletRequest request, final HttpServletResponse response) {
try {
response.getWriter().write(request.getParameter("string"));
Expand All @@ -28,7 +26,6 @@ public void write(final HttpServletRequest request, final HttpServletResponse re
}

@GetMapping("/write2")
@SuppressFBWarnings
public void write2(final HttpServletRequest request, final HttpServletResponse response) {
try {
response.getWriter().write(request.getParameter("string").toCharArray());
Expand All @@ -38,7 +35,6 @@ public void write2(final HttpServletRequest request, final HttpServletResponse r
}

@GetMapping("/write3")
@SuppressFBWarnings
public void write3(final HttpServletRequest request, final HttpServletResponse response) {
try {
String insecure = request.getParameter("string");
Expand All @@ -49,7 +45,6 @@ public void write3(final HttpServletRequest request, final HttpServletResponse r
}

@GetMapping("/write4")
@SuppressFBWarnings
public void write4(final HttpServletRequest request, final HttpServletResponse response) {
try {
char[] buf = request.getParameter("string").toCharArray();
Expand All @@ -60,7 +55,6 @@ public void write4(final HttpServletRequest request, final HttpServletResponse r
}

@GetMapping("/print")
@SuppressFBWarnings
public void print(final HttpServletRequest request, final HttpServletResponse response) {
try {
response.getWriter().print(request.getParameter("string"));
Expand All @@ -70,7 +64,6 @@ public void print(final HttpServletRequest request, final HttpServletResponse re
}

@GetMapping("/print2")
@SuppressFBWarnings
public void print2(final HttpServletRequest request, final HttpServletResponse response) {
try {
response.getWriter().print(request.getParameter("string").toCharArray());
Expand All @@ -80,7 +73,6 @@ public void print2(final HttpServletRequest request, final HttpServletResponse r
}

@GetMapping("/println")
@SuppressFBWarnings
public void println(final HttpServletRequest request, final HttpServletResponse response) {
try {
response.getWriter().println(request.getParameter("string"));
Expand All @@ -90,7 +82,6 @@ public void println(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/println2")
@SuppressFBWarnings
public void println2(final HttpServletRequest request, final HttpServletResponse response) {
try {
response.getWriter().println(request.getParameter("string").toCharArray());
Expand All @@ -100,7 +91,6 @@ public void println2(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/printf")
@SuppressFBWarnings
public void printf(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = request.getParameter("string");
Expand All @@ -111,7 +101,6 @@ public void printf(final HttpServletRequest request, final HttpServletResponse r
}

@GetMapping("/printf2")
@SuppressFBWarnings
public void printf2(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = "Formatted like: %1$s and %2$s.";
Expand All @@ -122,7 +111,6 @@ public void printf2(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/printf3")
@SuppressFBWarnings
public void printf3(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = request.getParameter("string");
Expand All @@ -133,7 +121,6 @@ public void printf3(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/printf4")
@SuppressFBWarnings
public void printf4(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = "Formatted like: %1$s and %2$s.";
Expand All @@ -144,7 +131,6 @@ public void printf4(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/format")
@SuppressFBWarnings
public void format(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = request.getParameter("string");
Expand All @@ -155,7 +141,6 @@ public void format(final HttpServletRequest request, final HttpServletResponse r
}

@GetMapping("/format2")
@SuppressFBWarnings
public void format2(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = "Formatted like: %1$s and %2$s.";
Expand All @@ -166,7 +151,6 @@ public void format2(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/format3")
@SuppressFBWarnings
public void format3(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = request.getParameter("string");
Expand All @@ -177,7 +161,6 @@ public void format3(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/format4")
@SuppressFBWarnings
public void format4(final HttpServletRequest request, final HttpServletResponse response) {
try {
String format = "Formatted like: %1$s and %2$s.";
Expand All @@ -194,7 +177,6 @@ public String responseBody(final HttpServletRequest request, final HttpServletRe
}

@GetMapping("/sanitize")
@SuppressFBWarnings
public void sanitize(final HttpServletRequest request, final HttpServletResponse response) {
try {
response.getWriter().write(Sanitizer.sanitize(request.getParameter("string")));
Expand All @@ -204,7 +186,6 @@ public void sanitize(final HttpServletRequest request, final HttpServletResponse
}

@GetMapping("/validateAll")
@SuppressFBWarnings
public void validateAll(final HttpServletRequest request, final HttpServletResponse response) {
try {
String s = request.getParameter("string");
Expand All @@ -216,7 +197,6 @@ public void validateAll(final HttpServletRequest request, final HttpServletRespo
}

@GetMapping("/validateAll2")
@SuppressFBWarnings
public void validate2(final HttpServletRequest request, final HttpServletResponse response) {
try {
String string1 = request.getParameter("string");
Expand All @@ -229,7 +209,6 @@ public void validate2(final HttpServletRequest request, final HttpServletRespons
}

@GetMapping("/validate")
@SuppressFBWarnings
public void validate(final HttpServletRequest request, final HttpServletResponse response) {
try {
String string1 = request.getParameter("string");
Expand Down
3 changes: 0 additions & 3 deletions ...integration-tests/src/main/java/datadog/smoketest/profiling/ProfilingTestApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import datadog.trace.api.profiling.Profiling;
import datadog.trace.api.profiling.ProfilingContextAttribute;
import datadog.trace.api.profiling.ProfilingScope;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadMXBean;
import java.util.List;
Expand Down Expand Up @@ -54,7 +53,6 @@ public static void main(final String[] args) throws Exception {
}

@Trace
@SuppressFBWarnings("DM_GC")
private static void tracedMethod() throws InterruptedException {
System.out.println("Tracing");
tracedBusyMethod();
Expand All @@ -68,7 +66,6 @@ private static void tracedMethod() throws InterruptedException {
}

@Trace
@SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE")
private static void tracedBusyMethod() {
long startTime = THREAD_MX_BEAN.getCurrentThreadCpuTime();
Random random = new Random();
Expand Down
Loading