Skip to content

Commit 4002d74

Browse files
JavaSaBrJavaSaBr
committed
Finish 9.5.0
2 parents eb17955 + 3d54a08 commit 4002d74

110 files changed

Lines changed: 4638 additions & 2779 deletions

File tree

Some content is hidden

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

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ repositories {
1616
}
1717
1818
dependencies {
19-
compile 'com.spaceshift:rlib.common:9.4.0'
20-
compile 'com.spaceshift:rlib.fx:9.4.0'
21-
compile 'com.spaceshift:rlib.network:9.4.0'
22-
compile 'com.spaceshift:rlib.mail:9.4.0'
23-
compile 'com.spaceshift:rlib.testcontainers:9.4.0'
19+
compile 'com.spaceshift:rlib.common:9.5.0'
20+
compile 'com.spaceshift:rlib.fx:9.5.0'
21+
compile 'com.spaceshift:rlib.network:9.5.0'
22+
compile 'com.spaceshift:rlib.mail:9.5.0'
23+
compile 'com.spaceshift:rlib.testcontainers:9.5.0'
2424
}
2525
```
2626

@@ -41,27 +41,27 @@ dependencies {
4141
<dependency>
4242
<groupId>com.spaceshift</groupId>
4343
<artifactId>rlib.common</artifactId>
44-
<version>9.3.0</version>
44+
<version>9.5.0</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.spaceshift</groupId>
4848
<artifactId>rlib.fx</artifactId>
49-
<version>9.3.0</version>
49+
<version>9.5.0</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.spaceshift</groupId>
5353
<artifactId>rlib.network</artifactId>
54-
<version>9.3.0</version>
54+
<version>9.5.0</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.spaceshift</groupId>
5858
<artifactId>rlib.mail</artifactId>
59-
<version>9.3.0</version>
59+
<version>9.5.0</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.spaceshift</groupId>
6363
<artifactId>rlib.testcontainers</artifactId>
64-
<version>9.3.0</version>
64+
<version>9.5.0</version>
6565
</dependency>
6666

6767
```

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
}
1010

11-
rootProject.version = '9.4.0'
11+
rootProject.version = '9.5.0'
1212
group = 'com.spaceshift'
1313

