Skip to content

Commit f07ae2b

Browse files
jarebudevtoddbaert
authored andcommitted
tidy up
Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com>
1 parent 8656c53 commit f07ae2b

File tree

2 files changed

+4
-56
lines changed

2 files changed

+4
-56
lines changed

src/main/java/dev/openfeature/sdk/internal/ConfigurableThreadFactory.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package dev.openfeature.sdk.internal;
22

3-
import java.util.concurrent.Executors;
43
import java.util.concurrent.ThreadFactory;
54
import java.util.concurrent.atomic.AtomicInteger;
65

76
/**
87
* A configurable thread factory for internal use in the SDK.
9-
* Allows daemon or non-daemon threads to be created with a custom name prefix,
10-
* and a delegate ThreadFactory if required.
8+
* Allows daemon or non-daemon threads to be created with a custom name prefix.
119
*/
1210
public final class ConfigurableThreadFactory implements ThreadFactory {
1311

1412
private final AtomicInteger counter = new AtomicInteger();
1513
private final String namePrefix;
16-
private final ThreadFactory delegate;
1714
private final boolean daemon;
1815

1916
/**
@@ -22,7 +19,7 @@ public final class ConfigurableThreadFactory implements ThreadFactory {
2219
* @param namePrefix Prefix used for setting the new thread's name.
2320
*/
2421
public ConfigurableThreadFactory(String namePrefix) {
25-
this(namePrefix, Executors.defaultThreadFactory(), false);
22+
this(namePrefix, false);
2623
}
2724

2825
/**
@@ -32,25 +29,13 @@ public ConfigurableThreadFactory(String namePrefix) {
3229
* @param daemon Whether daemon or non-daemon threads will be created.
3330
*/
3431
public ConfigurableThreadFactory(String namePrefix, boolean daemon) {
35-
this(namePrefix, Executors.defaultThreadFactory(), daemon);
36-
}
37-
38-
/**
39-
* {@link ConfigurableThreadFactory}'s constructor.
40-
*
41-
* @param namePrefix Prefix used for setting the new thread's name.
42-
* @param delegate Delegate ThreadFactory for creating threads.
43-
* @param daemon Whether daemon or non-daemon threads will be created.
44-
*/
45-
public ConfigurableThreadFactory(String namePrefix, ThreadFactory delegate, boolean daemon) {
4632
this.namePrefix = namePrefix;
47-
this.delegate = delegate;
4833
this.daemon = daemon;
4934
}
5035

5136
@Override
5237
public Thread newThread(Runnable runnable) {
53-
final Thread thread = delegate.newThread(runnable);
38+
final Thread thread = new Thread(runnable);
5439
thread.setDaemon(daemon);
5540
thread.setName(namePrefix + "-" + counter.incrementAndGet());
5641
return thread;

src/test/java/dev/openfeature/sdk/internal/ConfigurableThreadFactoryTest.java

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
package dev.openfeature.sdk.internal;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.ArgumentMatchers.eq;
5-
import static org.mockito.Mockito.mock;
6-
import static org.mockito.Mockito.times;
7-
import static org.mockito.Mockito.verify;
8-
import static org.mockito.Mockito.when;
94

10-
import java.util.concurrent.ThreadFactory;
115
import org.junit.jupiter.api.Test;
126

137
class ConfigurableThreadFactoryTest {
148

159
private static final String THREAD_NAME = "testthread";
16-
private final Runnable runnable = new Runnable() {
17-
@Override
18-
public void run() {}
19-
};
10+
private final Runnable runnable = () -> {};
2011

2112
@Test
2213
void verifyNewThreadHasNamePrefix() {
@@ -39,34 +30,6 @@ void verifyNewThreadHasNamePrefixWithIncrement() {
3930
assertThat(threadTwo.getName()).isEqualTo(THREAD_NAME + "-2");
4031
}
4132

42-
@Test
43-
void verifyNewThreadWithDelegateHasNamePrefix() {
44-
45-
var threadFactoryMock = mock(ThreadFactory.class);
46-
var threadMock = mock(Thread.class);
47-
var configurableThreadFactory = new ConfigurableThreadFactory(THREAD_NAME, threadFactoryMock, false);
48-
when(threadFactoryMock.newThread(eq(runnable))).thenReturn(threadMock);
49-
50-
var thread = configurableThreadFactory.newThread(runnable);
51-
52-
verify(threadMock, times(1)).setName(THREAD_NAME + "-1");
53-
verify(threadMock, times(1)).setDaemon(false);
54-
}
55-
56-
@Test
57-
void verifyNewDaemonThreadWithDelegateHasNamePrefix() {
58-
59-
var threadFactoryMock = mock(ThreadFactory.class);
60-
var threadMock = mock(Thread.class);
61-
var configurableThreadFactory = new ConfigurableThreadFactory(THREAD_NAME, threadFactoryMock, true);
62-
when(threadFactoryMock.newThread(eq(runnable))).thenReturn(threadMock);
63-
64-
var thread = configurableThreadFactory.newThread(runnable);
65-
66-
verify(threadMock, times(1)).setName(THREAD_NAME + "-1");
67-
verify(threadMock, times(1)).setDaemon(true);
68-
}
69-
7033
@Test
7134
void verifyNewDaemonThreadHasNamePrefix() {
7235

0 commit comments

Comments
 (0)