From 915c07a62e9c6d2c532f2e360941b12f12b27206 Mon Sep 17 00:00:00 2001 From: SimonCockx <47859223+SimonCockx@users.noreply.github.com> Date: Wed, 5 Mar 2025 17:25:22 +0100 Subject: [PATCH] Revert Xtext upgrade (#946) --- .github/renovate.json | 2 +- .github/workflows/license-scanning.yml | 1 - README.md | 4 +- checkstyle.xml | 6 +- pom.xml | 15 +- .../RosettaContentProposalProvider.java | 2 +- ...ancellableContentAssistContextFactory.java | 2 +- .../CancellableContentAssistService.java | 4 +- .../cancellable/CancellableRosettaParser.java | 2 +- .../formatting/RosettaFormattingService.java | 4 +- .../hover/RosettaDocumentationProvider.java | 2 +- .../ide/hover/RosettaHoverService.java | 2 +- .../inlayhints/AbstractInlayHintsService.java | 2 +- .../inlayhints/RosettaInlayHintsService.java | 2 +- .../quickfix/RosettaCodeActionProvider.java | 8 +- .../quickfix/RosettaCodeActionService.java | 15 +- .../ide/quickfix/RosettaQuickFixProvider.java | 2 +- .../RosettaResolveCodeActionService.java | 2 +- .../AbstractSemanticTokensService.java | 2 +- .../RosettaSemanticTokensService.java | 2 +- .../ide/server/RosettaLanguageServerImpl.java | 45 +- ...aLanguageServerShutdownAndExitHandler.java | 2 +- .../ide/server/RosettaRequestManager.java | 4 +- .../ide/server/RosettaServerModule.java | 5 - .../ide/server/RosettaWorkspaceManager.java | 25 - .../util/AbstractLanguageServerService.java | 2 +- .../rosetta/ide/util/CodeActionUtils.java | 2 +- .../regnosys/rosetta/ide/util/RangeUtils.java | 2 +- .../rosetta/ide/quickfix/QuickFixTest.xtend | 2 +- .../ide/server/RosettaRequestManagerTest.java | 2 +- .../AbstractRosettaLanguageServerTest.xtend | 2 +- .../tests/RosettaTextMateGrammarTest.java | 2 +- .../checkstyle-for-deprecated-guice.xml | 25 - rosetta-integration-tests/pom.xml | 26 - .../java/object/RosettaExtensionsTest.xtend | 4 +- .../tests/RosettaExpressionsTest.xtend | 2 +- .../rosetta/tests/RosettaParsingTest.xtend | 18 +- .../types/RosettaTypeProviderXtendTest.xtend | 2 +- .../regnosys/rosetta/RosettaEcoreUtil.xtend | 4 +- .../rosetta/RosettaRuntimeModule.xtend | 2 +- .../rosetta/cache/IRequestScopedCache.java | 2 +- .../rosetta/cache/RequestScopedCache.java | 6 +- .../DefaultRosettaConfigurationProvider.java | 4 +- .../RosettaGeneratorsConfiguration.java | 4 +- .../config/RosettaModelConfiguration.java | 4 +- .../config/RosettaTabulatorConfiguration.java | 4 +- ...FileBasedRosettaConfigurationProvider.java | 6 +- .../RosettaConfigurationFileProvider.java | 4 +- .../RosettaDerivedStateComputer.java | 2 +- .../RosettaExpressionFormatter.xtend | 4 +- .../formatting2/RosettaFormatter.xtend | 4 +- .../formatting2/XtextResourceFormatter.java | 4 +- .../IdentifierRepresentationService.java | 2 +- .../rosetta/generator/RosettaGenerator.xtend | 14 +- .../RosettaOutputConfigurationProvider.xtend | 2 +- .../EmptyExternalGeneratorsProvider.java | 4 +- .../java/condition/ConditionGenerator.xtend | 4 +- .../generator/java/enums/EnumGenerator.xtend | 2 +- .../expression/DeepPathUtilGenerator.xtend | 4 +- .../java/expression/ExpressionGenerator.xtend | 2 +- .../expression/JavaDependencyProvider.xtend | 2 +- .../java/expression/TypeCoercionService.xtend | 2 +- .../java/function/FunctionGenerator.xtend | 12 +- .../function/LabelProviderGenerator.xtend | 2 +- .../function/LabelProviderGeneratorUtil.java | 2 +- .../java/object/MetaFieldGenerator.xtend | 2 +- .../java/object/ModelMetaGenerator.xtend | 2 +- .../java/object/ModelObjectBoilerPlate.xtend | 2 +- .../object/ModelObjectBuilderGenerator.xtend | 2 +- .../java/object/ModelObjectGenerator.xtend | 2 +- .../java/object/ValidatorsGenerator.xtend | 2 +- .../java/reports/ReportGenerator.xtend | 2 +- .../java/reports/RuleGenerator.xtend | 2 +- .../java/reports/TabulatorGenerator.xtend | 14 +- .../generator/java/types/JavaTypeJoiner.java | 2 +- .../java/types/JavaTypeTranslator.java | 2 +- .../generator/java/types/JavaTypeUtil.java | 2 +- .../generator/java/util/RecordJavaUtil.xtend | 2 +- .../java/validator/ValidatorGenerator.xtend | 4 +- .../util/RosettaFunctionExtensions.xtend | 2 +- .../interpreter/RosettaInterpreter.java | 2 +- .../interpreter/RosettaValueFactory.java | 2 +- .../parsing/RosettaValueConverterService.java | 2 +- .../rosetta/parsing/ValidIDConverter.java | 2 +- .../resource/RosettaFragmentProvider.java | 2 +- .../RosettaResourceDescriptionStrategy.java | 3 +- .../rosetta/scoping/ReversedSimpleScope.java | 2 +- .../scoping/RosettaScopeProvider.xtend | 2 +- .../rosetta/transgest/ModelLoaderImpl.java | 4 +- .../rosetta/types/CardinalityProvider.java | 2 +- .../rosetta/types/ExpectedTypeProvider.java | 2 +- .../rosetta/types/RObjectFactory.java | 2 +- .../rosetta/types/RosettaTypeProvider.xtend | 4 +- .../rosetta/types/SubtypeRelation.java | 2 +- .../regnosys/rosetta/types/TypeFactory.java | 2 +- .../regnosys/rosetta/types/TypeSystem.java | 4 +- .../types/builtin/RBuiltinTypeService.java | 4 +- .../utils/ConstructorManagementService.java | 2 +- .../rosetta/utils/ExternalAnnotationUtil.java | 2 +- .../utils/ImportManagementService.java | 2 +- .../utils/RosettaConfigExtension.xtend | 2 +- .../utils/RosettaSimpleSystemSolver.java | 2 +- .../AbstractDeclarativeRosettaValidator.java | 2 +- .../validation/AttributeValidator.java | 2 +- .../rosetta/validation/ChoiceValidator.java | 2 +- .../rosetta/validation/EnumValidator.java | 2 +- .../rosetta/validation/ReportValidator.java | 2 +- .../validation/RosettaSimpleValidator.xtend | 16 +- .../rosetta/validation/TypeValidator.java | 2 +- .../AbstractExpressionValidator.java | 2 +- .../expression/ConstructorValidator.java | 2 +- .../expression/ExpressionValidator.java | 2 +- .../expression/SwitchValidator.java | 2 +- .../maven/AbstractRosettaGeneratorMojo.java | 50 +- .../rosetta/maven/ResourceFormatterMojo.java | 2 +- .../rosetta/maven/RosettaGenerateMojo.java | 5 - .../maven/RosettaStandaloneBuilder.java | 464 ++++-------------- .../maven/RosettaTestGenerateMojo.java | 6 - ...letonGeneratorResourceServiceProvider.java | 2 +- .../profiling/InitializationBenchmark.java | 2 +- .../checkstyle-for-deprecated-guice.xml | 25 - rosetta-runtime/pom.xml | 26 - .../testmodel/RosettaTestModelService.java | 2 +- .../tests/util/CodeGeneratorTestHelper.xtend | 2 +- .../util/ExpressionJavaEvaluatorService.xtend | 2 +- .../rosetta/tests/util/ExpressionParser.xtend | 4 +- .../util/ExpressionValidationHelper.xtend | 4 +- .../rosetta/tests/util/ModelHelper.xtend | 2 +- .../rosetta/tools/ResourceFormattingTool.java | 2 +- .../UnnecessaryElementsRemover.java | 2 +- .../modelimport/RosettaModelFactory.java | 2 +- .../tools/modelimport/RosettaXsdMapping.java | 2 +- .../tools/modelimport/XsdElementImport.java | 2 +- .../tools/modelimport/XsdEnumImport.java | 2 +- .../rosetta/tools/modelimport/XsdImport.java | 2 +- .../tools/modelimport/XsdTypeAliasImport.java | 2 +- .../tools/modelimport/XsdTypeImport.java | 2 +- .../UnnecessaryElementsRemoverTest.xtend | 2 +- .../tools/modelimport/XsdImportTest.java | 4 +- rosetta-xcore-plugin-dependencies/pom.xml | 8 +- .../RosettaSerializerFragment.xtend | 2 +- 141 files changed, 328 insertions(+), 798 deletions(-) delete mode 100644 rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaWorkspaceManager.java delete mode 100644 rosetta-integration-tests/checkstyle-for-deprecated-guice.xml delete mode 100644 rosetta-runtime/checkstyle-for-deprecated-guice.xml diff --git a/.github/renovate.json b/.github/renovate.json index 6ce5896ce..f9ac95a8e 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -16,7 +16,7 @@ "packageRules": [ { - "description": "Group all Eclipse related dependencies (including Xtext). These dependencies often introduce breaking changes in minor version upgrades.", + "description": "Group all Eclipse related dependencies (including Xtext). Because these dependencies often introduce breaking changes in minor version upgrades, we always require an explicit approval in the dependency dashboard before creating a PR.", "matchPackagePatterns": ["^org\\.eclipse\\."], "groupName": "eclipse dependencies", "groupSlug": "eclipse-dependencies" diff --git a/.github/workflows/license-scanning.yml b/.github/workflows/license-scanning.yml index 9e49d615b..bd3fba85f 100644 --- a/.github/workflows/license-scanning.yml +++ b/.github/workflows/license-scanning.yml @@ -21,7 +21,6 @@ env: ALLOW_LICENSES: " licenses/license/name!='Apache License, Version 2.0' and not(contains(licenses/license/url, '://www.apache.org/licenses/LICENSE-2.0.txt')) and - not(contains(licenses/license/url, '://opensource.org/licenses/Apache-2.0')) and licenses/license/name!='BSD License' and not(contains(licenses/license/url, 'antlr.org/license.html')) and diff --git a/README.md b/README.md index d5cacf3d7..0f3c7d44d 100644 --- a/README.md +++ b/README.md @@ -77,10 +77,10 @@ To build the project, run `mvn clean install`. ### 2. Setting things up in Eclipse #### Install Eclipse IDE for Java and DSL Developers -Install version `2025-06` of the "Eclipse IDE for Java and DSL Developers" using the [Eclipse Installer](https://www.eclipse.org/downloads/packages/installer). You might have to enable "Advanced Mode" in the settings of the Eclipse Installer to install a specific version. +Install version `2022-06` of the "Eclipse IDE for Java and DSL Developers" using the [Eclipse Installer](https://www.eclipse.org/downloads/packages/installer). Make sure to install version `2022-06`! Later versions dropped support for Java 8 Xtend files, which we need. You might have to enable "Advanced Mode" in the settings of the Eclipse Installer to install a specific version. #### Configure Eclipse with the right version of Java -Xtend files cannot be build with any Java version later than 21. In Eclipse, go to Settings... > Java > Installed JREs and make sure the checked JRE points to a Java version of 21. +Xtend files cannot be build with any Java version later than 17. In Eclipse, go to Settings... > Java > Installed JREs and make sure the checked JRE points to a Java version of 17. #### Install the Checkstyle plugin We use [Checkstyle](https://checkstyle.sourceforge.io/) for enforcing good coding practices. The Eclipse plugin for Checkstyle can be found here: [https://checkstyle.org/eclipse-cs/#!/](https://checkstyle.org/eclipse-cs/#!/). diff --git a/checkstyle.xml b/checkstyle.xml index 4ecc0dbb8..82acaf312 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -21,12 +21,10 @@ - + - + value="com.google.inject.Inject, com.google.inject.name.Named, com.google.inject.Provider" /> diff --git a/pom.xml b/pom.xml index adc1b9c94..cc002c685 100644 --- a/pom.xml +++ b/pom.xml @@ -98,11 +98,11 @@ 10 - 2.38.0 + 2.27.0 3.14.0 1.12.0 2.2 - 1.7.0 + 1.6.0 3.9.8 3.9.8 3.13.1 @@ -116,7 +116,7 @@ 5.12.0 - 1.32.0 + 1.23.0 3.5.0 3.4.0 3.3.0 @@ -180,13 +180,6 @@ - - - com.google.inject - guice - 6.0.0 - org.eclipse.xtext xtext-dev-bom @@ -227,7 +220,7 @@ org.eclipse.xtext - org.eclipse.xtext.xtext.generator + org.eclipse.xtext.generator ${xtext.version} diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/RosettaContentProposalProvider.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/RosettaContentProposalProvider.java index d6595eb93..b935153a6 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/RosettaContentProposalProvider.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/RosettaContentProposalProvider.java @@ -1,6 +1,6 @@ package com.regnosys.rosetta.ide.contentassist; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.RuleCall; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistContextFactory.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistContextFactory.java index 95771afac..4e27a8e62 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistContextFactory.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistContextFactory.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Collections; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.Token; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistService.java index c1b63ba64..2f2df8066 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableContentAssistService.java @@ -19,8 +19,8 @@ import java.util.Arrays; import java.util.concurrent.ExecutorService; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; import org.eclipse.lsp4j.CompletionItem; import org.eclipse.lsp4j.CompletionList; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableRosettaParser.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableRosettaParser.java index 4fd4be3cb..81b1efec7 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableRosettaParser.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/contentassist/cancellable/CancellableRosettaParser.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.Collection; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.antlr.runtime.TokenSource; import org.eclipse.xtext.AbstractElement; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/formatting/RosettaFormattingService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/formatting/RosettaFormattingService.java index 6cd93aefe..a1045f4cd 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/formatting/RosettaFormattingService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/formatting/RosettaFormattingService.java @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.List; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; import org.eclipse.lsp4j.FormattingOptions; import org.eclipse.lsp4j.TextEdit; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaDocumentationProvider.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaDocumentationProvider.java index 7c7e1f220..5a03e02af 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaDocumentationProvider.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaDocumentationProvider.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.documentation.IEObjectDocumentationProvider; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaHoverService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaHoverService.java index 6388821db..8480dd808 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaHoverService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/hover/RosettaHoverService.java @@ -3,7 +3,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.lsp4j.Hover; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/AbstractInlayHintsService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/AbstractInlayHintsService.java index c63dd1c4e..f3ab3cf87 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/AbstractInlayHintsService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/AbstractInlayHintsService.java @@ -29,7 +29,7 @@ import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.util.CancelIndicator; -import jakarta.inject.Inject; +import javax.inject.Inject; import java.util.*; /** diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/RosettaInlayHintsService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/RosettaInlayHintsService.java index ec78d181a..ff91cc738 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/RosettaInlayHintsService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/inlayhints/RosettaInlayHintsService.java @@ -16,7 +16,7 @@ package com.regnosys.rosetta.ide.inlayhints; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.lsp4j.InlayHint; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionProvider.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionProvider.java index 5fa900aa9..9f97ea161 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionProvider.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionProvider.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.EList; import org.eclipse.lsp4j.CodeAction; @@ -18,8 +18,6 @@ import com.regnosys.rosetta.utils.ImportManagementService; public class RosettaCodeActionProvider extends AbstractCodeActionProvider { - private static final String SORT_IMPORTS_LABEL = "Sort imports"; - @Inject private ImportManagementService importManagementService; @Inject @@ -32,14 +30,14 @@ public List getCodeActions(Options options) { // Handle Sorting CodeAction RosettaModel model = (RosettaModel) options.getResource().getContents().get(0); if (!importManagementService.isSorted(model.getImports())) { - result.add(codeActionUtils.createUnresolvedCodeAction(SORT_IMPORTS_LABEL, options.getCodeActionParams(), + result.add(codeActionUtils.createUnresolvedCodeAction("Sort imports", options.getCodeActionParams(), CodeActionKind.SourceOrganizeImports)); } return result; } - @CodeActionResolution(SORT_IMPORTS_LABEL) + @CodeActionResolution("Sort imports") public List sortImports(RosettaModel model) { EList imports = model.getImports(); diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionService.java index e0582fd33..603cfd260 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaCodeActionService.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.lsp4j.CodeAction; import org.eclipse.lsp4j.CodeActionKind; @@ -30,7 +30,6 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.eclipse.xtext.ide.editor.quickfix.DiagnosticResolution; import org.eclipse.xtext.ide.editor.quickfix.IQuickFixProvider; -import org.eclipse.xtext.ide.server.ILanguageServerAccess; import org.eclipse.xtext.ide.server.codeActions.ICodeActionService2; import com.regnosys.rosetta.ide.util.CodeActionUtils; @@ -48,16 +47,7 @@ public class RosettaCodeActionService implements ICodeActionService2 { public List> getCodeActions(Options options) { List> result = new ArrayList<>(); - // By default, Xtext only reads the resource if there is a diagnostic relevant for the quick fix provider. - // However, we always require the resource, since we always check contents to, e.g., check whether the imports are sorted or not. - options.getLanguageServerAccess() - .doSyncRead(options.getURI(), (ILanguageServerAccess.Context context) -> { - options.setDocument(context.getDocument()); - options.setResource(context.getResource()); - return null; - }); - - // Handle code actions + //Handle Code Actions List> codeActions = codeActionProvider.getCodeActions(options).stream() .map(action -> Either.forRight(action)) .collect(Collectors.toList()); @@ -68,7 +58,6 @@ public List> getCodeActions(Options options) { || options.getCodeActionParams().getContext().getOnly().contains(CodeActionKind.QuickFix); if (handleQuickfixes) { - // Handle quick fixes List diagnostics = options.getCodeActionParams().getContext().getDiagnostics(); for (Diagnostic diagnostic : diagnostics) { diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaQuickFixProvider.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaQuickFixProvider.java index 858f722c2..10322966e 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaQuickFixProvider.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaQuickFixProvider.java @@ -21,7 +21,7 @@ import java.util.List; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.lsp4j.Diagnostic; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaResolveCodeActionService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaResolveCodeActionService.java index c5ff28207..f0eba5a18 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaResolveCodeActionService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/quickfix/RosettaResolveCodeActionService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.lsp4j.CodeAction; import org.eclipse.lsp4j.CodeActionKind; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/AbstractSemanticTokensService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/AbstractSemanticTokensService.java index 462e2d1ab..1d30af80c 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/AbstractSemanticTokensService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/AbstractSemanticTokensService.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/RosettaSemanticTokensService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/RosettaSemanticTokensService.java index d4564aff8..75af51b2a 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/RosettaSemanticTokensService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/RosettaSemanticTokensService.java @@ -16,7 +16,7 @@ package com.regnosys.rosetta.ide.semantictokens; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerImpl.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerImpl.java index 175c34833..0d3a0903a 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerImpl.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerImpl.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.URI; import org.eclipse.lsp4j.CodeAction; @@ -62,7 +62,7 @@ * TODO: contribute to Xtext. * */ -public class RosettaLanguageServerImpl extends LanguageServerImpl implements RosettaLanguageServer{ +public class RosettaLanguageServerImpl extends LanguageServerImpl implements RosettaLanguageServer{ @Inject FormattingOptionsAdaptor formattingOptionsAdapter; @Inject CodeActionUtils codeActionUtils; @@ -156,25 +156,16 @@ protected URI uninstallInlayHintURI(InlayHint inlayHint) { /*** SEMANTIC TOKENS ***/ public List semanticTokens(SemanticTokensParams params, CancelIndicator cancelIndicator) { - URI uri = getURI(params.getTextDocument()); - return getWorkspaceManager().doRead(uri, (document, resource) -> { + URI uri = this.getURI(params.getTextDocument()); + return this.getWorkspaceManager().doRead(uri, (document, resource) -> { ISemanticTokensService service = getService(uri, ISemanticTokensService.class); return service.computeSemanticTokens(document, resource, params, cancelIndicator); }); } - /** - * LSP method: textDocument/semanticTokens/full - */ - @Override - public CompletableFuture semanticTokensFull(SemanticTokensParams params) { - return getRequestManager().runRead((cancelIndicator) -> semanticTokensFull(params, cancelIndicator)); - } - - @Override protected SemanticTokens semanticTokensFull(SemanticTokensParams params, CancelIndicator cancelIndicator) { - URI uri = getURI(params.getTextDocument()); - return getWorkspaceManager().doRead(uri, (document, resource) -> { + URI uri = this.getURI(params.getTextDocument()); + return this.getWorkspaceManager().doRead(uri, (document, resource) -> { ISemanticTokensService service = getService(uri, ISemanticTokensService.class); List tokens = service.computeSemanticTokens(document, resource, params, cancelIndicator); SemanticTokens result = service.toSemanticTokensResponse(tokens); @@ -183,30 +174,38 @@ protected SemanticTokens semanticTokensFull(SemanticTokensParams params, CancelI } /** - * LSP method: textDocument/semanticTokens/full/delta + * LSP method: textDocument/semanticTokens/full */ @Override - public CompletableFuture> semanticTokensFullDelta(SemanticTokensDeltaParams params) { - throw new UnsupportedOperationException(); + public CompletableFuture semanticTokensFull(SemanticTokensParams params) { + return this.getRequestManager().runRead((cancelIndicator) -> this.semanticTokensFull(params, cancelIndicator)); } /** - * LSP method: textDocument/semanticTokens/range + * LSP method: textDocument/semanticTokens/full/delta */ @Override - public CompletableFuture semanticTokensRange(SemanticTokensRangeParams params) { - return this.getRequestManager().runRead((cancelIndicator) -> this.semanticTokensRange(params, cancelIndicator)); + public CompletableFuture> semanticTokensFullDelta(SemanticTokensDeltaParams params) { + throw new UnsupportedOperationException(); } protected SemanticTokens semanticTokensRange(SemanticTokensRangeParams params, CancelIndicator cancelIndicator) { - URI uri = getURI(params.getTextDocument()); - return getWorkspaceManager().doRead(uri, (document, resource) -> { + URI uri = this.getURI(params.getTextDocument()); + return this.getWorkspaceManager().doRead(uri, (document, resource) -> { ISemanticTokensService service = getService(uri, ISemanticTokensService.class); List tokens = service.computeSemanticTokensInRange(document, resource, params, cancelIndicator); SemanticTokens result = service.toSemanticTokensResponse(tokens); return result; }); } + + /** + * LSP method: textDocument/semanticTokens/range + */ + @Override + public CompletableFuture semanticTokensRange(SemanticTokensRangeParams params) { + return this.getRequestManager().runRead((cancelIndicator) -> this.semanticTokensRange(params, cancelIndicator)); + } @Override public CompletableFuture getDefaultFormattingOptions() { diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerShutdownAndExitHandler.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerShutdownAndExitHandler.java index 5f497683d..4835ad75f 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerShutdownAndExitHandler.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaLanguageServerShutdownAndExitHandler.java @@ -1,6 +1,6 @@ package com.regnosys.rosetta.ide.server; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.ide.server.ILanguageServerShutdownAndExitHandler; import org.eclipse.xtext.ide.server.concurrent.RequestManager; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaRequestManager.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaRequestManager.java index 929c5ec34..d04176075 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaRequestManager.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaRequestManager.java @@ -28,8 +28,8 @@ import org.eclipse.xtext.xbase.lib.Functions.Function1; import org.eclipse.xtext.xbase.lib.Functions.Function2; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import javax.inject.Inject; +import javax.inject.Singleton; import java.time.Duration; import java.util.List; import java.util.concurrent.*; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaServerModule.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaServerModule.java index 1979c143e..42e64029f 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaServerModule.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaServerModule.java @@ -23,7 +23,6 @@ import org.eclipse.xtext.ide.server.ILanguageServerShutdownAndExitHandler; import org.eclipse.xtext.ide.server.LanguageServerImpl; import org.eclipse.xtext.ide.server.ServerModule; -import org.eclipse.xtext.ide.server.WorkspaceManager; import org.eclipse.xtext.ide.server.concurrent.RequestManager; import org.eclipse.xtext.service.AbstractGenericModule; @@ -79,8 +78,4 @@ public Class bindRequestManager() { public Class bindILanguageServerShutdownAndExitHandler() { return RosettaLanguageServerShutdownAndExitHandler.class; } - - public Class bindWorkspaceManager() { - return RosettaWorkspaceManager.class; - } } diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaWorkspaceManager.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaWorkspaceManager.java deleted file mode 100644 index 2359e575d..000000000 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/server/RosettaWorkspaceManager.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.regnosys.rosetta.ide.server; - -import java.util.Collections; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.xtext.ide.server.WorkspaceManager; -import org.eclipse.xtext.util.CancelIndicator; -import org.eclipse.xtext.validation.Issue; -import org.eclipse.xtext.xbase.lib.Procedures.Procedure2; - -/** - * Makes the language server robust against a null baseDir. - * TODO: This should be contributed back to Xtext. - */ -public class RosettaWorkspaceManager extends WorkspaceManager { - @Override - public void initialize(URI baseDir, Procedure2> issueAcceptor, - CancelIndicator cancelIndicator) { - if (baseDir == null) { - initialize(Collections.emptyList(), issueAcceptor, cancelIndicator); - } else { - super.initialize(baseDir, issueAcceptor, cancelIndicator); - } - } -} diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/AbstractLanguageServerService.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/AbstractLanguageServerService.java index 2ba9de940..6feb387b2 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/AbstractLanguageServerService.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/AbstractLanguageServerService.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/CodeActionUtils.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/CodeActionUtils.java index a0eab9d50..819cd92d5 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/CodeActionUtils.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/CodeActionUtils.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.lsp4j.CodeAction; import org.eclipse.lsp4j.CodeActionContext; diff --git a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/RangeUtils.java b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/RangeUtils.java index c95ddba79..6dd4de281 100644 --- a/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/RangeUtils.java +++ b/rosetta-ide/src/main/java/com/regnosys/rosetta/ide/util/RangeUtils.java @@ -18,7 +18,7 @@ import java.util.Iterator; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.AbstractTreeIterator; import org.eclipse.emf.common.util.TreeIterator; diff --git a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend index 19d14a096..33d2ea5ed 100644 --- a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/quickfix/QuickFixTest.xtend +++ b/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 jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.ide.util.RangeUtils class QuickFixTest extends AbstractRosettaLanguageServerTest { diff --git a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/server/RosettaRequestManagerTest.java b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/server/RosettaRequestManagerTest.java index 0befb15ee..214834806 100644 --- a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/server/RosettaRequestManagerTest.java +++ b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/server/RosettaRequestManagerTest.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; +import javax.inject.Inject; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/tests/AbstractRosettaLanguageServerTest.xtend b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/tests/AbstractRosettaLanguageServerTest.xtend index 6054592b6..33f191ce6 100644 --- a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/tests/AbstractRosettaLanguageServerTest.xtend +++ b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/tests/AbstractRosettaLanguageServerTest.xtend @@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets import java.util.HashMap import java.util.List import java.util.stream.Collectors -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.lsp4j.DiagnosticSeverity import org.eclipse.lsp4j.InlayHint import org.eclipse.lsp4j.InlayHintParams diff --git a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/textmate/tests/RosettaTextMateGrammarTest.java b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/textmate/tests/RosettaTextMateGrammarTest.java index 822347949..c38aeefc9 100644 --- a/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/textmate/tests/RosettaTextMateGrammarTest.java +++ b/rosetta-ide/src/test/java/com/regnosys/rosetta/ide/textmate/tests/RosettaTextMateGrammarTest.java @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import java.util.Scanner; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.testing.InjectWith; import org.eclipse.xtext.testing.extensions.InjectionExtension; diff --git a/rosetta-integration-tests/checkstyle-for-deprecated-guice.xml b/rosetta-integration-tests/checkstyle-for-deprecated-guice.xml deleted file mode 100644 index e865caf70..000000000 --- a/rosetta-integration-tests/checkstyle-for-deprecated-guice.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/rosetta-integration-tests/pom.xml b/rosetta-integration-tests/pom.xml index a81ed362d..266d3db6e 100644 --- a/rosetta-integration-tests/pom.xml +++ b/rosetta-integration-tests/pom.xml @@ -76,32 +76,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle-for-deprecated-guice.xml - true - true - - src/main/java - src/test/java - ${project.basedir}/xtend-gen/main/java - ${project.basedir}/xtend-gen/test/java - - - - - Check style - - process-test-sources - - check - - - - diff --git a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/generator/java/object/RosettaExtensionsTest.xtend b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/generator/java/object/RosettaExtensionsTest.xtend index 01909e1cc..4246dc590 100644 --- a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/generator/java/object/RosettaExtensionsTest.xtend +++ b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/generator/java/object/RosettaExtensionsTest.xtend @@ -32,7 +32,7 @@ class RosettaExtensionsTest { '''.parse.elements.filter(Data).map[buildRDataType] assertEquals(classes.toSet, classes.head.allSuperTypes.toSet) assertEquals(classes.tail.toSet, classes.get(1).allSuperTypes.toSet) - assertEquals(#{classes.lastOrNull}, classes.get(2).allSuperTypes.toSet) + assertEquals(#{classes.last}, classes.get(2).allSuperTypes.toSet) } @Test @@ -66,7 +66,7 @@ class RosettaExtensionsTest { val elems = model.elements.filter(RosettaEnumeration).map[buildREnumType] val foo = elems.head() val bar = elems.get(1) - val baz = elems.lastOrNull() + val baz = elems.last() assertEquals(#{foo, bar, baz}, baz.allParents.toSet) assertEquals(#{foo, bar}, bar.allParents.toSet) assertEquals(#{foo}, foo.allParents.toSet) diff --git a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaExpressionsTest.xtend b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaExpressionsTest.xtend index bc3c83121..1734cc9da 100644 --- a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaExpressionsTest.xtend +++ b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaExpressionsTest.xtend @@ -45,7 +45,7 @@ class RosettaExpressionsTest { '''.parseRosettaWithNoErrors model => [ - ((elements.lastOrNull as Function) + ((elements.last as Function) .operations.head.expression as RosettaConditionalExpression) => [ assertFalse(isFull); assertNotNull(elsethen); diff --git a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaParsingTest.xtend b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaParsingTest.xtend index 4ce869fee..936ce52ea 100644 --- a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaParsingTest.xtend +++ b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/tests/RosettaParsingTest.xtend @@ -433,9 +433,9 @@ class RosettaParsingTest { then (extract F(item) only-element -> a))) then (filter item <> "foo")) '''.parseRosettaWithNoErrors - model.elements.lastOrNull as Function => [ + model.elements.last as Function => [ val expr1 = operations.head.expression - val expr2 = operations.lastOrNull.expression + val expr2 = operations.last.expression assertTrue(EcoreUtil2.equals(expr1, expr2)); ] } @@ -476,9 +476,9 @@ class RosettaParsingTest { then only-element)])) then (extract (item + "bar")) '''.parseRosettaWithNoErrors - model.elements.lastOrNull as Function => [ + model.elements.last as Function => [ val expr1 = operations.head.expression - val expr2 = operations.lastOrNull.expression + val expr2 = operations.last.expression assertTrue(EcoreUtil2.equals(expr1, expr2)); ] } @@ -525,8 +525,8 @@ class RosettaParsingTest { foo extract a '''.parseRosettaWithNoIssues - model.elements.lastOrNull as Function => [ - val aInput = inputs.lastOrNull + model.elements.last as Function => [ + val aInput = inputs.last operations.head => [ expression as MapOperation => [ function => [ @@ -643,7 +643,7 @@ class RosettaParsingTest { extract [item = True] '''.parseRosetta - model.elements.lastOrNull as Function => [ + model.elements.last as Function => [ operations.head => [ assertTrue(expression instanceof MapOperation) expression as MapOperation => [ @@ -666,8 +666,8 @@ class RosettaParsingTest { [True, False] extract [item = False] '''.parseRosetta - model.elements.lastOrNull as Function => [ - assertTrue(operations.lastOrNull.expression instanceof MapOperation) + model.elements.last as Function => [ + assertTrue(operations.last.expression instanceof MapOperation) ] } diff --git a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/types/RosettaTypeProviderXtendTest.xtend b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/types/RosettaTypeProviderXtendTest.xtend index 635f3e391..57175247c 100644 --- a/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/types/RosettaTypeProviderXtendTest.xtend +++ b/rosetta-integration-tests/src/test/java/com/regnosys/rosetta/types/RosettaTypeProviderXtendTest.xtend @@ -561,7 +561,7 @@ class RosettaTypeProviderXtendTest { add result: if True then s2 else s2 add result: if True then s2 else s3 '''.parseRosettaWithNoIssues - model.elements.lastOrNull as Function => [ + model.elements.last as Function => [ val max4String = inputs.get(1).typeCall.typeCallToRType.withNoMeta val maxNString = inputs.get(2).typeCall.typeCallToRType.withNoMeta diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaEcoreUtil.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaEcoreUtil.xtend index 319a60e31..9bb869081 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaEcoreUtil.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaEcoreUtil.xtend @@ -23,8 +23,8 @@ import java.util.Collection import java.util.LinkedHashSet import java.util.List import java.util.Set -import jakarta.inject.Inject -import jakarta.inject.Singleton +import javax.inject.Inject +import javax.inject.Singleton import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.resource.ResourceSet diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaRuntimeModule.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaRuntimeModule.xtend index a32fc53b8..1abc6ea9a 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaRuntimeModule.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/RosettaRuntimeModule.xtend @@ -27,7 +27,7 @@ import org.eclipse.xtext.conversion.IValueConverterService import com.regnosys.rosetta.parsing.RosettaValueConverterService import com.regnosys.rosetta.transgest.ModelLoader import com.regnosys.rosetta.transgest.ModelLoaderImpl -import jakarta.inject.Provider +import javax.inject.Provider import com.regnosys.rosetta.serialization.RosettaTransientValueService import org.eclipse.xtext.parsetree.reconstr.ITransientValueService import com.regnosys.rosetta.resource.RosettaResource diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/IRequestScopedCache.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/IRequestScopedCache.java index e2772f9b7..34501d8f2 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/IRequestScopedCache.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/IRequestScopedCache.java @@ -1,6 +1,6 @@ package com.regnosys.rosetta.cache; -import jakarta.inject.Provider; +import javax.inject.Provider; public interface IRequestScopedCache { T get(Object key, Provider provider); diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/RequestScopedCache.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/RequestScopedCache.java index a9480a96a..0231e920c 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/RequestScopedCache.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/cache/RequestScopedCache.java @@ -3,9 +3,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import jakarta.inject.Inject; -import jakarta.inject.Provider; -import jakarta.inject.Singleton; +import javax.inject.Inject; +import javax.inject.Provider; +import javax.inject.Singleton; /** * A cache that will clear every time a write request is made. For all subsequent read requests, the cache is reused. diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/DefaultRosettaConfigurationProvider.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/DefaultRosettaConfigurationProvider.java index f147b33f0..d237c8492 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/DefaultRosettaConfigurationProvider.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/DefaultRosettaConfigurationProvider.java @@ -2,9 +2,9 @@ import java.util.List; -import jakarta.inject.Provider; +import javax.inject.Provider; -public class DefaultRosettaConfigurationProvider implements Provider, javax.inject.Provider { +public class DefaultRosettaConfigurationProvider implements Provider { @Override public RosettaConfiguration get() { return new RosettaConfiguration( diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaGeneratorsConfiguration.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaGeneratorsConfiguration.java index b2afd2f48..38d80eedc 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaGeneratorsConfiguration.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaGeneratorsConfiguration.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.function.Predicate; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.google.inject.ProvidedBy; @@ -32,7 +32,7 @@ public RosettaTabulatorConfiguration getTabulators() { return rosettaTabulatorConfiguration; } - public static class Provider implements jakarta.inject.Provider, javax.inject.Provider { + public static class Provider implements javax.inject.Provider { private final RosettaConfiguration config; @Inject public Provider(RosettaConfiguration config) { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaModelConfiguration.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaModelConfiguration.java index 7f5ed6a71..3f9ff10f8 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaModelConfiguration.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaModelConfiguration.java @@ -2,7 +2,7 @@ import java.util.Objects; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.google.inject.ProvidedBy; @@ -20,7 +20,7 @@ public String getName() { return name; } - public static class Provider implements jakarta.inject.Provider, javax.inject.Provider { + public static class Provider implements javax.inject.Provider { private final RosettaConfiguration config; @Inject public Provider(RosettaConfiguration config) { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaTabulatorConfiguration.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaTabulatorConfiguration.java index c8bc3005f..6b8b376f6 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaTabulatorConfiguration.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/RosettaTabulatorConfiguration.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.apache.commons.lang3.Validate; @@ -30,7 +30,7 @@ public List getTypes() { return types; } - public static class Provider implements jakarta.inject.Provider, javax.inject.Provider { + public static class Provider implements javax.inject.Provider { private final RosettaConfiguration config; @Inject public Provider(RosettaConfiguration config) { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/FileBasedRosettaConfigurationProvider.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/FileBasedRosettaConfigurationProvider.java index 82a98ec5d..ee7bf9ce3 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/FileBasedRosettaConfigurationProvider.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/FileBasedRosettaConfigurationProvider.java @@ -4,8 +4,8 @@ import java.net.URL; import java.util.List; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +20,7 @@ import com.regnosys.rosetta.config.RosettaModelConfiguration; import com.regnosys.rosetta.config.RosettaTabulatorConfiguration; -public class FileBasedRosettaConfigurationProvider implements Provider, javax.inject.Provider { +public class FileBasedRosettaConfigurationProvider implements Provider { private static final Logger LOGGER = LoggerFactory.getLogger(FileBasedRosettaConfigurationProvider.class); private final Provider fallback; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/RosettaConfigurationFileProvider.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/RosettaConfigurationFileProvider.java index 3d8591da1..2d8a10972 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/RosettaConfigurationFileProvider.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/config/file/RosettaConfigurationFileProvider.java @@ -2,9 +2,9 @@ import java.net.URL; -import jakarta.inject.Provider; +import javax.inject.Provider; -public class RosettaConfigurationFileProvider implements Provider, javax.inject.Provider { +public class RosettaConfigurationFileProvider implements Provider { public static final String FILE_NAME = "rosetta-config.yml"; @Override diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/derivedstate/RosettaDerivedStateComputer.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/derivedstate/RosettaDerivedStateComputer.java index fd903d4f9..06306a60b 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/derivedstate/RosettaDerivedStateComputer.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/derivedstate/RosettaDerivedStateComputer.java @@ -16,7 +16,7 @@ package com.regnosys.rosetta.derivedstate; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaExpressionFormatter.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaExpressionFormatter.xtend index 8ba5f3fef..38a88b42b 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaExpressionFormatter.xtend +++ b/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 jakarta.inject.Inject +import javax.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 @@ -266,7 +266,7 @@ class RosettaExpressionFormatter extends AbstractRosettaFormatter2 { [extension doc | // case: long list expr.regionFor.keyword('[') .append[newLine] - expr.elements.lastOrNull + expr.elements.last .append[newLine] expr.regionFor.keywords(',').forEach[ append[newLine] diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaFormatter.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaFormatter.xtend index 2fb666a10..a091db8bc 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaFormatter.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/RosettaFormatter.xtend @@ -54,7 +54,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 jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.rosetta.RosettaRule import com.regnosys.rosetta.rosetta.simple.Choice @@ -454,7 +454,7 @@ class RosettaFormatter extends AbstractRosettaFormatter2 { .prepend[noSpace] set( inputsColon.nextHiddenRegion, - ele.inputs.lastOrNull.nextHiddenRegion, + ele.inputs.last.nextHiddenRegion, [indent] ) ele.inputs.forEach[ diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/XtextResourceFormatter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/XtextResourceFormatter.java index 0c2d0eb13..add537182 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/XtextResourceFormatter.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/formatting2/XtextResourceFormatter.java @@ -22,8 +22,8 @@ import com.regnosys.rosetta.rosetta.RosettaModel; import com.regnosys.rosetta.utils.ImportManagementService; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; public class XtextResourceFormatter implements ResourceFormatterService { private static Logger LOGGER = LoggerFactory.getLogger(XtextResourceFormatter.class); diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/IdentifierRepresentationService.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/IdentifierRepresentationService.java index f67bb19cb..d06adcbff 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/IdentifierRepresentationService.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/IdentifierRepresentationService.java @@ -16,7 +16,7 @@ package com.regnosys.rosetta.generator; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaGenerator.xtend index 98b8d021c..72c7ba282 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaGenerator.xtend @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory 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 jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.rosetta.RosettaRule import com.regnosys.rosetta.rosetta.RosettaReport import com.regnosys.rosetta.generator.java.validator.ValidatorGenerator @@ -94,7 +94,7 @@ class RosettaGenerator implements IGenerator2 { val lock = locks.computeIfAbsent(resourceSet, [new DemandableLock]); try { lock.getWriteLock(true); - val models = resourceSet.resources.filter[!ignoredFiles.contains(URI.segments.lastOrNull)].map [ + val models = resourceSet.resources.filter[!ignoredFiles.contains(URI.segments.last)].map [ contents.head as RosettaModel ].filter[it.shouldGenerate].toList val version = models.head?.version // TODO: find a way to access the version of a project directly @@ -115,7 +115,7 @@ class RosettaGenerator implements IGenerator2 { } override void beforeGenerate(Resource resource, IFileSystemAccess2 fsa2, IGeneratorContext context) { - if (!ignoredFiles.contains(resource.URI.segments.lastOrNull)) { + if (!ignoredFiles.contains(resource.URI.segments.last)) { LOGGER.trace("Starting the before generate method for " + resource.URI.toString) val lock = locks.computeIfAbsent(resource.resourceSet, [new DemandableLock]); val fsa = fsaFactory.resourceAwareFSA(resource, fsa2, true) @@ -148,7 +148,7 @@ class RosettaGenerator implements IGenerator2 { } override void doGenerate(Resource resource, IFileSystemAccess2 fsa2, IGeneratorContext context) { - if (!ignoredFiles.contains(resource.URI.segments.lastOrNull)) { + if (!ignoredFiles.contains(resource.URI.segments.last)) { LOGGER.trace("Starting the main generate method for " + resource.URI.toString) val fsa = fsaFactory.resourceAwareFSA(resource, fsa2, false) val lock = locks.computeIfAbsent(resource.resourceSet, [new DemandableLock]); @@ -236,7 +236,7 @@ class RosettaGenerator implements IGenerator2 { } override void afterGenerate(Resource resource, IFileSystemAccess2 fsa2, IGeneratorContext context) { - if (!ignoredFiles.contains(resource.URI.segments.lastOrNull)) { + if (!ignoredFiles.contains(resource.URI.segments.last)) { LOGGER.trace("Starting the after generate method for " + resource.URI.toString) val lock = locks.computeIfAbsent(resource.resourceSet, [new DemandableLock]); val fsa = fsaFactory.resourceAwareFSA(resource, fsa2, true) @@ -257,7 +257,7 @@ class RosettaGenerator implements IGenerator2 { fsaFactory.afterGenerate(resource) // TODO: move this over to `afterAllGenerate` once the language supports that method as well. - val models = resource.resourceSet.resources.filter[!ignoredFiles.contains(URI.segments.lastOrNull)].map [ + val models = resource.resourceSet.resources.filter[!ignoredFiles.contains(URI.segments.last)].map [ contents.head as RosettaModel ].filter[shouldGenerate].toList javaPackageInfoGenerator.generatePackageInfoClasses(fsa2, models) @@ -279,7 +279,7 @@ class RosettaGenerator implements IGenerator2 { try { lock.getWriteLock(true) - val models = resourceSet.resources.filter[!ignoredFiles.contains(URI.segments.lastOrNull)].map [ + val models = resourceSet.resources.filter[!ignoredFiles.contains(URI.segments.last)].map [ contents.head as RosettaModel ].filter[shouldGenerate].toList val version = models.head?.version // TODO: find a way to access the version of a project directly diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaOutputConfigurationProvider.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaOutputConfigurationProvider.xtend index e5eb1ac60..9e616be8e 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaOutputConfigurationProvider.xtend +++ b/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 jakarta.inject.Inject +import javax.inject.Inject class RosettaOutputConfigurationProvider extends OutputConfigurationProvider { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/external/EmptyExternalGeneratorsProvider.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/external/EmptyExternalGeneratorsProvider.java index 78c39fda5..36dc11f9f 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/external/EmptyExternalGeneratorsProvider.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/external/EmptyExternalGeneratorsProvider.java @@ -19,13 +19,13 @@ import java.util.Collections; import java.util.Iterator; -import jakarta.inject.Provider; +import javax.inject.Provider; /** * The default implementation of {@code IExternalGeneratorProvider} that returns no external generators. * @author jimwang */ -public class EmptyExternalGeneratorsProvider implements Provider, javax.inject.Provider { +public class EmptyExternalGeneratorsProvider implements Provider { @Override public ExternalGenerators get() { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend index a34f3f03b..bfe942280 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend @@ -20,7 +20,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 jakarta.inject.Inject +import javax.inject.Inject import com.google.inject.ImplementedBy import com.rosetta.model.lib.validation.ValidationResult.ValidationType import com.regnosys.rosetta.generator.java.types.JavaTypeUtil @@ -90,7 +90,7 @@ class ConditionGenerator { class «defaultClassName» implements «className» { «FOR dep : deps» - @«javax.inject.Inject» protected «dep» «defaultClassScope.getIdentifierOrThrow(dep.toDependencyInstance)»; + @«Inject» protected «dep» «defaultClassScope.getIdentifierOrThrow(dep.toDependencyInstance)»; «ENDFOR» @Override diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/enums/EnumGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/enums/EnumGenerator.xtend index 35f6cab65..c303cd829 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/enums/EnumGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/enums/EnumGenerator.xtend @@ -9,7 +9,7 @@ import com.rosetta.model.lib.annotations.RosettaSynonym import java.util.Collections import java.util.Map import java.util.concurrent.ConcurrentHashMap -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtend2.lib.StringConcatenationClient import org.eclipse.xtext.generator.IFileSystemAccess2 diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/DeepPathUtilGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/DeepPathUtilGenerator.xtend index 7c1cf678e..446cb2620 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/DeepPathUtilGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/DeepPathUtilGenerator.xtend @@ -7,7 +7,7 @@ import java.util.Map import org.eclipse.xtend2.lib.StringConcatenationClient import org.eclipse.xtext.generator.IFileSystemAccess2 -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.generator.java.statement.builder.JavaExpression import com.regnosys.rosetta.generator.java.statement.builder.JavaStatementBuilder import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator @@ -78,7 +78,7 @@ class DeepPathUtilGenerator { private final «dependency» «classScope.getIdentifierOrThrow(dependency.toDependencyInstance)»; «ENDFOR» - @«javax.inject.Inject» + @«Inject» public «javaClass»(«FOR dependency : dependencies SEPARATOR ', '»«dependency» «classScope.getIdentifierOrThrow(dependency.toDependencyInstance)»«ENDFOR») { «FOR dependency : dependencies» this.«classScope.getIdentifierOrThrow(dependency.toDependencyInstance)» = «classScope.getIdentifierOrThrow(dependency.toDependencyInstance)»; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/ExpressionGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/ExpressionGenerator.xtend index c8beab798..a3cf164ba 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/ExpressionGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/ExpressionGenerator.xtend @@ -127,7 +127,7 @@ import java.util.Collection import java.util.List import java.util.Optional import java.util.stream.Collectors -import jakarta.inject.Inject +import javax.inject.Inject import org.apache.commons.text.StringEscapeUtils import org.eclipse.emf.ecore.EObject import org.eclipse.xtend2.lib.StringConcatenationClient diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/JavaDependencyProvider.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/JavaDependencyProvider.xtend index be6d3c5c4..5c73a1d5a 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/JavaDependencyProvider.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/JavaDependencyProvider.xtend @@ -5,7 +5,7 @@ import com.regnosys.rosetta.rosetta.simple.Function import com.regnosys.rosetta.rosetta.expression.RosettaSymbolReference import com.regnosys.rosetta.rosetta.expression.RosettaExpression import org.eclipse.xtext.EcoreUtil2 -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.types.RObjectFactory import com.regnosys.rosetta.rosetta.RosettaRule import com.rosetta.util.types.JavaClass diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/TypeCoercionService.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/TypeCoercionService.xtend index 446559da8..fd6537217 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/TypeCoercionService.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/TypeCoercionService.xtend @@ -22,7 +22,7 @@ import java.util.Collections import java.util.Optional import java.util.function.Function import java.util.stream.Collectors -import jakarta.inject.Inject +import javax.inject.Inject /** * This service is responsible for coercing an expression from its actual Java type to an `expected` Java type. diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend index 0d741322a..7c75b6045 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend @@ -69,7 +69,7 @@ import java.util.List import java.util.Map import java.util.Optional import java.util.stream.Collectors -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtend2.lib.StringConcatenationClient import org.eclipse.xtext.generator.IFileSystemAccess2 @@ -225,11 +225,11 @@ class FunctionGenerator { public «IF isStatic»static «ENDIF»abstract class «className» implements «FOR fInterface : functionInterfaces SEPARATOR ","»«fInterface»«ENDFOR» { «IF !preConditions.empty || !postConditions.empty» - @«javax.inject.Inject» protected «ConditionValidator» «conditionValidatorId»; + @«Inject» protected «ConditionValidator» «conditionValidatorId»; «ENDIF» «IF output.needsBuilder» - @«javax.inject.Inject» protected «ModelObjectValidator» «objectValidatorId»; + @«Inject» protected «ModelObjectValidator» «objectValidatorId»; «ENDIF» «IF !dependencies.empty» @@ -237,7 +237,7 @@ class FunctionGenerator { // «ENDIF» «FOR dep : dependencies» - @«javax.inject.Inject» protected «dep» «classScope.getIdentifierOrThrow(dep.toDependencyInstance)»; + @«Inject» protected «dep» «classScope.getIdentifierOrThrow(dep.toDependencyInstance)»; «ENDFOR» /** @@ -364,11 +364,11 @@ class FunctionGenerator { «javadoc(function.definition, function.references, version)» public class «className» implements «RosettaFunction» { «FOR dep : dependencies» - @«javax.inject.Inject» protected «dep» «dep.simpleName.toFirstLower»; + @«Inject» protected «dep» «dep.simpleName.toFirstLower»; «ENDFOR» «FOR enumFunc : dispatchingFuncs» - @«javax.inject.Inject» protected «toDispatchClass(enumFunc)» «classScope.getIdentifierOrThrow(enumFunc)»; + @«Inject» protected «toDispatchClass(enumFunc)» «classScope.getIdentifierOrThrow(enumFunc)»; «ENDFOR» public «outputType» evaluate(«function.inputsAsParameters(evaluateScope)») { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGenerator.xtend index 490133e53..212ccf9ed 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGenerator.xtend @@ -5,7 +5,7 @@ import com.regnosys.rosetta.rosetta.simple.Function import com.regnosys.rosetta.rosetta.RosettaReport import com.regnosys.rosetta.generator.java.JavaScope import com.regnosys.rosetta.types.RObjectFactory -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtend2.lib.StringConcatenationClient import com.regnosys.rosetta.types.RFunction import com.regnosys.rosetta.generator.java.util.ImportManagerExtension diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGeneratorUtil.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGeneratorUtil.java index 7713d0774..2f2fc9f7c 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGeneratorUtil.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/function/LabelProviderGeneratorUtil.java @@ -1,6 +1,6 @@ package com.regnosys.rosetta.generator.java.function; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.regnosys.rosetta.generator.util.RosettaFunctionExtensions; import com.regnosys.rosetta.rosetta.simple.Function; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/MetaFieldGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/MetaFieldGenerator.xtend index c0af0cefe..485b08b34 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/MetaFieldGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/MetaFieldGenerator.xtend @@ -9,7 +9,7 @@ import com.regnosys.rosetta.rosetta.simple.Attribute import com.regnosys.rosetta.types.RObjectFactory import com.rosetta.model.lib.meta.BasicRosettaMetaData import com.rosetta.util.types.generated.GeneratedJavaClass -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtend2.lib.StringConcatenationClient diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelMetaGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelMetaGenerator.xtend index 15c1e2da9..2a93da9ec 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelMetaGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelMetaGenerator.xtend @@ -27,7 +27,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 jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.utils.ModelIdProvider import com.regnosys.rosetta.RosettaEcoreUtil diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBoilerPlate.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBoilerPlate.xtend index 398b3d373..6e1948c6d 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBoilerPlate.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBoilerPlate.xtend @@ -9,7 +9,7 @@ import com.rosetta.model.lib.process.BuilderProcessor import com.rosetta.model.lib.process.Processor import com.rosetta.util.ListEquals import java.util.Objects -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtend2.lib.StringConcatenationClient import com.regnosys.rosetta.generator.java.types.JavaPojoInterface import com.regnosys.rosetta.generator.java.types.JavaTypeUtil diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBuilderGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBuilderGenerator.xtend index 7209de414..d94f192cd 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBuilderGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectBuilderGenerator.xtend @@ -26,7 +26,7 @@ import java.util.ArrayList import java.util.Collections import java.util.function.Consumer import java.util.stream.Collectors -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtend2.lib.StringConcatenationClient class ModelObjectBuilderGenerator { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectGenerator.xtend index f457ac8cd..5d2afcf8e 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelObjectGenerator.xtend @@ -26,7 +26,7 @@ import com.rosetta.util.types.generated.GeneratedJavaClass import java.util.List import java.util.Objects import java.util.Optional -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtend2.lib.StringConcatenationClient import org.eclipse.xtext.generator.IFileSystemAccess2 diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ValidatorsGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ValidatorsGenerator.xtend index acb5a18eb..0836cdea9 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ValidatorsGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ValidatorsGenerator.xtend @@ -30,7 +30,7 @@ import java.util.Optional import java.util.regex.Pattern import org.apache.commons.text.StringEscapeUtils import java.math.BigDecimal -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.generator.java.types.JavaTypeUtil import java.util.List import com.regnosys.rosetta.types.RAttribute diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/ReportGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/ReportGenerator.xtend index e06ac190b..cee47ca0b 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/ReportGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/ReportGenerator.xtend @@ -8,7 +8,7 @@ import com.regnosys.rosetta.generator.java.util.ImportManagerExtension import com.regnosys.rosetta.types.RObjectFactory import com.rosetta.model.lib.reports.ReportFunction import com.rosetta.util.types.JavaParameterizedType -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtext.generator.IFileSystemAccess2 import com.regnosys.rosetta.rosetta.RosettaReport import com.fasterxml.jackson.core.type.TypeReference diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/RuleGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/RuleGenerator.xtend index cc0380f08..fc3a6fd14 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/RuleGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/RuleGenerator.xtend @@ -1,7 +1,7 @@ package com.regnosys.rosetta.generator.java.reports import com.regnosys.rosetta.generator.java.RosettaJavaPackages.RootPackage -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.xtext.generator.IFileSystemAccess2 import com.regnosys.rosetta.generator.java.util.ImportManagerExtension import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/TabulatorGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/TabulatorGenerator.xtend index c682a2c7e..f7be71ef1 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/TabulatorGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/reports/TabulatorGenerator.xtend @@ -35,8 +35,8 @@ import java.util.Objects import java.util.Optional import java.util.Set import java.util.stream.Collectors -import jakarta.inject.Inject -import jakarta.inject.Singleton +import javax.inject.Inject +import javax.inject.Singleton import org.apache.commons.text.StringEscapeUtils import org.eclipse.xtend2.lib.StringConcatenationClient import org.eclipse.xtext.generator.IFileSystemAccess2 @@ -305,11 +305,11 @@ class TabulatorGenerator { ''' @«ImplementedBy»(«tabulatorClass».Impl.class) public interface «tabulatorClass» extends «Tabulator»<«inputClass»> { - @«javax.inject.Singleton» + @«Singleton» class Impl implements «tabulatorClass» { private final «innerTabulatorClass» «innerTabulatorInstance»; - @«javax.inject.Inject» + @«Inject» public Impl(«innerTabulatorClass» «innerTabulatorInstance») { this.«innerTabulatorInstance» = «innerTabulatorInstance»; } @@ -327,7 +327,7 @@ class TabulatorGenerator { ''' @«ImplementedBy»(«tabulatorClass».Impl.class) public interface «tabulatorClass» extends «Tabulator»<«inputClass»> { - @«javax.inject.Singleton» + @«Singleton» class Impl implements «tabulatorClass» { @Override @@ -352,7 +352,7 @@ class TabulatorGenerator { ''' @«ImplementedBy»(«tabulatorClass».Impl.class) public interface «tabulatorClass» extends «Tabulator»<«inputClass»> { - @«javax.inject.Singleton» + @«Singleton» class Impl implements «tabulatorClass» { «FOR attr : inputType.allAttributes» «IF context.isTabulated(attr)» @@ -367,7 +367,7 @@ class TabulatorGenerator { «ENDFOR» «ENDIF» - «IF !nestedTabulatorInstances.empty»@«javax.inject.Inject»«ENDIF» + «IF !nestedTabulatorInstances.empty»@«Inject»«ENDIF» public Impl(«FOR tabInst : nestedTabulatorInstances SEPARATOR ", "»«context.toTabulatorJavaClass(tabInst.type)» «classScope.getIdentifierOrThrow(tabInst)»«ENDFOR») { «FOR tabInst : nestedTabulatorInstances» this.«classScope.getIdentifierOrThrow(tabInst)» = «classScope.getIdentifierOrThrow(tabInst)»; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeJoiner.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeJoiner.java index d6e4d5a85..5919f72ee 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeJoiner.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeJoiner.java @@ -20,7 +20,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.rosetta.util.types.BinaryCommunicativeJavaTypeVisitor; import com.rosetta.util.types.JavaArrayType; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeTranslator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeTranslator.java index 42615a26a..0681887e4 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeTranslator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeTranslator.java @@ -39,7 +39,7 @@ import com.rosetta.util.types.generated.GeneratedJavaClassService; import com.rosetta.util.types.generated.GeneratedJavaGenericTypeDeclaration; -import jakarta.inject.Inject; +import javax.inject.Inject; import java.math.BigDecimal; import java.math.BigInteger; import java.time.LocalDateTime; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeUtil.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeUtil.java index 2a8af5f6f..487c77013 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeUtil.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeUtil.java @@ -24,7 +24,7 @@ import java.time.ZonedDateTime; import java.util.List; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.fasterxml.jackson.core.type.TypeReference; import com.regnosys.rosetta.rosetta.expression.RosettaExpression; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/util/RecordJavaUtil.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/util/RecordJavaUtil.xtend index 0ab3b0daa..afe991a56 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/util/RecordJavaUtil.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/util/RecordJavaUtil.xtend @@ -13,7 +13,7 @@ import java.time.LocalDateTime import java.time.ZoneId import com.regnosys.rosetta.generator.java.statement.builder.JavaStatementBuilder import com.regnosys.rosetta.generator.java.statement.builder.JavaExpression -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.generator.java.types.JavaTypeUtil import com.rosetta.util.types.JavaPrimitiveType import java.util.List diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/validator/ValidatorGenerator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/validator/ValidatorGenerator.xtend index 214466633..158e1a189 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/validator/ValidatorGenerator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/validator/ValidatorGenerator.xtend @@ -21,7 +21,7 @@ import java.util.ArrayList import java.util.Optional import java.util.regex.Pattern import java.util.stream.Collectors -import jakarta.inject.Inject +import javax.inject.Inject import org.apache.commons.text.StringEscapeUtils import org.eclipse.xtend2.lib.StringConcatenationClient import org.eclipse.xtext.generator.IFileSystemAccess2 @@ -57,7 +57,7 @@ class ValidatorGenerator { ''' public class «data.name»Validator implements «RosettaModelObjectValidator»<«modelPojo»>{ «FOR con : data.conditions» - @«javax.inject.Inject» protected «new GeneratedJavaClass(root.condition, con.conditionName(type).toConditionJavaType, Object)» «con.conditionName(type).toFirstLower» ; + @«Inject» protected «new GeneratedJavaClass(root.condition, con.conditionName(type).toConditionJavaType, Object)» «con.conditionName(type).toFirstLower» ; «ENDFOR» diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/util/RosettaFunctionExtensions.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/util/RosettaFunctionExtensions.xtend index a317b4cd3..cadc6d813 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/util/RosettaFunctionExtensions.xtend +++ b/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 jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.types.RChoiceType import com.regnosys.rosetta.RosettaEcoreUtil diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaInterpreter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaInterpreter.java index cdb6b1bef..5205d2f8d 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaInterpreter.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaInterpreter.java @@ -26,7 +26,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.google.common.collect.Streams; import com.regnosys.rosetta.rosetta.RosettaCallableWithArgs; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaValueFactory.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaValueFactory.java index 6fa5a11da..02013008a 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaValueFactory.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreter/RosettaValueFactory.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.regnosys.rosetta.types.RAliasType; import com.regnosys.rosetta.types.RChoiceType; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/RosettaValueConverterService.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/RosettaValueConverterService.java index 376b297a1..eba88f333 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/RosettaValueConverterService.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/RosettaValueConverterService.java @@ -20,7 +20,7 @@ import java.math.BigInteger; import java.util.regex.Pattern; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.common.services.DefaultTerminalConverters; import org.eclipse.xtext.conversion.IValueConverter; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/ValidIDConverter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/ValidIDConverter.java index 62ac58f6e..2b10e9439 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/ValidIDConverter.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/parsing/ValidIDConverter.java @@ -18,7 +18,7 @@ import java.util.Set; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.Alternatives; import org.eclipse.xtext.Keyword; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaFragmentProvider.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaFragmentProvider.java index 04c4a38e7..c4797deda 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaFragmentProvider.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaFragmentProvider.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaResourceDescriptionStrategy.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaResourceDescriptionStrategy.java index bbe8115f3..407829c3a 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaResourceDescriptionStrategy.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/resource/RosettaResourceDescriptionStrategy.java @@ -12,12 +12,11 @@ import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy; import org.eclipse.xtext.util.IAcceptor; +import com.google.inject.Singleton; import com.regnosys.rosetta.rosetta.RosettaModel; import com.regnosys.rosetta.rosetta.RosettaRule; import com.regnosys.rosetta.rosetta.simple.Attribute; -import jakarta.inject.Singleton; - @Singleton public class RosettaResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy { diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/ReversedSimpleScope.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/ReversedSimpleScope.java index 6bdb45115..d8c53b5bb 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/ReversedSimpleScope.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/ReversedSimpleScope.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.Iterator; -import jakarta.inject.Provider; +import javax.inject.Provider; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/RosettaScopeProvider.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/RosettaScopeProvider.xtend index db3103354..dded28dd9 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/RosettaScopeProvider.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/scoping/RosettaScopeProvider.xtend @@ -43,7 +43,7 @@ import com.regnosys.rosetta.types.RType import com.regnosys.rosetta.types.RosettaTypeProvider import com.regnosys.rosetta.utils.DeepFeatureCallUtil import java.util.List -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EReference import org.eclipse.xtext.EcoreUtil2 diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/transgest/ModelLoaderImpl.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/transgest/ModelLoaderImpl.java index cd54c5cda..d2e3e720a 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/transgest/ModelLoaderImpl.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/transgest/ModelLoaderImpl.java @@ -28,8 +28,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/CardinalityProvider.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/CardinalityProvider.java index de3ef7e40..67ec5c150 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/CardinalityProvider.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/CardinalityProvider.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.xbase.lib.IterableExtensions; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/ExpectedTypeProvider.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/ExpectedTypeProvider.java index 669d18ece..92161d420 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/ExpectedTypeProvider.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/ExpectedTypeProvider.java @@ -77,7 +77,7 @@ import java.util.List; import java.util.Objects; -import jakarta.inject.Inject; +import javax.inject.Inject; import static com.regnosys.rosetta.types.RMetaAnnotatedType.withNoMeta; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RObjectFactory.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RObjectFactory.java index a6de729c9..992e4b32d 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RObjectFactory.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RObjectFactory.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.EcoreUtil2; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RosettaTypeProvider.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RosettaTypeProvider.xtend index 9fdc19b78..f6f8dc539 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RosettaTypeProvider.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/RosettaTypeProvider.xtend @@ -85,8 +85,8 @@ import java.math.BigInteger import java.util.List import java.util.Map import java.util.Optional -import jakarta.inject.Inject -import jakarta.inject.Provider +import javax.inject.Inject +import javax.inject.Provider import org.eclipse.emf.ecore.EObject import static extension com.regnosys.rosetta.types.RMetaAnnotatedType.withMeta diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/SubtypeRelation.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/SubtypeRelation.java index fb982bee0..0c751e08e 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/SubtypeRelation.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/SubtypeRelation.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.google.common.collect.Sets; import com.regnosys.rosetta.interpreter.RosettaValue; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeFactory.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeFactory.java index 697d8979b..a9c9e2f77 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeFactory.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeFactory.java @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.regex.Pattern; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.regnosys.rosetta.interpreter.RosettaValue; import com.regnosys.rosetta.types.builtin.RBuiltinTypeService; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeSystem.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeSystem.java index 4a7458ed8..23b7f833c 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeSystem.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/TypeSystem.java @@ -29,8 +29,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; import org.apache.commons.lang3.Validate; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/builtin/RBuiltinTypeService.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/builtin/RBuiltinTypeService.java index ecbaf8f60..94a7e2f47 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/types/builtin/RBuiltinTypeService.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/types/builtin/RBuiltinTypeService.java @@ -23,8 +23,8 @@ import java.util.Optional; import java.util.function.Function; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import javax.inject.Inject; +import javax.inject.Singleton; import org.eclipse.emf.ecore.resource.ResourceSet; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ConstructorManagementService.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ConstructorManagementService.java index 61dedb9ee..245fb2b16 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ConstructorManagementService.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ConstructorManagementService.java @@ -10,7 +10,7 @@ import com.regnosys.rosetta.types.RMetaAnnotatedType; import com.regnosys.rosetta.types.RosettaTypeProvider; -import jakarta.inject.Inject; +import javax.inject.Inject; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ExternalAnnotationUtil.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ExternalAnnotationUtil.java index d19c4e76d..5cdf41825 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ExternalAnnotationUtil.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ExternalAnnotationUtil.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.regnosys.rosetta.rosetta.ExternalAnnotationSource; import com.regnosys.rosetta.rosetta.ExternalValueOperator; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java index ce6a9a37a..792db5627 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/ImportManagementService.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Set; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.ECollections; import org.eclipse.emf.common.util.EList; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaConfigExtension.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaConfigExtension.xtend index 69c716f03..407e978b9 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaConfigExtension.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaConfigExtension.xtend @@ -8,7 +8,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil import org.eclipse.xtext.resource.IResourceDescriptionsProvider import static com.regnosys.rosetta.rosetta.RosettaPackage.Literals.* -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.RosettaEcoreUtil import org.eclipse.emf.common.util.URI diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaSimpleSystemSolver.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaSimpleSystemSolver.java index 9dd16cce7..11f27f188 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaSimpleSystemSolver.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/utils/RosettaSimpleSystemSolver.java @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.Set; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.regnosys.rosetta.interpreter.RosettaInterpreter; import com.regnosys.rosetta.interpreter.RosettaInterpreterContext; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AbstractDeclarativeRosettaValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AbstractDeclarativeRosettaValidator.java index 8f2d3ca25..0fd75626b 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AbstractDeclarativeRosettaValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AbstractDeclarativeRosettaValidator.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.ecore.EObject; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AttributeValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AttributeValidator.java index 0a585fc92..b8e480f9c 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AttributeValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/AttributeValidator.java @@ -1,6 +1,6 @@ package com.regnosys.rosetta.validation; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.validation.Check; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ChoiceValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ChoiceValidator.java index a166ec7b4..ac0adee33 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ChoiceValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ChoiceValidator.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.validation.Check; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/EnumValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/EnumValidator.java index b25ccafb2..2005c764f 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/EnumValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/EnumValidator.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.validation.Check; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ReportValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ReportValidator.java index 5049687ab..983b80c2a 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ReportValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/ReportValidator.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Optional; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.validation.Check; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/RosettaSimpleValidator.xtend b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/RosettaSimpleValidator.xtend index 563f930ce..8ca2d71ec 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/RosettaSimpleValidator.xtend +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/RosettaSimpleValidator.xtend @@ -61,7 +61,7 @@ import java.util.Set import java.util.Stack import java.util.regex.Pattern import java.util.regex.PatternSyntaxException -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EReference import org.eclipse.xtext.EcoreUtil2 @@ -560,7 +560,7 @@ class RosettaSimpleValidator extends AbstractDeclarativeRosettaValidator { } if (element.instances.filter[^set !== null && when === null].size == 1) { val defaultInstance = element.instances.findFirst[^set !== null && when === null] - val lastInstance = element.instances.lastOrNull + val lastInstance = element.instances.last if (defaultInstance !== lastInstance) { error('''Set to without when case must be ordered last.''', element, ROSETTA_MAPPING__INSTANCES) } @@ -608,7 +608,7 @@ class RosettaSimpleValidator extends AbstractDeclarativeRosettaValidator { } if (element.instances.filter[^default].size == 1) { val defaultInstance = element.instances.findFirst[^default] - val lastInstance = element.instances.lastOrNull + val lastInstance = element.instances.last if (defaultInstance !== lastInstance) { error('''Default case must be ordered last.''', element, ROSETTA_MAPPING__INSTANCES) } @@ -697,7 +697,7 @@ class RosettaSimpleValidator extends AbstractDeclarativeRosettaValidator { try { Pattern.compile(body.patternMatch) } catch (PatternSyntaxException e) { - error("Pattern to match must be a valid regular expression - " + e.getPatternSyntaxErrorMessage, body, + error("Pattern to match must be a valid regular expression - " + e.message, body, ROSETTA_SYNONYM_BODY__PATTERN_MATCH) } } @@ -713,15 +713,11 @@ class RosettaSimpleValidator extends AbstractDeclarativeRosettaValidator { try { Pattern.compile(synonym.patternMatch) } catch (PatternSyntaxException e) { - error("Pattern to match must be a valid regular expression - " + e.getPatternSyntaxErrorMessage, synonym, + error("Pattern to match must be a valid regular expression - " + e.message, synonym, ROSETTA_ENUM_SYNONYM__PATTERN_MATCH) } } } - - private def String getPatternSyntaxErrorMessage(PatternSyntaxException e) { - return e.message.replace(System.lineSeparator, '\n') - } /** * Check all report attribute type and cardinality match the associated reporting rules @@ -1179,7 +1175,7 @@ class RosettaSimpleValidator extends AbstractDeclarativeRosettaValidator { return } val segments = container.path.asSegmentList(container.path) - val feature = segments?.lastOrNull?.feature + val feature = segments?.last?.feature if ((feature instanceof RosettaMetaType || !(feature as Attribute).hasReferenceAnnotation)) { error(''''«o.operator»' can only be used with attributes annotated with [metadata reference] annotation.''', o, ROSETTA_OPERATION__OPERATOR) diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/TypeValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/TypeValidator.java index 74ca0fe47..65de7d2d1 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/TypeValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/TypeValidator.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.validation.Check; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/AbstractExpressionValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/AbstractExpressionValidator.java index 22b4d322e..6e7328dff 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/AbstractExpressionValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/AbstractExpressionValidator.java @@ -6,7 +6,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ConstructorValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ConstructorValidator.java index 0ccf0d633..fab0184a2 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ConstructorValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ConstructorValidator.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; public class ConstructorValidator extends AbstractExpressionValidator { @Inject diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ExpressionValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ExpressionValidator.java index ef1828caf..55cb7a9a9 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ExpressionValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/ExpressionValidator.java @@ -1,6 +1,6 @@ package com.regnosys.rosetta.validation.expression; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.xtext.EcoreUtil2; diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/SwitchValidator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/SwitchValidator.java index c8ef64ca1..8fbde6c91 100644 --- a/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/SwitchValidator.java +++ b/rosetta-lang/src/main/java/com/regnosys/rosetta/validation/expression/SwitchValidator.java @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.xtext.validation.Check; diff --git a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/AbstractRosettaGeneratorMojo.java b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/AbstractRosettaGeneratorMojo.java index ee0198da9..786c343e9 100644 --- a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/AbstractRosettaGeneratorMojo.java +++ b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/AbstractRosettaGeneratorMojo.java @@ -19,21 +19,15 @@ import java.io.File; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.eclipse.xtext.builder.standalone.LanguageAccess; -import org.eclipse.xtext.builder.standalone.LanguageAccessFactory; import org.eclipse.xtext.builder.standalone.StandaloneBuilder; import org.eclipse.xtext.builder.standalone.compiler.CompilerConfiguration; import org.eclipse.xtext.builder.standalone.compiler.IJavaCompiler; import org.eclipse.xtext.maven.AbstractXtextGeneratorMojo; import org.eclipse.xtext.maven.ClusteringConfig; -import org.eclipse.xtext.maven.MavenStandaloneBuilderModule; import org.eclipse.xtext.xbase.lib.IterableExtensions; import com.google.inject.Guice; @@ -74,24 +68,6 @@ public abstract class AbstractRosettaGeneratorMojo extends AbstractXtextGenerato @Parameter(defaultValue = "false") private Boolean compilerPreserveInformationAboutFormalParameters; - @Parameter(defaultValue = "false") - private boolean writeStorageResources; - - @Parameter(defaultValue = "false") - private boolean writeClasspathConfiguration = false; - - @Parameter(defaultValue = "${project.build.directory}/xtext.classpath") - private String classpathConfigurationLocation; - - @Parameter( defaultValue = "${mojoExecution}", readonly = true ) - private MojoExecution mojoExecution; - - @Parameter( readonly = true, defaultValue = "${plugin.artifacts}" ) - private List pluginDependencies; - - @Parameter(defaultValue = "true") // NOTE: we have a different default from Xtext!! We want to have this enabled by default. - private boolean incrementalXtextBuild; - // TODO: add this method to Xtext so I don't have to overwrite `internalExecute` // and duplicate all of the above parameters. protected Module createModule() { @@ -110,21 +86,15 @@ protected void internalExecute() throws MojoExecutionException { builder.setBaseDir(getProject().getBasedir().getAbsolutePath()); builder.setLanguages(languages); builder.setEncoding(getEncoding()); - builder.setClassPathEntries(getClasspathEntries()); + builder.setClassPathEntries(getClasspathElements()); builder.setClassPathLookUpFilter(classPathLookupFilter); builder.setSourceDirs(getSourceRoots()); builder.setJavaSourceDirs(javaSourceRoots); builder.setFailOnValidationError(failOnValidationError); builder.setTempDir(createTempDir().getAbsolutePath()); builder.setDebugLog(getLog().isDebugEnabled()); - builder.setIncrementalBuild(incrementalXtextBuild); - builder.setWriteStorageResources(writeStorageResources); - if (writeClasspathConfiguration) { - builder.setClasspathConfigurationLocation(classpathConfigurationLocation, mojoExecution.getGoal(), getClassOutputDirectory()); - } - if (clusteringConfig != null) { + if (clusteringConfig != null) builder.setClusteringConfig(clusteringConfig.convertToStandaloneConfig()); - } configureCompiler(builder.getCompiler()); logState(); boolean errorDetected = !builder.launch(); @@ -143,7 +113,7 @@ private void configureCompiler(IJavaCompiler compiler) { } private File createTempDir() { - File tmpDir = new File(tmpClassDirectory + tmpDirSuffix()); + File tmpDir = new File(tmpClassDirectory); if (!tmpDir.mkdirs() && !tmpDir.exists()) { throw new IllegalArgumentException("Couldn't create directory '" + tmpClassDirectory + "'."); } @@ -158,19 +128,7 @@ private void logState() { if (getLog().isDebugEnabled()) { getLog().debug("Source dirs: " + IterableExtensions.join(getSourceRoots(), ", ")); getLog().debug("Java source dirs: " + IterableExtensions.join(javaSourceRoots, ", ")); - getLog().debug("Classpath entries: " + IterableExtensions.join(getClasspathEntries(), ", ")); - } - } - - private Set getClasspathEntries() { - Set classpathElements = getClasspathElements(); - if (isIncludePluginDependencies()) { - getLog().info("Including plugin dependencies"); - List pluginClasspathElements = pluginDependencies.stream() - .map(e -> e.getFile().toPath().toString()) - .collect(Collectors.toList()); - classpathElements.addAll(pluginClasspathElements); + getLog().debug("Classpath entries: " + IterableExtensions.join(getClasspathElements(), ", ")); } - return classpathElements; } } diff --git a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/ResourceFormatterMojo.java b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/ResourceFormatterMojo.java index 1cb3a0cf5..c6b30f416 100644 --- a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/ResourceFormatterMojo.java +++ b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/ResourceFormatterMojo.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; diff --git a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaGenerateMojo.java b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaGenerateMojo.java index de3623936..edbbeebf1 100644 --- a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaGenerateMojo.java +++ b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaGenerateMojo.java @@ -56,11 +56,6 @@ protected void configureMavenOutputs() { } } - @Override - protected String getClassOutputDirectory() { - return getProject().getBuild().getOutputDirectory(); - } - /** * Project source roots. List of folders, where the source models are * located.
diff --git a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaStandaloneBuilder.java b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaStandaloneBuilder.java index df5c7fbf8..76ad71725 100644 --- a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaStandaloneBuilder.java +++ b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaStandaloneBuilder.java @@ -16,57 +16,38 @@ package com.regnosys.rosetta.maven; -import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.xtext.EcoreUtil2; -import org.eclipse.xtext.builder.standalone.IIssueHandler; import org.eclipse.xtext.builder.standalone.LanguageAccess; import org.eclipse.xtext.builder.standalone.StandaloneBuilder; -import org.eclipse.xtext.builder.standalone.compiler.CompilerConfiguration; import org.eclipse.xtext.common.types.access.impl.IndexedJvmTypeAccess; import org.eclipse.xtext.generator.GeneratorContext; import org.eclipse.xtext.generator.GeneratorDelegate; import org.eclipse.xtext.generator.JavaIoFileSystemAccess; -import org.eclipse.xtext.resource.IResourceDescription; -import org.eclipse.xtext.resource.IResourceServiceProvider; -import org.eclipse.xtext.resource.IResourceServiceProviderExtension; -import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; -import org.eclipse.xtext.resource.IResourceDescription.Delta; -import org.eclipse.xtext.resource.IResourceDescription.Event; +import org.eclipse.xtext.resource.clustering.DisabledClusteringPolicy; +import org.eclipse.xtext.resource.clustering.DynamicResourceClusteringPolicy; import org.eclipse.xtext.resource.clustering.IResourceClusteringPolicy; import org.eclipse.xtext.resource.impl.ResourceDescriptionsData; -import org.eclipse.xtext.resource.persistence.SerializableResourceDescription; -import org.eclipse.xtext.resource.persistence.SourceLevelURIsAdapter; -import org.eclipse.xtext.resource.persistence.StorageAwareResource; import org.eclipse.xtext.util.CancelIndicator; import org.eclipse.xtext.xbase.lib.IterableExtensions; -import com.google.common.base.Stopwatch; -import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.hash.HashCode; import com.regnosys.rosetta.generator.RosettaGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,15 +55,6 @@ public class RosettaStandaloneBuilder extends StandaloneBuilder { private static final Logger LOG = LoggerFactory.getLogger(RosettaStandaloneBuilder.class); - private static Class standaloneBuilderStateClass; - static { - try { - standaloneBuilderStateClass = Class.forName("org.eclipse.xtext.builder.standalone.StandaloneBuilderState"); - } catch (ClassNotFoundException e) { - standaloneBuilderStateClass = null; - } - } - @Inject private Provider resourceSetProvider; @Inject @@ -121,197 +93,127 @@ private RosettaGenerator getRosettaGenerator() { } return rosettaGenerator; } - - private boolean isIncremental() { - try { - Field f = StandaloneBuilder.class.getDeclaredField("incremental"); - f.setAccessible(true); - return (boolean) f.get(this); - } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { - throw new RuntimeException(e); - } - } - private String getClasspathConfigurationLocation() { - try { - Field f = StandaloneBuilder.class.getDeclaredField("classpathConfigurationLocation"); - f.setAccessible(true); - return (String) f.get(this); - } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { - throw new RuntimeException(e); - } - } - @SuppressWarnings("unchecked") - private Map getConfiguredFsas() { - try { - Field f = StandaloneBuilder.class.getDeclaredField("configuredFsas"); - f.setAccessible(true); - return (Map) f.get(this); - } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { - throw new RuntimeException(e); - } - } - private Object getBuilderState() { - try { - Field f = StandaloneBuilder.class.getDeclaredField("builderState"); - f.setAccessible(true); - return f.get(this); - } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { - throw new RuntimeException(e); - } - } - private void setBuilderState(Object builderState) { - try { - Field f = StandaloneBuilder.class.getDeclaredField("builderState"); - f.setAccessible(true); - f.set(this, builderState); - } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { - throw new RuntimeException(e); - } - } - private Object callBuilderStateMethod(String methodName, Class[] parameterTypes, Object... arguments) { - try { - Method m = standaloneBuilderStateClass.getDeclaredMethod(methodName, parameterTypes); - m.setAccessible(true); - return m.invoke(getBuilderState(), arguments); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - throw new RuntimeException(e); - } - } - private Object getBuilderStateField(String fieldName) { - try { - Field f = standaloneBuilderStateClass.getDeclaredField(fieldName); - f.setAccessible(true); - return f.get(getBuilderState()); - } catch (IllegalAccessException | IllegalArgumentException | NoSuchFieldException | SecurityException e) { - throw new RuntimeException(e); - } - } private boolean needsBeforeAllCall = false; private ResourceSet currentResourceSet; private JavaIoFileSystemAccess currentFileSystemAccess; - @SuppressWarnings("unchecked") @Override public boolean launch() { needsBeforeAllCall = true; // START COPY PASTE OF ORIGINAL IMPLEMENTATION - Stopwatch rootStopwatch = Stopwatch.createStarted(); - File stubsDirectory = stubsDirectory(); - ensureBaseDir(); - handleEncoding(); + boolean needsJava = IterableExtensions.exists(getLanguages().values(), l -> l.isLinksAgainstJava()); + if (getBaseDir() == null) { + setBaseDir(System.getProperty("user.dir")); + LOG.warn("Property baseDir not set. Using '" + getBaseDir() + "'"); + } + if (needsJava) { + LOG.info("Using common types."); + } + XtextResourceSet resourceSet = resourceSetProvider.get(); + if (getEncoding() != null) { + forceDebugLog("Setting encoding."); + fileEncodingSetup(getLanguages().values(), getEncoding()); + } LOG.info("Collecting source models."); - Iterable rootsToTravers = rootsToTraverse(); - List sourceResourceURIs = collectResources(getSourceDirs()); - File stateFile; - try { - stateFile = readOrCreateBuilderState(stubsDirectory); - - Set changedSourceFiles = new HashSet<>(); - Map allDeltas = new LinkedHashMap<>(); - // PATCH: changed order of this code block... - Set changedLibraryFiles = new HashSet<>(); - List libraryResourceURIs = Collections.emptyList(); - if ((boolean) callBuilderStateMethod("updateLibraryHash", new Class[] { HashCode.class }, hashClasspath(rootsToTravers))) { - libraryResourceURIs = collectResources(rootsToTravers); - aggregateDeltas((Event) callBuilderStateMethod("libraryChanges", new Class[] { List.class, Collection.class }, libraryResourceURIs, changedLibraryFiles), allDeltas); - } else { - libraryResourceURIs = new ArrayList<>(((Map)getBuilderStateField("libraryFiles")).keySet()); + long startedAt = System.currentTimeMillis(); + Iterable rootsToTravers = getClassPathEntries(); + if (getClassPathLookUpFilter() != null) { + LOG.info("Class path look up filter is active."); + Pattern cpLookUpFilter = Pattern.compile(getClassPathLookUpFilter()); + rootsToTravers = Iterables.filter(getClassPathEntries(), root -> cpLookUpFilter.matcher(root).matches()); + LOG.info("Investigating " + Iterables.size(rootsToTravers) + " of " + Iterables.size(getClassPathEntries()) + + " class path entries."); + } + List sourceResourceURIs = collectResources(getSourceDirs(), resourceSet); + // PATCHED THE FOLLOWING LINE TO WORKAROUND ISSUE: https://github.com/finos/rune-dsl/issues/878 + Iterable allResourcesURIs = Iterables.concat(collectResources(rootsToTravers, resourceSet), sourceResourceURIs); + forceDebugLog("Finished collecting source models. Took: " + (System.currentTimeMillis() - startedAt) + " ms."); + Iterable allClassPathEntries = Iterables.concat(getSourceDirs(), getClassPathEntries()); + if (needsJava) { + LOG.info("Installing type provider."); + installTypeProvider(allClassPathEntries, resourceSet, null); + } + IResourceClusteringPolicy strategy = null; + if (getClusteringConfig() != null) { + LOG.info("Clustering configured."); + DynamicResourceClusteringPolicy dynamicResourceClusteringPolicy = new DynamicResourceClusteringPolicy(); + // Convert MB to byte to make it easier for the user + dynamicResourceClusteringPolicy.setMinimumFreeMemory(getClusteringConfig().getMinimumFreeMemory() * 1024 * 1024); + dynamicResourceClusteringPolicy.setMinimumClusterSize(getClusteringConfig().getMinimumClusterSize()); + dynamicResourceClusteringPolicy.setMinimumPercentFreeMemory(getClusteringConfig().getMinimumPercentFreeMemory()); + strategy = dynamicResourceClusteringPolicy; + } else { + strategy = new DisabledClusteringPolicy(); + } + // Fill index + ResourceDescriptionsData index = new ResourceDescriptionsData(new ArrayList<>()); + Iterator allResourceIterator = allResourcesURIs.iterator(); + while (allResourceIterator.hasNext()) { + List resources = new ArrayList<>(); + int clusterIndex = 0; + boolean canContinue = true; + while (allResourceIterator.hasNext() && canContinue) { + URI uri = allResourceIterator.next(); + Resource resource = resourceSet.getResource(uri, true); + resources.add(resource); + fillIndex(uri, resource, index); + clusterIndex++; + if (!strategy.continueProcessing(resourceSet, null, clusterIndex)) { + canContinue = false; + } } - // ... with this one. This is a workaround for the following issue: https://github.com/finos/rune-dsl/issues/878 - aggregateDeltas((Event) callBuilderStateMethod("sourceChanges", new Class[] { List.class, Collection.class }, sourceResourceURIs, changedSourceFiles), allDeltas); - // END PATCH - - forceDebugLog("Collected source models. Took: " + rootStopwatch.elapsed(TimeUnit.MILLISECONDS) + " ms."); - - if (getClasspathConfigurationLocation() != null) { - writeClassPathConfiguration(rootsToTravers, stubsDirectory != null); + if (!canContinue) { + clearResourceSet(resourceSet); } - - XtextResourceSet resourceSet = resourceSetProvider.get(); - configureWorkspace(resourceSet); - Iterable allClassPathEntries = Iterables.concat(getSourceDirs(), getClassPathEntries()); - if (stubsDirectory != null) { - LOG.info("Installing type provider."); - installTypeProvider(allClassPathEntries, resourceSet, null); + } + installIndex(resourceSet, index); + // Generate Stubs + if (needsJava) { + String stubsClasses = compileStubs(generateStubs(index, sourceResourceURIs)); + LOG.info("Installing type provider for stubs."); + installTypeProvider(Iterables.concat(allClassPathEntries, Lists.newArrayList(stubsClasses)), resourceSet, + jvmTypeAccess); + } + // Validate and generate + LOG.info("Validate and generate."); + Iterator sourceResourceIterator = sourceResourceURIs.iterator(); + boolean hasValidationErrors = false; + while (sourceResourceIterator.hasNext()) { + List resources = new ArrayList<>(); + int clusterIndex = 0; + boolean canContinue = true; + while (sourceResourceIterator.hasNext() && canContinue) { + URI uri = sourceResourceIterator.next(); + Resource resource = resourceSet.getResource(uri, true); + resources.add(resource); + resource.getContents(); // full initialize + EcoreUtil2.resolveLazyCrossReferences(resource, CancelIndicator.NullImpl); + hasValidationErrors = !validate(resource) || hasValidationErrors; + clusterIndex++; + if (!strategy.continueProcessing(resourceSet, null, clusterIndex)) { + canContinue = false; + } } - IResourceClusteringPolicy strategy = getClusteringPolicy(); - aggregateDeltas(indexResources(resourceSet, changedSourceFiles, changedLibraryFiles, strategy), allDeltas); - // Generate Stubs - String stubsClasses = generateStubs(stubsDirectory, changedSourceFiles, allDeltas); - if (stubsClasses != null) { - LOG.info("Installing type provider for stubs."); - installTypeProvider(FluentIterable.from(allClassPathEntries).append(stubsClasses), resourceSet, jvmTypeAccess); + if (isFailOnValidationError() && hasValidationErrors) { + return !hasValidationErrors; } - // Validate and generate - ResourceDescriptionsData index = (ResourceDescriptionsData) getBuilderStateField("index"); - boolean hasValidationErrors = false; - LOG.info("Validate and generate."); - while (!changedSourceFiles.isEmpty() || !allDeltas.isEmpty()) { - installSourceLevelURIs(resourceSet, changedSourceFiles); - Iterator sourceResourceIterator = changedSourceFiles.iterator(); - while (sourceResourceIterator.hasNext()) { - List resources = new ArrayList<>(); - int clusterIndex = 0; - boolean canContinue = true; - while (sourceResourceIterator.hasNext() && canContinue) { - URI uri = sourceResourceIterator.next(); - Resource resource = resourceSet.getResource(uri, true); - resources.add(resource); - resource.getContents(); // fully initialize - EcoreUtil2.resolveLazyCrossReferences(resource, CancelIndicator.NullImpl); - IResourceDescription.Manager manager = resourceDescriptionManager(resource); - - IResourceDescription oldDescription = index.getResourceDescription(uri); - IResourceDescription newDescription = SerializableResourceDescription - .createCopy(manager.getResourceDescription(resource)); - index.addDescription(uri, newDescription); - aggregateDelta(manager.createDelta(oldDescription, newDescription), allDeltas); - - // TODO adjust to handle validations that need an up-to-date index - hasValidationErrors = validate(resource) || hasValidationErrors; - clusterIndex++; - if (!strategy.continueProcessing(resourceSet, null, clusterIndex)) { - canContinue = false; - } - } - if (isFailOnValidationError() && hasValidationErrors) { - if (isIncremental()) { - // since we didn't generate anything yet, we don't want to persist the builder state - callBuilderStateMethod("processIssues", new Class[] { IIssueHandler.class }, issueHandler); - } - return false; - } - generate(resources); - if (!canContinue) { - clearResourceSet(resourceSet); - } - } - if (!allDeltas.isEmpty()) { - sourceResourceURIs.removeAll(changedSourceFiles); - changedSourceFiles.clear(); - for (URI candidate : sourceResourceURIs) { - IResourceDescription description = index.getResourceDescription(candidate); - if (resourceDescriptionManager(candidate).isAffected(allDeltas.values(), description, - index)) { - changedSourceFiles.add(candidate); - } - } - allDeltas.clear(); - } else { - changedSourceFiles.clear(); - } + generate(resources); + if (!canContinue) { + clearResourceSet(resourceSet); } - return commitBuilderState(stateFile, hasValidationErrors); - } finally { - setBuilderState(null); - getConfiguredFsas().clear(); - - LOG.info("Build took " + rootStopwatch.elapsed(TimeUnit.MILLISECONDS) + "ms."); } + boolean success = !hasValidationErrors; + // END COPY PASTE OF ORIGINAL IMPLEMENTATION + + LOG.info("Starting after all generation"); + GeneratorContext context = new GeneratorContext(); + context.setCancelIndicator(CancelIndicator.NullImpl); + getRosettaGenerator().afterAllGenerate(currentResourceSet, currentFileSystemAccess, context); + + return success; } - @Override protected void generate(List sourceResources) { if (needsBeforeAllCall) { LOG.info("Starting before all generation"); @@ -336,156 +238,4 @@ private JavaIoFileSystemAccess getFileSystemAccess(LanguageAccess language) { throw new RuntimeException(e); } } - - - /** COPY PASTE **/ - private boolean commitBuilderState(File stateFile, boolean hasValidationErrors) { - if (isIncremental()) { - callBuilderStateMethod("to", new Class[] { File.class }, stateFile); - return (boolean) callBuilderStateMethod("processIssues", new Class[] { IIssueHandler.class }, issueHandler) && !hasValidationErrors; - } - return !hasValidationErrors; - } - - private HashCode hashClasspath(Iterable classpathEntries) { - try { - Method m = StandaloneBuilder.class.getDeclaredMethod("hashClasspath", Iterable.class); - m.setAccessible(true); - return (HashCode) m.invoke(this, classpathEntries); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - throw new RuntimeException(e); - } - } - - private File stubsDirectory() { - boolean needsJava = IterableExtensions.exists(getLanguages().values(), LanguageAccess::isLinksAgainstJava); - File stubsDirectory; - if (needsJava) { - forceDebugLog("Using common types."); - stubsDirectory = createTempDir("stubs"); - } else { - stubsDirectory = null; - } - return stubsDirectory; - } - - private void ensureBaseDir() { - if (getBaseDir() == null) { - setBaseDir(System.getProperty("user.dir")); - LOG.warn("Property baseDir not set. Using '" + getBaseDir() + "'"); - } - } - - private void handleEncoding() { - if (getEncoding() != null) { - forceDebugLog("Setting encoding."); - fileEncodingSetup(getLanguages().values(), getEncoding()); - } - } - - private Iterable rootsToTraverse() { - Iterable rootsToTravers = getClassPathEntries(); - if (getClassPathLookUpFilter() != null) { - LOG.info("Class path look up filter is active."); - Pattern cpLookUpFilter = Pattern.compile(getClassPathLookUpFilter()); - rootsToTravers = Lists - .newArrayList(Iterables.filter(getClassPathEntries(), root -> cpLookUpFilter.matcher(root).matches())); - LOG.info("Investigating " + Iterables.size(rootsToTravers) + " of " + Iterables.size(getClassPathEntries()) - + " class path entries."); - } - return rootsToTravers; - } - - private File readOrCreateBuilderState(File stubsDirectory) { - try { - Method m = StandaloneBuilder.class.getDeclaredMethod("readOrCreateBuilderState", File.class); - m.setAccessible(true); - return (File) m.invoke(this, stubsDirectory); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - throw new RuntimeException(e); - } - } - - private void aggregateDeltas(Event event, Map allDeltas) { - for (Delta delta : event.getDeltas()) { - aggregateDelta(delta, allDeltas); - } - } - - private void aggregateDelta(Delta delta, Map allDeltas) { - URI uri = delta.getUri(); - allDeltas.merge(uri, delta, (prev, current) -> { - return resourceDescriptionManager(uri).createDelta(prev.getOld(), current.getNew()); - }); - } - - private IResourceDescription.Manager resourceDescriptionManager(Resource resource) { - if (resource instanceof XtextResource) { - return ((XtextResource) resource).getResourceServiceProvider().getResourceDescriptionManager(); - } - return resourceDescriptionManager(resource.getURI()); - } - - private IResourceDescription.Manager resourceDescriptionManager(URI uri) { - return languageAccess(uri).getResourceDescriptionManager(); - } - - private LanguageAccess languageAccess(URI uri) { - return getLanguages().get(uri.fileExtension()); - } - - private void writeClassPathConfiguration(Iterable modelRoots, boolean classpath) { - try { - Method m = StandaloneBuilder.class.getDeclaredMethod("writeClassPathConfiguration", Iterable.class, boolean.class); - m.setAccessible(true); - m.invoke(this, modelRoots, classpath); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - throw new RuntimeException(e); - } - } - - private String generateStubs(File stubsDirectory, Set changedSourceFiles, - Map allDeltas) { - if (stubsDirectory == null) { - return null; - } - generateStubs(changedSourceFiles, stubsDirectory); - CompilerConfiguration configuration = getCompiler().getConfiguration(); - if (isIncremental()) { - configuration.enableIncrementalCompilation(createTempDir("state"), event -> { - aggregateDeltas(event, allDeltas); - }); - } - String stubsClasses = compileStubs(stubsDirectory); - if (isIncremental()) { - configuration.disableIncrementalCompilation(); - } - return stubsClasses; - } - - private void installSourceLevelURIs(ResourceSet resourceSet, Collection changes) { - Set effectiveSourceLevelUris = new HashSet<>(); - for (URI uri : changes) { - if (isSource(uri)) { - effectiveSourceLevelUris.add(uri); - Resource resource = resourceSet.getResource(uri, false); - if (resource != null && isLoadedFromStorage(resource)) { - resourceSet.getResources().remove(resource); - // proxify - resource.unload(); - } - } - } - SourceLevelURIsAdapter.setSourceLevelUris(resourceSet, effectiveSourceLevelUris); - } - - private boolean isLoadedFromStorage(Resource resource) { - return resource instanceof StorageAwareResource && ((StorageAwareResource) resource).isLoadedFromStorage(); - } - - private boolean isSource(URI uri) { - IResourceServiceProvider provider = languageAccess(uri).getResourceServiceProvider(); - return provider instanceof IResourceServiceProviderExtension - && ((IResourceServiceProviderExtension) provider).isSource(uri); - } } diff --git a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaTestGenerateMojo.java b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaTestGenerateMojo.java index 32eb663c3..43bf38b99 100644 --- a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaTestGenerateMojo.java +++ b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/RosettaTestGenerateMojo.java @@ -54,12 +54,6 @@ protected void configureMavenOutputs() { } } - @Override - protected String getClassOutputDirectory() { - return getProject().getBuild().getTestOutputDirectory(); - } - - @Override protected String tmpDirSuffix() { return "-test"; } diff --git a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/SingletonGeneratorResourceServiceProvider.java b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/SingletonGeneratorResourceServiceProvider.java index 62163a8d6..2bee31da1 100644 --- a/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/SingletonGeneratorResourceServiceProvider.java +++ b/rosetta-maven-plugin/src/main/java/com/regnosys/rosetta/maven/SingletonGeneratorResourceServiceProvider.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.URI; import org.eclipse.xtext.generator.GeneratorDelegate; diff --git a/rosetta-profiling/src/main/java/com/regnosys/rosetta/profiling/InitializationBenchmark.java b/rosetta-profiling/src/main/java/com/regnosys/rosetta/profiling/InitializationBenchmark.java index c809e75f1..65479a210 100644 --- a/rosetta-profiling/src/main/java/com/regnosys/rosetta/profiling/InitializationBenchmark.java +++ b/rosetta-profiling/src/main/java/com/regnosys/rosetta/profiling/InitializationBenchmark.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.lsp4j.DidCloseTextDocumentParams; import org.eclipse.lsp4j.DidOpenTextDocumentParams; diff --git a/rosetta-runtime/checkstyle-for-deprecated-guice.xml b/rosetta-runtime/checkstyle-for-deprecated-guice.xml deleted file mode 100644 index e865caf70..000000000 --- a/rosetta-runtime/checkstyle-for-deprecated-guice.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/rosetta-runtime/pom.xml b/rosetta-runtime/pom.xml index 3c4882ad5..3b54da819 100644 --- a/rosetta-runtime/pom.xml +++ b/rosetta-runtime/pom.xml @@ -88,32 +88,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle-for-deprecated-guice.xml - true - true - - src/main/java - src/test/java - ${project.basedir}/xtend-gen/main/java - ${project.basedir}/xtend-gen/test/java - - - - - Check style - - process-test-sources - - check - - - - \ No newline at end of file diff --git a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/testmodel/RosettaTestModelService.java b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/testmodel/RosettaTestModelService.java index 378c2399e..73477e6f0 100644 --- a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/testmodel/RosettaTestModelService.java +++ b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/testmodel/RosettaTestModelService.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.apache.commons.lang3.stream.Streams; import org.eclipse.emf.common.util.URI; diff --git a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/CodeGeneratorTestHelper.xtend b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/CodeGeneratorTestHelper.xtend index ec6e6ff66..51d780566 100644 --- a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/CodeGeneratorTestHelper.xtend +++ b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/CodeGeneratorTestHelper.xtend @@ -18,7 +18,7 @@ import org.eclipse.xtext.xbase.testing.RegisteringFileSystemAccess import static com.google.common.collect.ImmutableMap.* import com.rosetta.model.lib.RosettaModelObject -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.tests.compiler.InMemoryJavacCompiler import com.regnosys.rosetta.utils.ModelIdProvider import com.rosetta.model.lib.RosettaModelObjectBuilder diff --git a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionJavaEvaluatorService.xtend b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionJavaEvaluatorService.xtend index 16a54ff83..4a91ba5cf 100644 --- a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionJavaEvaluatorService.xtend +++ b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionJavaEvaluatorService.xtend @@ -1,7 +1,7 @@ package com.regnosys.rosetta.tests.util import com.regnosys.rosetta.tests.util.ExpressionParser -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.generator.java.expression.ExpressionGenerator import com.rosetta.util.types.JavaType import com.regnosys.rosetta.generator.java.JavaScope diff --git a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionParser.xtend b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionParser.xtend index 73d4b43d3..f73ed12f8 100644 --- a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionParser.xtend +++ b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionParser.xtend @@ -20,11 +20,11 @@ import com.regnosys.rosetta.scoping.RosettaScopeProvider import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtext.scoping.IScope import com.regnosys.rosetta.rosetta.RosettaModel -import jakarta.inject.Inject +import javax.inject.Inject import java.util.List import org.eclipse.xtext.scoping.Scopes import org.eclipse.xtext.linking.lazy.LazyLinker -import jakarta.inject.Provider +import javax.inject.Provider import org.eclipse.xtext.resource.XtextResource import org.eclipse.emf.common.util.URI import org.eclipse.xtext.EcoreUtil2 diff --git a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionValidationHelper.xtend b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionValidationHelper.xtend index 393db4c18..6fbfd274b 100644 --- a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionValidationHelper.xtend +++ b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ExpressionValidationHelper.xtend @@ -13,8 +13,8 @@ import org.eclipse.xtext.validation.Issue import static com.google.common.collect.Iterables.isEmpty import static org.junit.jupiter.api.Assertions.* -import jakarta.inject.Inject -import jakarta.inject.Named +import javax.inject.Inject +import javax.inject.Named import com.regnosys.rosetta.validation.ReportValidator class ExpressionValidationHelper { diff --git a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ModelHelper.xtend b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ModelHelper.xtend index 9843762ce..83c63d327 100644 --- a/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ModelHelper.xtend +++ b/rosetta-testing/src/main/java/com/regnosys/rosetta/tests/util/ModelHelper.xtend @@ -7,7 +7,7 @@ import org.eclipse.xtext.testing.validation.ValidationTestHelper import org.eclipse.xtext.EcoreUtil2 import com.regnosys.rosetta.builtin.RosettaBuiltinsService import java.util.ArrayList -import jakarta.inject.Inject +import javax.inject.Inject class ModelHelper { diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/ResourceFormattingTool.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/ResourceFormattingTool.java index 957c330d0..605881e0b 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/ResourceFormattingTool.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/ResourceFormattingTool.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemover.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemover.java index 6b7ba89a3..28f6de786 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemover.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemover.java @@ -25,7 +25,7 @@ import java.util.Set; import java.util.stream.Stream; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaModelFactory.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaModelFactory.java index 2d8c0ec6f..b3059e5a6 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaModelFactory.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaModelFactory.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaXsdMapping.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaXsdMapping.java index 3f1c33fcc..55da0e07b 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaXsdMapping.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/RosettaXsdMapping.java @@ -34,7 +34,7 @@ import com.regnosys.rosetta.rosetta.simple.Data; import com.regnosys.rosetta.types.builtin.RBuiltinTypeService; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.xmlet.xsdparser.xsdelements.*; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdElementImport.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdElementImport.java index 0e9a9a2c2..12b313804 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdElementImport.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdElementImport.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.xmlet.xsdparser.xsdelements.XsdAbstractElement; import org.xmlet.xsdparser.xsdelements.XsdComplexType; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdEnumImport.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdEnumImport.java index 16f28a135..f922de117 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdEnumImport.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdEnumImport.java @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.xmlet.xsdparser.xsdelements.XsdAbstractElement; import org.xmlet.xsdparser.xsdelements.XsdSimpleType; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdImport.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdImport.java index 6c2be1bf5..8e7547e7d 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdImport.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdImport.java @@ -21,7 +21,7 @@ import java.util.Map.Entry; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.regnosys.rosetta.rosetta.RosettaNamed; import org.eclipse.emf.ecore.resource.ResourceSet; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeAliasImport.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeAliasImport.java index d3d5ecf10..9bdeea74e 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeAliasImport.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeAliasImport.java @@ -22,7 +22,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import jakarta.inject.Inject; +import javax.inject.Inject; import org.xmlet.xsdparser.xsdelements.XsdAbstractElement; import org.xmlet.xsdparser.xsdelements.XsdRestriction; diff --git a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeImport.java b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeImport.java index 9a3a8c512..7532be478 100644 --- a/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeImport.java +++ b/rosetta-tools/src/main/java/com/regnosys/rosetta/tools/modelimport/XsdTypeImport.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jakarta.inject.Inject; +import javax.inject.Inject; import com.regnosys.rosetta.rosetta.expression.ChoiceOperation; import com.regnosys.rosetta.rosetta.expression.Necessity; diff --git a/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemoverTest.xtend b/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemoverTest.xtend index 9d746018c..533314331 100644 --- a/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemoverTest.xtend +++ b/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/minimalexampleproducer/UnnecessaryElementsRemoverTest.xtend @@ -4,7 +4,7 @@ import com.regnosys.rosetta.tests.RosettaTestInjectorProvider import org.eclipse.xtext.testing.InjectWith import org.eclipse.xtext.testing.extensions.InjectionExtension import org.junit.jupiter.api.^extension.ExtendWith -import jakarta.inject.Inject +import javax.inject.Inject import com.regnosys.rosetta.tools.minimalexampleproducer.UnnecessaryElementsRemover import org.junit.jupiter.api.Test diff --git a/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/modelimport/XsdImportTest.java b/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/modelimport/XsdImportTest.java index 45d61db4e..31e84329f 100644 --- a/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/modelimport/XsdImportTest.java +++ b/rosetta-tools/src/test/java/com/regnosys/rosetta/tools/modelimport/XsdImportTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.stream.Collectors; -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import javax.inject.Inject; +import javax.inject.Provider; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; diff --git a/rosetta-xcore-plugin-dependencies/pom.xml b/rosetta-xcore-plugin-dependencies/pom.xml index aa1374291..53ab6cd00 100644 --- a/rosetta-xcore-plugin-dependencies/pom.xml +++ b/rosetta-xcore-plugin-dependencies/pom.xml @@ -61,13 +61,7 @@ org.eclipse.xtext - org.eclipse.xtext.xtext.generator - - - org.osgi - org.osgi.service.prefs - - + org.eclipse.xtext.generator com.google.inject diff --git a/rosetta-xcore-plugin-dependencies/src/main/java/com/regnosys/rosetta/xcore/generator/serializer/RosettaSerializerFragment.xtend b/rosetta-xcore-plugin-dependencies/src/main/java/com/regnosys/rosetta/xcore/generator/serializer/RosettaSerializerFragment.xtend index b48464458..5d31f8828 100644 --- a/rosetta-xcore-plugin-dependencies/src/main/java/com/regnosys/rosetta/xcore/generator/serializer/RosettaSerializerFragment.xtend +++ b/rosetta-xcore-plugin-dependencies/src/main/java/com/regnosys/rosetta/xcore/generator/serializer/RosettaSerializerFragment.xtend @@ -6,7 +6,7 @@ import com.google.common.collect.Multimap import java.util.List import java.util.Map import java.util.Set -import jakarta.inject.Inject +import javax.inject.Inject import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EPackage