MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] refactoring: move MavenServerGlobals to intellij.maven.server module

Browse Source 
GitOrigin-RevId: d620e02f477c69435efb657d52e52df7e15770dd
This commit is contained in:
Dmitry Kichinsky
2023-04-26 23:36:47 +00:00
committed by intellij-monorepo-bot
parent bffc39be16
commit d927bf75af
19 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenRemotePullUtil.java → plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenRemotePullUtil.java
View File
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenServerDownloadListenerWrapper.java → plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerDownloadListenerWrapper.java
View File
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerGlobals.java → plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerGlobals.java
+3 -3
View File
@@ -2,9 +2,9 @@
package org.jetbrains.idea.maven.server;
public final class Maven3ServerGlobals {
private static MavenServerLoggerWrapper myLogger = new MavenServerLoggerWrapper();
private static MavenServerDownloadListenerWrapper myDownloadListener = new MavenServerDownloadListenerWrapper();
public final class MavenServerGlobals {
private static final MavenServerLoggerWrapper myLogger = new MavenServerLoggerWrapper();
private static final MavenServerDownloadListenerWrapper myDownloadListener = new MavenServerDownloadListenerWrapper();
public static MavenServerLoggerWrapper getLogger() {
return myLogger;
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenServerLoggerWrapper.java → plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerLoggerWrapper.java
View File
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedder.java
+5 -5
View File
@@ -325,7 +325,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements
result.add(ProjectUtils.buildArtifactRepository(MavenModelConverter.toNativeRepository(each), factory, container));
}
catch (InvalidRepositoryException e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
return result;
@@ -440,7 +440,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements
throws RemoteException;
protected static void warn(String message, Throwable e) {
Maven3ServerGlobals.getLogger().warn(new RuntimeException(message, e));
MavenServerGlobals.getLogger().warn(new RuntimeException(message, e));
}
@Override
@@ -465,7 +465,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements
return getArchetypes(archetypeCatalog);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
return Collections.emptyList();
}
@@ -481,7 +481,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements
return getArchetypes(archetypeCatalog);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
return Collections.emptyList();
}
@@ -497,7 +497,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements
return getArchetypes(archetypeCatalog);
}
catch (ArchetypeDataSourceException e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
return Collections.emptyList();
}
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexFetcher.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class Maven3ServerIndexFetcher extends AbstractResourceFetcher {
myWagon.disconnect();
}
catch (ConnectionException ex) {
Maven3ServerGlobals.getLogger().warn(ex);
MavenServerGlobals.getLogger().warn(ex);
}
}
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java
+2 -2
View File
@@ -90,7 +90,7 @@ public abstract class Maven3ServerIndexerImpl extends MavenWatchdogAware impleme
return IndexReader.indexExists(dir);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
return false;
}
@@ -336,7 +336,7 @@ public abstract class Maven3ServerIndexerImpl extends MavenWatchdogAware impleme
}
}
catch (ArchetypeDataSourceException e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenLeakDetector.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class MavenLeakDetector {
private static void removeHook(Thread thread) throws RemoteException {
Runtime.getRuntime().removeShutdownHook(thread);
Maven3ServerGlobals.getLogger().print(String.format("ShutdownHook[%s] was removed to avoid memory leak", thread));
MavenServerGlobals.getLogger().print(String.format("ShutdownHook[%s] was removed to avoid memory leak", thread));
}
private static Map<Thread, Thread> getShutdownHooks() {
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
+1 -1
View File
@@ -296,7 +296,7 @@ public class MavenModelConverter {
result = new Element(xpp.getName());
}
catch (IllegalNameException e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
return null;
}
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/WagonTransferListenerAdapter.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class WagonTransferListenerAdapter implements TransferListener {
@Override
public void transferCompleted(TransferEvent event) {
Maven3ServerGlobals.getDownloadListener().artifactDownloaded(event.getLocalFile(), event.getResource().getName());
MavenServerGlobals.getDownloadListener().artifactDownloaded(event.getLocalFile(), event.getResource().getName());
checkCanceled();
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java
+2 -2
View File
@@ -84,7 +84,7 @@ public class Maven3ServerImpl extends MavenWatchdogAware implements MavenServer
public MavenPullServerLogger createPullLogger(MavenToken token) {
MavenServerUtil.checkToken(token);
try {
MavenServerLoggerWrapper result = Maven3ServerGlobals.getLogger();
MavenServerLoggerWrapper result = MavenServerGlobals.getLogger();
UnicastRemoteObject.exportObject(result, 0);
return result;
}
@@ -97,7 +97,7 @@ public class Maven3ServerImpl extends MavenWatchdogAware implements MavenServer
public MavenPullDownloadListener createPullDownloadListener(MavenToken token) {
MavenServerUtil.checkToken(token);
try {
MavenServerDownloadListenerWrapper result = Maven3ServerGlobals.getDownloadListener();
MavenServerDownloadListenerWrapper result = MavenServerGlobals.getDownloadListener();
UnicastRemoteObject.exportObject(result, 0);
return result;
}
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XProfileUtil.java
+8 -8
View File
@@ -81,7 +81,7 @@ public final class Maven3XProfileUtil {
}
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
}
@@ -131,7 +131,7 @@ public final class Maven3XProfileUtil {
}
catch (Exception e) {
// don't bother user if maven failed to build parent project
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
}
return collectProfilesIds(profiles);
}
@@ -167,10 +167,10 @@ public final class Maven3XProfileUtil {
result = interpolator.interpolate(result, basedir, config, false);
}
catch (ModelInterpolationException e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
catch (InitializationException e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
}
return result;
}
@@ -190,7 +190,7 @@ public final class Maven3XProfileUtil {
processor.invoke(interpolator, component);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
}
}
//interpolator.initialize();
@@ -234,12 +234,12 @@ public final class Maven3XProfileUtil {
for (ModelProblemCollectorRequest problem : problems) {
if (problem.getException() != null) {
Maven3ServerGlobals.getLogger().warn(problem.getException());
MavenServerGlobals.getLogger().warn(problem.getException());
}
}
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
}
return result;
}
@@ -262,7 +262,7 @@ public final class Maven3XProfileUtil {
sysPropertyActivator.contextualize(context);
}
catch (ContextException e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
return new ProfileActivator[0];
}
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java
+11 -11
View File
@@ -315,7 +315,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
result = builder.build(settingsRequest).getEffectiveSettings();
}
catch (SettingsBuildingException e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
}
result.setOffline(settings.isOffline());
@@ -503,7 +503,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
methodSetModelVersionProcessor.invoke(interpolator, component);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
}
}
@@ -980,7 +980,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
result.setMultiModuleProjectDirectory(mavenMultiModuleProjectDirectory);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
}
}
@@ -1117,7 +1117,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
for (Throwable each : exceptions) {
if (each == null) continue;
Maven3ServerGlobals.getLogger().print(ExceptionUtils.getFullStackTrace(each));
MavenServerGlobals.getLogger().print(ExceptionUtils.getFullStackTrace(each));
myConsoleWrapper.info("Validation error:", each);
Artifact problemTransferArtifact = getProblemTransferArtifact(each);
@@ -1278,7 +1278,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
return new MavenArtifactResolveResult(mavenArtifacts.get(), null);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
Artifact transferArtifact = getProblemTransferArtifact(e);
String message = getRootMessage(e);
MavenProjectProblem problem;
@@ -1316,7 +1316,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
return MavenModelConverter.convertArtifacts(res, new HashMap<Artifact, MavenArtifact>(), getLocalRepositoryFile());
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
throw wrapToSerializableRuntimeException(e);
}
}
@@ -1443,7 +1443,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
return new PluginResolutionResponse(mavenPluginId, true, artifacts);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
return new PluginResolutionResponse(mavenPluginId, false, artifacts);
}
}
@@ -1468,7 +1468,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
catch (ComponentLookupException ignore) {
}
catch (Throwable e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
@@ -1485,12 +1485,12 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
return MavenModelConverter.convertModel(model, null);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
return null;
}
@@ -1532,7 +1532,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder {
return resolve(artifact, remoteRepositories);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
}
return artifact;
}
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class TransferListenerAdapter implements TransferListener {
try {
myIndicator.setText2("Finished (" + StringUtilRt.formatFileSize(event.getTransferredBytes()) + ") " + formatResourceName(event));
myIndicator.setIndeterminate(true);
Maven3ServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName());
MavenServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName());
}
catch (RemoteException e) {
throw new RuntimeRemoteException(e);
plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java
+10 -10
View File
@@ -245,7 +245,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
result = builder.build(settingsRequest).getEffectiveSettings();
}
catch (SettingsBuildingException e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
}
result.setOffline(settings.isOffline());
@@ -281,7 +281,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
}
catch (Exception e) {
// don't bother user if maven failed to build parent project
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
}
return collectProfilesIds(profiles);
}
@@ -357,7 +357,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
}
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
}
@@ -401,10 +401,10 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
result = interpolator.interpolate(result, basedir, config, false);
}
catch (ModelInterpolationException e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
catch (InitializationException e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
}
return result;
}
@@ -427,7 +427,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
sysPropertyActivator.contextualize(context);
}
catch (ContextException e) {
Maven3ServerGlobals.getLogger().error(e);
MavenServerGlobals.getLogger().error(e);
return new ProfileActivator[0];
}
@@ -950,7 +950,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
for (Throwable each : exceptions) {
if (each == null) continue;
Maven3ServerGlobals.getLogger().info(each);
MavenServerGlobals.getLogger().info(each);
if (each instanceof IllegalStateException && each.getCause() != null) {
each = each.getCause();
@@ -1005,7 +1005,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
return MavenModelConverter.convertArtifacts(res, new HashMap<Artifact, MavenArtifact>(), getLocalRepositoryFile());
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
throw wrapToSerializableRuntimeException(e);
}
}
@@ -1074,7 +1074,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
return new PluginResolutionResponse(pluginId, true, artifacts);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
return new PluginResolutionResponse(pluginId, false, artifacts);
}
}
@@ -1111,7 +1111,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder {
return resolve(artifact, remoteRepositories);
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().info(e);
MavenServerGlobals.getLogger().info(e);
}
return artifact;
}
plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerImpl.java
+2 -2
View File
@@ -98,7 +98,7 @@ public class Maven30ServerImpl extends MavenWatchdogAware implements MavenServer
public MavenPullServerLogger createPullLogger(MavenToken token) {
MavenServerUtil.checkToken(token);
try {
MavenServerLoggerWrapper result = Maven3ServerGlobals.getLogger();
MavenServerLoggerWrapper result = MavenServerGlobals.getLogger();
UnicastRemoteObject.exportObject(result, 0);
return result;
}
@@ -111,7 +111,7 @@ public class Maven30ServerImpl extends MavenWatchdogAware implements MavenServer
public MavenPullDownloadListener createPullDownloadListener(MavenToken token) {
MavenServerUtil.checkToken(token);
try {
MavenServerDownloadListenerWrapper result = Maven3ServerGlobals.getDownloadListener();
MavenServerDownloadListenerWrapper result = MavenServerGlobals.getDownloadListener();
UnicastRemoteObject.exportObject(result, 0);
return result;
}
plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30TransferListenerAdapter.java
+1 -1
View File
@@ -116,7 +116,7 @@ public class Maven30TransferListenerAdapter implements TransferListener {
myIndicator.setIndeterminate(true);
myIndicator.completedDownload(MavenServerProgressIndicator.ResolveType.DEPENDENCY, formatResourceName(event));
Maven3ServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName());
MavenServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName());
}
catch (RemoteException e) {
throw new RuntimeRemoteException(e);
plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerEmbedderImpl.java
+3 -3
View File
@@ -84,7 +84,7 @@ public class Maven36ServerEmbedderImpl extends Maven3XServerEmbedder {
defaultRepositorySystem.setDependencyCollector(dependencyCollector);
}
catch (Throwable e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
return repositorySystem;
@@ -111,7 +111,7 @@ public class Maven36ServerEmbedderImpl extends Maven3XServerEmbedder {
repoSystemField.set(defaultResolver, getRepositorySystem());
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
}
@@ -133,7 +133,7 @@ public class Maven36ServerEmbedderImpl extends Maven3XServerEmbedder {
repoSystemField.set(defaultResolver, getRepositorySystem());
}
catch (Exception e) {
Maven3ServerGlobals.getLogger().warn(e);
MavenServerGlobals.getLogger().warn(e);
}
}
}
plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerImpl.java
+2 -2
View File
@@ -88,7 +88,7 @@ public class Maven36ServerImpl extends MavenWatchdogAware implements MavenServer
public MavenPullServerLogger createPullLogger(MavenToken token) {
MavenServerUtil.checkToken(token);
try {
MavenServerLoggerWrapper result = Maven3ServerGlobals.getLogger();
MavenServerLoggerWrapper result = MavenServerGlobals.getLogger();
UnicastRemoteObject.exportObject(result, 0);
return result;
}
@@ -101,7 +101,7 @@ public class Maven36ServerImpl extends MavenWatchdogAware implements MavenServer
public MavenPullDownloadListener createPullDownloadListener(MavenToken token) {
MavenServerUtil.checkToken(token);
try {
MavenServerDownloadListenerWrapper result = Maven3ServerGlobals.getDownloadListener();
MavenServerDownloadListenerWrapper result = MavenServerGlobals.getDownloadListener();
UnicastRemoteObject.exportObject(result, 0);
return result;
}