Skip to content

Commit 0019109

Browse files
rgrunberfbricon
authored andcommitted
Ignore o.e.jdt.core.compiler.problem.missingSerialVersion by default.
- Fixes #1714 Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
1 parent 1400ad5 commit 0019109

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/PreferenceManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public static void initializeJavaCoreOptions() {
132132
javaCoreOptions.put(JavaCore.COMPILER_PB_UNHANDLED_WARNING_TOKEN, JavaCore.IGNORE);
133133
javaCoreOptions.put(JavaCore.COMPILER_PB_REDUNDANT_SUPERINTERFACE, JavaCore.WARNING);
134134
javaCoreOptions.put(JavaCore.CODEASSIST_SUBWORD_MATCH, JavaCore.DISABLED);
135+
javaCoreOptions.put(JavaCore.COMPILER_PB_MISSING_SERIAL_VERSION, JavaCore.IGNORE);
135136
JavaCore.setOptions(javaCoreOptions);
136137
}
137138

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
1+
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/JavaSettingsTest.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ public void cleanUp() throws Exception {
7070

7171
@Test
7272
public void testFilePath() throws Exception {
73-
assertEquals("warning", JavaCore.getOption(MISSING_SERIAL_VERSION));
74-
assertEquals("warning", javaProject.getOption(MISSING_SERIAL_VERSION, true));
75-
testMarkers(1);
73+
assertEquals("ignore", JavaCore.getOption(MISSING_SERIAL_VERSION));
74+
assertEquals("ignore", javaProject.getOption(MISSING_SERIAL_VERSION, true));
75+
testMarkers(0);
7676
try {
7777
Bundle bundle = Platform.getBundle(JavaLanguageServerTestPlugin.PLUGIN_ID);
7878
URL settingsUrl = bundle.getEntry("/formatter/settings.prefs");
@@ -83,17 +83,17 @@ public void testFilePath() throws Exception {
8383
StandardProjectsManager.configureSettings(preferences);
8484
assertTrue(preferences.getSettingsAsURI().isAbsolute());
8585
JobHelpers.waitForJobsToComplete();
86-
assertEquals("ignore", JavaCore.getOption(MISSING_SERIAL_VERSION));
87-
assertEquals("ignore", javaProject.getOption(MISSING_SERIAL_VERSION, true));
88-
testMarkers(0);
86+
assertEquals("warning", JavaCore.getOption(MISSING_SERIAL_VERSION));
87+
assertEquals("warning", javaProject.getOption(MISSING_SERIAL_VERSION, true));
88+
testMarkers(1);
8989
} finally {
9090
JavaCore.setOptions(options);
9191
preferences.setSettingsUrl(null);
9292
StandardProjectsManager.configureSettings(preferences);
9393
}
94-
assertEquals("warning", JavaCore.getOption(MISSING_SERIAL_VERSION));
94+
assertEquals("ignore", JavaCore.getOption(MISSING_SERIAL_VERSION));
9595
JobHelpers.waitForJobsToComplete();
96-
testMarkers(1);
96+
testMarkers(0);
9797
}
9898

9999
private void testMarkers(int count) throws JavaModelException, CoreException {
@@ -104,21 +104,21 @@ private void testMarkers(int count) throws JavaModelException, CoreException {
104104

105105
@Test
106106
public void testRelativeFilePath() throws Exception {
107-
assertEquals("warning", JavaCore.getOption(MISSING_SERIAL_VERSION));
108-
assertEquals("warning", javaProject.getOption(MISSING_SERIAL_VERSION, true));
107+
assertEquals("ignore", JavaCore.getOption(MISSING_SERIAL_VERSION));
108+
assertEquals("ignore", javaProject.getOption(MISSING_SERIAL_VERSION, true));
109109
try {
110110
String settingsUrl = "../../formatter/settings.prefs";
111111
preferences.setSettingsUrl(settingsUrl);
112112
StandardProjectsManager.configureSettings(preferences);
113113
assertTrue(preferences.getSettingsAsURI().isAbsolute());
114-
assertEquals("ignore", JavaCore.getOption(MISSING_SERIAL_VERSION));
115-
assertEquals("ignore", javaProject.getOption(MISSING_SERIAL_VERSION, true));
114+
assertEquals("warning", JavaCore.getOption(MISSING_SERIAL_VERSION));
115+
assertEquals("warning", javaProject.getOption(MISSING_SERIAL_VERSION, true));
116116
} finally {
117117
JavaCore.setOptions(options);
118118
preferences.setSettingsUrl(null);
119119
StandardProjectsManager.configureSettings(preferences);
120120
}
121-
assertEquals("warning", JavaCore.getOption(MISSING_SERIAL_VERSION));
121+
assertEquals("ignore", JavaCore.getOption(MISSING_SERIAL_VERSION));
122122
}
123123

124124
}

0 commit comments

Comments
 (0)