From b84981c124f059465a1ff2563acbb602c78933ae Mon Sep 17 00:00:00 2001 From: sarthak Date: Mon, 20 Sep 2021 16:14:33 +0530 Subject: [PATCH] Library for baseline calculation (#104) * init commit * minor fixes * minor fix * minor fix * minor fix Co-authored-by: Sarthak Singhal --- gateway-service-baseline-lib/build.gradle.kts | 21 +++++++++++++++++++ .../baseline/lib}/BaselineCalculator.java | 2 +- .../baseline/lib}/BaselineCalculatorTest.java | 2 +- gateway-service-impl/build.gradle.kts | 1 + .../service/baseline/BaselineServiceImpl.java | 1 + settings.gradle.kts | 1 + 6 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 gateway-service-baseline-lib/build.gradle.kts rename {gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline => gateway-service-baseline-lib/src/main/java/org/hypertrace/gateway/service/baseline/lib}/BaselineCalculator.java (97%) rename {gateway-service-impl/src/test/java/org/hypertrace/gateway/service/baseline => gateway-service-baseline-lib/src/test/java/org/hypertrace/gateway/service/baseline/lib}/BaselineCalculatorTest.java (97%) diff --git a/gateway-service-baseline-lib/build.gradle.kts b/gateway-service-baseline-lib/build.gradle.kts new file mode 100644 index 00000000..956c9f4c --- /dev/null +++ b/gateway-service-baseline-lib/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + `java-library` + jacoco + id("org.hypertrace.jacoco-report-plugin") + id("org.hypertrace.publish-plugin") +} + +tasks.test { + useJUnitPlatform() +} + +dependencies { + api(project(":gateway-service-api")) + + // Common utilities + implementation("org.apache.commons:commons-lang3:3.10") + implementation("org.apache.commons:commons-math:2.2") + implementation("com.google.protobuf:protobuf-java-util:3.17.3") + + testImplementation("org.junit.jupiter:junit-jupiter:5.7.0") +} diff --git a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineCalculator.java b/gateway-service-baseline-lib/src/main/java/org/hypertrace/gateway/service/baseline/lib/BaselineCalculator.java similarity index 97% rename from gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineCalculator.java rename to gateway-service-baseline-lib/src/main/java/org/hypertrace/gateway/service/baseline/lib/BaselineCalculator.java index cb2d8acf..aa910aed 100644 --- a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineCalculator.java +++ b/gateway-service-baseline-lib/src/main/java/org/hypertrace/gateway/service/baseline/lib/BaselineCalculator.java @@ -1,4 +1,4 @@ -package org.hypertrace.gateway.service.baseline; +package org.hypertrace.gateway.service.baseline.lib; import com.google.common.annotations.VisibleForTesting; import java.util.List; diff --git a/gateway-service-impl/src/test/java/org/hypertrace/gateway/service/baseline/BaselineCalculatorTest.java b/gateway-service-baseline-lib/src/test/java/org/hypertrace/gateway/service/baseline/lib/BaselineCalculatorTest.java similarity index 97% rename from gateway-service-impl/src/test/java/org/hypertrace/gateway/service/baseline/BaselineCalculatorTest.java rename to gateway-service-baseline-lib/src/test/java/org/hypertrace/gateway/service/baseline/lib/BaselineCalculatorTest.java index 6b9af2ff..89596db4 100644 --- a/gateway-service-impl/src/test/java/org/hypertrace/gateway/service/baseline/BaselineCalculatorTest.java +++ b/gateway-service-baseline-lib/src/test/java/org/hypertrace/gateway/service/baseline/lib/BaselineCalculatorTest.java @@ -1,4 +1,4 @@ -package org.hypertrace.gateway.service.baseline; +package org.hypertrace.gateway.service.baseline.lib; import java.util.ArrayList; import java.util.List; diff --git a/gateway-service-impl/build.gradle.kts b/gateway-service-impl/build.gradle.kts index 8637f99c..63ccb68a 100644 --- a/gateway-service-impl/build.gradle.kts +++ b/gateway-service-impl/build.gradle.kts @@ -10,6 +10,7 @@ tasks.test { dependencies { api(project(":gateway-service-api")) + api(project(":gateway-service-baseline-lib")) implementation("org.hypertrace.core.query.service:query-service-client:0.6.2") implementation("org.hypertrace.core.attribute.service:attribute-service-client:0.12.5") diff --git a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineServiceImpl.java b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineServiceImpl.java index f1e56aaf..9fb4401f 100644 --- a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineServiceImpl.java +++ b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/baseline/BaselineServiceImpl.java @@ -13,6 +13,7 @@ import org.hypertrace.core.attribute.service.v1.AttributeMetadata; import org.hypertrace.core.query.service.api.QueryRequest; import org.hypertrace.core.query.service.api.ResultSetChunk; +import org.hypertrace.gateway.service.baseline.lib.BaselineCalculator; import org.hypertrace.gateway.service.common.AttributeMetadataProvider; import org.hypertrace.gateway.service.common.util.AttributeMetadataUtil; import org.hypertrace.gateway.service.common.util.QueryExpressionUtil; diff --git a/settings.gradle.kts b/settings.gradle.kts index 14010ba6..fc4a84b0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,3 +15,4 @@ plugins { include(":gateway-service-api") include(":gateway-service-impl") include(":gateway-service") +include(":gateway-service-baseline-lib")