Skip to content

Commit 929360d

Browse files
nedtwiggnedtwigg
committed
Blowdryer-ed spotless.
1 parent e611df9 commit 929360d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+180
-211
lines changed

‎build.gradle‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ apply plugin: 'java-library'
1313
apply from: 干.file('base/java8.gradle')
1414
apply from: 干.file('base/osgi.gradle')
1515
apply from: 干.file('spotless/freshmark.gradle')
16+
apply from: 干.file('spotless/java.gradle')
1617

1718
dependencies {
1819
implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
@@ -35,18 +36,6 @@ ext.javadoc_links = [
3536
apply from: 干.file('base/maven.gradle')
3637
apply from: 干.file('base/bintray.gradle')
3738

38-
////////////
39-
// FORMAT //
40-
////////////
41-
group='com.diffplug.durian' // https://discuss.gradle.org/t/separation-between-gradle-classpath-and-the-compiled-classpath/19042/6
42-
spotless {
43-
java {
44-
licenseHeaderFile 'gradle/spotless.license.java' // License header file
45-
importOrderFile 'gradle/spotless.importorder' // An import ordering file, exported from Eclipse
46-
eclipse().configFile 'gradle/spotless.eclipseformat.xml' // XML file dumped out by the Eclipse formatter
47-
}
48-
}
49-
5039
////////////////////////
5140
// SPOTBUGS (someday) //
5241
////////////////////////

‎src/main/java/com/diffplug/common/rx/Breaker.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +15,9 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18-
import java.util.concurrent.atomic.AtomicBoolean;
1918

2019
import io.reactivex.disposables.Disposable;
20+
import java.util.concurrent.atomic.AtomicBoolean;
2121

2222
/**
2323
* A mechanism for "turning off" an existing `RxBox`, much like a a circuit breaker.

‎src/main/java/com/diffplug/common/rx/CasBox.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,10 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18-
import java.util.function.Function;
1918

2019
import com.diffplug.common.base.Box;
2120
import com.diffplug.common.base.Converter;
21+
import java.util.function.Function;
2222

2323
/**
2424
* CasBox is a lock-free and race-condition-free mechanism

‎src/main/java/com/diffplug/common/rx/CasBoxImp.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +15,9 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18-
import java.util.concurrent.atomic.AtomicReference;
1918

2019
import com.diffplug.common.base.Converter;
20+
import java.util.concurrent.atomic.AtomicReference;
2121

2222
class CasBoxImp<T> implements CasBox<T> {
2323
private final AtomicReference<T> ref;

‎src/main/java/com/diffplug/common/rx/Chit.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,9 +15,9 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18-
import java.util.ArrayList;
1918

2019
import io.reactivex.disposables.Disposable;
20+
import java.util.ArrayList;
2121

2222
/**
2323
* Makes it possible to receive a notification when a resource is disposed.

‎src/main/java/com/diffplug/common/rx/ChitImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18+
1819
import java.util.Objects;
1920

2021
class ChitImpl {

‎src/main/java/com/diffplug/common/rx/ForwardingBox.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18+
1819
import com.diffplug.common.base.Box;
1920
import io.reactivex.Observable;
2021

‎src/main/java/com/diffplug/common/rx/GuardedExecutor.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,16 +15,15 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18-
import java.util.Objects;
19-
import java.util.concurrent.CompletionStage;
20-
import java.util.concurrent.Executor;
21-
import java.util.function.Supplier;
2218

2319
import com.diffplug.common.util.concurrent.ListenableFuture;
24-
2520
import io.reactivex.Observable;
2621
import io.reactivex.disposables.Disposable;
2722
import io.reactivex.disposables.Disposables;
23+
import java.util.Objects;
24+
import java.util.concurrent.CompletionStage;
25+
import java.util.concurrent.Executor;
26+
import java.util.function.Supplier;
2827

2928
/**
3029
* GuardedExecutor is an {@link Executor} and {@link RxSubscriber}

‎src/main/java/com/diffplug/common/rx/IObservable.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18+
1819
import io.reactivex.Observable;
1920
import io.reactivex.ObservableSource;
2021
import io.reactivex.Observer;

‎src/main/java/com/diffplug/common/rx/LockBox.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,12 +15,12 @@
1515
*/
1616
package com.diffplug.common.rx;
1717

18-
import java.util.Arrays;
19-
import java.util.function.Function;
20-
import java.util.stream.Collectors;
2118

2219
import com.diffplug.common.base.Box;
2320
import com.diffplug.common.base.Converter;
21+
import java.util.Arrays;
22+
import java.util.function.Function;
23+
import java.util.stream.Collectors;
2424

2525
/**
2626
* LockBox is a box where every call to {@link #modify(Function)}

0 commit comments

Comments
 (0)