Skip to content

Commit 0a603ef

Browse files
committed
Renames newInstance to getInstance
1 parent dd18e90 commit 0a603ef

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

log4j-converter-config/src/main/java/org/apache/logging/converter/config/ConfigurationConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public interface ConfigurationConverter {
3030
* A default implementation of {@link ConfigurationConverter} that uses {@link java.util.ServiceLoader} to load additional formats.
3131
* @see org.apache.logging.converter.config.spi.ConfigurationMapper
3232
*/
33-
static ConfigurationConverter newInstance() {
34-
return new DefaultConfigurationConverter();
33+
static ConfigurationConverter getInstance() {
34+
return DefaultConfigurationConverter.INSTANCE;
3535
}
3636

3737
/**

log4j-converter-config/src/main/java/org/apache/logging/converter/config/internal/DefaultConfigurationConverter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@
4848
value = ConfigurationMapper.class,
4949
cardinality = Cardinality.MULTIPLE,
5050
resolution = Resolution.OPTIONAL)
51-
public class DefaultConfigurationConverter implements ConfigurationConverter {
51+
public final class DefaultConfigurationConverter implements ConfigurationConverter {
52+
53+
public static final ConfigurationConverter INSTANCE = new DefaultConfigurationConverter();
5254

5355
private final Map<String, ConfigurationParser> parsers = new HashMap<>();
5456
private final Map<String, ConfigurationWriter> writers = new HashMap<>();
5557

56-
public DefaultConfigurationConverter() {
58+
private DefaultConfigurationConverter() {
5759
ServiceLoader.load(ConfigurationParser.class).forEach(parser -> parsers.put(parser.getInputFormat(), parser));
5860
ServiceLoader.load(ConfigurationWriter.class).forEach(writer -> writers.put(writer.getOutputFormat(), writer));
5961
ServiceLoader.load(ConfigurationMapper.class).forEach(mapper -> {

log4j-converter-config/src/test/java/org/apache/logging/converter/config/ConfigurationConverterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ConfigurationConverterTest {
4040

4141
private static final String DEFAULT_FORMAT = "v2:xml";
4242

43-
private final ConfigurationConverter converter = ConfigurationConverter.newInstance();
43+
private final ConfigurationConverter converter = ConfigurationConverter.getInstance();
4444
private final ConfigurationParser parser = new XmlConfigurationMapper();
4545

4646
public static Stream<Arguments> conversionToXml() {

0 commit comments

Comments
 (0)