MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[aether-dependency-resolver] IJI-1259 Don't use sl4j logger

Browse Source 
GitOrigin-RevId: b35ab65b58b14d2dc3cc64b049aef777a7f04ca8
This commit is contained in:
Vladislav.Yaroshchuk
2023-08-15 18:03:12 +04:00
committed by intellij-monorepo-bot
parent 4b77dd8d21
commit c22f6ba36e
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
View File

@@ -109,5 +109,6 @@
<orderEntry type="library" name="commons-lang3" level="project" />
<orderEntry type="library" name="plexus-utils" level="project" />
<orderEntry type="library" name="commons-codec" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" />
</component>
</module>

17
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
View File

@@ -1,6 +1,8 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven.aether;
import com.intellij.openapi.application.ClassPathUtil;
import com.intellij.util.ArrayUtil;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.DefaultSessionData;
@@ -39,8 +41,7 @@ import org.eclipse.aether.util.version.GenericVersionScheme;
import org.eclipse.aether.version.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.intellij.openapi.diagnostic.Logger;
import java.io.File;
import java.util.*;
@@ -55,7 +56,7 @@ import java.util.stream.Collectors;
public final class ArtifactRepositoryManager {
private static final VersionScheme ourVersioning = new GenericVersionScheme();
private static final JreProxySelector ourProxySelector = new JreProxySelector();
private static final Logger LOG = LoggerFactory.getLogger(ArtifactRepositoryManager.class);
private static final Logger LOG = Logger.getInstance(ArtifactRepositoryManager.class);
private final RepositorySystemSessionFactory mySessionFactory;
private static final RemoteRepository MAVEN_CENTRAL_REPOSITORY = createRemoteRepository(
@@ -256,7 +257,7 @@ public final class ArtifactRepositoryManager {
*/
@SuppressWarnings("UnnecessaryFullyQualifiedName")
public static Class<?>[] getClassesFromDependencies() {
return new Class<?>[]{
var result = new ArrayList<>(List.of(
org.jetbrains.idea.maven.aether.ArtifactRepositoryManager.class, //this module
org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory.class, //maven-aether-provider
org.apache.maven.artifact.Artifact.class, //maven-artifact
@@ -277,9 +278,13 @@ public final class ArtifactRepositoryManager {
org.apache.http.HttpConnection.class, //http-core
org.apache.http.client.HttpClient.class, //http-client
org.apache.commons.logging.LogFactory.class, // commons-logging
org.slf4j.Marker.class, // slf4j
org.slf4j.Marker.class, // slf4j, - required for aether resolver at runtime
org.slf4j.impl.JDK14LoggerFactory.class, // slf4j-jdk14 - required for aether resolver at runtime
org.apache.commons.codec.binary.Base64.class // commons-codec
};
));
result.addAll(Arrays.asList(ClassPathUtil.getUtilClasses())); // intellij.platform.util module
return result.toArray(ArrayUtil.EMPTY_CLASS_ARRAY);
}
public @NotNull Collection<File> resolveDependency(String groupId,

2
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/Retry.java
View File

@@ -1,8 +1,8 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven.aether;
import com.intellij.openapi.diagnostic.Logger;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
/**
* Common retry interface for aether dependency resolver.

2
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/RetryProvider.java
View File

@@ -1,8 +1,8 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven.aether;
import com.intellij.openapi.diagnostic.Logger;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import java.util.Random;

19
aether-dependency-resolver/testSrc/org/jetbrains/idea/maven/aether/RetryProviderTest.java
View File

@@ -1,16 +1,16 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven.aether;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.testFramework.LoggedErrorProcessor;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.jetbrains.idea.maven.aether.RetryProvider.disabled;
import static org.jetbrains.idea.maven.aether.RetryProvider.withExponentialBackOff;
import static org.junit.jupiter.api.Assertions.*;
class RetryProviderTest {
private final Logger logger = LoggerFactory.getLogger(RetryProviderTest.class);
private final Logger logger = Logger.getInstance(RetryProviderTest.class);
private final Retry retryDisabled = disabled();
private final Retry retryWithExpBackOff = withExponentialBackOff(1000, 5000, 5);
@@ -88,9 +88,14 @@ class RetryProviderTest {
@Test
public void expBackOff_testRethrowsException() {
String expected = "Value42";
assertThrows(Exception.class, () -> retryWithExpBackOff.retry(() -> {
throw new Exception(expected);
}, logger), expected);
Throwable error = LoggedErrorProcessor.executeAndReturnLoggedError(
() -> {
String expected = "Value42";
assertThrows(Exception.class, () -> retryWithExpBackOff.retry(() -> {
throw new Exception(expected);
}, logger), expected);
});
assertNotNull(error);
}
}