Skip to content

Commit 99584a3

Browse files
authored
chore: Enable ErrorProne plugin (#876)
1 parent 7891080 commit 99584a3

File tree

6 files changed

+38
-24
lines changed

6 files changed

+38
-24
lines changed

.mvn/jvm.config

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
-Xmx2048m -Xms1024m -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dgwt.compiler.localWorkers=1
1+
-Xmx2048m -Xms1024m -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dgwt.compiler.localWorkers=1
2+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
3+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
4+
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
5+
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
6+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
7+
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
8+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
9+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
10+
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
11+
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearchTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2021 Red Hat, Inc.
2+
* Copyright (c) 2012-2025 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -44,6 +44,7 @@
4444
import java.util.Collections;
4545
import java.util.List;
4646
import java.util.Map;
47+
import java.util.Optional;
4748
import org.testng.Assert;
4849
import org.testng.annotations.BeforeMethod;
4950
import org.testng.annotations.Test;
@@ -355,12 +356,10 @@ public void shouldConsiderEmptySelectorAsNotPresent() {
355356
}
356357

357358
private static void assertContainsContainer(Collection<Container> containers, String name) {
358-
containers.stream()
359-
.filter(c -> name.equals(c.getName()))
360-
.findAny()
361-
.orElseThrow(
362-
() ->
363-
new AssertionError(
364-
format("Expected a container called %s but didn't find any.", name)));
359+
Optional<Container> containerOptional =
360+
containers.stream().filter(c -> name.equals(c.getName())).findAny();
361+
if (containerOptional.isEmpty()) {
362+
throw new AssertionError(format("Expected a container called %s but didn't find any.", name));
363+
}
365364
}
366365
}

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<com.fasterxml.jackson.version>2.20.0</com.fasterxml.jackson.version>
5353
<com.github.kirviq.dumbster.version>1.7.1</com.github.kirviq.dumbster.version>
5454
<com.google.code.guice.version>5.0.1</com.google.code.guice.version>
55-
<com.google.errorprone>2.3.4</com.google.errorprone>
55+
<com.google.errorprone>2.42.0</com.google.errorprone>
5656
<com.google.guava.version>32.1.2-jre</com.google.guava.version>
5757
<com.google.http-client.version>2.0.2</com.google.http-client.version>
5858
<com.google.oauth-client.version>1.34.1</com.google.oauth-client.version>
@@ -2035,7 +2035,8 @@
20352035
<release>${java.target.version}</release>
20362036
<compilerArgs>
20372037
<arg>-XDcompilePolicy=simple</arg>
2038-
<!-- <arg>-Xplugin:ErrorProne</arg>-->
2038+
<arg>--should-stop=ifError=FLOW</arg>
2039+
<arg>-Xplugin:ErrorProne</arg>
20392040
</compilerArgs>
20402041
<annotationProcessorPaths>
20412042
<path>

wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/jpa/JpaFactoryDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public Page<FactoryImpl> getByAttributes(
101101
int maxItems, int skipCount, List<Pair<String, String>> attributes) throws ServerException {
102102
checkArgument(maxItems >= 0, "The number of items to return can't be negative.");
103103
checkArgument(
104-
skipCount >= 0 && skipCount <= Integer.MAX_VALUE,
104+
skipCount >= 0,
105105
"The number of items to skip can't be negative or greater than " + Integer.MAX_VALUE);
106106
try {
107107
LOG.debug(

wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/impl/SourceProjectParametersValidatorTest.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2018 Red Hat, Inc.
2+
* Copyright (c) 2012-2025 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -11,6 +11,7 @@
1111
*/
1212
package org.eclipse.che.api.factory.server.impl;
1313

14+
import com.google.common.collect.ImmutableMap;
1415
import java.util.HashMap;
1516
import org.eclipse.che.api.core.ConflictException;
1617
import org.eclipse.che.api.core.factory.FactoryParameter;
@@ -34,15 +35,18 @@ public void setUp() throws Exception {
3435
.withLocation("location")
3536
.withType("git")
3637
.withParameters(
37-
new HashMap<String, String>() {
38-
{
39-
put("branch", "master");
40-
put("commitId", "123456");
41-
put("keepVcs", "true");
42-
put("fetch", "12345");
43-
put("keepDir", "/src");
44-
}
45-
});
38+
new HashMap<>(
39+
ImmutableMap.of(
40+
"branch",
41+
"master",
42+
"commitId",
43+
"123456",
44+
"keepVcs",
45+
"true",
46+
"fetch",
47+
"12345",
48+
"keepDir",
49+
"/src")));
4650
}
4751

4852
@Test

wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/devfile/ComponentImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,8 @@ public boolean equals(Object o) {
480480
return false;
481481
}
482482
ComponentImpl component = (ComponentImpl) o;
483-
return getMountSources() == component.getMountSources()
484-
&& getAutomountWorkspaceSecrets() == component.getAutomountWorkspaceSecrets()
483+
return Objects.equals(getMountSources(), component.getMountSources())
484+
&& Objects.equals(getAutomountWorkspaceSecrets(), component.getAutomountWorkspaceSecrets())
485485
&& Objects.equals(generatedId, component.generatedId)
486486
&& Objects.equals(alias, component.alias)
487487
&& Objects.equals(type, component.type)

0 commit comments

Comments
 (0)