Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
ca818de
router for vertx that maps pojo's and thrift objects
nikhil-zlai Dec 6, 2024
b5a4fdb
ci for router
nikhil-zlai Dec 6, 2024
b3230f6
enum support
nikhil-zlai Dec 6, 2024
286d0fa
enum, map and list support
nikhil-zlai Dec 7, 2024
61e26bb
test fixes, better error handling
nikhil-zlai Dec 7, 2024
8bba81e
cleaned up redundant comments
nikhil-zlai Dec 7, 2024
6a3e713
a few todos
nikhil-zlai Dec 7, 2024
b62d877
readme
nikhil-zlai Dec 7, 2024
e28ec33
lint
nikhil-zlai Dec 7, 2024
2e7c6ed
support for binary serialization
nikhil-zlai Dec 7, 2024
5b5c145
docs for binary serialization
nikhil-zlai Dec 8, 2024
e27b9c8
docs for javascript usage
nikhil-zlai Dec 8, 2024
39b9259
map validation + formatting
nikhil-zlai Dec 8, 2024
12683c9
caching setters
nikhil-zlai Dec 8, 2024
65846d7
coderabbit nits
nikhil-zlai Dec 9, 2024
cc9ab7f
Build config for aggregator module
kumar-zlai Jan 9, 2025
c22461a
Minor fix to change naming convention for api module targets
kumar-zlai Jan 9, 2025
0d8c084
Initial partial commit with CatalystHelper renaming
kumar-zlai Jan 9, 2025
6d6dd6a
Initial partial commit with CatalystHelper renaming
kumar-zlai Jan 9, 2025
7160500
Minor fix to update the naming convention for thrift targets
kumar-zlai Jan 9, 2025
b8d54e8
Partial commit with build config to merge changes from main
kumar-zlai Jan 9, 2025
fd4163a
Merge branch 'kumarteja/bazel-build' into kumarteja/online-bazel-migr…
kumar-zlai Jan 9, 2025
6f3def4
working bazel build config for online module
kumar-zlai Jan 9, 2025
d4e34ee
Merge branch 'main' into kumarteja/online-bazel-migration
kumar-zlai Jan 9, 2025
e13ac8a
Minor changes to cleanup unused imports
kumar-zlai Jan 9, 2025
cb2b3fd
minor scalafixAll changes
kumar-zlai Jan 9, 2025
add315d
All spark targets working
kumar-zlai Jan 10, 2025
5fea6d9
Initial working version with all spark targets
kumar-zlai Jan 10, 2025
76c6f62
Merged with main branch
kumar-zlai Jan 10, 2025
cae2d80
Minor clean up of unused dependencies
kumar-zlai Jan 10, 2025
0c8a955
Modified logging implementation dependency to match out sbt config
kumar-zlai Jan 10, 2025
feed133
merging with latest head
kumar-zlai Jan 14, 2025
e2acf6d
renamed to service_common package to avoid conflict with src root dir…
kumar-zlai Jan 14, 2025
c593729
Rename the service_common package back to service
Jan 15, 2025
91d6d9e
Addressed PR comments around handling response types
Jan 15, 2025
28d638e
Minor change to remove todo which is no longer needed
Jan 15, 2025
da2ff7f
Merge branch 'main' into kumarteja/spark-bazel-migration
kumar-zlai Jan 15, 2025
9983609
Merge branch 'mead' into kumarteja/service-commons-bazel-migration
kumar-zlai Jan 15, 2025
1b2ed5b
Merge branch 'mead' into kumarteja/service-commons-bazel-migration
kumar-zlai Jan 15, 2025
c545cc5
Initial working version along with unit tests
kumar-zlai Jan 15, 2025
6630965
Merge branch 'main' into kumarteja/service-commons-bazel-migration
kumar-zlai Jan 15, 2025
13182dd
Initial working version for src lib, tests pending
kumar-zlai Jan 16, 2025
678a67c
merged with latest main branch
kumar-zlai Jan 16, 2025
9dd1e09
test-lib build still not working
kumar-zlai Jan 16, 2025
dfe0e65
initial commit but test package not building
kumar-zlai Jan 17, 2025
da2b57c
Merged service_commons bazel migration branch
kumar-zlai Jan 17, 2025
e209d0f
Initial working version with unit tests
kumar-zlai Jan 17, 2025
588d5dc
Initial working version without tests
kumar-zlai Jan 17, 2025
1d03713
Merged for spark module minor fixes
kumar-zlai Jan 17, 2025
0b506dc
Initial working version without tests
kumar-zlai Jan 17, 2025
412e8ee
Merged with service module migration changes
kumar-zlai Jan 17, 2025
5daa5e1
working version with unit tests
kumar-zlai Jan 17, 2025
3076062
unit tests build working
kumar-zlai Jan 17, 2025
1613377
test build succeeded but 3 of the tests are failing
kumar-zlai Jan 17, 2025
f449cbf
Merged with latest main branch
kumar-zlai Jan 17, 2025
2e8fa95
Merged with latest main branch
kumar-zlai Jan 17, 2025
1c153f2
Merged with latest main branch
kumar-zlai Jan 17, 2025
03b985b
Merged with latest main
kumar-zlai Jan 17, 2025
a933223
merged with flink module changes to resolve conflicts later
kumar-zlai Jan 17, 2025
5d4ad00
merged with cloud_gcp module changes to resolve econflicts later
kumar-zlai Jan 17, 2025
90cc291
Merged with latest main
kumar-zlai Jan 22, 2025
b5d2216
Refactored common dependencies to remove duplication
kumar-zlai Jan 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 2 additions & 25 deletions flink/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,31 +1,8 @@
flink_deps = [
scala_artifact("org.apache.flink:flink-streaming-scala"),
scala_artifact("org.apache.flink:flink-scala"),
maven_artifact("org.apache.flink:flink-streaming-java"),
maven_artifact("org.apache.flink:flink-core"),
maven_artifact("org.apache.flink:flink-metrics-dropwizard"),
maven_artifact("org.apache.flink:flink-metrics-core"),
maven_artifact("org.apache.flink:flink-clients"),
maven_artifact("org.apache.flink:flink-yarn"),
]

