Rename onFileLoaded method

DataDog · Sep 12, 2024 · 7a6cea9 · 7a6cea9
1 parent d8c8b1b
commit 7a6cea9
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 31 deletions.
diff --git a/...mentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java b/...mentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java
@@ -101,18 +101,18 @@ private static void iastCallback(URI uri) {
   }
 
   private static void raspCallback(File parent, String child) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(parent, child);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(parent, child);
   }
 
   private static void raspCallback(String parent, String file) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(parent, file);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(parent, file);
   }
 
   private static void raspCallback(String s) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(s);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(s);
   }
 
   private static void raspCallback(URI uri) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(uri);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(uri);
   }
 }
diff --git a/...ava-io/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java b/...ava-io/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java
@@ -35,6 +35,6 @@ private static void iastCallback(String path) {
   }
 
   private static void raspCallback(String path) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(path);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(path);
   }
 }
diff --git a/...n/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java b/...n/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java
@@ -29,14 +29,14 @@ private FileLoadedRaspHelper() {
     // prevent instantiation
   }
 
-  public void onFileLoaded(@Nullable final String parent, @Nonnull final String child) {
+  public void beforeFileLoaded(@Nullable final String parent, @Nonnull final String child) {
     try {
       if (parent == null) {
-        onFileLoaded(child);
+        beforeFileLoaded(child);
         return;
       }
       String s = parent + FileSystems.getDefault().getSeparator() + child;
-      onFileLoaded(s);
+      beforeFileLoaded(s);
     } catch (final BlockingException e) {
       // re-throw blocking exceptions
       throw e;
@@ -46,14 +46,14 @@ public void onFileLoaded(@Nullable final String parent, @Nonnull final String ch
     }
   }
 
-  public void onFileLoaded(@Nonnull final String first, @Nonnull final String[] more) {
+  public void beforeFileLoaded(@Nonnull final String first, @Nonnull final String[] more) {
     try {
       String separator = FileSystems.getDefault().getSeparator();
       String s = first;
       if (more.length > 0) {
         s += separator + String.join(separator, more);
       }
-      onFileLoaded(s);
+      beforeFileLoaded(s);
     } catch (final BlockingException e) {
       // re-throw blocking exceptions
       throw e;
@@ -63,9 +63,9 @@ public void onFileLoaded(@Nonnull final String first, @Nonnull final String[] mo
     }
   }
 
-  public void onFileLoaded(@Nonnull final URI uri) {
+  public void beforeFileLoaded(@Nonnull final URI uri) {
     try {
-      onFileLoaded(uri.toString());
+      beforeFileLoaded(uri.toString());
     } catch (final BlockingException e) {
       // re-throw blocking exceptions
       throw e;
@@ -75,14 +75,14 @@ public void onFileLoaded(@Nonnull final URI uri) {
     }
   }
 
-  public void onFileLoaded(@Nullable final File parent, @Nonnull final String child) {
+  public void beforeFileLoaded(@Nullable final File parent, @Nonnull final String child) {
     try {
       if (parent == null) {
-        onFileLoaded(child);
+        beforeFileLoaded(child);
         return;
       }
       String s = parent + FileSystems.getDefault().getSeparator() + child;
-      onFileLoaded(s);
+      beforeFileLoaded(s);
     } catch (final BlockingException e) {
       // re-throw blocking exceptions
       throw e;
@@ -92,7 +92,7 @@ public void onFileLoaded(@Nullable final File parent, @Nonnull final String chil
     }
   }
 
-  public void onFileLoaded(@Nonnull final String path) {
+  public void beforeFileLoaded(@Nonnull final String path) {
     if (!Config.get().isAppSecRaspEnabled()) {
       return;
     }

diff --git a/...va-io/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java b/...va-io/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java
@@ -36,6 +36,6 @@ private static void iastCallback(String path) {
   }
 
   private static void raspCallback(String path) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(path);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(path);
   }
 }
diff --git a/...mentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java b/...mentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java
@@ -36,6 +36,6 @@ private static void iastCallback(String other) {
   }
 
   private static void raspCallback(String other) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(other);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(other);
   }
 }
diff --git a/...entation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java b/...entation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java
@@ -58,10 +58,10 @@ private static void iastCallback(String first, String[] more) {
   }
 
   private static void raspCallback(String first, String[] more) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(first, more);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(first, more);
   }
 
   private static void raspCallback(URI uri) {
-    FileLoadedRaspHelper.INSTANCE.onFileLoaded(uri);
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(uri);
   }
 }
diff --git a/...ion/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy b/...ion/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy
@@ -93,7 +93,7 @@ class FileCallSiteTest extends BaseIoRaspCallSiteTest {
     TestFileSuite.newFile(parent, child)
 
     then:
-    1 *  helper.onFileLoaded(parent, child)
+    1 *  helper.beforeFileLoaded(parent, child)
   }
 
   void 'test RASP new file with parent file and child'() {
@@ -107,7 +107,7 @@ class FileCallSiteTest extends BaseIoRaspCallSiteTest {
     TestFileSuite.newFile(parent, child)
 
     then:
-    1 *  helper.onFileLoaded(parent, child)
+    1 *  helper.beforeFileLoaded(parent, child)
   }
 
   void 'test RASP new file with uri'() {
@@ -120,6 +120,6 @@ class FileCallSiteTest extends BaseIoRaspCallSiteTest {
     TestFileSuite.newFile(file)
 
     then:
-    1 *  helper.onFileLoaded(file)
+    1 *  helper.beforeFileLoaded(file)
   }
 }
diff --git a/.../src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy b/.../src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy
@@ -30,6 +30,6 @@ class FileInputStreamCallSiteTest extends BaseIoRaspCallSiteTest {
     TestFileInputStreamSuite.newFileInputStream(path)
 
     then:
-    1 * helper.onFileLoaded(path)
+    1 * helper.beforeFileLoaded(path)
   }
 }
diff --git a/...c/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy b/...c/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy
@@ -19,7 +19,7 @@ class FileLoadedRaspHelperForkedTest extends BaseIoRaspCallSiteTest {
     tracer.getCallbackProvider(RequestContextSlot.APPSEC) >> callbackProvider
 
     when:
-    FileLoadedRaspHelper.INSTANCE."onFileLoaded"(*args)
+    FileLoadedRaspHelper.INSTANCE.beforeFileLoaded(*args)
 
     then:
     1 * callbackProvider.getCallback(EVENTS.fileLoaded()) >> listener

diff --git a/...src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy b/...src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy
@@ -45,7 +45,7 @@ class FileOutputStreamCallSiteTest extends BaseIoRaspCallSiteTest {
     TestFileOutputStreamSuite.newFileOutputStream(path)
 
     then:
-    1 * helper.onFileLoaded(path)
+    1 * helper.beforeFileLoaded(path)
   }
 
   void 'test RASP new file input stream with path and append'() {
@@ -58,6 +58,6 @@ class FileOutputStreamCallSiteTest extends BaseIoRaspCallSiteTest {
     TestFileOutputStreamSuite.newFileOutputStream(path, false)
 
     then:
-    1 * helper.onFileLoaded(path)
+    1 * helper.beforeFileLoaded(path)
   }
 }
diff --git a/...ion/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy b/...ion/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy
@@ -44,7 +44,7 @@ class PathCallSiteTest extends BaseIoRaspCallSiteTest {
     TestPathSuite.resolve(getRootFolder().toPath(), path)
 
     then:
-    1 * helper.onFileLoaded(path)
+    1 * helper.beforeFileLoaded(path)
   }
 
   void 'test RASP resolve sibling'() {
@@ -58,6 +58,6 @@ class PathCallSiteTest extends BaseIoRaspCallSiteTest {
     TestPathSuite.resolveSibling(sibling, path)
 
     then:
-    1 * helper.onFileLoaded(path)
+    1 * helper.beforeFileLoaded(path)
   }
 }
diff --git a/...on/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy b/...on/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy
@@ -46,7 +46,7 @@ class PathsCallSiteTest extends BaseIoRaspCallSiteTest {
     TestPathsSuite.get(first, other)
 
     then:
-    1 * helper.onFileLoaded(first, other)
+    1 * helper.beforeFileLoaded(first, other)
 
     where:
     first      | other
@@ -64,6 +64,6 @@ class PathsCallSiteTest extends BaseIoRaspCallSiteTest {
     TestPathsSuite.get(file)
 
     then:
-    1 * helper.onFileLoaded(file)
+    1 * helper.beforeFileLoaded(file)
   }
 }