impl/api: update build files and drop jsr305

carl-mastrangelo · Mar 18, 2023 · d5d6978 · d5d6978
1 parent 3d79f41
commit d5d6978
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 35 deletions.
diff --git a/api/BUILD.bazel b/api/BUILD.bazel
@@ -18,7 +18,6 @@ java_library(
         ":link",
         ":tag",
         ":stringfunction",
-        "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_errorprone_error_prone_annotations",
     ],
 )
@@ -27,17 +26,13 @@ java_library(
     name = "tag",
     srcs = glob(["src/main/java/io/perfmark/Tag.java"]),
     visibility = ["//:__subpackages__"],
-    deps = [
-        "@maven//:com_google_code_findbugs_jsr305",
-    ],
 )
 
 java_library(
     name = "link",
     srcs = glob(["src/main/java/io/perfmark/Link.java"]),
     visibility = ["//:__subpackages__"],
     deps = [
-        "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_errorprone_error_prone_annotations",
     ],
 )
@@ -56,7 +51,6 @@ java_library(
         ":link",
         ":tag",
         ":stringfunction",
-        "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_errorprone_error_prone_annotations",
     ],
 )
diff --git a/impl/BUILD.bazel b/impl/BUILD.bazel
@@ -1,44 +1,62 @@
 java_library(
     name = "impl",
     srcs = [
-        "src/main/java/io/perfmark/impl/NoopGenerator.java",
         "src/main/java/io/perfmark/impl/SecretPerfMarkImpl.java",
     ],
     deps = [
         ":generator",
         ":mark",
+        ":mark-recorder",
         ":storage",
         "//api:impl",
         "//api:link",
         "//api:tag",
         "//api:stringfunction",
-        "@maven//:com_google_code_findbugs_jsr305",
     ],
 )
 
 java_library(
-    name = "generator",
-    srcs = ["src/main/java/io/perfmark/impl/Generator.java"],
+    name = "mark-recorder",
+    srcs = ["src/main/java/io/perfmark/impl/MarkRecorder.java"],
+    visibility = ["//:__subpackages__"],
+)
+
+java_library(
+    name = "thread-info",
+    srcs = ["src/main/java/io/perfmark/impl/ThreadInfo.java"],
+    visibility = ["//:__subpackages__"],
+)
+
+java_library(
+    name = "mark-recorder-ref",
+    srcs = [
+      "src/main/java/io/perfmark/impl/MarkRecorderRef.java",
+      "src/main/java/io/perfmark/impl/ThreadRef.java",
+      "src/main/java/io/perfmark/impl/ThreadRefInfo.java",
+    ],
     visibility = ["//:__subpackages__"],
     deps = [
-        "@maven//:com_google_code_findbugs_jsr305",
+      ":thread-info",
     ],
 )
 
+java_library(
+    name = "generator",
+    srcs = ["src/main/java/io/perfmark/impl/Generator.java"],
+    visibility = ["//:__subpackages__"],
+)
+
 java_library(
     name = "storage",
     srcs = [
-        "src/main/java/io/perfmark/impl/NoopMarkHolderProvider.java",
         "src/main/java/io/perfmark/impl/Storage.java",
     ],
     visibility = ["//:__subpackages__"],
     deps = [
         ":generator",
         ":mark",
         ":mark-holder",
-        ":mark-holder-provider",
         ":mark-list",
-        "@maven//:com_google_code_findbugs_jsr305",
     ],
 )
 
@@ -47,16 +65,7 @@ java_library(
     srcs = ["src/main/java/io/perfmark/impl/MarkHolder.java"],
     visibility = ["//:__subpackages__"],
     deps = [
-        ":mark",
-    ],
-)
-
-java_library(
-    name = "mark-holder-provider",
-    srcs = ["src/main/java/io/perfmark/impl/MarkHolderProvider.java"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":mark-holder",
+        ":mark-list",
     ],
 )
 
@@ -66,7 +75,6 @@ java_library(
     visibility = ["//:__subpackages__"],
     deps = [
         ":generator",
-        "@maven//:com_google_code_findbugs_jsr305",
     ],
 )
 

diff --git a/impl/build.gradle.kts b/impl/build.gradle.kts
@@ -30,7 +30,6 @@ tasks.named<JavaCompile>("compileJava") {
 
 dependencies {
     implementation(project(":perfmark-api"))
-    compileOnly(libs.jsr305)
     compileOnly(libs.errorprone)
     testImplementation(libs.truth)
     testCompileOnly(libs.errorprone)

diff --git a/impl/src/main/java/io/perfmark/impl/Mark.java b/impl/src/main/java/io/perfmark/impl/Mark.java
@@ -17,7 +17,6 @@
 package io.perfmark.impl;
 
 import java.util.Arrays;
-import javax.annotation.Nullable;
 
 public final class Mark {
   // TODO: make sure these match the values in Impl
@@ -34,9 +33,12 @@ public final class Mark {
   private final long n2;
   private final long n3;
 
-  @Nullable private final String s1;
-  @Nullable private final String s2;
-  @Nullable private final String s3;
+  /** {@code Nullable} */
+  private final String s1;
+  /** {@code Nullable} */
+  private final String s2;
+  /** {@code Nullable} */
+  private final String s3;
 
   private final Operation operation;
 
@@ -138,13 +140,14 @@ public Mark withTaskName(String name) {
     throw new AssertionError();
   }
 
+  /** s1, s2, and s3 are {@code Nullable} */
   private Mark(
       long n1,
       long n2,
       long n3,
-      @Nullable String s1,
-      @Nullable String s2,
-      @Nullable String s3,
+      String s1,
+      String s2,
+      String s3,
       long generation,
       Operation operation) {
     if (operation == null) {

diff --git a/impl/src/main/java/io/perfmark/impl/SecretPerfMarkImpl.java b/impl/src/main/java/io/perfmark/impl/SecretPerfMarkImpl.java
@@ -24,7 +24,6 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
 
 final class SecretPerfMarkImpl {
 
@@ -449,7 +448,7 @@ protected void attachTag(String tagName, long tagValue0, long tagValue1) {
     }
 
     @Override
-    protected Tag createTag(@Nullable String tagName, long tagId) {
+    protected Tag createTag(String tagName, long tagId) {
       if (!isEnabled(getGen())) {
         return NO_TAG;
       }