Skip to content

Commit 12d3f2f

Browse files
committed
Finally fix checkstyle.
1 parent 3830fc0 commit 12d3f2f

9 files changed

Lines changed: 15 additions & 17 deletions

File tree

config/checkstyle/checkstyle.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<module name="Checker">
1212
<property name="severity" value="warning"/>
1313
<module name="SuppressionFilter">
14-
<property name="file" value="${project_loc}/config/checkstyle/suppressions.xml"/>
14+
<property name="file" value="${config_loc}/suppressions.xml"/>
1515
<property name="optional" value="false"/>
1616
</module>
1717
<module name="BeforeExecutionExclusionFileFilter">
@@ -28,6 +28,6 @@
2828
</module>
2929
<module name="Header">
3030
<property name="fileExtensions" value="java"/>
31-
<property name="headerFile" value="${project_loc}/config/license/HEADER_JAVA"/>
31+
<property name="headerFile" value="${config_loc}/../license/HEADER_JAVA"/>
3232
</module>
3333
</module>

config/checkstyle/suppressions.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
<suppressions>
88

9-
<suppress checks="MissingJavadocMethod,JavadocMethod" files=".*[\\/]src[\\/]main[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava4[\\/]internal[\\/].*\.java$"/>
10-
<suppress checks="MissingJavadocMethod,JavadocMethod" files=".*[\\/]src[\\/]test[\\/]java[\\/].*\.java$"/>
11-
<suppress checks="MissingJavadocMethod,JavadocMethod" files=".*[\\/]src[\\/]jmh[\\/]java[\\/].*\.java$"/>
12-
<suppress checks="MissingJavadocMethod,JavadocMethod" files=".*Test\.java$"/>
13-
<suppress checks="MissingJavadocMethod,JavadocMethod" files=".*Perf\.java$"/>
9+
<suppress checks="MissingJavadocMethod|JavadocMethod" files=".*[\\/]src[\\/]main[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava4[\\/]internal[\\/].*\.java$"/>
10+
<suppress checks="MissingJavadocMethod|JavadocMethod" files=".*[\\/]src[\\/]test[\\/]java[\\/].*\.java$"/>
11+
<suppress checks="MissingJavadocMethod|JavadocMethod" files=".*[\\/]src[\\/]jmh[\\/]java[\\/].*\.java$"/>
12+
<suppress checks="MissingJavadocMethod|JavadocMethod" files=".*Test\.java$"/>
13+
<suppress checks="MissingJavadocMethod|JavadocMethod" files=".*Perf\.java$"/>
1414

1515
</suppressions>

src/jmh/java/io/reactivex/rxjava4/core/BinaryFlatMapPerf.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import io.reactivex.rxjava4.functions.Function;
2424

25-
@SuppressWarnings("exports")
25+
@SuppressWarnings("exports")
2626
@BenchmarkMode(Mode.Throughput)
2727
@Warmup(iterations = 5)
2828
@Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)

src/main/java/io/reactivex/rxjava4/core/Flowable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20863,7 +20863,7 @@ public final Stream<T> blockingStream(int prefetch) {
2086320863
ObjectHelper.verifyPositive(prefetch, "prefetch");
2086420864
return RxJavaPlugins.onAssembly(new FlowableFlatMapStream<>(this, mapper, prefetch));
2086520865
}
20866-
20866+
2086720867
/**
2086820868
* Construct a {@code Flowable} and use the given {@code generator}
2086920869
* to generate items on demand while running on the given {@link ExecutorService}.
@@ -20915,7 +20915,7 @@ public final Stream<T> blockingStream(int prefetch) {
2091520915
}
2091620916

2091720917
/**
20918-
* Returns a {@code Flowable} that turns an upstream item an upstream item into
20918+
* Returns a {@code Flowable} that turns an upstream item an upstream item into
2091920919
* zero or more downstream values by running on the given {@link ExecutorService}.
2092020920
* <p>
2092120921
* <dl>

src/main/java/io/reactivex/rxjava4/internal/virtual/FlowableVirtualCreateExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
4848
executor.submit(parent);
4949
}
5050

51-
static final class ExecutorVirtualCreateSubscription<T> extends AtomicLong
51+
static final class ExecutorVirtualCreateSubscription<T> extends AtomicLong
5252
implements Subscription, Callable<Void>, VirtualEmitter<T> {
5353

5454
private static final long serialVersionUID = -6959205135542203083L;

src/main/java/io/reactivex/rxjava4/plugins/RxJavaPlugins.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import java.util.concurrent.*;
1919
import java.util.concurrent.Flow.Subscriber;
2020

21-
import static java.util.concurrent.Flow.*;
22-
2321
import io.reactivex.rxjava4.annotations.*;
2422
import io.reactivex.rxjava4.core.*;
2523
import io.reactivex.rxjava4.exceptions.*;

src/test/java/io/reactivex/rxjava4/tck/BaseTck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public static void before() {
6262
@AfterClass
6363
public static void after() {
6464
service.shutdown();
65-
}
66-
65+
}
66+
6767
/**
6868
* Creates an Iterable with the specified number of elements or an infinite one if
6969
* {@code elements >} {@link Integer#MAX_VALUE}.

src/test/java/io/reactivex/rxjava4/validators/JavadocWording.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ static void aOrAn(StringBuilder e, RxMethod m, String wrongPre, String word, Str
11071107
}
11081108
int nn = javadoc2.indexOf(" ", jj + 2);
11091109
int mm = javadoc2.indexOf("}", jj + 2);
1110-
1110+
11111111
if (nn > mm) {
11121112
nn = mm - 1;
11131113
}

src/test/java/io/reactivex/rxjava4/validators/ParamValidationCheckerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ public void checkParallelFlowable() {
605605
defaultValues.put(Collector.class, Collectors.toList());
606606

607607
defaultValues.put(ExecutorService.class, Executors.newVirtualThreadPerTaskExecutor());
608-
608+
609609
VirtualTransformer<Object, Object> trs = (_, _) -> { };
610610
defaultValues.put(VirtualTransformer.class, trs);
611611

0 commit comments

Comments
 (0)