clean up/reduce diff

Author: evanchooly

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java

@@ -10,26 +10,23 @@
 
 /** Stores status instrumentation results */
 public class InstrumentationResult {
-
   public enum Status {
     INSTALLED,
     BLOCKED,
-    ERROR;
+    ERROR
   }
 
   private final Status status;
-
   private final Map<ProbeId, List<DiagnosticMessage>> diagnostics;
   private final String sourceFileName;
   private final String typeName;
   private final String methodName;
-  private final String signature;
   private final int methodStart;
+  private final String signature;
 
   public static class Factory {
-
     public static InstrumentationResult blocked(String className) {
-      return new InstrumentationResult(Status.BLOCKED, null, className);
+      return new InstrumentationResult(Status.BLOCKED, className, null);
     }
 
     public static InstrumentationResult blocked(
@@ -38,38 +35,38 @@ public static InstrumentationResult blocked(
       definitions.forEach(
           probeDefinition ->
               diagnostics.put(probeDefinition.getProbeId(), Arrays.asList(messages)));
-      return new InstrumentationResult(Status.BLOCKED, diagnostics, className);
+      return new InstrumentationResult(Status.BLOCKED, diagnostics, null, className, null);
     }
   }
 
-  private InstrumentationResult(
-      Status status, Map<ProbeId, List<DiagnosticMessage>> diagnostics, String className) {
-    this(status, diagnostics, className, null);
+  public InstrumentationResult(
+      Status status, Map<ProbeId, List<DiagnosticMessage>> diagnostics, MethodInfo methodInfo) {
+    this.status = status;
+    this.diagnostics = diagnostics;
+    this.sourceFileName = methodInfo.getSourceFileName();
+    this.typeName = methodInfo.getTypeName();
+    this.methodName = methodInfo.getMethodName();
+    this.methodStart = methodInfo.getMethodStart();
+    this.signature = methodInfo.getSignature();
+  }
+
+  public InstrumentationResult(Status status, String className, String methodName) {
+    this(status, null, className, className, methodName);
   }
 
   public InstrumentationResult(
       Status status,
       Map<ProbeId, List<DiagnosticMessage>> diagnostics,
+      String sourceFileName,
       String className,
-      String method) {
+      String methodName) {
     this.status = status;
     this.diagnostics = diagnostics;
+    this.sourceFileName = sourceFileName;
     this.typeName = className;
-    this.methodName = method;
-    this.sourceFileName = null;
-    this.signature = null;
+    this.methodName = methodName;
     this.methodStart = -1;
-  }
-
-  public InstrumentationResult(
-      Status status, Map<ProbeId, List<DiagnosticMessage>> diagnostics, MethodInfo methodInfo) {
-    this.status = status;
-    this.diagnostics = diagnostics;
-    this.sourceFileName = methodInfo.getSourceFileName();
-    this.typeName = methodInfo.getTypeName();
-    this.methodName = methodInfo.getMethodName();
-    this.methodStart = methodInfo.getMethodStart();
-    this.signature = methodInfo.getSignature();
+    this.signature = null;
   }
 
   public boolean isError() {
@@ -111,17 +108,9 @@ public String getMethodSignature() {
   @Generated
   @Override
   public String toString() {
-    return "InstrumentationResult{"
-        + "status="
-        + status
-        + ", diagnostics="
-        + diagnostics
-        + ", typeName='"
-        + typeName
-        + '\''
-        + ", methodName='"
-        + methodName
-        + '\''
-        + '}';
+    return String.format(
+        "InstrumentationResult{typeName='%s', methodName='%s', methodStart=%d, signature='%s',"
+            + " sourceFileName='%s', status=%s. diagnostics=%s}",
+        typeName, methodName, methodStart, signature, sourceFileName, status, diagnostics);
   }
 }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/ConfigurationComparerTest.java

@@ -222,7 +222,7 @@ public void hasProbeRelatedChangesWhenDenyListAddedWithProbe() {
     instrumentationResults.put(
         probe.getId(),
         new InstrumentationResult(
-            InstrumentationResult.Status.INSTALLED, null, "com.datadog.Blocked", "method"));
+            InstrumentationResult.Status.INSTALLED, "com.datadog.Blocked", "method"));
     Configuration noFilterConfig = createConfig(Collections.singletonList(probe));
     Configuration config =
         Configuration.builder()