Skip to content
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

#6536, #6537: avoid stack overflow, catch missing artifacts to be downloaded. #6548

Merged
merged 1 commit into from
Oct 16, 2023
Merged

#6536, #6537: avoid stack overflow, catch missing artifacts to be downloaded. #6548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 47 additions & 25 deletions ...radle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
Expand Down Expand Up @@ -102,7 +103,7 @@
import org.gradle.api.tasks.TaskDependency;
import org.gradle.api.tasks.bundling.Jar;
import org.gradle.api.tasks.testing.Test;
import org.gradle.internal.extensibility.DefaultExtraPropertiesExtension;
import org.gradle.internal.resolve.ArtifactResolveException;
import org.gradle.jvm.JvmLibrary;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
Expand Down Expand Up @@ -274,7 +275,7 @@ private String getTaskInheritance(Task t) {
addTypes(nonDecorated, classes);
return classes.stream().map(Class::getName).sorted().collect(Collectors.joining(","));
}

private static final Set<String> EXCLUDE_TASK_PROPERTIES = new HashSet<>(Arrays.asList(
"dependsOn",
"project",
Expand Down Expand Up @@ -418,6 +419,10 @@ private void runAndRegisterPerf(NbProjectInfoModel model, String s, Runnable r)
long time = System.currentTimeMillis();
try {
r.run();
} catch (RuntimeException ex) {
// convert will eventually throw a different exception
convertOfflineException(ex);
LOG.debug("Error encountered during {0}: {1}", s, ex);
} finally {
long span = System.currentTimeMillis() - time;
model.registerPerf(s, span);
Expand Down Expand Up @@ -509,8 +514,14 @@ private Class findIterableItemClass(Class clazz) {
public static final String COLLECTION_KEYS_MARKER = "#keys"; // NOI18N


/**
* Prevents the recursive descent to loop back to an already processed structure.
*/
private Map<Object, Boolean> valueIdentities = new IdentityHashMap<>();

private static boolean isPrimitiveOrString(Class c) {
if (c == Object.class) {
// Cannot export a Class as an object, the Class may not exist in the netbeans VM.
if (c == Object.class || c == Class.class) {
return false;
}
String n = c.getName();
Expand All @@ -533,10 +544,15 @@ private void inspectObjectAndValues(Class clazz, Object object, String prefix, M
}

private void inspectObjectAndValues(Class clazz, Object object, String prefix, Map<String, Map<String, String>> globalTypes, Map<String, String> propertyTypes, Map<String, Object> defaultValues, Set<String> excludes, boolean type) {
if (valueIdentities.put(object, Boolean.TRUE) == Boolean.TRUE) {
return;
}
try {
inspectObjectAndValues0(clazz, object, prefix, globalTypes, propertyTypes, defaultValues, excludes, type);
} catch (RuntimeException ex) {
LOG.warn("Error during inspection of {}, value {}, prefix {}", clazz, object, prefix);
} finally {
valueIdentities.remove(object);
}
}

Expand Down Expand Up @@ -1188,12 +1204,16 @@ private void detectSources(NbProjectInfoModel model) {
model.getInfo().put(propBase + "classpath_compile", storeSet(sourceSet.getCompileClasspath().getFiles()));
model.getInfo().put(propBase + "classpath_runtime", storeSet(sourceSet.getRuntimeClasspath().getFiles()));
} catch(Exception e) {
convertOfflineException(e);
// will not be reached
model.noteProblem(e);
}
sinceGradle("4.6", () -> {
try {
model.getInfo().put(propBase + "classpath_annotation", storeSet(getProperty(sourceSet, "annotationProcessorPath", "files")));
} catch(Exception e) {
convertOfflineException(e);
// will not be reached
model.noteProblem(e);
}
model.getInfo().put(propBase + "configuration_annotation", getProperty(sourceSet, "annotationProcessorConfigurationName"));
Expand Down Expand Up @@ -1403,22 +1423,26 @@ public void walkChildren(boolean root, String parentId, Collection<? extends Dep
// hidden configurations like 'testCodeCoverageReportExecutionData' might contain unresolvable artifacts.
// do not report problems here
Throwable failure = ((UnresolvedDependencyResult) it2).getFailure();
if (project.getGradle().getStartParameter().isOffline()) {
// if the unresolvable is bcs. offline mode, throw an exception to get retry in online mode.
Throwable prev = null;
for (Throwable t = failure; t != prev && t != null; prev = t, t = t.getCause()) {
if (t.getMessage().contains("available for offline")) {
throw new NeedOnlineModeException("Need online mode", failure);
}
}
}
convertOfflineException(failure);
unresolvedProblems.putIfAbsent(id, ((UnresolvedDependencyResult) it2).getFailure().getMessage());
}
}
}
}
}

private void convertOfflineException(Throwable failure) {
if (project.getGradle().getStartParameter().isOffline()) {
// if the unresolvable is bcs. offline mode, throw an exception to get retry in online mode.
Throwable prev = null;
for (Throwable t = failure; t != prev && t != null; prev = t, t = t.getCause()) {
if (t.getMessage().contains("available for offline")) {
throw new NeedOnlineModeException("Need online mode", failure);
}
}
}
}

private void detectDependencies(NbProjectInfoModel model) {
Set<ComponentIdentifier> ids = new HashSet<>();
Map<String, File> projects = new HashMap<>();
Expand Down Expand Up @@ -1501,15 +1525,7 @@ private void detectDependencies(NbProjectInfoModel model) {
// hidden configurations like 'testCodeCoverageReportExecutionData' might contain unresolvable artifacts.
// do not report problems here
Throwable failure = ((UnresolvedDependencyResult) it2).getFailure();
if (project.getGradle().getStartParameter().isOffline()) {
// if the unresolvable is bcs. offline mode, throw an exception to get retry in online mode.
Throwable prev = null;
for (Throwable t = failure; t != prev && t != null; prev = t, t = t.getCause()) {
if (t.getMessage().contains("available for offline")) {
throw new NeedOnlineModeException("Need online mode", failure);
}
}
}
convertOfflineException(failure);
unresolvedProblems.put(id, ((UnresolvedDependencyResult) it2).getFailure().getMessage());
}
}
Expand Down Expand Up @@ -1581,10 +1597,16 @@ private void detectDependencies(NbProjectInfoModel model) {
resolvedJvmArtifacts.putIfAbsent(a.getId().getComponentIdentifier().toString(), Collections.singleton(a.getFile()));
}
});
it.getResolvedConfiguration()
.getLenientConfiguration()
.getFirstLevelModuleDependencies(Specs.SATISFIES_ALL)
.forEach(rd -> collectArtifacts(rd, resolvedJvmArtifacts));
try {
it.getResolvedConfiguration()
.getLenientConfiguration()
.getFirstLevelModuleDependencies(Specs.SATISFIES_ALL)
.forEach(rd -> collectArtifacts(rd, resolvedJvmArtifacts));
} catch (ArtifactResolveException ex) {
convertOfflineException(ex);
// will not be reached, if the exception is converted
throw ex;
}
} catch (NullPointerException ex) {
//This can happen if the configuration resolution had issues
}
Expand Down