Generate Java from Proto using Nix

.gitignore

@@ -50,13 +50,6 @@ java/target
 # https://jbang.dev
 .jbang/
 
-# Ignore generated proto
-java/dev/enola/common/validation/
-java/dev/enola/core/meta/proto/
-java/dev/enola/core/proto/
-java/dev/enola/protobuf/
-java/dev/enola/thing/proto/
-
 tools/version/VERSION
 
 # LinkML
@@ -78,3 +71,9 @@ flox.x86_64-linux.deb
 
 # Python Virtual Environment (venv)
 .venv/
+
+# The *.java etc. under generated/ are created at build-time by tools/protoc.
+# So we ignore everything in it, EXCEPT for the generated/protoc/java/BUILD file.
+# PS: Due to https://github.com/NixOS/nix/issues/14024, it's done like this?
+# (That was the initial thought, but it may not be true; did not re-verify.)
+generated/protoc/java/dev/

MODULE.bazel

@@ -24,40 +24,9 @@ RDF4J_VERSION = "5.1.4"
 
 GRPC_JAVA_VERSION = "1.75.0"
 
-# https://github.com/bazel-contrib/rules_jvm_external/issues/1426
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-
-# https://github.com/bazelbuild/apple_support/
-bazel_dep(name = "apple_support", version = "1.23.1", repo_name = "build_bazel_apple_support")
-
-# https://github.com/protocolbuffers/protobuf/tree/main?tab=readme-ov-file#bazel-with-bzlmod
-bazel_dep(name = "protobuf", version = "32.0")
-
 # https://registry.bazel.build/modules/rules_java
 bazel_dep(name = "rules_java", version = "8.15.2")
 
-# Required by gRPC
-# (from https://github.com/grpc/grpc-java/blob/8c261c3f28c7d83e1e976acfc34b62027078252b/examples/MODULE.bazel#L1)
-bazel_dep(name = "googleapis", version = "0.0.0-20250703-f9d6fe4a", repo_name = "com_google_googleapis")
-bazel_dep(name = "googleapis-java", version = "1.0.0")
-
-switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
-switched_rules.use_languages(java = True)
-
-# https://github.com/grpc/grpc-java/
-# https://registry.bazel.build/modules/grpc-java
-# TODO How to avoid the ugly WARNING & DEBUG once https://github.com/grpc/grpc-java/issues/11792
-#  and https://github.com/grpc/grpc-java/issues/11791 are fixed (and released).
-bazel_dep(name = "grpc-java", version = GRPC_JAVA_VERSION, repo_name = "io_grpc_grpc_java")
-
-# https://github.com/grpc/grpc-java/issues/12055
-# https://github.com/grpc/grpc-java/pull/12135
-git_override(
-    module_name = "grpc-java",
-    remote = "https://github.com/grpc/grpc-java.git",
-    tag = "v" + GRPC_JAVA_VERSION,
-)
-
 # https://github.com/bazelbuild/rules_go/blob/master/docs/go/core/bzlmod.md
 bazel_dep(name = "rules_go", version = "0.57.0")
 bazel_dep(name = "gazelle", version = "0.45.0")

docs/dev/dependencies.txt

@@ -1,4 +1,6 @@
 at.favre.lib:hkdf:2.0.0
+biz.aQute.bnd:biz.aQute.bnd.util:6.4.0
+biz.aQute.bnd:biz.aQute.bndlib:6.4.0
 ch.vorburger.exec:exec:3.3.2
 com.adobe.xmp:xmpcore:6.1.11
 com.amazonaws:aws-java-sdk-core:1.12.783
@@ -80,6 +82,13 @@ com.google.auto.service:auto-service-annotations:1.1.1
 com.google.auto.value:auto-value:1.11.0
 com.google.auto.value:auto-value-annotations:1.11.0
 com.google.auto:auto-common:1.2.1
