Skip to content

Commit

Permalink
[MRESOLVER-386] Make all injected ctors public, deprecate def ctors
Browse files Browse the repository at this point in the history
All injection points are public and deprecate all def ctors (where ctor injection used).

---

https://issues.apache.org/jira/browse/MRESOLVER-386
  • Loading branch information
cstamas committed Jul 26, 2023
1 parent 04a6c3c commit fd7984c
Show file tree
Hide file tree
Showing 19 changed files with 32 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<MetadataGeneratorFactory> metadataFactories,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ public class DefaultLocalRepositoryProvider implements LocalRepositoryProvider,

private Collection<LocalRepositoryManagerFactory> managerFactories = new ArrayList<>();

@Deprecated
public DefaultLocalRepositoryProvider() {
// enables default constructor
}

@Inject
DefaultLocalRepositoryProvider(Set<LocalRepositoryManagerFactory> factories) {
public DefaultLocalRepositoryProvider(Set<LocalRepositoryManagerFactory> factories) {
setLocalRepositoryManagerFactories(factories);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@ public class DefaultRepositoryConnectorProvider implements RepositoryConnectorPr

private RemoteRepositoryFilterManager remoteRepositoryFilterManager;

@Deprecated
public DefaultRepositoryConnectorProvider() {
// enables default constructor
}

@Inject
DefaultRepositoryConnectorProvider(
public DefaultRepositoryConnectorProvider(
Set<RepositoryConnectorFactory> connectorFactories,
RemoteRepositoryFilterManager remoteRepositoryFilterManager) {
setRepositoryConnectorFactories(connectorFactories);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ public class DefaultRepositoryEventDispatcher implements RepositoryEventDispatch

private Collection<RepositoryListener> listeners = new ArrayList<>();

@Deprecated
public DefaultRepositoryEventDispatcher() {
// enables no-arg constructor
}

@Inject
DefaultRepositoryEventDispatcher(Set<RepositoryListener> listeners) {
public DefaultRepositoryEventDispatcher(Set<RepositoryListener> listeners) {
setRepositoryListeners(listeners);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ public final class DefaultRepositoryLayoutProvider implements RepositoryLayoutPr

private Collection<RepositoryLayoutFactory> factories = new ArrayList<>();

@Deprecated
public DefaultRepositoryLayoutProvider() {
// enables default constructor
}

@Inject
DefaultRepositoryLayoutProvider(Set<RepositoryLayoutFactory> layoutFactories) {
public DefaultRepositoryLayoutProvider(Set<RepositoryLayoutFactory> layoutFactories) {
setRepositoryLayoutFactories(layoutFactories);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,15 @@ public class DefaultRepositorySystem implements RepositorySystem, Service {

private RepositorySystemLifecycle repositorySystemLifecycle;

@Deprecated
public DefaultRepositorySystem() {
// enables default constructor
this.shutdown = new AtomicBoolean(false);
}

@SuppressWarnings("checkstyle:parameternumber")
@Inject
DefaultRepositorySystem(
public DefaultRepositorySystem(
VersionResolver versionResolver,
VersionRangeResolver versionRangeResolver,
ArtifactResolver artifactResolver,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ public final class DefaultTransporterProvider implements TransporterProvider, Se

private Collection<TransporterFactory> factories = new ArrayList<>();

@Deprecated
public DefaultTransporterProvider() {
// enables default constructor
}

@Inject
DefaultTransporterProvider(Set<TransporterFactory> transporterFactories) {
public DefaultTransporterProvider(Set<TransporterFactory> transporterFactories) {
setTransporterFactories(transporterFactories);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class EnhancedLocalRepositoryManagerFactory implements LocalRepositoryMan

private LocalPathPrefixComposerFactory localPathPrefixComposerFactory;

@Deprecated
public EnhancedLocalRepositoryManagerFactory() {
// no arg ctor for ServiceLocator
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public BfDependencyCollector() {
}

@Inject
BfDependencyCollector(
public BfDependencyCollector(
RemoteRepositoryManager remoteRepositoryManager,
ArtifactDescriptorReader artifactDescriptorReader,
VersionRangeResolver versionRangeResolver) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public DfDependencyCollector() {
}

@Inject
DfDependencyCollector(
public DfDependencyCollector(
RemoteRepositoryManager remoteRepositoryManager,
ArtifactDescriptorReader artifactDescriptorReader,
VersionRangeResolver versionRangeResolver) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit fd7984c

Please sign in to comment.