This is an automated email from the ASF dual-hosted git repository.
chungen0126 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new c1875b844a3 HDDS-15934. Remove usage of internal jersey internal
InjectionManager (#10853)
c1875b844a3 is described below
commit c1875b844a3ae42dfc244b6554dcdf92f293763e
Author: Eric C. Ho <[email protected]>
AuthorDate: Mon Jul 27 09:40:58 2026 +0800
HDDS-15934. Remove usage of internal jersey internal InjectionManager
(#10853)
---
hadoop-ozone/recon/pom.xml | 4 ---
.../hadoop/ozone/recon/ReconRestServletModule.java | 41 +++++++---------------
2 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 84d466c81cb..c2d25b203a2 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -229,10 +229,6 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java
index 544e22757e6..28a138a73ed 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java
@@ -23,6 +23,9 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriBuilder;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -31,10 +34,7 @@
import org.apache.hadoop.ozone.recon.api.filters.ReconAuthFilter;
import org.apache.hadoop.ozone.recon.chatbot.ChatbotConfigKeys;
import org.glassfish.hk2.api.ServiceLocator;
-import org.glassfish.jersey.internal.inject.InjectionManager;
import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.spi.Container;
-import org.glassfish.jersey.server.spi.ContainerLifecycleListener;
import org.glassfish.jersey.servlet.ServletContainer;
import org.jvnet.hk2.guice.bridge.api.GuiceBridge;
import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;
@@ -125,31 +125,14 @@ private void checkIfPackageExistsAndLog(String pkg) {
* Class to bridge Guice bindings to Jersey hk2 bindings.
*/
class GuiceResourceConfig extends ResourceConfig {
- GuiceResourceConfig() {
- register(new ContainerLifecycleListener() {
-
- @Override
- public void onStartup(Container container) {
- ServletContainer servletContainer = (ServletContainer) container;
- InjectionManager injectionManager = container.getApplicationHandler()
- .getInjectionManager();
- ServiceLocator serviceLocator = injectionManager
- .getInstance(ServiceLocator.class);
- GuiceBridge.getGuiceBridge().initializeGuiceBridge(serviceLocator);
- GuiceIntoHK2Bridge guiceBridge = serviceLocator
- .getService(GuiceIntoHK2Bridge.class);
- Injector injector = (Injector) servletContainer.getServletContext()
- .getAttribute(Injector.class.getName());
- guiceBridge.bridgeGuiceInjector(injector);
- }
-
- @Override
- public void onReload(Container container) {
- }
-
- @Override
- public void onShutdown(Container container) {
- }
- });
+ @Inject
+ GuiceResourceConfig(ServiceLocator serviceLocator,
+ @Context ServletContext servletContext) {
+ GuiceBridge.getGuiceBridge().initializeGuiceBridge(serviceLocator);
+ GuiceIntoHK2Bridge guiceBridge = serviceLocator
+ .getService(GuiceIntoHK2Bridge.class);
+ Injector injector = (Injector) servletContext
+ .getAttribute(Injector.class.getName());
+ guiceBridge.bridgeGuiceInjector(injector);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
