Skip to content

Remove hack from Basic connector #1676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2025
+16 −21
Merged

Remove hack from Basic connector #1676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
672854e
Remove hack from Basic connector
cstamas Nov 18, 2025
ece8e1a
Use concurrent map
cstamas Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions ...ctor-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,6 @@ public void get(
RunnableErrorForwarder errorForwarder = new RunnableErrorForwarder();
List<ChecksumAlgorithmFactory> checksumAlgorithmFactories = layout.getChecksumAlgorithmFactories();

boolean first = true;

for (MetadataDownload transfer : safeMetadataDownloads) {
URI location = layout.getLocation(transfer.getMetadata(), false);

Expand All @@ -240,9 +238,8 @@ public void get(
checksumLocations,
null,
listener);
if (executor == null || first) {
if (executor == null) {
task.run();
first = false;
} else {
executor.submit(errorForwarder.wrap(task));
}
Expand Down Expand Up @@ -285,9 +282,8 @@ public void get(
providedChecksums,
listener);
}
if (executor == null || first) {
if (executor == null) {
task.run();
first = false;
} else {
executor.submit(errorForwarder.wrap(task));
}
Expand All @@ -309,8 +305,6 @@ public void put(
getExecutor(false, parallelPut ? safeArtifactUploads.size() + safeMetadataUploads.size() : 1);
RunnableErrorForwarder errorForwarder = new RunnableErrorForwarder();

boolean first = true;

for (ArtifactUpload transfer : safeArtifactUploads) {
URI location = layout.getLocation(transfer.getArtifact(), true);

Expand All @@ -322,9 +316,8 @@ public void put(
layout.getChecksumLocations(transfer.getArtifact(), true, location);

Runnable task = new PutTaskRunner(location, transfer.getPath(), checksumLocations, listener);
if (executor == null || first) {
if (executor == null) {
task.run();
first = false;
} else {
executor.submit(errorForwarder.wrap(task));
}
Expand All @@ -344,9 +337,8 @@ public void put(
layout.getChecksumLocations(transfer.getMetadata(), true, location);

Runnable task = new PutTaskRunner(location, transfer.getPath(), checksumLocations, listener);
if (executor == null || first) {
if (executor == null) {
task.run();
first = false;
} else {
executor.submit(errorForwarder.wrap(task));
}
Expand Down
6 changes: 3 additions & 3 deletions ...apache/src/main/java/org/eclipse/aether/transport/apache/DeferredCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
Expand All @@ -39,11 +39,11 @@ final class DeferredCredentialsProvider implements CredentialsProvider {

private final CredentialsProvider delegate;

private final Map<AuthScope, Factory> factories;
private final ConcurrentHashMap<AuthScope, Factory> factories;

DeferredCredentialsProvider() {
delegate = new BasicCredentialsProvider();
factories = new HashMap<>();
factories = new ConcurrentHashMap<>();
}

public void setCredentials(AuthScope authScope, Factory factory) {
Expand Down
15 changes: 9 additions & 6 deletions ...-transport-apache/src/main/java/org/eclipse/aether/transport/apache/SharingAuthCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
package org.eclipse.aether.transport.apache;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScheme;
Expand All @@ -33,11 +33,11 @@ final class SharingAuthCache implements AuthCache {

private final LocalState state;

private final Map<HttpHost, AuthScheme> authSchemes;
private final ConcurrentHashMap<HttpHost, AuthScheme> authSchemes;

SharingAuthCache(LocalState state) {
this.state = state;
authSchemes = new HashMap<>();
authSchemes = new ConcurrentHashMap<>();
}

private static HttpHost toKey(HttpHost host) {
Expand All @@ -54,17 +54,20 @@ public AuthScheme get(HttpHost host) {
AuthScheme authScheme = authSchemes.get(host);
if (authScheme == null) {
authScheme = state.getAuthScheme(host);
authSchemes.put(host, authScheme);
if (authScheme != null) {
authSchemes.put(host, authScheme);
}
}
return authScheme;
}

@Override
public void put(HttpHost host, AuthScheme authScheme) {
host = toKey(host);
if (authScheme != null) {
authSchemes.put(toKey(host), authScheme);
authSchemes.put(host, authScheme);
} else {
remove(host);
authSchemes.remove(host);
}
}

Expand Down