Skip to content

No-ticket: Migrate Guice inject namespace to jakarta #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
harshit-kumar-v2 wants to merge 1 commit into from
Closed

No-ticket: Migrate Guice inject namespace to jakarta #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion query-service-factory/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies {
api("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.78")

implementation(project(":query-service-impl"))
implementation("com.google.inject:guice:5.0.1")
implementation("com.google.inject:guice:6.0.0")
}
2 changes: 1 addition & 1 deletion query-service-impl/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
implementation("org.hypertrace.core.attribute.service:attribute-service-api:0.14.26")
implementation("org.hypertrace.core.attribute.service:attribute-projection-registry:0.14.26")
implementation("org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.26")
implementation("com.google.inject:guice:5.0.1")
implementation("com.google.inject:guice:6.0.0")
implementation("org.apache.pinot:pinot-java-client:0.12.1") {
// We want to use log4j2 impl so exclude the log4j binding of slf4j
exclude("org.slf4j", "slf4j-log4j12")
Expand Down
4 changes: 2 additions & 2 deletions ...service-impl/src/main/java/org/hypertrace/core/query/service/AttributeClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import static org.hypertrace.core.grpcutils.client.RequestContextClientCallCredsProviderFactory.getClientCallCredsProvider;

import com.google.inject.Provider;
import io.grpc.Channel;
import jakarta.inject.Inject;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import javax.inject.Inject;
import javax.inject.Provider;
import org.hypertrace.core.attribute.service.cachingclient.CachingAttributeClient;
import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry;

Expand Down
4 changes: 2 additions & 2 deletions query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import io.micrometer.core.instrument.Counter;
import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Observable;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import org.hypertrace.core.grpcutils.context.RequestContext;
import org.hypertrace.core.grpcutils.server.rx.ServerCallStreamRxObserver;
Expand Down
2 changes: 1 addition & 1 deletion query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.google.inject.AbstractModule;
import com.google.inject.multibindings.Multibinder;
import com.typesafe.config.Config;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
import org.hypertrace.core.attribute.service.cachingclient.CachingAttributeClient;
import org.hypertrace.core.grpcutils.client.GrpcChannelRegistry;
import org.hypertrace.core.query.service.api.QueryServiceGrpc.QueryServiceImplBase;
Expand Down
2 changes: 1 addition & 1 deletion ...ice-impl/src/main/java/org/hypertrace/core/query/service/QueryTransformationPipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import jakarta.inject.Inject;
import java.util.Set;
import javax.inject.Inject;
import org.hypertrace.core.query.service.QueryTransformation.QueryTransformationContext;
import org.hypertrace.core.query.service.api.QueryRequest;

Expand Down
2 changes: 1 addition & 1 deletion ...l/src/main/java/org/hypertrace/core/query/service/RequestHandlerClientConfigRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.hypertrace.core.query.service;

import jakarta.inject.Inject;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.inject.Inject;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;

public class RequestHandlerClientConfigRegistry {
Expand Down
4 changes: 2 additions & 2 deletions ...-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.hypertrace.core.query.service;

import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;

@Singleton
Expand Down
2 changes: 1 addition & 1 deletion ...-service-impl/src/main/java/org/hypertrace/core/query/service/RequestHandlerSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.hypertrace.core.query.service;

import jakarta.inject.Inject;
import java.util.Optional;
import javax.inject.Inject;
import org.hypertrace.core.query.service.api.QueryRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/hypertrace/core/query/service/multivalue/MultiValueTransformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import jakarta.inject.Inject;
import java.util.List;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import org.hypertrace.core.query.service.AbstractQueryTransformation;
import org.hypertrace.core.query.service.api.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...mpl/src/main/java/org/hypertrace/core/query/service/pinot/PinotRequestHandlerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.hypertrace.core.query.service.pinot;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
import org.hypertrace.core.query.service.RequestHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/hypertrace/core/query/service/postgres/PostgresRequestHandlerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.hypertrace.core.query.service.postgres;

import jakarta.inject.Inject;
import java.sql.SQLException;
import javax.inject.Inject;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
import org.hypertrace.core.query.service.RequestHandler;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/hypertrace/core/query/service/projection/ProjectionTransformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import jakarta.inject.Inject;
import java.util.List;
import java.util.Optional;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import org.hypertrace.core.attribute.service.cachingclient.CachingAttributeClient;
import org.hypertrace.core.attribute.service.projection.AttributeProjection;
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/hypertrace/core/query/service/prometheus/PrometheusRequestHandlerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.hypertrace.core.query.service.prometheus;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
import org.hypertrace.core.query.service.RequestHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...mpl/src/main/java/org/hypertrace/core/query/service/trino/TrinoRequestHandlerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.hypertrace.core.query.service.trino;

import jakarta.inject.Inject;
import java.sql.SQLException;
import javax.inject.Inject;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerConfig;
import org.hypertrace.core.query.service.RequestHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...vice-impl/src/main/java/org/hypertrace/core/query/service/validation/LimitValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import io.grpc.Status;
import io.reactivex.rxjava3.core.Completable;
import javax.inject.Inject;
import jakarta.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import org.hypertrace.core.grpcutils.context.RequestContext;
import org.hypertrace.core.query.service.QueryServiceConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...rvice-impl/src/main/java/org/hypertrace/core/query/service/validation/QueryValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Observable;
import jakarta.inject.Inject;
import java.util.Set;
import javax.inject.Inject;
import org.hypertrace.core.grpcutils.context.RequestContext;
import org.hypertrace.core.query.service.api.QueryRequest;

Expand Down
Loading