Add buildship offline mode preference

Signed-off-by: Snjezana Peco <[email protected]>
eclipse-jdtls · Dec 18, 2019 · eb36213 · eb36213
1 parent dd830b5
commit eb36213
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java b/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
@@ -178,13 +178,15 @@ public static BuildConfiguration getBuildConfiguration(Path rootFolder) {
 		File javaHome = javaHomeStr == null ? null : new File(javaHomeStr);
 		List<String> gradleArguments = JavaLanguageServerPlugin.getPreferencesManager() != null ? JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleArguments() : new ArrayList<>();
 		List<String> gradleJvmArguments = JavaLanguageServerPlugin.getPreferencesManager() != null ? JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleJvmArguments() : new ArrayList<>();
+		boolean offlineMode = JavaLanguageServerPlugin.getPreferencesManager() != null ? JavaLanguageServerPlugin.getPreferencesManager().getPreferences().isImportGradleOfflineEnabled() : false;
 		// @formatter:off
 		BuildConfiguration build = BuildConfiguration.forRootProjectDirectory(rootFolder.toFile())
 				.overrideWorkspaceConfiguration(overrideWorkspaceConfiguration)
 				.gradleDistribution(distribution)
 				.javaHome(javaHome)
 				.arguments(gradleArguments)
 				.jvmArguments(gradleJvmArguments)
+				.offlineMode(offlineMode)
 				.build();
 		// @formatter:on
 		return build;

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java
@@ -25,6 +25,8 @@
 import java.util.Map;
 import java.util.UUID;
 
+import org.eclipse.buildship.core.internal.CorePlugin;
+import org.eclipse.buildship.core.internal.configuration.WorkspaceConfiguration;
 import org.eclipse.core.internal.resources.PreferenceInitializer;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
@@ -65,6 +67,10 @@ public class Preferences {
 	 * Preference key to enable/disable gradle importer.
 	 */
 	public static final String IMPORT_GRADLE_ENABLED = "java.import.gradle.enabled";
+	/**
+	 * Preference key to enable/disable gradle offline mode.
+	 */
+	public static final String IMPORT_GRADLE_OFFLINE_ENABLED = "java.import.gradle.offline.enabled";
 	/**
 	 * Preference key to enable/disable gradle wrapper.
 	 */
@@ -323,6 +329,7 @@ public class Preferences {
 	private FeatureStatus updateBuildConfigurationStatus;
 	private boolean referencesCodeLensEnabled;
 	private boolean importGradleEnabled;
+	private boolean importGradleOfflineEnabled;
 	private boolean gradleWrapperEnabled;
 	private String gradleVersion;
 	private List<String> gradleArguments;
@@ -441,6 +448,7 @@ public Preferences() {
 		incompleteClasspathSeverity = Severity.warning;
 		updateBuildConfigurationStatus = FeatureStatus.interactive;
 		importGradleEnabled = true;
+		importGradleOfflineEnabled = false;
 		gradleWrapperEnabled = true;
 		gradleVersion = null;
 		gradleArguments = new ArrayList<>();
@@ -502,6 +510,8 @@ public static Preferences createFrom(Map<String, Object> configuration) {
 
 		boolean importGradleEnabled = getBoolean(configuration, IMPORT_GRADLE_ENABLED, true);
 		prefs.setImportGradleEnabled(importGradleEnabled);
+		boolean importGradleOfflineEnabled = getBoolean(configuration, IMPORT_GRADLE_OFFLINE_ENABLED, false);
+		prefs.setImportGradleOfflineEnabled(importGradleOfflineEnabled);
 		boolean gradleWrapperEnabled = getBoolean(configuration, GRADLE_WRAPPER_ENABLED, true);
 		prefs.setGradleWrapperEnabled(gradleWrapperEnabled);
 		String gradleVersion = getString(configuration, GRADLE_VERSION);
@@ -703,6 +713,19 @@ public Preferences setImportGradleEnabled(boolean enabled) {
 		return this;
 	}
 
+	@SuppressWarnings("restriction")
+	public Preferences setImportGradleOfflineEnabled(boolean enabled) {
+		this.importGradleOfflineEnabled = enabled;
+		WorkspaceConfiguration workspaceConfiguration = CorePlugin.configurationManager().loadWorkspaceConfiguration();
+		if (workspaceConfiguration.isOffline() != enabled) {
+			WorkspaceConfiguration newConfig = new WorkspaceConfiguration(workspaceConfiguration.getGradleDistribution(), workspaceConfiguration.getGradleUserHome(), workspaceConfiguration.getJavaHome(), enabled,
+					workspaceConfiguration.isBuildScansEnabled(), workspaceConfiguration.isAutoSync(), workspaceConfiguration.getArguments(), workspaceConfiguration.getJvmArguments(), workspaceConfiguration.isShowConsoleView(),
+					workspaceConfiguration.isShowExecutionsView());
+			CorePlugin.configurationManager().saveWorkspaceConfiguration(newConfig);
+		}
+		return this;
+	}
+
 	public Preferences setGradleWrapperEnabled(boolean enabled) {
 		this.gradleWrapperEnabled = enabled;
 		return this;
@@ -914,6 +937,10 @@ public boolean isImportGradleEnabled() {
 		return importGradleEnabled;
 	}
 
+	public boolean isImportGradleOfflineEnabled() {
+		return importGradleOfflineEnabled;
+	}
+
 	public boolean isGradleWrapperEnabled() {
 		return gradleWrapperEnabled;
 	}

diff --git a/...jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporterTest.java b/...jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporterTest.java
@@ -300,6 +300,21 @@ public void testGradleArguments() {
 		}
 	}
 
+	@Test
+	public void testGradleOfflineMode() {
+		boolean offlineMode = JavaLanguageServerPlugin.getPreferencesManager().getPreferences().isImportGradleOfflineEnabled();
+		try {
+			Path rootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().toPath();
+			BuildConfiguration build = GradleProjectImporter.getBuildConfiguration(rootPath);
+			assertFalse(build.isOfflineMode());
+			JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setImportGradleOfflineEnabled(true);
+			build = GradleProjectImporter.getBuildConfiguration(rootPath);
+			assertTrue(build.isOfflineMode());
+		} finally {
+			JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setImportGradleOfflineEnabled(offlineMode);
+		}
+	}
+
 	@Test
 	public void testGradleJvmArguments() {
 		List<String> jvmArguments = JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleJvmArguments();