Skip to content

Commit 7ae1e52

Browse files
committed
GH-1521: removed old prototype around detecting differences between different runs of the same project
Fixes GH-1521
1 parent 04ff252 commit 7ae1e52

File tree

11 files changed

+0
-611
lines changed

11 files changed

+0
-611
lines changed

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/Constants.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ public class Constants {
2828
public static final String PREF_XML_CONFIGS_HYPERLINKS = "boot-java.support-spring-xml-config.hyperlinks";
2929
public static final String PREF_XML_CONFIGS_CONTENT_ASSIST = "boot-java.support-spring-xml-config.content-assist";
3030

31-
public static final String PREF_CHANGE_DETECTION = "boot-java.change-detection.on";
32-
3331
public static final String PREF_JAVA_RECONCILE = "boot-java.java.reconcile";
3432

3533
public static final String PREF_REWRITE_RECIPE_FILTERS = "boot-java.rewrite.recipe-filters";

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/DelegatingStreamConnectionProvider.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ private void sendConfiguration() {
180180
Map<String, Object> liveInformation = new HashMap<>();
181181
Map<String, Object> liveInformationFetchData = new HashMap<>();
182182
Map<String, Object> supportXML = new HashMap<>();
183-
Map<String, Object> bootChangeDetection = new HashMap<>();
184183
Map<String, Object> scanTestJavaSources = new HashMap<>();
185184
Map<String, Object> javaSettings = new HashMap<>();
186185
Map<String, Object> javaCompletionSettings = new HashMap<>();
@@ -197,7 +196,6 @@ private void sendConfiguration() {
197196
supportXML.put("scan-folders", preferenceStore.getString(Constants.PREF_XML_CONFIGS_SCAN_FOLDERS));
198197
supportXML.put("hyperlinks", preferenceStore.getString(Constants.PREF_XML_CONFIGS_HYPERLINKS));
199198
supportXML.put("content-assist", preferenceStore.getString(Constants.PREF_XML_CONFIGS_CONTENT_ASSIST));
200-
bootChangeDetection.put("on", preferenceStore.getBoolean(Constants.PREF_CHANGE_DETECTION));
201199
scanTestJavaSources.put("on", preferenceStore.getBoolean(Constants.PREF_SCAN_JAVA_TEST_SOURCES));
202200

203201
javaCompletionSettings.put("inject-bean", preferenceStore.getBoolean(Constants.PREF_COMPLETION_JAVA_INJECT_BEAN));
@@ -209,9 +207,7 @@ private void sendConfiguration() {
209207
bootJavaObj.put("jpql", preferenceStore.getBoolean(Constants.PREF_JPQL));
210208
bootJavaObj.put("live-information", liveInformation);
211209
bootJavaObj.put("support-spring-xml-config", supportXML);
212-
bootJavaObj.put("change-detection", bootChangeDetection);
213210
bootJavaObj.put("scan-java-test-sources", scanTestJavaSources);
214-
bootJavaObj.put("change-detection", bootChangeDetection);
215211
bootJavaObj.put("java", javaSettings);
216212
bootJavaObj.put("remote-apps", getAllRemoteApps());
217213
bootJavaObj.put("modulith-project-tracking", preferenceStore.getBoolean(Constants.PREF_MODULITH));

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/BootJavaPreferencesPage.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ protected void createFieldEditors() {
4141
addField(new BooleanFieldEditor(Constants.PREF_START_LS_EARLY, "Start Language Server at startup if Spring Boot is a dependency", fieldEditorParent));
4242
addField(new BooleanFieldEditor(Constants.PREF_SCAN_JAVA_TEST_SOURCES, "Scan Java test sources", fieldEditorParent));
4343

44-
addField(new BooleanFieldEditor(Constants.PREF_CHANGE_DETECTION, "Live Boot Change Detection", fieldEditorParent));
45-
4644
// JPQL Support switch
4745
addField(new BooleanFieldEditor(Constants.PREF_JPQL, "JPA Query language support", fieldEditorParent));
4846

eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/PrefsInitializer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ public void initializeDefaultPreferences() {
4040
preferenceStore.setDefault(Constants.PREF_XML_CONFIGS_CONTENT_ASSIST, true);
4141
preferenceStore.setDefault(Constants.PREF_XML_CONFIGS_SCAN_FOLDERS, "src/main");
4242

43-
preferenceStore.setDefault(Constants.PREF_CHANGE_DETECTION, false);
44-
4543
preferenceStore.setDefault(Constants.PREF_SCAN_JAVA_TEST_SOURCES, false);
4644

4745
preferenceStore.setDefault(Constants.PREF_JAVA_RECONCILE, true);

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootJavaConfig.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,6 @@ public String[] xmlBeansFoldersToScan() {
131131
return cleanedFolders.toArray(new String[cleanedFolders.size()]);
132132
}
133133

134-
public boolean isChangeDetectionEnabled() {
135-
Boolean enabled = settings.getBoolean("boot-java", "change-detection", "on");
136-
return enabled != null && enabled.booleanValue();
137-
}
138-
139134
public boolean isSpelExpressionValidationEnabled() {
140135
Toggle categorySwitch = SpringProblemCategories.SPEL.getToggle();
141136
return isProblemCategoryEnabled(categorySwitch);

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*******************************************************************************/
1111
package org.springframework.ide.vscode.boot.java;
1212

13-
import java.time.Duration;
1413
import java.util.ArrayList;
1514
import java.util.Collection;
1615
import java.util.HashMap;
@@ -63,7 +62,6 @@
6362
import org.springframework.ide.vscode.boot.java.requestmapping.WebfluxRouteHighlightProdivder;
6463
import org.springframework.ide.vscode.boot.java.spel.SpelSemanticTokens;
6564
import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache;
66-
import org.springframework.ide.vscode.boot.java.utils.SpringLiveChangeDetectionWatchdog;
6765
import org.springframework.ide.vscode.boot.java.value.ValueHoverProvider;
6866
import org.springframework.ide.vscode.boot.java.value.ValuePropertyReferencesProvider;
6967
import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider;
@@ -111,7 +109,6 @@ public class BootJavaLanguageServerComponents implements LanguageServerComponent
111109

112110
private final SpringProcessConnectorService liveDataService;
113111

114-
private final SpringLiveChangeDetectionWatchdog liveChangeDetectionWatchdog;
115112
private final ProjectObserver projectObserver;
116113
private final CompilationUnitCache cuCache;
117114
private final ResponseModifier responseModifier;
@@ -179,14 +176,6 @@ public BootJavaLanguageServerComponents(ApplicationContext appContext) {
179176
workspaceService.onWorkspaceSymbol(new BootJavaWorkspaceSymbolHandler(springSymbolIndex,
180177
new LiveAppURLSymbolProvider(liveDataProvider)));
181178

182-
liveChangeDetectionWatchdog = new SpringLiveChangeDetectionWatchdog(
183-
this,
184-
server,
185-
serverParams.projectObserver,
186-
projectFinder,
187-
Duration.ofSeconds(5),
188-
sourceLinks);
189-
190179
spelSemanticTokens = appContext.getBean(SpelSemanticTokens.class);
191180

192181
codeLensHandler = createCodeLensEngine(springIndex, projectFinder, server, spelSemanticTokens);
@@ -211,14 +200,6 @@ public BootJavaLanguageServerComponents(ApplicationContext appContext) {
211200
// live information data fetch params
212201
liveDataService.setMaxRetryCount(config.getLiveInformationFetchDataMaxRetryCount());
213202
liveDataService.setRetryDelayInSeconds(config.getLiveInformationFetchDataRetryDelayInSeconds());
214-
215-
// live change detection watchdog
216-
if (config.isChangeDetectionEnabled()) {
217-
liveChangeDetectionWatchdog.enableHighlights();
218-
}
219-
else {
220-
liveChangeDetectionWatchdog.disableHighlights();
221-
}
222203

223204
log.info("update live process tracker settings - done");
224205
});
@@ -255,11 +236,9 @@ public Optional<DocumentSymbolHandler> getDocumentSymbolProvider() {
255236
}
256237

257238
private void initialized() {
258-
this.liveChangeDetectionWatchdog.start();
259239
}
260240

261241
private void shutdown() {
262-
this.liveChangeDetectionWatchdog.shutdown();
263242
this.cuCache.dispose();
264243
}
265244

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/Change.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ChangeDetectionHistory.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)