Revert "Replaced usages of javax.inject with jakarta.inject"

amitjoy · Dec 18, 2023 · 96e6b6e · 96e6b6e
1 parent fa1e785
commit 96e6b6e
Show file tree

Hide file tree

Showing 119 changed files with 273 additions and 206 deletions.
diff --git a/cnf/ext/runtime.bnd b/cnf/ext/runtime.bnd
@@ -13,7 +13,7 @@ bundles.console: \
 
 bundles.deps: \
                  javax.annotation,\
-                 jakarta.inject.jakarta.inject-api,\
+                 javax.inject,\
                  javax.xml.jre,\
                  org.apache.commons.jxpath,\
                  com.google.guava,\
@@ -86,7 +86,7 @@ bundles.required: \
                  org.apache.commons.text,\
                  org.eclipse.equinox.preferences,\
                  controlsfx,\
-                 jakarta.inject.jakarta.inject-api,\
+                 javax.inject,\
                  com.osgifx.console.util,\
                  com.osgifx.console.wrapper.mug,\
                  eu.hansolo.tilesfx,\

diff --git a/cnf/maven/runtime.maven b/cnf/maven/runtime.maven
@@ -88,7 +88,3 @@ org.eclipse.platform:org.eclipse.core.variables:3.6.200
 org.slf4j:slf4j-api:1.7.36
 org.apache.sling:org.apache.sling.commons.log:5.4.2
 org.apache.sling:org.apache.sling.commons.logservice:1.1.0
-
-# Jakarta
-
-jakarta.inject:jakarta.inject-api:2.0.1
diff --git a/...sole.agent/src/main/java/com/osgifx/console/agent/provider/BundleStartTimeCalculator.java b/...sole.agent/src/main/java/com/osgifx/console/agent/provider/BundleStartTimeCalculator.java
@@ -108,7 +108,7 @@ public List<BundleStartDuration> getBundleStartDurations() {
             return bundleToStartTime.values().stream().map(StartTime::toBundleStartDuration).collect(toList());
         }
     }
-
+    
     public Optional<BundleStartDuration> getBundleStartDuration(long bundleId) {
         return Optional.ofNullable(bundleToStartTime.get(bundleId)).map(StartTime::toBundleStartDuration);
     }

diff --git a/...e.application/src/main/java/com/osgifx/console/application/addon/AgentConnectedAddon.java b/...e.application/src/main/java/com/osgifx/console/application/addon/AgentConnectedAddon.java
@@ -17,6 +17,8 @@
 
 import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC;
 
+import javax.inject.Inject;
+
 import org.controlsfx.dialog.ProgressDialog;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.UIEventTopic;
