fix (build): Big 🎂 Birthday Move, part II

vorburger · Apr 16, 2024 · 80df284 · 80df284
1 parent 39346c7
commit 80df284
Show file tree

Hide file tree

Showing 266 changed files with 369 additions and 658 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -66,7 +66,7 @@ repos:
           - --use-current-year
       - id: insert-license
         files: \.(bash|bazel|textproto|yaml)$
-        exclude: ^docs/use|core/impl/src/test/resources|.*test_resources.*
+        exclude: ^docs/use|test/
         args:
           - --comment-style
           - "#"
@@ -76,7 +76,7 @@ repos:
           - --use-current-year
       - id: insert-license
         files: \.(md|html)$
-        exclude: ^.github|src/test/resources/|docs/blog/posts/|docs/use/execmd/demo.md|.*test_resources.*
+        exclude: ^.github|test/|docs/blog/posts/|docs/use/execmd/demo.md
         args:
           - --comment-style
           - "<!--|   |-->"
@@ -95,7 +95,7 @@ repos:
         # and https://github.com/pre-commit/mirrors-clang-format/pull/22.
         # In the mean-time, it's possible to manually clang-format -i the.textproto
         files: \.(proto|textproto)$
-        exclude: ^core/impl/src/test/resources/bar-abc-def.textproto
+        exclude: ^test
 
   - repo: https://github.com/yoheimuta/protolint
     # This version must be kept in the sync with the one in tools/protolint/install.bash
@@ -118,14 +118,14 @@ repos:
     rev: v0.12.1
     hooks:
       - id: markdownlint-cli2
-        exclude: (^.github/|src/test/resources/|docs/use/docgen/docgen.md)
+        exclude: (^.github/|test/|docs/use/docgen/docgen.md)
 
     # Until https://github.com/DavidAnson/markdownlint/issues/121
   - repo: https://github.com/tcort/markdown-link-check
     rev: v3.12.1
     hooks:
       - id: markdown-link-check
-        exclude: (src/test/resources/|docs/use/docgen/docgen.md|docs/use/server/index.md)
+        exclude: (test/|docs/use/docgen/docgen.md|docs/use/server/index.md)
         args: [--quiet, --config, .markdown-link-check.json]
 
   # Alternative: https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md
@@ -144,7 +144,7 @@ repos:
       - id: prettier
         # NOT markdown, because we use markdownlint for that
         types_or: [css, html, javascript, json, json5, scss, ts, tsx, yaml]
-        exclude: ^docs/use|core/impl/src/test/resources|.devcontainer/devcontainer.json
+        exclude: ^docs/use|test/|.devcontainer/devcontainer.json
         additional_dependencies:
           - [email protected]
 

