From e6a24993492136d6f98038cbc22ae36ab30fe943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Porras=20Campo?= Date: Mon, 2 Mar 2026 09:24:33 +0100 Subject: [PATCH] chore(deps): bump net.sourceforge.pmd:pmd-core from 7.21.0 to 7.22.0 --- .../BundleAwareModelLocation.java | 2 +- .../ui/test/contentassist/BugAig931Test.java | 24 ++++++------------- .../util/CheckPreferencesExtensionHelper.java | 2 +- .../typesystem/ParameterListMatcherTest.java | 3 +-- .../FormatValueConverterService.java | 3 +-- .../util/CustomClassAwareEcoreGenerator.java | 3 +-- .../xtext/linking/ILazyLinkingResource2.java | 2 +- .../xtext/naming/QualifiedNameConverter.java | 3 +-- .../DelegatingResourceDescriptionsData.java | 2 +- .../NullResourceDescriptionsData.java | 2 +- ddk-parent/pom.xml | 2 +- 11 files changed, 17 insertions(+), 31 deletions(-) diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/configuration/BundleAwareModelLocation.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/configuration/BundleAwareModelLocation.java index a405826972..5912e52e90 100644 --- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/configuration/BundleAwareModelLocation.java +++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/configuration/BundleAwareModelLocation.java @@ -19,7 +19,7 @@ * Describes a mapping of check catalogs registered with the check plugin extension to * model location objects storing derived and cached data relevant to scoping and type providers. */ -public class BundleAwareModelLocation extends AbstractModelLocation implements IModelLocation { +public class BundleAwareModelLocation extends AbstractModelLocation { private final Bundle bundle; diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/BugAig931Test.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/BugAig931Test.java index 459c7a8e93..e87499b675 100644 --- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/BugAig931Test.java +++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/BugAig931Test.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; +import java.util.stream.Stream; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -21,19 +22,14 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.progress.UIJob; -import org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider; import org.junit.jupiter.api.Test; -import com.google.common.base.Function; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - /** * Tests content assist in Check models. */ -@SuppressWarnings({"PMD.SignatureDeclareThrowsException", "PMD.AvoidFinalLocalVariable", "nls"}) -public class BugAig931Test extends AbstractCheckContentAssistBugTest implements IJavaProjectProvider { +@SuppressWarnings("nls") +public class BugAig931Test extends AbstractCheckContentAssistBugTest { /** * Verifies that given completions exist. @@ -44,13 +40,7 @@ public class BugAig931Test extends AbstractCheckContentAssistBugTest implements * the expected display strings */ private void completionsExist(final ICompletionProposal[] completionProposals, final String... expected) { - List actual = Lists.newArrayList(Iterables.transform(Lists.newArrayList(completionProposals), // - new Function() { - @Override - public String apply(final ICompletionProposal input) { - return input.getDisplayString(); - } - })); + List actual = Stream.of(completionProposals).map(ICompletionProposal::getDisplayString).toList(); for (String string : expected) { assertTrue(actual.contains(string), NLS.bind("Expected {0} but found {1}", Arrays.toString(expected), actual)); } @@ -63,13 +53,13 @@ public String apply(final ICompletionProposal input) { * the exception */ @Test + @SuppressWarnings("PMD.SignatureDeclareThrowsException") public void testBugAig931() throws Exception { - final String partialModel = "package p catalog T for grammar com.avaloq.tools.ddk.check.Check { error \"X\" for "; - final String[] expectedContextTypeProposals = {"EObject - org.eclipse.emf.ecore", "JvmType - org.eclipse.xtext.common.types"}; new UIJob("compute completion proposals") { - @SuppressWarnings("restriction") @Override public IStatus runInUIThread(final IProgressMonitor monitor) { + String partialModel = "package p catalog T for grammar com.avaloq.tools.ddk.check.Check { error \"X\" for "; + String[] expectedContextTypeProposals = {"EObject - org.eclipse.emf.ecore", "JvmType - org.eclipse.xtext.common.types"}; try { completionsExist(newBuilder().append(partialModel).computeCompletionProposals(), expectedContextTypeProposals); // CHECKSTYLE:OFF diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckPreferencesExtensionHelper.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckPreferencesExtensionHelper.java index 2e90a54a73..7126420b58 100644 --- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckPreferencesExtensionHelper.java +++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckPreferencesExtensionHelper.java @@ -27,7 +27,7 @@ * The extension point utility class for preference initializers. Intended to be used by the Check builder participant. */ @SuppressWarnings("nls") -public final class CheckPreferencesExtensionHelper extends AbstractCheckExtensionHelper implements ICheckExtensionHelper { +public final class CheckPreferencesExtensionHelper extends AbstractCheckExtensionHelper { public static final String GENERATE_PREFERENCES_EXTENSION_PREFERENCE = "generatePreferencesExtension"; diff --git a/com.avaloq.tools.ddk.typesystem.test/src/com/avaloq/tools/ddk/typesystem/ParameterListMatcherTest.java b/com.avaloq.tools.ddk.typesystem.test/src/com/avaloq/tools/ddk/typesystem/ParameterListMatcherTest.java index f22eb2259a..02cf48bb28 100644 --- a/com.avaloq.tools.ddk.typesystem.test/src/com/avaloq/tools/ddk/typesystem/ParameterListMatcherTest.java +++ b/com.avaloq.tools.ddk.typesystem.test/src/com/avaloq/tools/ddk/typesystem/ParameterListMatcherTest.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Locale; -import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.junit.jupiter.api.Test; @@ -132,7 +131,7 @@ public String getName() { } - protected class ParameterList extends EObjectImpl implements InternalEObject { + protected class ParameterList extends EObjectImpl { // Empty class to make protected constructor visible. } diff --git a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/conversion/FormatValueConverterService.java b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/conversion/FormatValueConverterService.java index f12d5505fa..812d984915 100644 --- a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/conversion/FormatValueConverterService.java +++ b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/conversion/FormatValueConverterService.java @@ -12,7 +12,6 @@ import org.antlr.runtime.TokenSource; import org.eclipse.xtext.conversion.IValueConverter; -import org.eclipse.xtext.conversion.IValueConverterService; import org.eclipse.xtext.conversion.ValueConverter; import org.eclipse.xtext.xbase.conversion.XbaseValueConverterService; @@ -25,7 +24,7 @@ * Value converters for Format. */ @Singleton -public class FormatValueConverterService extends XbaseValueConverterService implements IValueConverterService { +public class FormatValueConverterService extends XbaseValueConverterService { @Inject private Injector injector; diff --git a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java index e6d87536fe..103987ec51 100644 --- a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java +++ b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/util/CustomClassAwareEcoreGenerator.java @@ -31,7 +31,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.mwe2.ecore.EcoreGenerator; import org.eclipse.emf.mwe2.runtime.Mandatory; -import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowComponent; import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext; import com.google.common.base.Joiner; @@ -44,7 +43,7 @@ * order not to show a warning. */ @SuppressWarnings("nls") -public class CustomClassAwareEcoreGenerator extends EcoreGenerator implements IWorkflowComponent { +public class CustomClassAwareEcoreGenerator extends EcoreGenerator { private static final Logger LOGGER = LogManager.getLogger(EcoreGenerator.class); private String genModel; diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java index 7f2731c14a..3ca4563a3a 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ILazyLinkingResource2.java @@ -25,7 +25,7 @@ /** * Common interface of LazyLinkingResource with custom implementations. */ -public interface ILazyLinkingResource2 extends Resource, Resource.Internal { +public interface ILazyLinkingResource2 extends Resource.Internal { String MARK_UNRESOLVABLE_XREFS = ILazyLinkingResource2.class.getName() + ".MARK_UNRESOLVABLE_XREFS"; //$NON-NLS-1$ diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java index 4b09675bb1..81375e91e4 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java @@ -12,7 +12,6 @@ import java.util.List; -import org.eclipse.xtext.naming.IQualifiedNameConverter; import org.eclipse.xtext.naming.IQualifiedNameConverter.DefaultImpl; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.util.Strings; @@ -22,7 +21,7 @@ * AcsQualifiedNamesConverter overrides {@link DefaultImpl} in order to use custom segment splitter. * This implementation is about 3 times faster than the (uncompiled) regexp splitter. */ -public class QualifiedNameConverter extends DefaultImpl implements IQualifiedNameConverter { +public class QualifiedNameConverter extends DefaultImpl { private static final String DELIMITER = "."; //$NON-NLS-1$ diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/DelegatingResourceDescriptionsData.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/DelegatingResourceDescriptionsData.java index 1d1757eadd..39e54a54b4 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/DelegatingResourceDescriptionsData.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/DelegatingResourceDescriptionsData.java @@ -27,7 +27,7 @@ /** * A {@link ResourceDescriptionsData} that delegates all operations to another {@link ResourceDescriptionsData}. */ -public class DelegatingResourceDescriptionsData extends AbstractResourceDescriptionsData implements IResourceDescriptionsData { +public class DelegatingResourceDescriptionsData extends AbstractResourceDescriptionsData { private final ResourceDescriptionsData delegate; private final IResourceDescriptions2 wrapped; diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/NullResourceDescriptionsData.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/NullResourceDescriptionsData.java index 1db1950713..e98bd5369c 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/NullResourceDescriptionsData.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/extensions/NullResourceDescriptionsData.java @@ -23,7 +23,7 @@ /** * A null version of {@link ResourceDescriptionsData}. */ -public class NullResourceDescriptionsData extends DelegatingResourceDescriptionsData implements IResourceDescriptionsData { +public class NullResourceDescriptionsData extends DelegatingResourceDescriptionsData { public NullResourceDescriptionsData() { super(new ResourceDescriptionsData(Collections. emptyList())); diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml index 72171c223b..dfc60495f9 100644 --- a/ddk-parent/pom.xml +++ b/ddk-parent/pom.xml @@ -53,7 +53,7 @@ 4.9.8.2 4.9.8 3.28.0 - 7.21.0 + 7.22.0 5.0.2 2.42.0