Skip to content

Commit 32de6f8

Browse files
rahulpadhy-traceablerahulpadhy-traceable
authored
Overriding ContextualConfigObjectImpl (#324)
1 parent 8c205aa commit 32de6f8

28 files changed

Lines changed: 72 additions & 65 deletions

File tree

‎alerting-config-service-api/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,te
2020
org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
2121
org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
2222
org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
23-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
24-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
23+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
24+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
2525
empty=annotationProcessor

‎alerting-config-service-impl/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
4343
org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4545
org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4747
org.hypertrace.core.eventstore:event-store:0.1.5=runtimeClasspath,testRuntimeClasspath
4848
org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4949
org.hypertrace.core.grpcutils:grpc-client-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5050
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5151
org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
52-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
52+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5353
org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
5454
org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
5555
org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
@@ -62,7 +62,7 @@ org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath
6262
org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath
6363
org.junit:junit-bom:5.10.0=testCompileClasspath
6464
org.junit:junit-bom:5.10.1=testRuntimeClasspath
65-
org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
65+
org.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath
6666
org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
6767
org.mockito:mockito-junit-jupiter:5.8.0=testCompileClasspath,testRuntimeClasspath
6868
org.objenesis:objenesis:3.3=testRuntimeClasspath

‎build.gradle.kts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ subprojects {
2020
}
2121
}
2222
apply(plugin = rootProject.commonLibs.plugins.hypertrace.codestyle.get().pluginId)
23+
24+
configurations.all {
25+
resolutionStrategy.dependencySubstitution {
26+
substitute(module("at.yawk.lz4:lz4-java")).using(module("org.lz4:lz4-java:1.8.1"))
27+
.because("Resolve capability conflict between org.lz4:lz4-java and at.yawk.lz4:lz4-java")
28+
}
29+
}
2330
}
2431

2532
dependencyCheck {

‎config-object-store/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
3939
org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4040
org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4141
org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
42-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
42+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4343
org.hypertrace.core.eventstore:event-store:0.1.5=runtimeClasspath,testRuntimeClasspath
4444
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4646
org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
4747
org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
4848
org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
@@ -55,7 +55,7 @@ org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath
5555
org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath
5656
org.junit:junit-bom:5.10.0=testCompileClasspath
5757
org.junit:junit-bom:5.10.1=testRuntimeClasspath
58-
org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
58+
org.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath
5959
org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
6060
org.mockito:mockito-junit-jupiter:5.8.0=testCompileClasspath,testRuntimeClasspath
6161
org.objenesis:objenesis:3.3=testRuntimeClasspath

‎config-object-store/src/main/java/org/hypertrace/config/objectstore/ContextualConfigObjectImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
@lombok.Value
1313
@Builder(toBuilder = true)
14-
class ContextualConfigObjectImpl<T> implements ContextualConfigObject<T> {
14+
public class ContextualConfigObjectImpl<T> implements ContextualConfigObject<T> {
1515
String context;
1616
T data;
1717
Instant creationTimestamp;

‎config-proto-converter/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ io.netty:netty-bom:4.1.125.Final=compileClasspath,runtimeClasspath,testCompileCl
2424
org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath
2525
org.checkerframework:checker-qual:3.43.0=runtimeClasspath,testRuntimeClasspath
2626
org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
27-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
28-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
27+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
28+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
2929
empty=annotationProcessor

‎config-service-api/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ net.bytebuddy:byte-buddy:1.14.10=testRuntimeClasspath
3434
org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3535
org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3636
org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
37-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
37+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3838
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.17=testRuntimeClasspath
39-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
39+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4040
org.mockito:mockito-core:5.8.0=testRuntimeClasspath
4141
org.objenesis:objenesis:3.3=testRuntimeClasspath
4242
org.slf4j:slf4j-api:2.0.7=testRuntimeClasspath

‎config-service-change-event-api/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ io.grpc:grpc-bom:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,t
88
io.netty:netty-bom:4.1.125.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
99
org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
11-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
13-
org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
11+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
13+
org.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath
1414
org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath
1515
org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath
1616
empty=annotationProcessor

‎config-service-change-event-generator/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath
4545
org.checkerframework:checker-qual:3.43.0=runtimeClasspath,testRuntimeClasspath
4646
org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath
4747
org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
48-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
48+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4949
org.hypertrace.core.eventstore:event-store:0.1.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5050
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
51-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
51+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5252
org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
5353
org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
5454
org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
@@ -61,7 +61,7 @@ org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath
6161
org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath
6262
org.junit:junit-bom:5.10.0=testCompileClasspath
6363
org.junit:junit-bom:5.10.1=testRuntimeClasspath
64-
org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
64+
org.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath
6565
org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
6666
org.mockito:mockito-junit-jupiter:5.8.0=testCompileClasspath,testRuntimeClasspath
6767
org.objenesis:objenesis:3.3=testRuntimeClasspath

‎config-service-factory/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,22 @@ org.eclipse.jetty:jetty-server:11.0.24=runtimeClasspath,testRuntimeClasspath
9898
org.eclipse.jetty:jetty-servlet:11.0.24=runtimeClasspath,testRuntimeClasspath
9999
org.eclipse.jetty:jetty-util:11.0.24=runtimeClasspath,testRuntimeClasspath
100100
org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
101-
org.hypertrace.bom:hypertrace-bom:0.3.65=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
101+
org.hypertrace.bom:hypertrace-bom:0.3.66=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
102102
org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
103103
org.hypertrace.core.eventstore:event-store:0.1.5=runtimeClasspath,testRuntimeClasspath
104104
org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.17=runtimeClasspath,testRuntimeClasspath
105105
org.hypertrace.core.grpcutils:grpc-client-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
106106
org.hypertrace.core.grpcutils:grpc-context-utils:0.13.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
107107
org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.17=runtimeClasspath,testRuntimeClasspath
108108
org.hypertrace.core.grpcutils:grpc-server-utils:0.13.17=runtimeClasspath,testRuntimeClasspath
109-
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
109+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
110110
org.hypertrace.core.serviceframework:docstore-metrics:0.1.91=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
111111
org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.91=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
112112
org.hypertrace.core.serviceframework:platform-metrics:0.1.91=runtimeClasspath,testRuntimeClasspath
113113
org.hypertrace.core.serviceframework:platform-service-framework:0.1.91=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
114114
org.hypertrace.core.serviceframework:service-framework-spi:0.1.91=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
115115
org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
116-
org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
116+
org.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath
117117
org.mongodb:bson-record-codec:5.2.0=runtimeClasspath,testRuntimeClasspath
118118
org.mongodb:bson:5.2.0=runtimeClasspath,testRuntimeClasspath
119119
org.mongodb:mongodb-driver-core:5.2.0=runtimeClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)