flink_test_deps = [
# Libraries
scala_artifact("org.apache.flink:flink-streaming-scala"),
scala_artifact("org.apache.flink:flink-scala"),
maven_artifact("org.apache.flink:flink-streaming-java"),
maven_artifact("org.apache.flink:flink-core"),
maven_artifact("org.apache.flink:flink-runtime"),
# Testing
maven_artifact("org.apache.flink:flink-test-utils"),
maven_artifact("org.apache.flink:flink-runtime-tests"),
]

scala_library(
name = "lib",
srcs = glob(["src/main/**/*.scala"]),
visibility = ["//visibility:public"],
deps = flink_deps + [
deps = _FLINK_DEPS + [
"//api:lib",
"//api:thrift",
"//aggregator:lib",
Expand All @@ -38,7 +15,7 @@ scala_library(
],
)

test_deps = flink_test_deps + [
test_deps = _FLINK_TEST_DEPS + [
":lib",
"//online:lib",
"//online:test-lib",
Expand Down
66 changes: 66 additions & 0 deletions hub/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
scala_library(
name = "lib",
srcs = glob(["src/main/**/*.scala"]) + glob(["src/main/**/*.java"]),
visibility = ["//visibility:public"],
deps = _VERTX_DEPS + _CIRCE_DEPS + [
"//api:thrift",
"//api:lib",
"//online:lib",
"//service_commons:lib",
"//spark:lib",
scala_artifact("org.typelevel:cats-core"),
scala_artifact("com.chuusai:shapeless"),
scala_artifact("org.json4s:json4s-core"),
scala_artifact("org.json4s:json4s-jackson"),
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
maven_artifact("ch.qos.logback:logback-classic"),
maven_artifact("org.slf4j:slf4j-api"),
maven_artifact("com.typesafe:config"),
maven_artifact("io.netty:netty-all"),
maven_artifact("io.micrometer:micrometer-registry-statsd"),
maven_artifact("io.micrometer:micrometer-core"),
],
)

test_deps = _VERTX_TEST_DEPS + _CIRCE_DEPS + [
":lib",
"//api:thrift",
"//api:lib",
"//online:lib",
"//spark:lib",
"//service_commons:lib",
# Libraries
scala_artifact("org.typelevel:cats-core"),
scala_artifact("com.chuusai:shapeless"),
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
# Testing
scala_artifact("org.scalatest:scalatest-matchers-core"),
scala_artifact("org.scalatest:scalatest-core"),
scala_artifact("org.scalatest:scalatest"),
scala_artifact("org.scalatest:scalatest-flatspec"),
scala_artifact("org.scalatest:scalatest-funsuite"),
scala_artifact("org.scalatest:scalatest-shouldmatchers"),
scala_artifact("org.scalactic:scalactic"),
scala_artifact("org.scalatestplus:mockito-3-4"),
scala_artifact("org.mockito:mockito-scala"),
maven_artifact("org.mockito:mockito-core"),
maven_artifact("org.scalatest:scalatest-compatible"),
maven_artifact("junit:junit"),
maven_artifact("com.novocode:junit-interface"),
]

scala_library(
name = "test-lib",
srcs = glob(["src/test/**/*.scala"]),
visibility = ["//visibility:public"],
deps = test_deps,
)

scala_test_suite(
name = "test",
srcs = glob(["src/test/**/*.scala"]),
visibility = ["//visibility:public"],
deps = test_deps + [":test-lib"],
)
22 changes: 2 additions & 20 deletions service/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
vertx_deps = [
maven_artifact("io.vertx:vertx-core"),
maven_artifact("io.vertx:vertx-web"),
maven_artifact("io.vertx:vertx-web-client"),
maven_artifact("io.vertx:vertx-config"),
maven_artifact("io.vertx:vertx-micrometer-metrics"),
]

vertx_test_deps = [
# Libraries
maven_artifact("io.vertx:vertx-core"),
maven_artifact("io.vertx:vertx-web"),
maven_artifact("io.vertx:vertx-web-client"),
# Testing
maven_artifact("io.vertx:vertx-junit5"),
maven_artifact("io.vertx:vertx-unit"),
]

java_library(
name = "lib",
srcs = glob(["src/main/**/*.java"]),
visibility = ["//visibility:public"],
deps = _SCALA_DEPS + vertx_deps + [
deps = _SCALA_DEPS + _VERTX_DEPS + [
"//online:lib",
"//service_commons:lib",
maven_artifact("ch.qos.logback:logback-classic"),
Expand All @@ -36,7 +18,7 @@ java_library(
],
)

test_deps = vertx_test_deps + [
test_deps = _VERTX_TEST_DEPS + [
":lib",
"//online:lib",
"//service_commons:lib",
Expand Down
15 changes: 2 additions & 13 deletions service_commons/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@ java_library(
name = "lib",
srcs = glob(["src/main/**/*.java"]),
visibility = ["//visibility:public"],
deps = _SCALA_DEPS + [
deps = _SCALA_DEPS + _VERTX_DEPS + [
"//api:lib",
"//online:lib",
maven_artifact("io.vertx:vertx-core"),
maven_artifact("io.vertx:vertx-web"),
maven_artifact("io.vertx:vertx-web-client"),
maven_artifact("io.vertx:vertx-config"),
maven_artifact("io.vertx:vertx-micrometer-metrics"),
maven_artifact("ch.qos.logback:logback-classic"),
maven_artifact("com.typesafe:config"),
maven_artifact("io.netty:netty-all"),
Expand All @@ -20,17 +15,11 @@ java_library(
],
)

test_deps = [
test_deps = _VERTX_TEST_DEPS + [
":lib",
"//api:lib",
"//api:thrift",
"//online:lib",
# Libraries
maven_artifact("io.vertx:vertx-core"),
maven_artifact("io.vertx:vertx-web"),
maven_artifact("io.vertx:vertx-web-client"),
# Testing
maven_artifact("io.vertx:vertx-junit5"),
maven_artifact("org.junit.jupiter:junit-jupiter-api"),
maven_artifact("org.junit.platform:junit-platform-launcher"),
maven_artifact("org.junit.platform:junit-platform-reporting"),
Expand Down
6 changes: 6 additions & 0 deletions tools/build_rules/dependencies/maven_repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ maven_repository = repository(
"io.vertx:vertx-micrometer-metrics:4.5.10",
"io.vertx:vertx-junit5:4.5.10",
"io.vertx:vertx-unit:4.5.10",
"io.vertx:vertx-unit:4.5.10",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Remove duplicate dependency.

io.vertx:vertx-unit:4.5.10 is already declared on line 92.

-        "io.vertx:vertx-unit:4.5.10",


# Circe
"io.circe:circe-core_2.12:0.14.9",
"io.circe:circe-generic_2.12:0.14.9",
"io.circe:circe-parser_2.12:0.14.9",
],
overrides = {
},
Expand Down
59 changes: 53 additions & 6 deletions tools/build_rules/prelude_bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contains default rules and functions available to all BUILD files
# Contains default rules, variables and functions available to all BUILD files

load("//tools/build_rules:common.bzl", "jar", "scala_jar")
load("//tools/build_rules:jvm_binary.bzl", "jvm_binary")
Expand All @@ -8,11 +8,6 @@ load("@contrib_rules_jvm//docs:stardoc-input.bzl", "java_test_suite")
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library", "scala_test_suite")
load("//tools/build_rules:maven_artifact.bzl", "maven_artifact", "scala_artifact")

_SCALA_DEPS = [
"@io_bazel_rules_scala_scala_library_2_12_18//:io_bazel_rules_scala_scala_library_2_12_18",
# other scala related deps...
]

_JVM_FLAGS_FOR_ACCESSING_BASE_JAVA_CLASSES = [
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
Expand All @@ -27,4 +22,56 @@ _JVM_FLAGS_FOR_ACCESSING_BASE_JAVA_CLASSES = [
"--add-opens=java.base/sun.nio.cs=ALL-UNNAMED",
"--add-opens=java.base/sun.security.action=ALL-UNNAMED",
"--add-opens=java.base/sun.util.calendar=ALL-UNNAMED",
]

_SCALA_DEPS = [
"@io_bazel_rules_scala_scala_library_2_12_18//:io_bazel_rules_scala_scala_library_2_12_18",
# other scala related deps...
]

_FLINK_DEPS = [
scala_artifact("org.apache.flink:flink-streaming-scala"),
scala_artifact("org.apache.flink:flink-scala"),
maven_artifact("org.apache.flink:flink-streaming-java"),
maven_artifact("org.apache.flink:flink-core"),
maven_artifact("org.apache.flink:flink-metrics-dropwizard"),
maven_artifact("org.apache.flink:flink-metrics-core"),
maven_artifact("org.apache.flink:flink-clients"),
maven_artifact("org.apache.flink:flink-yarn"),
]

_FLINK_TEST_DEPS = [
# Libraries
scala_artifact("org.apache.flink:flink-streaming-scala"),
scala_artifact("org.apache.flink:flink-scala"),
maven_artifact("org.apache.flink:flink-streaming-java"),
maven_artifact("org.apache.flink:flink-core"),
maven_artifact("org.apache.flink:flink-runtime"),
# Testing
maven_artifact("org.apache.flink:flink-test-utils"),
maven_artifact("org.apache.flink:flink-runtime-tests"),
]

_VERTX_DEPS = [
maven_artifact("io.vertx:vertx-core"),
maven_artifact("io.vertx:vertx-web"),
maven_artifact("io.vertx:vertx-web-client"),
maven_artifact("io.vertx:vertx-config"),
maven_artifact("io.vertx:vertx-micrometer-metrics"),
]

_VERTX_TEST_DEPS = [
# Libraries
maven_artifact("io.vertx:vertx-core"),
maven_artifact("io.vertx:vertx-web"),
maven_artifact("io.vertx:vertx-web-client"),
# Testing
maven_artifact("io.vertx:vertx-junit5"),
maven_artifact("io.vertx:vertx-unit"),
]

_CIRCE_DEPS = [
scala_artifact("io.circe:circe-core"),
scala_artifact("io.circe:circe-generic"),
scala_artifact("io.circe:circe-parser"),
]
Loading