+com.google.caliper:caliper:1.0-beta-3
+com.google.caliper:caliper-api:1.0-beta-3
+com.google.caliper:caliper-core:1.0-beta-3
+com.google.caliper:caliper-runner:1.0-beta-3
+com.google.caliper:caliper-util:1.0-beta-3
+com.google.caliper:caliper-worker:1.0-beta-3
+com.google.caliper:caliper-worker-jvm:1.0-beta-3
 com.google.cloud.opentelemetry:detector-resources-support:0.33.0
 com.google.cloud.opentelemetry:exporter-metrics:0.33.0
 com.google.cloud.opentelemetry:shared-resourcemapping:0.33.0
@@ -92,10 +101,14 @@ com.google.cloud:google-cloud-speech:4.51.0
 com.google.cloud:google-cloud-storage:2.47.0
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.13.1
+com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0
+com.google.dagger:dagger:2.22.1
+com.google.dagger:dagger-producers:2.22.1
 com.google.errorprone:error_prone_annotations:2.41.0
 com.google.genai:google-genai:1.8.0
 com.google.guava:failureaccess:1.0.3
 com.google.guava:guava:33.4.8-jre
+com.google.guava:guava-testlib:32.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.http-client:google-http-client:1.47.0
 com.google.http-client:google-http-client-apache-v2:1.45.3
@@ -107,8 +120,7 @@ com.google.jimfs:jimfs:1.3.1
 com.google.oauth-client:google-oauth-client:1.37.0
 com.google.protobuf:protobuf-java:4.32.0
 com.google.protobuf:protobuf-java-util:4.32.0
-com.google.re2j:re2j:1.8
-com.google.s2a.proto.v2:s2a-proto:0.1.2
+com.google.re2j:re2j:1.7
 com.google.truth.extensions:truth-java8-extension:1.4.5
 com.google.truth.extensions:truth-liteproto-extension:1.4.5
 com.google.truth.extensions:truth-proto-extension:1.4.5
@@ -127,6 +139,8 @@ com.squareup.okhttp:okhttp:2.7.5
 com.squareup.okio:okio:3.6.0
 com.squareup.okio:okio-jvm:3.6.0
 com.sun.istack:istack-commons-runtime:4.1.2
+com.sun.jersey:jersey-client:1.19.4
+com.sun.jersey:jersey-core:1.19.4
 com.zaxxer:SparseBitSet:1.3
 commons-codec:commons-codec:1.18.0
 commons-io:commons-io:2.19.0
@@ -186,16 +200,13 @@ io.netty:netty-common:4.1.124.Final
 io.netty:netty-handler:4.1.124.Final
 io.netty:netty-handler-proxy:4.1.124.Final
 io.netty:netty-resolver:4.1.124.Final
-io.netty:netty-tcnative-boringssl-static:2.0.70.Final
-io.netty:netty-tcnative-classes:2.0.70.Final
 io.netty:netty-transport:4.1.124.Final
-io.netty:netty-transport-classes-epoll:4.1.124.Final
+io.netty:netty-transport-classes-epoll:4.1.116.Final
 io.netty:netty-transport-classes-kqueue:4.1.116.Final
-io.netty:netty-transport-native-epoll:4.1.124.Final
+io.netty:netty-transport-native-epoll:4.1.116.Final
 io.netty:netty-transport-native-kqueue:4.1.116.Final
 io.netty:netty-transport-native-unix-common:4.1.124.Final
 io.opencensus:opencensus-api:0.31.1
-io.opencensus:opencensus-contrib-grpc-metrics:0.31.0
 io.opencensus:opencensus-contrib-http-util:0.31.1
 io.opentelemetry.contrib:opentelemetry-gcp-resources:1.37.0-alpha
 io.opentelemetry.semconv:opentelemetry-semconv:1.27.0-alpha
@@ -229,10 +240,14 @@ jakarta.json:jakarta.json-api:2.0.1
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2
 javax.annotation:javax.annotation-api:1.3.2
+javax.inject:javax.inject:1
+javax.ws.rs:jsr311-api:1.1.1
 javax.xml.bind:jaxb-api:2.2.12
 joda-time:joda-time:2.12.7
 junit:junit:4.13.2
 net.arnx:nashorn-promise:0.1.1
