Replaced javax inject with jakarta inject

Author: SimonCockx

checkstyle.xml

@@ -3,10 +3,12 @@
   "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 	<module name="TreeWalker">
-		<!-- Forbid using Google Inject in favor of javax Inject. -->
+		<!-- Forbid using Google Inject and the deprecated javax Inject in favor of jakarta Inject. -->
 		<module name="IllegalImport">
 			<property name="illegalClasses"
-				value="com.google.inject.Inject, com.google.inject.name.Named, com.google.inject.Provider" />
+				value="com.google.inject.Inject, com.google.inject.name.Named, com.google.inject.Provider, com.google.inject.Singleton" />
+			<property name="illegalPkgs"
+				value="javax.inject" />
 		</module>
 	</module>
 </module>

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/formatting/RosettaFormattingService.java

@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.eclipse.lsp4j.FormattingOptions;
 import org.eclipse.lsp4j.TextEdit;

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/AbstractInlayHintsService.java

@@ -13,7 +13,7 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.util.CancelIndicator;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.*;
 
 /**

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/RosettaInlayHintsService.java

@@ -1,6 +1,6 @@
 package com.regnosys.rosetta.ide.inlayhints;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.InlayHint;

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaQuickFixCodeActionService.java

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionContext;

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaQuickFixProvider.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.lsp4j.Diagnostic;

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/AbstractSemanticTokensService.java

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/RosettaSemanticTokensService.java

@@ -1,6 +1,6 @@
 package com.regnosys.rosetta.ide.semantictokens;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.ecore.EReference;
 

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/AbstractLanguageServerService.java

@@ -13,7 +13,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/RangeUtils.java

@@ -2,7 +2,7 @@
 
 import java.util.Iterator;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.common.util.AbstractTreeIterator;
 import org.eclipse.emf.common.util.TreeIterator;

rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend

@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test
 import com.regnosys.rosetta.ide.tests.AbstractRosettaLanguageServerTest
 import static org.junit.jupiter.api.Assertions.*
 import org.eclipse.lsp4j.Position
-import javax.inject.Inject
+import jakarta.inject.Inject
 import com.regnosys.rosetta.ide.util.RangeUtils
 
 class QuickFixTest extends AbstractRosettaLanguageServerTest {

rosetta-ide/src/test/java/com/regnosys/rosetta/ide/tests/AbstractRosettaLanguageServerTest.xtend

@@ -10,7 +10,7 @@ import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.Range
 import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.SemanticTokensParams
-import javax.inject.Inject
+import jakarta.inject.Inject
 import com.regnosys.rosetta.ide.semantictokens.SemanticToken
 import com.regnosys.rosetta.ide.server.RosettaLanguageServerImpl
 import org.eclipse.xtext.testing.TextDocumentConfiguration

rosetta-ide/src/test/java/com/regnosys/rosetta/ide/textmate/tests/RosettaTextMateGrammarTest.java

@@ -5,7 +5,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Scanner;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;

rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaExtensions.xtend

@@ -26,7 +26,6 @@ import java.util.Collection
 import java.util.List
 import java.util.Map
 import java.util.Set
-import javax.inject.Inject
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
 
@@ -37,6 +36,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet
 import com.regnosys.rosetta.rosetta.RosettaRecordType
 import java.util.Optional
 import com.regnosys.rosetta.types.RAttribute
+import jakarta.inject.Inject
 
 class RosettaExtensions {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaRuntimeModule.xtend

@@ -38,7 +38,7 @@ import com.regnosys.rosetta.formatting2.RosettaExpressionFormatter
 import org.eclipse.xtext.serializer.impl.Serializer
 import com.regnosys.rosetta.formatting2.FormattingUtil
 import com.regnosys.rosetta.generator.java.util.RecordFeatureMap
-import javax.inject.Provider
+import jakarta.inject.Provider
 
 /* Use this class to register components to be used at runtime / without the Equinox extension registry.*/
 class RosettaRuntimeModule extends AbstractRosettaRuntimeModule {

rosetta-lang/src/main/java/com/regnosys/rosetta/derivedstate/RosettaDerivedStateComputer.java

@@ -1,6 +1,6 @@
 package com.regnosys.rosetta.derivedstate;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;

rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaExpressionFormatter.xtend

@@ -18,7 +18,7 @@ import com.regnosys.rosetta.rosetta.expression.ModifiableBinaryOperation
 import com.regnosys.rosetta.rosetta.expression.RosettaFunctionalOperation
 import com.regnosys.rosetta.rosetta.expression.RosettaUnaryOperation
 import com.regnosys.rosetta.services.RosettaGrammarAccess
-import javax.inject.Inject
+import jakarta.inject.Inject
 import static com.regnosys.rosetta.rosetta.expression.ExpressionPackage.Literals.*
 import com.regnosys.rosetta.rosetta.expression.RosettaExistsExpression
 import com.regnosys.rosetta.rosetta.expression.RosettaAbsentExpression

rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaFormatter.xtend

@@ -56,7 +56,7 @@ import com.regnosys.rosetta.rosetta.RosettaTypeAlias
 import com.regnosys.rosetta.rosetta.ParametrizedRosettaType
 import com.regnosys.rosetta.rosetta.TypeParameter
 import com.regnosys.rosetta.rosetta.TypeCallArgument
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class RosettaFormatter extends AbstractRosettaFormatter2 {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/IdentifierRepresentationService.java

@@ -1,6 +1,6 @@
 package com.regnosys.rosetta.generator;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.emf.ecore.EObject;
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaGenerator.xtend

@@ -37,7 +37,7 @@ import com.regnosys.rosetta.generator.java.reports.RuleGenerator
 import com.regnosys.rosetta.generator.java.condition.ConditionGenerator
 import com.regnosys.rosetta.generator.java.reports.ReportGenerator
 import com.regnosys.rosetta.generator.java.blueprints.BlueprintGenerator
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 /**
  * Generates code from your model files on save.

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaOutputConfigurationProvider.xtend

@@ -9,7 +9,7 @@ import com.regnosys.rosetta.generator.external.ExternalOutputConfiguration
 import java.util.Map
 import java.util.HashMap
 import java.util.HashSet
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class RosettaOutputConfigurationProvider extends OutputConfigurationProvider {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/external/EmptyExternalGeneratorsProvider.java

@@ -3,7 +3,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 /**
  * The default implementation of {@code IExternalGeneratorProvider} that returns no external generators. 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/blueprints/BlueprintGenerator.xtend

@@ -67,7 +67,7 @@ import java.util.Optional
 import java.util.function.Supplier
 import java.util.stream.Collectors
 import java.util.stream.Stream
-import javax.inject.Inject
+import jakarta.inject.Inject
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.xtend2.lib.StringConcatenationClient

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend

@@ -22,7 +22,7 @@ import org.eclipse.xtext.generator.IFileSystemAccess2
 
 import static com.regnosys.rosetta.generator.java.util.ModelGeneratorUtil.*
 import static com.regnosys.rosetta.rosetta.simple.SimplePackage.Literals.CONDITION__EXPRESSION
-import javax.inject.Inject
+import jakarta.inject.Inject
 import com.google.inject.ImplementedBy
 import com.rosetta.model.lib.validation.ValidationResult.ValidationType
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/enums/EnumGenerator.xtend

@@ -10,7 +10,7 @@ import org.eclipse.xtext.generator.IFileSystemAccess2
 import static com.regnosys.rosetta.generator.java.enums.EnumHelper.*
 import static com.regnosys.rosetta.generator.java.util.ModelGeneratorUtil.*
 import com.regnosys.rosetta.generator.java.RosettaJavaPackages.RootPackage
-import javax.inject.Inject
+import jakarta.inject.Inject
 import java.util.Map
 import org.eclipse.xtend2.lib.StringConcatenationClient
 import com.regnosys.rosetta.generator.java.JavaScope

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/ExpressionGenerator.xtend

@@ -109,7 +109,7 @@ import org.eclipse.xtext.EcoreUtil2
 
 import static extension com.regnosys.rosetta.generator.java.enums.EnumHelper.convertValues
 import com.regnosys.rosetta.types.RObjectFactory
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class ExpressionGenerator extends RosettaExpressionSwitch<StringConcatenationClient, JavaScope> {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionDependencyProvider.xtend

@@ -22,7 +22,7 @@ import com.regnosys.rosetta.rosetta.RosettaSymbol
 import com.regnosys.rosetta.types.RFunction
 import com.regnosys.rosetta.rosetta.expression.RosettaExpression
 import org.eclipse.xtext.EcoreUtil2
-import javax.inject.Inject
+import jakarta.inject.Inject
 import com.regnosys.rosetta.rosetta.RosettaBlueprint
 import com.regnosys.rosetta.types.RObjectFactory
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend

@@ -59,7 +59,7 @@ import static com.regnosys.rosetta.generator.java.enums.EnumHelper.*
 import static com.regnosys.rosetta.generator.java.util.ModelGeneratorUtil.*
 import com.regnosys.rosetta.utils.ImplicitVariableUtil
 import com.rosetta.util.types.JavaParameterizedType
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class FunctionGenerator {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/MetaFieldGenerator.xtend

@@ -38,7 +38,7 @@ import org.eclipse.xtext.EcoreUtil2
 import com.regnosys.rosetta.scoping.RosettaScopeProvider
 import com.rosetta.util.types.JavaClass
 import com.rosetta.util.types.JavaParameterizedType
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class MetaFieldGenerator {
 	@Inject extension ImportManagerExtension

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelMetaGenerator.xtend

@@ -28,7 +28,7 @@ import com.regnosys.rosetta.generator.java.RosettaJavaPackages.RootPackage
 import com.regnosys.rosetta.generator.java.JavaScope
 import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator
 import com.regnosys.rosetta.types.RDataType
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class ModelMetaGenerator {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBoilerPlate.xtend

@@ -23,7 +23,7 @@ import com.regnosys.rosetta.generator.java.JavaScope
 import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator
 import com.regnosys.rosetta.types.RDataType
 import com.rosetta.util.types.JavaType
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class ModelObjectBoilerPlate {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBuilderGenerator.xtend

@@ -17,7 +17,7 @@ import com.regnosys.rosetta.generator.java.JavaScope
 import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator
 import com.regnosys.rosetta.types.RDataType
 import com.regnosys.rosetta.types.TypeSystem
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class ModelObjectBuilderGenerator {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectGenerator.xtend

@@ -28,7 +28,7 @@ import com.regnosys.rosetta.types.TypeSystem
 import com.rosetta.util.types.JavaClass
 import com.rosetta.util.DottedPath
 import com.rosetta.util.types.JavaParameterizedType
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class ModelObjectGenerator {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ValidatorsGenerator.xtend

@@ -41,7 +41,7 @@ import com.rosetta.util.types.JavaWildcardTypeArgument
 import com.rosetta.util.types.JavaReferenceType
 import com.rosetta.util.types.JavaClass
 import com.rosetta.util.types.JavaParameterizedType
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class ValidatorsGenerator {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/ReportGenerator.xtend

@@ -10,7 +10,7 @@ import com.regnosys.rosetta.types.RObjectFactory
 import com.rosetta.model.lib.reports.ReportFunction
 import com.rosetta.util.types.JavaInterface
 import com.rosetta.util.types.JavaParameterizedType
-import javax.inject.Inject
+import jakarta.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess2
 
 class ReportGenerator {

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/RuleGenerator.xtend

@@ -2,7 +2,7 @@ package com.regnosys.rosetta.generator.java.reports
 
 import com.regnosys.rosetta.generator.java.RosettaJavaPackages.RootPackage
 import com.regnosys.rosetta.rosetta.RosettaBlueprint
-import javax.inject.Inject
+import jakarta.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess2
 import com.regnosys.rosetta.generator.java.util.ImportManagerExtension
 import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/TabulatorGenerator.xtend

@@ -4,7 +4,7 @@ import org.eclipse.xtext.generator.IFileSystemAccess2
 import com.regnosys.rosetta.rosetta.simple.Data
 import com.regnosys.rosetta.rosetta.RosettaBlueprintReport
 import com.regnosys.rosetta.generator.java.JavaScope
-import javax.inject.Inject
+import jakarta.inject.Inject
 import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator
 import org.eclipse.xtend2.lib.StringConcatenationClient
 import com.regnosys.rosetta.generator.java.util.ImportManagerExtension

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeTranslator.java

@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.xtext.EcoreUtil2;
 

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/util/RosettaFunctionExtensions.xtend

@@ -22,7 +22,7 @@ import com.regnosys.rosetta.types.RShortcut
 import com.regnosys.rosetta.rosetta.simple.AnnotationRef
 import java.util.List
 import com.regnosys.rosetta.types.RFunction
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class RosettaFunctionExtensions {
 

rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaInterpreter.java

@@ -10,7 +10,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.google.common.collect.Streams;
 import com.regnosys.rosetta.rosetta.RosettaCallableWithArgs;

rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaValueFactory.java

@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.regnosys.rosetta.types.RAliasType;
 import com.regnosys.rosetta.types.RDataType;

rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/RosettaValueConverterService.java

@@ -3,7 +3,7 @@
 import java.math.BigDecimal;
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.xtext.common.services.DefaultTerminalConverters;
 import org.eclipse.xtext.conversion.IValueConverter;

rosetta-lang/src/main/java/com/regnosys/rosetta/resource/Indexed.xtend

@@ -7,7 +7,7 @@ import org.eclipse.xtext.naming.QualifiedName
 import org.eclipse.xtext.resource.EObjectDescription
 import org.eclipse.xtext.resource.IEObjectDescription
 import org.eclipse.xtext.naming.IQualifiedNameProvider
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class Indexed {