diff --git a/cli/src/test/resources/enola.dev-properties.ttl b/cli/src/test/resources/enola.dev-properties.ttl
diff --git a/common/protobuf/BUILD b/common/protobuf/BUILD
diff --git a/common/protobuf/src/test/java/dev/enola/common/protobuf/AbstractProtoTestBase.java b/common/protobuf/src/test/java/dev/enola/common/protobuf/AbstractProtoTestBase.java
diff --git a/common/thing/src/test/resources/picasso.ttl b/common/thing/src/test/resources/picasso.ttl
diff --git a/connectors/demo/BUILD b/connectors/demo/BUILD
@@ -28,7 +28,7 @@ proto_library(
 java_proto_library(
     name = "demo_java_proto",
     # ONLY for tests:
-    visibility = ["//core/impl:__subpackages__"],
+    visibility = ["//:__subpackages__"],
     deps = [
         "demo_proto",
     ],
@@ -40,14 +40,14 @@ java_binary(
     main_class = "dev.enola.demo.Server",
     resources = glob(["src/main/resources/**/*"]),
     # ONLY for tests:
-    visibility = ["//core/impl:__subpackages__"],
+    visibility = ["//:__subpackages__"],
     runtime_deps = [
         "@maven//:io_grpc_grpc_netty",
     ],
     deps = [
         ":demo_java_proto",
-        "//core/lib:connector_java_grpc",
-        "//core/lib:core_java_proto",
+        "//java/dev/enola/core:connector_java_grpc",
+        "//java/dev/enola/core:core_java_proto",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:io_grpc_grpc_api",
@@ -67,14 +67,13 @@ java_binary(
     deps = [
         ":demo",
         ":demo_java_proto",
-        "//common/protobuf",
-        "//core/impl",  # ONLY for test, NEVER for non-test Demo (or any other) Connector binary!
-        "//core/lib:connector_java_grpc",
-        "//core/lib:core_java_grpc",
-        "//core/lib:core_java_proto",
-        "//core/lib:lib_java",
+        # "//core/impl",  # ONLY for test, NEVER for non-test Demo (or any other) Connector binary!
         "//java/dev/enola/common/io",
         "//java/dev/enola/common/protobuf",
+        "//java/dev/enola/core:connector_java_grpc",
+        "//java/dev/enola/core:core_java_grpc",
+        "//java/dev/enola/core:core_java_proto",
+        "//java/dev/enola/core",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",

diff --git a/core/impl/BUILD b/core/impl/BUILD
diff --git a/core/impl/src/test/resources/picasso.ttl b/core/impl/src/test/resources/picasso.ttl
diff --git a/docs/dev/implementation.md b/docs/dev/implementation.md
@@ -40,7 +40,7 @@ The Java `Thing` API is an _interface_ which has several available implementatio
 
 #### Proto Thing
 
-* Defined in: [`common/thing/thing.proto`](../../common/thing/thing.proto), see [Proto doc](proto/thing.md#dev-enola-thing-thing)
+* Defined in: [`common/thing/thing.proto`](../../java/dev/enola/thing/thing.proto), see [Proto doc](proto/thing.md#dev-enola-thing-thing)
 * Java Type: `dev.enola.thing.proto.Thing` <!-- TODO https://github.com/enola-dev/enola/issues/491: Link to Java Doc -->
 
 #### Proto Message
@@ -61,7 +61,7 @@ Any [Protocol Buffer](https://protobuf.dev) can be [converted](#conversions) to
 * Filename extension: `.ttl`
 * Wikipedia: [Turtle Syntax](https://en.wikipedia.org/wiki/Turtle_(syntax))
 * W3C Spec: [w3.org/TR/turtle](https://www.w3.org/TR/turtle/)
-* Example: [picasso.ttl](../../common/rdf/src/test/resources/picasso.ttl)
+* Example: [picasso.ttl](../../test/picasso.ttl)
 
 <!-- TODO #### RDF TriG-star 📐 -->
 
@@ -75,7 +75,7 @@ Any [Protocol Buffer](https://protobuf.dev) can be [converted](#conversions) to
 
 * Media Type: `text/enola.dev#thing+yaml` (from `dev.enola.thing.ThingMediaTypes`)
 * Filename extension: `.thing.yaml`
-* Example: [picasso.thing.yaml](../../common/rdf/src/test/resources/picasso.thing.yaml)
+* Example: [picasso.thing.yaml](../../test/picasso.thing.yaml)
 
 #### Proto Thing Text
 

diff --git a/enola b/enola
@@ -40,7 +40,7 @@ JAVA=$(java_binary)
 
 cd "$ROOT"
 LOG=$(mktemp)
-if "$BZL" build --color=yes //cli:enola_deploy.jar >"$LOG" 2>&1 ; then
+if "$BZL" build --color=yes //java/dev/enola/cli:enola_deploy.jar >"$LOG" 2>&1 ; then
   rm "$LOG"
   # TODO Integrate this with (use) tools/distro/build.sh instead of launching it like this
   cd "$CWD" && $JAVA --enable-preview -jar "$ROOT"/bazel-bin/cli/enola_deploy.jar "$@"

diff --git a/java/dev/enola/BUILD b/java/dev/enola/BUILD
@@ -24,9 +24,9 @@ java_library(
     ),
     visibility = ["//:__subpackages__"],
     deps = [
-        "//common/thing:thing_java",
         "//java/dev/enola/common",
         "//java/dev/enola/common/io",
+        "//java/dev/enola/thing:thing_java",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:org_slf4j_slf4j_api",