Use the ProjectUtils static methods in cases where we know exactly wh…

…ich build support we want to check against the project.

Signed-off-by: Siarhei Leanavets <[email protected]>

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ProjectUtils.java

@@ -28,6 +28,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.eclipse.core.resources.ICommand;
+import org.eclipse.buildship.core.internal.configuration.GradleProjectNature;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -49,6 +50,7 @@
 import org.eclipse.jdt.ls.core.internal.managers.InternalBuildSupports;
 import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager;
 import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
+import org.eclipse.m2e.core.internal.IMavenConstants;
 
 /**
  * @author Fred Bricon
@@ -78,6 +80,14 @@ public static boolean isJavaProject(IProject project) {
  return hasNature(project, JavaCore.NATURE_ID);
  }
 
+ public static boolean isMavenProject(IProject project) {
+ return hasNature(project, IMavenConstants.NATURE_ID);
+ }
+
+ public static boolean isGradleProject(IProject project) {
+ return hasNature(project, GradleProjectNature.ID);
+ }
+
  public static boolean isGeneralJavaProject(IProject project) {
  return isJavaProject(project) && isInternalBuildSupport(BuildSupportManager.find(project).orElse(null));
  }
@@ -101,11 +111,7 @@ public static Map<String, String> getJavaOptions(IProject project) {
  }
 
  public static List<IProject> getGradleProjects() {
- IBuildSupport buildSupport = BuildSupportManager.find("Gradle").get();
- return Stream
- .of(getAllProjects())
- .filter(buildSupport::applies)
- .collect(Collectors.toList());
+ return Stream.of(getAllProjects()).filter(ProjectUtils::isGradleProject).collect(Collectors.toList());
  }
 
  public static IJavaProject[] getJavaProjects() {

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleBuildSupport.java

@@ -25,7 +25,6 @@
 import org.eclipse.buildship.core.GradleBuild;
 import org.eclipse.buildship.core.GradleCore;
 import org.eclipse.buildship.core.internal.CorePlugin;
-import org.eclipse.buildship.core.internal.configuration.GradleProjectNature;
 import org.eclipse.buildship.core.internal.launch.GradleClasspathProvider;
 import org.eclipse.buildship.core.internal.preferences.PersistentModel;
 import org.eclipse.buildship.core.internal.util.file.FileUtils;
@@ -67,7 +66,7 @@ public class GradleBuildSupport implements IBuildSupport {
 
  @Override
  public boolean applies(IProject project) {
- return ProjectUtils.hasNature(project, GradleProjectNature.ID);
+ return ProjectUtils.isGradleProject(project);
  }
 
  @Override
@@ -113,7 +112,7 @@ private boolean isRoot(IProject project, GradleBuild gradleBuild, IProgressMonit
  @Override
  public boolean isBuildFile(IResource resource) {
  if (resource != null && resource.getType() == IResource.FILE && (resource.getName().endsWith(GRADLE_SUFFIX) || resource.getName().equals(GRADLE_PROPERTIES))
- && applies(resource.getProject())) {
+ && ProjectUtils.isGradleProject(resource.getProject())) {
  try {
  if (!ProjectUtils.isJavaProject(resource.getProject())) {
  return true;

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java

@@ -98,7 +98,7 @@ public boolean applies(IProgressMonitor monitor) throws CoreException {
  .addExclusions("**/build")//default gradle build dir
  .addExclusions("**/bin");
  for (IProject project : ProjectUtils.getAllProjects()) {
- if (!BuildSupportManager.find("Gradle").get().applies(project)) {
+ if (!ProjectUtils.isGradleProject(project)) {
  String path = project.getLocation().toOSString();
  gradleDetector.addExclusions(path);
  }

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/MavenBuildSupport.java

@@ -33,7 +33,6 @@
 import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager.CHANGE_TYPE;
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.internal.IMavenConstants;
 import org.eclipse.m2e.core.internal.MavenPluginActivator;
 import org.eclipse.m2e.core.internal.project.ProjectConfigurationManager;
 import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager;
@@ -68,7 +67,7 @@ public MavenBuildSupport() {
 
  @Override
  public boolean applies(IProject project) {
- return ProjectUtils.hasNature(project, IMavenConstants.NATURE_ID);
+ return ProjectUtils.isMavenProject(project);
  }
 
  @Override
@@ -94,7 +93,7 @@ public void update(IProject project, boolean force, IProgressMonitor monitor) th
  }
 
  public void collectProjects(Collection<IProject> projects, IProject project, IProgressMonitor monitor) {
- if (!project.isOpen() || !applies(project)) {
+ if (!project.isOpen() || !ProjectUtils.isMavenProject(project)) {
  return;
  }
  projects.add(project);

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/MavenProjectImporter.java

@@ -90,10 +90,7 @@ public boolean applies(IProgressMonitor monitor) throws OperationCanceledExcepti
  .addExclusions("**/target"); //default maven build dir
  //@formatter:on
  for (IProject project : ProjectUtils.getAllProjects()) {
- // MavenBuildSupport must be available, otherwise the whole system is broken.
- IBuildSupport buildSupport = BuildSupportManager.find("Maven").get();
-
- if (!buildSupport.applies(project)) {
+ if (!ProjectUtils.isMavenProject(project)) {
  String path = project.getLocation().toOSString();
  mavenDetector.addExclusions(path);
  }
@@ -154,7 +151,7 @@ public void importToWorkspace(IProgressMonitor monitor) throws CoreException, Op
  } else {
  IProject project = container.getProject();
  boolean valid = !ProjectUtils.isJavaProject(project) || project.getFile(IJavaProject.CLASSPATH_FILE_NAME).exists();
- if (BuildSupportManager.find("Maven").get().applies(project) && valid) {
+ if (ProjectUtils.isMavenProject(project) && valid) {
  projects.add(container.getProject());
  } else if (project != null) {
  //Project doesn't have the Maven nature, so we (re)import it

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/AbstractGradleBasedTest.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 
 /**
  * @author Fred Bricon
@@ -42,7 +43,7 @@ protected IProject importGradleProject(String name) throws Exception {
 
  protected void assertIsGradleProject(IProject project) {
  assertNotNull(project);
- assertTrue(project.getName() + " is missing the Gradle nature", BuildSupportManager.find("Gradle").get().applies(project));
+ assertTrue(project.getName() + " is missing the Gradle nature", ProjectUtils.isGradleProject(project));
  }
 
 }

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/AbstractMavenBasedTest.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 
 /**
  * @author Fred Bricon
@@ -52,7 +53,7 @@ protected IProject importSimpleJavaProject() throws Exception {
 
  protected void assertIsMavenProject(IProject project) {
  assertNotNull(project);
- assertTrue(project.getName() + " is missing the Maven nature", BuildSupportManager.find("Maven").get().applies(project));
+ assertTrue(project.getName() + " is missing the Maven nature", ProjectUtils.isMavenProject(project));
  }
 
  protected String comment(String s, String from, String to) {

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporterTest.java

@@ -166,7 +166,7 @@ public void testDisableGradleWrapper() throws Exception {
  assertEquals(2, projects.size());//default + 1 eclipse projects
  IProject eclipse = WorkspaceHelper.getProject("eclipsegradle");
  assertNotNull(eclipse);
- assertTrue(eclipse.getName() + " does not have the Gradle nature", BuildSupportManager.find("Gradle").get().applies(eclipse));
+ assertTrue(eclipse.getName() + " does not have the Gradle nature", ProjectUtils.isGradleProject(eclipse));
  } finally {
  JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setGradleWrapperEnabled(enabled);
  JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setGradleVersion(gradleVersion);
@@ -185,7 +185,7 @@ public void testGradleUserHome() throws Exception {
  assertEquals(2, projects.size());//default + 1 eclipse projects
  IProject project = WorkspaceHelper.getProject("simple-gradle");
  assertNotNull(project);
- assertTrue(project.getName() + " does not have the Gradle nature", BuildSupportManager.find("Gradle").get().applies(project));
+ assertTrue(project.getName() + " does not have the Gradle nature", ProjectUtils.isGradleProject(project));
  assertTrue(gradleUserHome.exists());
  ProjectConfiguration projectConfiguration = CorePlugin.configurationManager().loadProjectConfiguration(project);
  assertEquals(gradleUserHome, projectConfiguration.getBuildConfiguration().getGradleUserHome());
@@ -259,7 +259,7 @@ public void testDisableImportGradle() throws Exception {
  assertEquals(2, projects.size());//default + 1 eclipse projects
  IProject eclipse = WorkspaceHelper.getProject("eclipse");
  assertNotNull(eclipse);
- assertFalse(eclipse.getName() + " has the Gradle nature", BuildSupportManager.find("Gradle").get().applies(eclipse));
+ assertFalse(eclipse.getName() + " has the Gradle nature", ProjectUtils.isGradleProject(eclipse));
  } finally {
  JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setImportGradleEnabled(enabled);
  }

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/MavenBuildSupportTest.java

@@ -46,6 +46,7 @@
 import org.eclipse.jdt.ls.core.internal.DependencyUtil;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
 import org.eclipse.jdt.ls.core.internal.JobHelpers;
+import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 import org.eclipse.jdt.ls.core.internal.ResourceUtils;
 import org.eclipse.jdt.ls.core.internal.SourceContentProvider;
 import org.eclipse.jdt.ls.core.internal.WorkspaceHelper;
@@ -226,11 +227,11 @@ public void testUpdateSnapshots() throws Exception {
  public void testBatchImport() throws Exception {
  IProject project = importMavenProject("batch");
  waitForBackgroundJobs();
- assertTrue(BuildSupportManager.find("Maven").get().applies(project));
+ assertTrue(ProjectUtils.isMavenProject(project));
  IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
  assertEquals(root.getProjects().length, 14);
  project = root.getProject("batchchild");
- assertTrue(BuildSupportManager.find("Maven").get().applies(project));
+ assertTrue(ProjectUtils.isMavenProject(project));
  }
 
  protected void testNonStandardCompilerId(String projectName) throws Exception {

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/MavenProjectImporterTest.java

@@ -41,6 +41,7 @@
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 import org.eclipse.jdt.ls.core.internal.WorkspaceHelper;
 import org.eclipse.jdt.ls.core.internal.handlers.ProgressReporterManager;
 import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager.CHANGE_TYPE;
@@ -142,7 +143,7 @@ public void testDisableMaven() throws Exception {
  assertEquals(2, projects.size());//default + 1 eclipse projects
  IProject eclipse = WorkspaceHelper.getProject("eclipse");
  assertNotNull(eclipse);
- assertFalse(eclipse.getName() + " has the Maven nature", BuildSupportManager.find("Maven").get().applies(eclipse));
+ assertFalse(eclipse.getName() + " has the Maven nature", ProjectUtils.isMavenProject(eclipse));
  } finally {
  JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setImportMavenEnabled(enabled);
  }