+net.bytebuddy:byte-buddy:1.12.7
+net.bytebuddy:byte-buddy-agent:1.12.7
 net.java.dev.jna:jna:5.14.0
 net.java.dev.jna:jna-platform:5.14.0
 no.hasmac:hasmac-json-ld:0.9.0
@@ -323,6 +338,7 @@ org.bouncycastle:bcprov-jdk18on:1.80
 org.bouncycastle:bcutil-jdk18on:1.80
 org.brotli:dec:0.1.2
 org.ccil.cowan.tagsoup:tagsoup:1.2.1
+org.checkerframework:checker-compat-qual:2.5.3
 org.checkerframework:checker-qual:3.49.0
 org.codehaus.mojo:animal-sniffer-annotations:1.24
 org.codehaus.plexus:plexus-cipher:2.0
@@ -407,8 +423,23 @@ org.jspecify:jspecify:1.0.0
 org.lz4:lz4-java:1.8.0
 org.mapdb:elsa:3.0.0-M5
 org.mapdb:mapdb:3.1.0
+org.mockito:mockito-core:4.3.1
 org.netpreserve:jwarc:0.30.0
+org.objenesis:objenesis:3.2
+org.osgi:org.osgi.dto:1.0.0
+org.osgi:org.osgi.framework:1.8.0
+org.osgi:org.osgi.resource:1.0.0
+org.osgi:org.osgi.service.log:1.3.0
+org.osgi:org.osgi.service.repository:1.1.0
+org.osgi:org.osgi.util.function:1.2.0
+org.osgi:org.osgi.util.promise:1.2.0
+org.osgi:org.osgi.util.tracker:1.5.4
+org.osgi:osgi.annotation:8.0.1
 org.ow2.asm:asm:9.8
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm-util:7.2
 org.reactivestreams:reactive-streams:1.0.4
 org.slf4j:jcl-over-slf4j:2.0.16
 org.slf4j:jul-to-slf4j:2.0.16

flake.nix

@@ -52,7 +52,9 @@
           jdk'
           graphviz
           protobuf
+          protoc-gen-grpc-java
           docker
+          which
 
           statix
           deadnix.packages.${system}.default
@@ -80,6 +82,9 @@
 
           # A hook run every time you enter the environment
           postShellHook = ''
+            # TODO Huh, why is this ugly hack required!?
+            export PATH="${pkgs.protoc-gen-grpc-java}/bin:$PATH"
+
             echo Welcome to contributing to Enola.dev! You can now run e.g. ./enola or ./test.bash etc. here.
           '';
         };
@@ -97,13 +102,17 @@
             nativeBuildInputs = buildTools ++ [
               pkgs.cacert
               pkgs.makeWrapper
+              pkgs.which
             ];
             src = ./.;
 
             buildPhase = ''
               # class dev.enola.common.Version reads VERSION
               echo -n "${gitRev}" >tools/version/VERSION
 
+              # See https://github.com/NixOS/nix/issues/14024
+              bash tools/protoc/protoc.bash
+
               export HOME=$TMPDIR
               bazel build //java/dev/enola/cli:enola_deploy.jar
             '';

java/dev/enola/model/enola/meta/proto/BUILD → generated/protoc/java/BUILD

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2023-2024 The Enola <https://enola.dev> Authors
+# Copyright 2023 The Enola <https://enola.dev> Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,10 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
 
-proto_library(
-    name = "meta_proto",
-    srcs = ["meta.proto"],
-    deps = [],
+java_library(
+    name = "java",
+    srcs = glob(
+        ["**/*.java"],
+    ),
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven//:com_google_protobuf_protobuf_java_util",
+        "@maven//:io_grpc_grpc_api",
+        "@maven//:io_grpc_grpc_protobuf",
+        "@maven//:io_grpc_grpc_stub",
+        "@maven//:javax_annotation_javax_annotation_api",
+    ],
 )

java/dev/enola/cli/BUILD

