Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ maven.install(
name = "maven",
artifacts = [
"com.beust:jcommander:1.82",
"org.checkerframework:checker-qual:3.49.2",
"com.github.javaparser:javaparser-core:3.27.0",
"com.github.spotbugs:spotbugs:4.9.6",
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
Expand All @@ -187,6 +188,7 @@ maven.install(
"com.google.protobuf:protobuf-java:4.32.1",
"com.google.protobuf.nano:protobuf-javanano:3.1.0",
"com.graphql-java:graphql-java:24.1",
"com.uber.nullaway:nullaway:0.12.10",
"dev.failsafe:failsafe:3.3.2",
"io.grpc:grpc-context:1.75.0",
"io.lettuce:lettuce-core:6.8.1.RELEASE",
Expand Down
35 changes: 35 additions & 0 deletions java/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
load("@contrib_rules_jvm//java:defs.bzl", "spotbugs_binary", "spotbugs_config")
load(":defs.bzl", "artifact")

Expand All @@ -21,6 +22,16 @@ java_plugin(
],
)

java_plugin(
name = "nullaway",
visibility = [
"//java:__subpackages__",
],
deps = [
artifact("com.uber.nullaway:nullaway"),
],
)

java_library(
name = "auto-service",
exported_plugins = [
Expand Down Expand Up @@ -52,3 +63,27 @@ spotbugs_config(
"//visibility:public",
],
)

string_flag(
name = "nullaway_level",
build_setting_default = "NONE",
values = [
"NONE",
"WARN",
"ERROR",
],
)

config_setting(
name = "use_nullaway_level_warn",
flag_values = {
":nullaway_level": "WARN",
},
)

config_setting(
name = "use_nullaway_level_error",
flag_values = {
":nullaway_level": "ERROR",
},
)
106 changes: 100 additions & 6 deletions java/maven_install.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -1728807581,
"__RESOLVED_ARTIFACTS_HASH": 2067975034,
"__INPUT_ARTIFACTS_HASH": 613305158,
"__RESOLVED_ARTIFACTS_HASH": -1530309246,
"artifacts": {
"com.beust:jcommander": {
"shasums": {
Expand Down Expand Up @@ -205,6 +205,13 @@
},
"version": "5.0.0"
},
"com.uber.nullaway:nullaway": {
"shasums": {
"jar": "34e6402eb8725468c1682da44034bef839d944ea0ebbc77b483e03ef99f90644",
"sources": "bca1c0d73859e6996a3227cc7224b4b324929ee53bc0cf9929bead8a4f21c418"
},
"version": "0.12.10"
},
"commons-io:commons-io": {
"shasums": {
"jar": "a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474",
Expand Down Expand Up @@ -599,10 +606,17 @@
},
"org.checkerframework:checker-qual": {
"shasums": {
"jar": "7e8554c902b9b839e61396cfe3a64c84ecabfb8eb652c410bfd8e4f5c1a8ece8",
"sources": "4f85e422b5da3c73990e894f1ed4cac45358f34fb4b979687848301584eccb57"
"jar": "33b1d8b2c4b00f7d4f4b4931424274f3f729474ce3a87cea09a879976a1dcaeb",
"sources": "4eb3d30ab38fda99c5c9fbd3ae0c97eff2e71195e2726a01c115d9ed661fbdd6"
},
"version": "3.21.2"
"version": "3.49.2"
},
"org.checkerframework:dataflow-nullaway": {
"shasums": {
"jar": "db2e715f7350db5b27e6df7d49e74caf083d17aade009c6a9e9c9e6f0cb013c2",
"sources": "d974d911ffb85690e513e1d57b08e5bc5f4f4d161feb2e888ebe729eb6e1ca1b"
},
"version": "3.49.2"
},
"org.dom4j:dom4j": {
"shasums": {
Expand Down Expand Up @@ -934,6 +948,11 @@
"org.jspecify:jspecify",
"org.reactivestreams:reactive-streams"
],
"com.uber.nullaway:nullaway": [
"com.google.guava:guava",
"org.checkerframework:dataflow-nullaway",
"org.jspecify:jspecify"
],
"io.grpc:grpc-context": [
"io.grpc:grpc-api"
],
Expand Down Expand Up @@ -1124,6 +1143,9 @@
"org.bouncycastle:bcutil-jdk18on": [
"org.bouncycastle:bcprov-jdk18on"
],
"org.checkerframework:dataflow-nullaway": [
"org.checkerframework:checker-qual"
],
"org.eclipse.mylyn.github:org.eclipse.egit.github.core": [
"com.google.code.gson:gson"
],
Expand Down Expand Up @@ -1549,6 +1571,23 @@
"org.dataloader.stats",
"org.dataloader.stats.context"
],
"com.uber.nullaway:nullaway": [
"com.uber.nullaway",
"com.uber.nullaway.annotations",
"com.uber.nullaway.dataflow",
"com.uber.nullaway.dataflow.cfg",
"com.uber.nullaway.fixserialization",
"com.uber.nullaway.fixserialization.adapters",
"com.uber.nullaway.fixserialization.location",
"com.uber.nullaway.fixserialization.out",
"com.uber.nullaway.generics",
"com.uber.nullaway.handlers",
"com.uber.nullaway.handlers.contract",
"com.uber.nullaway.handlers.contract.fieldcontract",
"com.uber.nullaway.handlers.stream",
"com.uber.nullaway.handlers.temporary",
"com.uber.nullaway.jarinfer"
],
"commons-io:commons-io": [
"org.apache.commons.io",
"org.apache.commons.io.comparator",
Expand Down Expand Up @@ -2489,24 +2528,70 @@
"org.checkerframework.checker.interning.qual",
"org.checkerframework.checker.lock.qual",
"org.checkerframework.checker.mustcall.qual",
"org.checkerframework.checker.nonempty.qual",
"org.checkerframework.checker.nullness.qual",
"org.checkerframework.checker.optional.qual",
"org.checkerframework.checker.propkey.qual",
"org.checkerframework.checker.regex.qual",
"org.checkerframework.checker.signature.qual",
"org.checkerframework.checker.signedness.qual",
"org.checkerframework.checker.sqlquotes.qual",
"org.checkerframework.checker.tainting.qual",
"org.checkerframework.checker.units.qual",
"org.checkerframework.common.aliasing.qual",
"org.checkerframework.common.initializedfields.qual",
"org.checkerframework.common.reflection.qual",
"org.checkerframework.common.returnsreceiver.qual",
"org.checkerframework.common.subtyping.qual",
"org.checkerframework.common.util.report.qual",
"org.checkerframework.common.util.count.report.qual",
"org.checkerframework.common.value.qual",
"org.checkerframework.dataflow.qual",
"org.checkerframework.framework.qual"
],
"org.checkerframework:dataflow-nullaway": [
"javax.annotation",
"javax.annotation.concurrent",
"javax.annotation.meta",
"org.checkerframework.nullaway.com.google.common.annotations",
"org.checkerframework.nullaway.com.google.common.base",
"org.checkerframework.nullaway.com.google.common.base.internal",
"org.checkerframework.nullaway.com.google.common.cache",
"org.checkerframework.nullaway.com.google.common.collect",
"org.checkerframework.nullaway.com.google.common.escape",
"org.checkerframework.nullaway.com.google.common.eventbus",
"org.checkerframework.nullaway.com.google.common.graph",
"org.checkerframework.nullaway.com.google.common.hash",
"org.checkerframework.nullaway.com.google.common.html",
"org.checkerframework.nullaway.com.google.common.io",
"org.checkerframework.nullaway.com.google.common.math",
"org.checkerframework.nullaway.com.google.common.net",
"org.checkerframework.nullaway.com.google.common.primitives",
"org.checkerframework.nullaway.com.google.common.reflect",
"org.checkerframework.nullaway.com.google.common.util.concurrent",
"org.checkerframework.nullaway.com.google.common.util.concurrent.internal",
"org.checkerframework.nullaway.com.google.common.xml",
"org.checkerframework.nullaway.com.google.errorprone.annotations",
"org.checkerframework.nullaway.com.google.errorprone.annotations.concurrent",
"org.checkerframework.nullaway.com.google.j2objc.annotations",
"org.checkerframework.nullaway.com.google.thirdparty.publicsuffix",
"org.checkerframework.nullaway.dataflow.analysis",
"org.checkerframework.nullaway.dataflow.busyexpr",
"org.checkerframework.nullaway.dataflow.cfg",
"org.checkerframework.nullaway.dataflow.cfg.block",
"org.checkerframework.nullaway.dataflow.cfg.builder",
"org.checkerframework.nullaway.dataflow.cfg.node",
"org.checkerframework.nullaway.dataflow.cfg.playground",
"org.checkerframework.nullaway.dataflow.cfg.visualize",
"org.checkerframework.nullaway.dataflow.constantpropagation",
"org.checkerframework.nullaway.dataflow.expression",
"org.checkerframework.nullaway.dataflow.livevariable",
"org.checkerframework.nullaway.dataflow.reachingdef",
"org.checkerframework.nullaway.dataflow.util",
"org.checkerframework.nullaway.javacutil",
"org.checkerframework.nullaway.javacutil.trees",
"org.checkerframework.nullaway.org.plumelib.reflection",
"org.checkerframework.nullaway.org.plumelib.util"
],
"org.dom4j:dom4j": [
"org.dom4j",
"org.dom4j.bean",
Expand Down Expand Up @@ -3021,6 +3106,8 @@
"com.graphql-java:graphql-java:jar:sources",
"com.graphql-java:java-dataloader",
"com.graphql-java:java-dataloader:jar:sources",
"com.uber.nullaway:nullaway",
"com.uber.nullaway:nullaway:jar:sources",
"commons-io:commons-io",
"commons-io:commons-io:jar:sources",
"commons-logging:commons-logging",
Expand Down Expand Up @@ -3135,6 +3222,8 @@
"org.bouncycastle:bcutil-jdk18on:jar:sources",
"org.checkerframework:checker-qual",
"org.checkerframework:checker-qual:jar:sources",
"org.checkerframework:dataflow-nullaway",
"org.checkerframework:dataflow-nullaway:jar:sources",
"org.dom4j:dom4j",
"org.dom4j:dom4j:jar:sources",
"org.eclipse.mylyn.github:org.eclipse.egit.github.core",
Expand Down Expand Up @@ -3245,6 +3334,11 @@
"com.google.googlejavaformat.java.GoogleJavaFormatTool"
]
},
"com.uber.nullaway:nullaway": {
"com.google.errorprone.bugpatterns.BugChecker": [
"com.uber.nullaway.NullAway"
]
},
"io.lettuce:lettuce-core": {
"io.lettuce.core.json.JsonParser": [
"io.lettuce.core.json.DefaultJsonParser"
Expand Down
2 changes: 1 addition & 1 deletion java/private/export.bzl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
load("@contrib_rules_jvm//java:defs.bzl", "java_library")
load(
"@rules_jvm_external//:defs.bzl",
"javadoc",
Expand All @@ -8,6 +7,7 @@ load("@rules_jvm_external//private/rules:maven_bom_fragment.bzl", "maven_bom_fra
load("@rules_jvm_external//private/rules:maven_project_jar.bzl", "maven_project_jar")
load("@rules_jvm_external//private/rules:maven_publish.bzl", "maven_publish")
load("//java/private:module.bzl", "java_module")
load(":java_library.bzl", "java_library")

def java_export(
name,
Expand Down
49 changes: 49 additions & 0 deletions java/private/java_library.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
load(
"@contrib_rules_jvm//java:defs.bzl",
_java_library = "java_library",
)

def java_library(
name,
deps = [],
srcs = [],
exports = [],
tags = [],
visibility = None,
javacopts = [],
plugins = [],
**kwargs):
# NullAway configuration
nullaway_plugins = select({
"//java:use_nullaway_level_warn": [
"//java:nullaway",
],
"//java:use_nullaway_level_error": [
"//java:nullaway",
],
"//conditions:default": [],
})
nullaway_javacopts = select({
"//java:use_nullaway_level_warn": [
"-Xep:NullAway:WARN",
"-XepOpt:NullAway:AnnotatedPackages=org.openqa.selenium",
],
"//java:use_nullaway_level_error": [
"-Xep:NullAway:ERROR",
"-XepOpt:NullAway:AnnotatedPackages=org.openqa.selenium",
],
"//conditions:default": [],
})

# global place for NullAway plugin use
_java_library(
name = name,
deps = deps,
srcs = srcs,
exports = exports,
tags = tags,
visibility = visibility,
plugins = plugins + nullaway_plugins,
javacopts = javacopts + nullaway_javacopts,
**kwargs
)
2 changes: 1 addition & 1 deletion java/private/library.bzl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
load(
"@contrib_rules_jvm//java:defs.bzl",
_java_library = "java_library",
_java_test = "java_test",
)
load(":export.bzl", _java_export = "java_export")
load(":java_library.bzl", _java_library = "java_library")

java_export = _java_export
java_library = _java_library
Expand Down