Skip to content

Commit 8b8e76a

Browse files
gselzerctrueden
gselzer
authored and
ctrueden
committed
Rename StderrLogFactory to LoggerFactory
1 parent 7e9ae81 commit 8b8e76a

9 files changed

Lines changed: 21 additions & 24 deletions

File tree

scijava/scijava-log2/src/main/java/org/scijava/log2/StderrLogFactory.java renamed to scijava/scijava-log2/src/main/java/org/scijava/log2/StderrLoggerFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
* @author Johannes Schindelin
4444
* @author Curtis Rueden
4545
*/
46-
public class StderrLogFactory extends AbstractLoggerFactory {
46+
public class StderrLoggerFactory extends AbstractLoggerFactory {
4747

4848
private final Function<Integer, PrintStream> levelToStream;
4949

50-
public StderrLogFactory() {
50+
public StderrLoggerFactory() {
5151
this.levelToStream = level -> (level <= LogLevel.WARN) ? System.err : System.out;
5252
}
5353

54-
public StderrLogFactory(Function<Integer, PrintStream> levelToStream) {
54+
public StderrLoggerFactory(Function<Integer, PrintStream> levelToStream) {
5555
this.levelToStream = levelToStream;
5656
}
5757

‎scijava/scijava-log2/src/test/java/org/scijava/log2/StderrLogServiceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.junit.Test;
3939

4040
/**
41-
* Tests {@link StderrLogFactory}.
41+
* Tests {@link StderrLoggerFactory}.
4242
*
4343
* @author Johannes Schindelin
4444
* @author Matthias Arzt
@@ -47,7 +47,7 @@ public class StderrLogServiceTest {
4747

4848
@Test
4949
public void testDefaultLevel() {
50-
final Logger log = new StderrLogFactory().create();
50+
final Logger log = new StderrLoggerFactory().create();
5151
int level = log.getLevel();
5252
assertTrue("default level (" + level + //
5353
") is at least INFO(" + WARN + ")", level >= WARN);
@@ -58,7 +58,7 @@ public void testOutputToStream() {
5858
// setup
5959
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
6060
final PrintStream p = new PrintStream(outputStream);
61-
final Logger log = new StderrLogFactory(ignore -> p).create();
61+
final Logger log = new StderrLoggerFactory(ignore -> p).create();
6262

6363
final String text1 = "Hello World!";
6464
final String text2 = "foo bar";

‎scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.scijava.discovery.plugin.PluginBasedDiscoverer;
3939
import org.scijava.discovery.therapi.TherapiDiscoverer;
4040
import org.scijava.log2.Logger;
41-
import org.scijava.log2.StderrLogFactory;
41+
import org.scijava.log2.StderrLoggerFactory;
4242
import org.scijava.ops.api.OpBuilder;
4343
import org.scijava.ops.api.OpEnvironment;
4444
import org.scijava.ops.api.OpHistory;
@@ -97,7 +97,7 @@ public OpHistory history() {
9797

9898
private synchronized void initEnv() {
9999
if (env != null) return;
100-
Logger log = new StderrLogFactory().create();
100+
Logger log = new StderrLoggerFactory().create();
101101
Parser parser = ServiceLoader.load(Parser.class).findFirst().get();
102102
OpHistory history = history();
103103
List<Discoverer> discoverers = new ArrayList<>();

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/AbstractTestEnvironment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.scijava.discovery.Discoverer;
1818
import org.scijava.discovery.StaticDiscoverer;
1919
import org.scijava.log2.Logger;
20-
import org.scijava.log2.StderrLogFactory;
20+
import org.scijava.log2.StderrLoggerFactory;
2121
import org.scijava.ops.api.OpEnvironment;
2222
import org.scijava.ops.api.OpHistory;
2323
import org.scijava.ops.api.OpInfoGenerator;
@@ -57,7 +57,7 @@ protected static List<Class<?>> opContainingClasses() {
5757

5858
@BeforeClass
5959
public static void setUp() {
60-
logger = new StderrLogFactory().create();
60+
logger = new StderrLoggerFactory().create();
6161
types = new DefaultTypeReifier(logger, Discoverer.using(
6262
ServiceLoader::load));
6363
ops = barebonesEnvironment(routines(), opContainingClasses());

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/ServiceLoaderDiscoveryIntegrationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.scijava.discovery.Discoverer;
66
import org.scijava.discovery.Discovery;
77
import org.scijava.log2.Logger;
8-
import org.scijava.log2.StderrLogFactory;
8+
import org.scijava.log2.StderrLoggerFactory;
99
import org.scijava.ops.api.OpInfo;
1010
import org.scijava.ops.api.OpInfoGenerator;
1111
import org.scijava.ops.engine.impl.OpClassBasedClassOpInfoGenerator;
@@ -24,7 +24,7 @@ public void opDiscoveryRegressionIT() {
2424
final List<Discovery<Class<Op>>> discoveries = d.discoveriesOfType(Op.class);
2525
Assert.assertEquals(235, discoveries.size());
2626

27-
final Logger l = new StderrLogFactory().create();
27+
final Logger l = new StderrLoggerFactory().create();
2828
final OpInfoGenerator g = new OpClassBasedClassOpInfoGenerator(l, d);
2929
final List<OpInfo> infos = g.generateInfos();
3030
Assert.assertEquals(235, infos.size());
@@ -36,7 +36,7 @@ public void opCollectionDiscoveryRegressionIT() {
3636
final List<Discovery<Class<OpCollection>>> discoveries = d.discoveriesOfType(
3737
OpCollection.class);
3838
Assert.assertEquals(16, discoveries.size());
39-
final Logger l = new StderrLogFactory().create();
39+
final Logger l = new StderrLoggerFactory().create();
4040
final OpInfoGenerator g = new OpCollectionInfoGenerator(l, d);
4141
final List<OpInfo> infos = g.generateInfos();
4242
Assert.assertEquals(264, infos.size());

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TherapiDiscoveryIntegrationTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
import org.scijava.discovery.Discovery;
77
import org.scijava.discovery.therapi.TherapiDiscoverer;
88
import org.scijava.log2.Logger;
9-
import org.scijava.log2.StderrLogFactory;
9+
import org.scijava.log2.StderrLoggerFactory;
1010
import org.scijava.ops.api.OpInfo;
1111
import org.scijava.ops.api.OpInfoGenerator;
1212
import org.scijava.ops.engine.impl.OpClassBasedClassOpInfoGenerator;
13-
import org.scijava.ops.engine.impl.OpCollectionInfoGenerator;
1413
import org.scijava.ops.spi.Op;
15-
import org.scijava.ops.spi.OpCollection;
1614
import org.scijava.parse2.Parser;
1715

1816
import java.util.List;
@@ -27,7 +25,7 @@ public void opDiscoveryRegressionIT() {
2725
final List<Discovery<Class<Op>>> discoveries = d.discoveriesOfType(Op.class);
2826
Assert.assertEquals(0, discoveries.size());
2927

30-
final Logger l = new StderrLogFactory().create();
28+
final Logger l = new StderrLoggerFactory().create();
3129
final OpInfoGenerator g = new OpClassBasedClassOpInfoGenerator(l, d);
3230
final List<OpInfo> infos = g.generateInfos();
3331
Assert.assertEquals(0, infos.size());

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@
4545
import org.scijava.discovery.StaticDiscoverer;
4646
import org.scijava.function.Producer;
4747
import org.scijava.log2.Logger;
48-
import org.scijava.log2.StderrLogFactory;
48+
import org.scijava.log2.StderrLoggerFactory;
4949
import org.scijava.ops.api.OpEnvironment;
5050
import org.scijava.ops.api.OpHistory;
5151
import org.scijava.ops.api.OpInfoGenerator;
5252
import org.scijava.ops.api.OpInstance;
5353
import org.scijava.ops.api.features.MatchingConditions;
54-
import org.scijava.ops.api.features.MatchingRoutine;
5554
import org.scijava.ops.engine.matcher.impl.OpWrappers;
5655
import org.scijava.ops.engine.matcher.impl.RuntimeSafeMatchingRoutine;
5756
import org.scijava.ops.spi.Op;
@@ -69,7 +68,7 @@ public class OpCachingTest implements OpCollection {
6968

7069
@Before
7170
public void setUp() {
72-
Logger logger = new StderrLogFactory().create();
71+
Logger logger = new StderrLoggerFactory().create();
7372
TypeReifier types = new DefaultTypeReifier(logger, Discoverer.using(
7473
ServiceLoader::load));
7574
OpHistory history = new DefaultOpHistory();

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/TherapiBasedOpTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.scijava.discovery.therapi.TherapiDiscoverer;
1414
import org.scijava.function.Producer;
1515
import org.scijava.log2.Logger;
16-
import org.scijava.log2.StderrLogFactory;
16+
import org.scijava.log2.StderrLoggerFactory;
1717
import org.scijava.ops.api.OpEnvironment;
1818
import org.scijava.ops.api.OpHistory;
1919
import org.scijava.ops.api.OpInfoGenerator;
@@ -34,7 +34,7 @@ public class TherapiBasedOpTest {
3434

3535
@BeforeClass
3636
public static void setUp() {
37-
logger = new StderrLogFactory().create();
37+
logger = new StderrLoggerFactory().create();
3838
types = new DefaultTypeReifier(logger, Discoverer.using(
3939
ServiceLoader::load));
4040
parser = ServiceLoader.load(Parser.class).findFirst().get();

‎scijava/scijava-types/src/test/java/org/scijava/types/DefaultTypeReifierTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.junit.jupiter.api.Test;
4747
import org.scijava.discovery.Discoverer;
4848
import org.scijava.log2.Logger;
49-
import org.scijava.log2.StderrLogFactory;
49+
import org.scijava.log2.StderrLoggerFactory;
5050
import org.scijava.types.ExampleTypes.Bag;
5151
import org.scijava.types.ExampleTypes.BlueThing;
5252
import org.scijava.types.ExampleTypes.RedThing;
@@ -63,7 +63,7 @@ public class DefaultTypeReifierTest {
6363

6464
@BeforeEach
6565
public void setUp() {
66-
Logger log = new StderrLogFactory().create();
66+
Logger log = new StderrLoggerFactory().create();
6767
Discoverer serviceLoaderDiscoverer = Discoverer.using(ServiceLoader::load);
6868
types = new DefaultTypeReifier(log, serviceLoaderDiscoverer);
6969
}

0 commit comments

Comments
 (0)