From fd7984ccd60cf2ec383ad233dc5cbdd988aedce5 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 26 Jul 2023 16:43:36 +0200 Subject: [PATCH] [MRESOLVER-386] Make all injected ctors public, deprecate def ctors All injection points are public and deprecate all def ctors (where ctor injection used). --- https://issues.apache.org/jira/browse/MRESOLVER-386 --- .../connector/basic/BasicRepositoryConnectorFactory.java | 3 ++- .../eclipse/aether/internal/impl/DefaultArtifactResolver.java | 3 ++- .../java/org/eclipse/aether/internal/impl/DefaultDeployer.java | 3 ++- .../org/eclipse/aether/internal/impl/DefaultInstaller.java | 3 ++- .../aether/internal/impl/DefaultLocalRepositoryProvider.java | 3 ++- .../eclipse/aether/internal/impl/DefaultMetadataResolver.java | 3 ++- .../aether/internal/impl/DefaultRemoteRepositoryManager.java | 3 ++- .../internal/impl/DefaultRepositoryConnectorProvider.java | 3 ++- .../aether/internal/impl/DefaultRepositoryEventDispatcher.java | 3 ++- .../aether/internal/impl/DefaultRepositoryLayoutProvider.java | 3 ++- .../eclipse/aether/internal/impl/DefaultRepositorySystem.java | 3 ++- .../aether/internal/impl/DefaultTransporterProvider.java | 3 ++- .../aether/internal/impl/DefaultUpdateCheckManager.java | 3 ++- .../internal/impl/EnhancedLocalRepositoryManagerFactory.java | 1 + .../internal/impl/SimpleLocalRepositoryManagerFactory.java | 1 + .../aether/internal/impl/collect/bf/BfDependencyCollector.java | 2 +- .../aether/internal/impl/collect/df/DfDependencyCollector.java | 2 +- .../impl/synccontext/legacy/DefaultSyncContextFactory.java | 1 + .../aether/transport/wagon/WagonTransporterFactory.java | 1 + 19 files changed, 32 insertions(+), 15 deletions(-) diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java index 8fa86edcb..76dc3116d 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java +++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java @@ -63,12 +63,13 @@ public final class BasicRepositoryConnectorFactory implements RepositoryConnecto * clients, the new factory needs to be configured via its various mutators before first use or runtime errors will * occur. */ + @Deprecated public BasicRepositoryConnectorFactory() { // enables default constructor } @Inject - BasicRepositoryConnectorFactory( + public BasicRepositoryConnectorFactory( TransporterProvider transporterProvider, RepositoryLayoutProvider layoutProvider, ChecksumPolicyProvider checksumPolicyProvider, diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java index a77ab9064..044302461 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java @@ -125,13 +125,14 @@ public class DefaultArtifactResolver implements ArtifactResolver, Service { private RemoteRepositoryFilterManager remoteRepositoryFilterManager; + @Deprecated public DefaultArtifactResolver() { // enables default constructor } @SuppressWarnings("checkstyle:parameternumber") @Inject - DefaultArtifactResolver( + public DefaultArtifactResolver( FileProcessor fileProcessor, RepositoryEventDispatcher repositoryEventDispatcher, VersionResolver versionResolver, diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java index be9df02c4..e451fa1a4 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java @@ -97,13 +97,14 @@ public class DefaultDeployer implements Deployer, Service { private OfflineController offlineController; + @Deprecated public DefaultDeployer() { // enables default constructor } @SuppressWarnings("checkstyle:parameternumber") @Inject - DefaultDeployer( + public DefaultDeployer( FileProcessor fileProcessor, RepositoryEventDispatcher repositoryEventDispatcher, RepositoryConnectorProvider repositoryConnectorProvider, diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java index 6ce59e6bb..c30f75a2e 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java @@ -75,12 +75,13 @@ public class DefaultInstaller implements Installer, Service { private SyncContextFactory syncContextFactory; + @Deprecated public DefaultInstaller() { // enables default constructor } @Inject - DefaultInstaller( + public DefaultInstaller( FileProcessor fileProcessor, RepositoryEventDispatcher repositoryEventDispatcher, Set metadataFactories, diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java index 201b79348..6be859f68 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java @@ -50,12 +50,13 @@ public class DefaultLocalRepositoryProvider implements LocalRepositoryProvider, private Collection managerFactories = new ArrayList<>(); + @Deprecated public DefaultLocalRepositoryProvider() { // enables default constructor } @Inject - DefaultLocalRepositoryProvider(Set factories) { + public DefaultLocalRepositoryProvider(Set factories) { setLocalRepositoryManagerFactories(factories); } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java index a077d7ac3..e28dd75bf 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java @@ -92,12 +92,13 @@ public class DefaultMetadataResolver implements MetadataResolver, Service { private RemoteRepositoryFilterManager remoteRepositoryFilterManager; + @Deprecated public DefaultMetadataResolver() { // enables default constructor } @Inject - DefaultMetadataResolver( + public DefaultMetadataResolver( RepositoryEventDispatcher repositoryEventDispatcher, UpdateCheckManager updateCheckManager, RepositoryConnectorProvider repositoryConnectorProvider, diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java index 9a297555c..9f8471ee4 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java @@ -83,12 +83,13 @@ public int hashCode() { private ChecksumPolicyProvider checksumPolicyProvider; + @Deprecated public DefaultRemoteRepositoryManager() { // enables default constructor } @Inject - DefaultRemoteRepositoryManager( + public DefaultRemoteRepositoryManager( UpdatePolicyAnalyzer updatePolicyAnalyzer, ChecksumPolicyProvider checksumPolicyProvider) { setUpdatePolicyAnalyzer(updatePolicyAnalyzer); setChecksumPolicyProvider(checksumPolicyProvider); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java index 1f94cb2ef..b058eb0e0 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java @@ -57,12 +57,13 @@ public class DefaultRepositoryConnectorProvider implements RepositoryConnectorPr private RemoteRepositoryFilterManager remoteRepositoryFilterManager; + @Deprecated public DefaultRepositoryConnectorProvider() { // enables default constructor } @Inject - DefaultRepositoryConnectorProvider( + public DefaultRepositoryConnectorProvider( Set connectorFactories, RemoteRepositoryFilterManager remoteRepositoryFilterManager) { setRepositoryConnectorFactories(connectorFactories); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java index 31b15292d..f603f1c0a 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java @@ -46,12 +46,13 @@ public class DefaultRepositoryEventDispatcher implements RepositoryEventDispatch private Collection listeners = new ArrayList<>(); + @Deprecated public DefaultRepositoryEventDispatcher() { // enables no-arg constructor } @Inject - DefaultRepositoryEventDispatcher(Set listeners) { + public DefaultRepositoryEventDispatcher(Set listeners) { setRepositoryListeners(listeners); } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java index f555c684f..52cc6beaf 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java @@ -50,12 +50,13 @@ public final class DefaultRepositoryLayoutProvider implements RepositoryLayoutPr private Collection factories = new ArrayList<>(); + @Deprecated public DefaultRepositoryLayoutProvider() { // enables default constructor } @Inject - DefaultRepositoryLayoutProvider(Set layoutFactories) { + public DefaultRepositoryLayoutProvider(Set layoutFactories) { setRepositoryLayoutFactories(layoutFactories); } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java index 4c3d37470..8477d5bb3 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java @@ -117,6 +117,7 @@ public class DefaultRepositorySystem implements RepositorySystem, Service { private RepositorySystemLifecycle repositorySystemLifecycle; + @Deprecated public DefaultRepositorySystem() { // enables default constructor this.shutdown = new AtomicBoolean(false); @@ -124,7 +125,7 @@ public DefaultRepositorySystem() { @SuppressWarnings("checkstyle:parameternumber") @Inject - DefaultRepositorySystem( + public DefaultRepositorySystem( VersionResolver versionResolver, VersionRangeResolver versionRangeResolver, ArtifactResolver artifactResolver, diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java index f7d10b19d..dd6823e96 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java @@ -50,12 +50,13 @@ public final class DefaultTransporterProvider implements TransporterProvider, Se private Collection factories = new ArrayList<>(); + @Deprecated public DefaultTransporterProvider() { // enables default constructor } @Inject - DefaultTransporterProvider(Set transporterFactories) { + public DefaultTransporterProvider(Set transporterFactories) { setTransporterFactories(transporterFactories); } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java index 367bc2b2c..0ecb422c3 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java @@ -106,12 +106,13 @@ public String toString() { */ private static final long TS_UNKNOWN = 1L; + @Deprecated public DefaultUpdateCheckManager() { // default ctor for ServiceLocator } @Inject - DefaultUpdateCheckManager(TrackingFileManager trackingFileManager, UpdatePolicyAnalyzer updatePolicyAnalyzer) { + public DefaultUpdateCheckManager(TrackingFileManager trackingFileManager, UpdatePolicyAnalyzer updatePolicyAnalyzer) { setTrackingFileManager(trackingFileManager); setUpdatePolicyAnalyzer(updatePolicyAnalyzer); } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java index 44b7f6ba4..ec1c5583c 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java @@ -55,6 +55,7 @@ public class EnhancedLocalRepositoryManagerFactory implements LocalRepositoryMan private LocalPathPrefixComposerFactory localPathPrefixComposerFactory; + @Deprecated public EnhancedLocalRepositoryManagerFactory() { // no arg ctor for ServiceLocator } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java index 40b923408..1fe6d19eb 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java @@ -42,6 +42,7 @@ public class SimpleLocalRepositoryManagerFactory implements LocalRepositoryManag private LocalPathComposer localPathComposer; + @Deprecated public SimpleLocalRepositoryManagerFactory() { // enable no-arg constructor this.localPathComposer = new DefaultLocalPathComposer(); // maven UTs needs this diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java index 56e6704e8..68a417579 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java @@ -121,7 +121,7 @@ public BfDependencyCollector() { } @Inject - BfDependencyCollector( + public BfDependencyCollector( RemoteRepositoryManager remoteRepositoryManager, ArtifactDescriptorReader artifactDescriptorReader, VersionRangeResolver versionRangeResolver) { diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java index f6d9900f4..5948d4fd8 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java @@ -79,7 +79,7 @@ public DfDependencyCollector() { } @Inject - DfDependencyCollector( + public DfDependencyCollector( RemoteRepositoryManager remoteRepositoryManager, ArtifactDescriptorReader artifactDescriptorReader, VersionRangeResolver versionRangeResolver) { diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java index 86e2d9666..71b7f09aa 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java @@ -43,6 +43,7 @@ public final class DefaultSyncContextFactory implements org.eclipse.aether.impl.SyncContextFactory, Service { private SyncContextFactory delegate; + @Deprecated public DefaultSyncContextFactory() { // default ctor for ServiceLocator } diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java index 5c6ebabeb..462c58368 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java +++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java @@ -50,6 +50,7 @@ public final class WagonTransporterFactory implements TransporterFactory, Servic * by clients, the new factory needs to be configured via its various mutators before first use or runtime errors * will occur. */ + @Deprecated public WagonTransporterFactory() { // enables default constructor }