1414
allprojects {
@@ -68,16 +68,16 @@ allprojects {
6868

6969
task sourcesJar(type: Jar, dependsOn: classes) {
7070
afterEvaluate {
71-
archiveClassifier = 'sources'
72-
archiveBaseName = jar.getArchiveBaseName()
71+
getArchiveClassifier().set("sources")
72+
getArchiveBaseName().set(jar.getArchiveBaseName())
7373
from sourceSets.main.allSource
7474
}
7575
}
7676

7777
task javadocJar(type: Jar, dependsOn: javadoc) {
7878
afterEvaluate {
79-
archiveClassifier = 'javadoc'
80-
archiveBaseName = jar.getArchiveBaseName()
79+
getArchiveClassifier().set("javadoc")
80+
getArchiveBaseName().set(jar.getArchiveBaseName())
8181
from sourceSets.main.allSource
8282
}
8383
}
@@ -125,7 +125,7 @@ allprojects {
125125
}
126126

127127
task testJar(type: Jar) {
128-
archiveClassifier = "test"
128+
getArchiveClassifier().set("test")
129129
from sourceSets.test.output
130130
}
131131

@@ -139,6 +139,6 @@ allprojects {
139139
}
140140

141141
wrapper {
142-
gradleVersion = '5.5.1'
142+
gradleVersion = '6.0'
143143
distributionType = Wrapper.DistributionType.ALL
144144
}

‎rlib-common/src/main/java/com/ss/rlib/common/concurrent/deadlock/DeadLockDetector.java‎

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.ss.rlib.common.util.array.Array;
77
import com.ss.rlib.common.util.array.ArrayFactory;
88
import com.ss.rlib.common.util.array.ConcurrentArray;
9+
import lombok.Getter;
910
import org.jetbrains.annotations.NotNull;
1011
import org.jetbrains.annotations.Nullable;
1112

@@ -29,38 +30,29 @@ public class DeadLockDetector implements Runnable {
2930
/**
3031
* The list of listeners.
3132
*/
32-
@NotNull
33-
private final ConcurrentArray<DeadLockListener> listeners;
33+
private final @Getter @NotNull ConcurrentArray<DeadLockListener> listeners;
3434

3535
/**
3636
* The bean with information about threads.
3737
*/
38-
@NotNull
39-
private final ThreadMXBean mxThread;
38+
private final @NotNull ThreadMXBean mxThread;
4039

4140
/**
4241
* The scheduler.
4342
*/
44-
@NotNull
45-
private final ScheduledExecutorService executorService;
43+
private final @NotNull ScheduledExecutorService executorService;
4644

4745
/**
4846
* The reference to a task.
4947
*/
50-
@Nullable
51-
private volatile ScheduledFuture<?> schedule;
48+
private volatile @Getter @Nullable ScheduledFuture<?> schedule;
5249

5350
/**
5451
* The checking interval.
5552
*/
5653
private final int interval;
5754

58-
/**
59-
* Instantiates a new Dead lock detector.
60-
*
61-
* @param interval the checking interval.
62-
*/
63-
public DeadLockDetector(final int interval) {
55+
public DeadLockDetector(int interval) {
6456

6557
if (interval < 1) {
6658
throw new IllegalArgumentException("negative interval.");
@@ -77,54 +69,44 @@ public DeadLockDetector(final int interval) {
7769
*
7870
* @param listener the new listener.
7971
*/
80-
public void addListener(@NotNull final DeadLockListener listener) {
81-
ArrayUtils.runInWriteLock(listeners, listener, Array::add);
82-
}
83-
84-
/**
85-
* Gets listeners.
86-
*
87-
* @return the list of listeners.
88-
*/
89-
@NotNull
90-
public ConcurrentArray<DeadLockListener> getListeners() {
91-
return listeners;
72+
public void addListener(@NotNull DeadLockListener listener) {
73+
listeners.runInWriteLock(listener, Array::add);
9274
}
9375

9476
@Override
9577
public void run() {
9678

97-
final long[] threadIds = mxThread.findDeadlockedThreads();
98-
if (threadIds.length < 1) return;
79+
var threadIds = mxThread.findDeadlockedThreads();
80+
81+
if (threadIds.length < 1) {
82+
return;
83+
}
84+
85+
var listeners = getListeners();
9986

100-
final ConcurrentArray<DeadLockListener> listeners = getListeners();
87+
for (var id : threadIds) {
10188

102-
for (final long id : threadIds) {
89+
var info = mxThread.getThreadInfo(id);
10390

104-
final ThreadInfo info = mxThread.getThreadInfo(id);
105-
if (listeners.isEmpty()) continue;
91+
if (listeners.isEmpty()) {
92+
continue;
93+
}
10694

107-
ArrayUtils.runInReadLock(listeners, info,
108-
(deadLockListeners, threadInfo) ->
109-
deadLockListeners.forEach(threadInfo, DeadLockListener::onDetected));
95+
listeners.runInReadLock(info, (list, inf) -> list.forEachR(inf, DeadLockListener::onDetected));
11096

11197
LOGGER.warning("DeadLock detected! : " + info);
11298
}
11399
}
114100

115-
/**
116-
* @return the reference to a task.
117-
*/
118-
@Nullable
119-
private ScheduledFuture<?> getSchedule() {
120-
return schedule;
121-
}
122-
123101
/**
124102
* Start.
125103
*/
126104
public synchronized void start() {
127-
if (schedule != null) return;
105+
106+
if (schedule != null) {
107+
return;
108+
}
109+
128110
schedule = executorService.scheduleAtFixedRate(this, interval, interval, TimeUnit.MILLISECONDS);
129111
}
130112

@@ -133,8 +115,12 @@ public synchronized void start() {
133115
*/
134116
public synchronized void stop() {
135117

136-
final ScheduledFuture<?> schedule = getSchedule();
137-
if (schedule == null) return;
118+
var schedule = getSchedule();
119+
120+
if (schedule == null) {
121+
return;
122+
}
123+
138124
schedule.cancel(false);
139125

140126
this.schedule = null;

‎rlib-common/src/main/java/com/ss/rlib/common/function/FloatBiObjectConsumer.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.ss.rlib.common.function;
2+
3+
import org.jetbrains.annotations.Nullable;
4+
5+
/**
6+
* @author JavaSaBr
7+
*/
8+
@FunctionalInterface
9+
public interface FloatBiObjectConsumer<S, T> {
10+
11+
void accept(float first, @Nullable S second, @Nullable T third);
12+
}

‎rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiConsumer.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.ss.rlib.common.function;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
5+
import java.util.function.BiConsumer;
6+
7+
@FunctionalInterface
8+
public interface NotNullBiConsumer<T, U> extends BiConsumer<T, U> {
9+
10+
@Override
11+
void accept(@NotNull T first, @NotNull U second);
12+
}

‎rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiFunction.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.ss.rlib.common.function;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
5+
import java.util.function.BiFunction;
6+
7+
@FunctionalInterface
8+
public interface NotNullBiFunction<T, U, R> extends BiFunction<T, U, R> {
9+
10+
@Override
11+
@NotNull R apply(@NotNull T first, @NotNull U second);
12+
}

‎rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiPredicate.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.ss.rlib.common.function;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
5+
import java.util.function.BiPredicate;
6+
7+
@FunctionalInterface
8+
public interface NotNullBiPredicate<T, U> extends BiPredicate<T, U> {
9+
10+
@Override
11+
boolean test(@NotNull T first, @NotNull U second);
12+
}

‎rlib-common/src/main/java/com/ss/rlib/common/function/NotNullConsumer.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.ss.rlib.common.function;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
5+
import java.util.function.Consumer;
6+
7+
@FunctionalInterface
8+
public interface NotNullConsumer<T> extends Consumer<T> {
9+
10+
@Override
11+
void accept(@NotNull T object);
12+
}

‎rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFloatBiObjectConsumer.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.ss.rlib.common.function;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
5+
/**
6+
* @author JavaSaBr
7+
*/
8+
@FunctionalInterface
9+
public interface NotNullFloatBiObjectConsumer<S, T> extends FloatBiObjectConsumer<S, T> {
10+
11+
@Override
12+
void accept(float first, @NotNull S second, @NotNull T third);
13+
}

‎rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunction.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.ss.rlib.common.function;
2+
3+
import org.jetbrains.annotations.NotNull;
4+
5+
import java.util.function.Function;
6+
7+
@FunctionalInterface
8+
public interface NotNullFunction<T, R> extends Function<T, R> {
9+
10+
@Override
11+
@NotNull R apply(@NotNull T object);
12+
}

0 commit comments

Comments
 (0)