@@ -40,8 +40,7 @@ java_library(
     # TODO Change "//java/dev/enola:__pkg__" visibility to tools/javadoc/all
     visibility = ["//java/dev/enola:__pkg__"],
     deps = [
-        "@maven//:com_google_genai_google_genai",
-        "@maven//:io_reactivex_rxjava3_rxjava",
+        "//generated/protoc/java",
         "//java/dev/enola/ai/adk/core",
         # TODO Remove most of these direct deps, through new "//java/dev/enola" API...
         "//java/dev/enola/ai/adk/iri",
@@ -75,8 +74,6 @@ java_library(
         "//java/dev/enola/infer/datalog",
         "//java/dev/enola/infer/rdf",
         "//java/dev/enola/core",
-        "//java/dev/enola/core:core_java_grpc",
-        "//java/dev/enola/core:core_java_proto",
         "//java/dev/enola/data",
         "//java/dev/enola/datatype",
         "//java/dev/enola/format/tika",
@@ -85,10 +82,10 @@ java_library(
         "//java/dev/enola/rdf/io",
         "//java/dev/enola/rdf/proto",
         "//java/dev/enola/thing:thing_java",
-        "//java/dev/enola/thing:thing_java_proto",
         "//java/dev/enola/thing/gen",
         "//java/dev/enola/web",
         "//java/dev/enola/web/netty",
+        "@maven//:com_google_genai_google_genai",
         "@maven//:com_github_ipld_java_cid",
         "@maven//:com_github_multiformats_java_multibase",
         "@maven//:com_github_multiformats_java_multihash",
@@ -99,6 +96,7 @@ java_library(
         "@maven//:info_picocli_picocli",
         "@maven//:info_picocli_picocli_shell_jline3",
         # TODO "@maven//:org_apache_httpcomponents_client5_httpclient5",
+        "@maven//:io_reactivex_rxjava3_rxjava",
         "@maven//:org_jline_jline",
         "@maven//:org_eclipse_rdf4j_rdf4j_model",
         "@maven//:org_eclipse_rdf4j_rdf4j_rio_api",

java/dev/enola/common/protobuf/BUILD

@@ -14,44 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 load("//tools/bazel:junit.bzl", "junit_tests")
 
-proto_library(
-    name = "validation_proto",
-    srcs = ["validation.proto"],
-    deps = [
-        "@protobuf//:any_proto",
-    ],
-)
-
-java_proto_library(
-    name = "validation_proto_java_library",
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "validation_proto",
-    ],
-)
-
-proto_library(
-    name = "test_proto",
-    srcs = ["test.proto"],
-    deps = [
-        "@protobuf//:any_proto",
-        "@protobuf//:descriptor_proto",
-        "@protobuf//:struct_proto",
-        "@protobuf//:timestamp_proto",
-    ],
-)
-
-java_proto_library(
-    name = "test_java_proto",
-    visibility = ["//:__subpackages__"],
-    deps = ["test_proto"],
-)
-
 java_library(
     name = "protobuf",
     srcs = glob(
@@ -61,7 +26,7 @@ java_library(
     plugins = ["//tools/bazel/java_plugin:autoservice"],
     visibility = ["//:__subpackages__"],
     deps = [
-        ":validation_proto_java_library",
+        "//generated/protoc/java",
         "//java/dev/enola/common",
         "//java/dev/enola/common/convert",
         "//java/dev/enola/common/io",
@@ -81,7 +46,7 @@ junit_tests(
     srcs = glob(["*Test.java"]),
     deps = [
         ":protobuf",
-        ":test_java_proto",
+        "//generated/protoc/java",
         "//java/dev/enola/common/context/testlib",
         "//java/dev/enola/common/io",
         "//test",

java/dev/enola/common/protobuf/schema/BUILD

@@ -40,7 +40,7 @@ junit_tests(
     srcs = glob(["*Test.java"]),
     deps = [
         ":schema",
-        "//java/dev/enola/common/protobuf:test_java_proto",
+        "//generated/protoc/java",
         "//java/dev/enola/common/protobuf/test:test-resources",
         "//java/dev/enola/common/yamljson",
     ],