@@ -30,7 +32,6 @@
 import com.osgifx.console.executor.Executor;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.concurrent.Task;
 
 public final class AgentConnectedAddon {

diff --git a/...onsole.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java b/...onsole.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java
@@ -24,6 +24,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import javax.inject.Inject;
 
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.EventTopic;
@@ -37,8 +38,6 @@
 import com.osgifx.console.executor.Executor;
 import com.osgifx.console.supervisor.Supervisor;
 
-import jakarta.inject.Inject;
-
 public final class AgentPingAddon {
 
     private static final Duration INITIAL_DELAY = Duration.ofSeconds(0);

diff --git a/...plication/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java b/...plication/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java
@@ -19,15 +19,14 @@
 import java.util.Set;
 
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.fx.core.log.FluentLogger;
 import org.eclipse.fx.core.log.Log;
 
 import com.google.common.collect.Maps;
 
-import jakarta.inject.Inject;
-
 public final class ModifiablePropertyAddon {
 
     private final Map<String, Object> modifiableProperties = Maps.newHashMap();

diff --git a/...ication/src/main/java/com/osgifx/console/application/addon/WindowResizeDisablerAddon.java b/...ication/src/main/java/com/osgifx/console/application/addon/WindowResizeDisablerAddon.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.addon;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.EventTopic;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -24,7 +26,6 @@
 import org.eclipse.fx.ui.workbench.renderers.base.widget.WWindow;
 import org.osgi.service.event.Event;
 
-import jakarta.inject.Inject;
 import javafx.stage.Stage;
 
 public final class WindowResizeDisablerAddon {

diff --git a/...plication/src/main/java/com/osgifx/console/application/dialog/AboutApplicationDialog.java b/...plication/src/main/java/com/osgifx/console/application/dialog/AboutApplicationDialog.java
@@ -17,13 +17,14 @@
 
 import static com.osgifx.console.constants.FxConstants.STANDARD_CSS;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.fx.core.di.LocalInstance;
 import org.osgi.framework.BundleContext;
 
 import com.osgifx.console.util.fx.Fx;
 
-import jakarta.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;

diff --git a/...ication/src/main/java/com/osgifx/console/application/dialog/ConnectToMqttAgentDialog.java b/...ication/src/main/java/com/osgifx/console/application/dialog/ConnectToMqttAgentDialog.java
@@ -25,6 +25,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.fx.core.di.LocalInstance;
 import org.osgi.framework.BundleContext;
@@ -33,7 +35,6 @@
 import com.osgifx.console.application.fxml.controller.MqttConnectionSettingsDialogController;
 import com.osgifx.console.util.fx.Fx;
 
-import jakarta.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;

diff --git a/...ation/src/main/java/com/osgifx/console/application/dialog/ConnectToSocketAgentDialog.java b/...ation/src/main/java/com/osgifx/console/application/dialog/ConnectToSocketAgentDialog.java
@@ -25,6 +25,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.fx.core.di.LocalInstance;
 import org.osgi.framework.BundleContext;
@@ -33,7 +35,6 @@
 import com.osgifx.console.application.fxml.controller.SocketConnectionSettingsDialogController;
 import com.osgifx.console.util.fx.Fx;
 
-import jakarta.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;

diff --git a/...application/src/main/java/com/osgifx/console/application/dialog/MqttConnectionDialog.java b/...application/src/main/java/com/osgifx/console/application/dialog/MqttConnectionDialog.java
@@ -23,6 +23,8 @@
 
 import java.util.Optional;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
@@ -35,7 +37,6 @@
 import com.google.common.primitives.Ints;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;

diff --git a/...plication/src/main/java/com/osgifx/console/application/dialog/SocketConnectionDialog.java b/...plication/src/main/java/com/osgifx/console/application/dialog/SocketConnectionDialog.java
@@ -23,6 +23,8 @@
 
 import java.util.Optional;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
@@ -35,7 +37,6 @@
 import com.google.common.primitives.Ints;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;

diff --git a/...java/com/osgifx/console/application/fxml/controller/AboutApplicationDialogController.java b/...java/com/osgifx/console/application/fxml/controller/AboutApplicationDialogController.java
@@ -19,6 +19,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.commons.text.StringSubstitutor;
 import org.controlsfx.control.HyperlinkLabel;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
@@ -27,7 +29,6 @@
 import org.eclipse.fx.core.log.Log;
 import org.osgi.framework.BundleContext;
 
-import jakarta.inject.Inject;
 import javafx.application.Application;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;

diff --git a/...om/osgifx/console/application/fxml/controller/MqttConnectionSettingsDialogController.java b/...om/osgifx/console/application/fxml/controller/MqttConnectionSettingsDialogController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.fxml.controller;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.table.TableFilter;
 import org.eclipse.fx.core.di.ContextBoundValue;
 import org.eclipse.fx.core.di.ContextValue;
@@ -26,7 +28,6 @@
 import com.osgifx.console.application.preference.ConnectionsProvider;
 import com.osgifx.console.util.fx.DTOCellValueFactory;
 
-import jakarta.inject.Inject;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;

diff --git a/.../osgifx/console/application/fxml/controller/SocketConnectionSettingsDialogController.java b/.../osgifx/console/application/fxml/controller/SocketConnectionSettingsDialogController.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.fxml.controller;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.table.TableFilter;
 import org.eclipse.fx.core.di.ContextBoundValue;
 import org.eclipse.fx.core.di.ContextValue;
@@ -25,7 +27,6 @@
 import com.osgifx.console.application.preference.ConnectionsProvider;
 import com.osgifx.console.util.fx.DTOCellValueFactory;
 
-import jakarta.inject.Inject;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;

diff --git a/...ication/src/main/java/com/osgifx/console/application/handler/AboutApplicationHandler.java b/...ication/src/main/java/com/osgifx/console/application/handler/AboutApplicationHandler.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.handler;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
@@ -23,8 +25,6 @@
 
 import com.osgifx.console.application.dialog.AboutApplicationDialog;
 
-import jakarta.inject.Inject;
-
 public final class AboutApplicationHandler {
 
     @Log

diff --git a/...tion/src/main/java/com/osgifx/console/application/handler/ConnectToLocalAgentHandler.java b/...tion/src/main/java/com/osgifx/console/application/handler/ConnectToLocalAgentHandler.java
@@ -19,6 +19,9 @@
 import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.REMOTE_RPC;
 import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.SNAPSHOT;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import org.controlsfx.dialog.ProgressDialog;
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
@@ -38,8 +41,6 @@
 import com.osgifx.console.supervisor.factory.SupervisorFactory;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
 import javafx.concurrent.Task;
 
 public final class ConnectToLocalAgentHandler {

diff --git a/...ation/src/main/java/com/osgifx/console/application/handler/ConnectToMqttAgentHandler.java b/...ation/src/main/java/com/osgifx/console/application/handler/ConnectToMqttAgentHandler.java
@@ -22,6 +22,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.controlsfx.dialog.ProgressDialog;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -49,7 +51,6 @@
 import com.osgifx.console.util.fx.Fx;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.concurrent.Task;
 
 public final class ConnectToMqttAgentHandler {

diff --git a/...ion/src/main/java/com/osgifx/console/application/handler/ConnectToSocketAgentHandler.java b/...ion/src/main/java/com/osgifx/console/application/handler/ConnectToSocketAgentHandler.java
@@ -22,6 +22,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.controlsfx.dialog.ProgressDialog;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -49,7 +51,6 @@
 import com.osgifx.console.util.fx.Fx;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.concurrent.Task;
 
 public final class ConnectToSocketAgentHandler {

diff --git a/...tion/src/main/java/com/osgifx/console/application/handler/DisconnectFromAgentHandler.java b/...tion/src/main/java/com/osgifx/console/application/handler/DisconnectFromAgentHandler.java
@@ -19,6 +19,8 @@
 
 import java.util.stream.Stream;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -33,8 +35,6 @@
 import com.osgifx.console.supervisor.factory.SupervisorFactory;
 import com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType;
 
-import jakarta.inject.Inject;
-
 public final class DisconnectFromAgentHandler {
 
     @Log

diff --git a/...ain/java/com/osgifx/console/application/handler/ExtensionListMenuContributionHandler.java b/...ain/java/com/osgifx/console/application/handler/ExtensionListMenuContributionHandler.java
@@ -19,6 +19,8 @@
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.e4.ui.di.AboutToShow;
@@ -32,8 +34,6 @@
 import org.eclipse.fx.core.log.Log;
 import org.osgi.framework.BundleContext;
 
-import jakarta.inject.Inject;
-
 public final class ExtensionListMenuContributionHandler {
 
     @Log

diff --git a/...src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java b/...src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java
@@ -19,6 +19,8 @@
 import java.util.stream.IntStream;
 
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -34,9 +36,6 @@
 import com.osgifx.console.application.dialog.MqttConnectionSettingDTO;
 import com.osgifx.console.application.preference.ConnectionsProvider;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
 public final class MqttConnectionPreferenceHandler {
 
     @Log

diff --git a/...lication/src/main/java/com/osgifx/console/application/handler/OpenDiagnosticsHandler.java b/...lication/src/main/java/com/osgifx/console/application/handler/OpenDiagnosticsHandler.java
@@ -19,6 +19,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.fx.core.log.FluentLogger;
@@ -27,8 +29,6 @@
 
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
-
 public final class OpenDiagnosticsHandler {
 
     private static final String LOG_FILE_LOCATION_PROPERTY = "org.apache.sling.commons.log.file";
-Original file line number
+Diff line change
@@ Expand Up @@
                 return bundleToStartTime.values().stream().map(StartTime::toBundleStartDuration).collect(toList());
             }
         }
         public Optional<BundleStartDuration> getBundleStartDuration(long bundleId) {
             return Optional.ofNullable(bundleToStartTime.get(bundleId)).map(StartTime::toBundleStartDuration);
         }
@@ Expand Down @@