assigning ConfigFactory a more specialized meaning - a source of fact…

…ories

src/main/java/com/nhl/launcher/BootstrapModule.java

@@ -10,9 +10,9 @@
 import com.nhl.launcher.command.FailoverHelpCommand;
 import com.nhl.launcher.command.HelpCommand;
 import com.nhl.launcher.config.CliConfigurationSource;
-import com.nhl.launcher.config.ConfigurationFactory;
+import com.nhl.launcher.config.FactoryConfigurationService;
 import com.nhl.launcher.config.ConfigurationSource;
-import com.nhl.launcher.config.YamlConfigurationFactory;
+import com.nhl.launcher.config.YamlFactoryConfigurationService;
 import com.nhl.launcher.env.DefaultEnvironment;
 import com.nhl.launcher.env.Environment;
 import com.nhl.launcher.jackson.DefaultJacksonService;
@@ -38,7 +38,7 @@ public void configure(Binder binder) {
 		binder.bind(Runner.class).to(DefaultRunner.class).in(Singleton.class);
 		binder.bind(Options.class).toProvider(OptionsProvider.class).in(Singleton.class);
 		binder.bind(ConfigurationSource.class).to(CliConfigurationSource.class).in(Singleton.class);
-		binder.bind(ConfigurationFactory.class).to(YamlConfigurationFactory.class);
+		binder.bind(FactoryConfigurationService.class).to(YamlFactoryConfigurationService.class);
 		binder.bind(Environment.class).to(DefaultEnvironment.class);
 
 		binder.bind(Command.class).annotatedWith(DefaultCommand.class).to(FailoverHelpCommand.class)

src/main/java/com/nhl/launcher/config/ConfigurationSource.java

@@ -3,6 +3,10 @@
 import java.io.InputStream;
 import java.util.function.Function;
 
+/**
+ * A facade that presents configuration data as a stream to consumers.
+ * Configuration can be stored in a file, etc.
+ */
 public interface ConfigurationSource {
 
 	<T> T readConfig(Function<InputStream, T> processor);

src/main/java/com/nhl/launcher/config/FactoryConfigurationService.java

@@ -0,0 +1,25 @@
+package com.nhl.launcher.config;
+
+/**
+ * An object that has access to a tree of factories configuration data, and acts
+ * as a factory of custom factories that are initialized from this
+ * configuration.
+ */
+public interface FactoryConfigurationService {
+
+	/**
+	 * Creates and returns a custom factory instance with its state initialized
+	 * based on internal configuration. "prefix" argument defines
+	 * sub-configuration location in the config tree.
+	 * 
+	 * 
+	 * @param type
+	 *            a type of factory to create.
+	 * @param prefix
+	 *            defines sub-configuration location in the config tree. Use
+	 *            empty string to access root config.
+	 * @return a fully initialized factory of tghe specified type.
+	 * 
+	 */
+	<T> T factory(Class<T> type, String prefix);
+}

src/main/java/com/nhl/launcher/config/YamlConfigurationFactory.java → src/main/java/com/nhl/launcher/config/YamlFactoryConfigurationService.java

@@ -12,7 +12,10 @@
 import com.nhl.launcher.env.Environment;
 import com.nhl.launcher.jackson.JacksonService;
 
-public class YamlConfigurationFactory implements ConfigurationFactory {
+/**
+ * {@link FactoryConfigurationService} based on YAML configs.
+ */
+public class YamlFactoryConfigurationService implements FactoryConfigurationService {
 
 	private JsonNode rootNode;
 	private ObjectMapper mapper;
@@ -27,7 +30,7 @@ protected static JsonNode readYaml(InputStream in, ObjectMapper mapper) {
 	}
 
 	@Inject
-	public YamlConfigurationFactory(ConfigurationSource configurationSource, Environment environment,
+	public YamlFactoryConfigurationService(ConfigurationSource configurationSource, Environment environment,
 			JacksonService jacksonService) {
 		this.mapper = jacksonService.newObjectMapper();
 		this.rootNode = configurationSource.readConfig(in -> readYaml(in, mapper));
@@ -36,12 +39,7 @@ public YamlConfigurationFactory(ConfigurationSource configurationSource, Environ
 	}
 
 	@Override
-	public <T> T config(Class<T> type) {
-		return subconfig("", type);
-	}
-
-	@Override
-	public <T> T subconfig(String prefix, Class<T> type) {
+	public <T> T factory(Class<T> type, String prefix) {
 		if (rootNode == null) {
 			throw new IllegalStateException("No configuration data available..");
 		}

src/test/java/com/nhl/launcher/config/YamlConfigurationFactoryStaticsTest.java → src/test/java/com/nhl/launcher/config/YamlFactoryConfigurationServiceStaticsTest.java

@@ -11,15 +11,15 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class YamlConfigurationFactoryStaticsTest {
+public class YamlFactoryConfigurationServiceStaticsTest {
 
 	@Test
 	public void testReadYaml() {
 
 		InputStream in = new ByteArrayInputStream("a: b\nb: c".getBytes());
 		ObjectMapper mapper = new ObjectMapper();
 
-		JsonNode node = YamlConfigurationFactory.readYaml(in, mapper);
+		JsonNode node = YamlFactoryConfigurationService.readYaml(in, mapper);
 		assertNotNull(node);
 
 		assertEquals("b", node.get("a").asText());

src/test/java/com/nhl/launcher/config/YamlConfigurationFactoryTest.java → src/test/java/com/nhl/launcher/config/YamlFactoryConfigurationServiceTest.java

@@ -18,7 +18,7 @@
 import com.nhl.launcher.env.Environment;
 import com.nhl.launcher.jackson.JacksonService;
 
-public class YamlConfigurationFactoryTest {
+public class YamlFactoryConfigurationServiceTest {
 
 	private ConfigurationSource mockConfigSource;
 	private JacksonService mockJacksonService;
@@ -34,7 +34,7 @@ public void before() {
 	}
 
 	@Test
-	public void testConfig() {
+	public void testCreateFactory() {
 
 		when(mockConfigSource.readConfig(any())).thenAnswer(i -> {
 
@@ -45,15 +45,15 @@ public void testConfig() {
 			return processor.apply(in);
 		});
 
-		Bean1 b1 = new YamlConfigurationFactory(mockConfigSource, mockEnvironment, mockJacksonService)
-				.config(Bean1.class);
+		Bean1 b1 = new YamlFactoryConfigurationService(mockConfigSource, mockEnvironment, mockJacksonService)
+				.factory(Bean1.class, "");
 		assertNotNull(b1);
 		assertEquals("SS", b1.getS());
 		assertEquals(55, b1.getI());
 	}
 
 	@Test
-	public void testConfig_Nested() {
+	public void testCreateFactory_Nested() {
 
 		when(mockConfigSource.readConfig(any())).thenAnswer(i -> {
 
@@ -64,16 +64,16 @@ public void testConfig_Nested() {
 			return processor.apply(in);
 		});
 
-		Bean2 b2 = new YamlConfigurationFactory(mockConfigSource, mockEnvironment, mockJacksonService)
-				.config(Bean2.class);
+		Bean2 b2 = new YamlFactoryConfigurationService(mockConfigSource, mockEnvironment, mockJacksonService)
+				.factory(Bean2.class, "");
 		assertNotNull(b2);
 		assertNotNull(b2.getB1());
 		assertEquals("SS", b2.getB1().getS());
 		assertEquals(55, b2.getB1().getI());
 	}
 
 	@Test
-	public void testSubconfig() {
+	public void testCreateFactory_Subconfig() {
 
 		when(mockConfigSource.readConfig(any())).thenAnswer(i -> {
 
@@ -84,15 +84,15 @@ public void testSubconfig() {
 			return processor.apply(in);
 		});
 
-		Bean1 b1 = new YamlConfigurationFactory(mockConfigSource, mockEnvironment, mockJacksonService).subconfig("b1",
-				Bean1.class);
+		Bean1 b1 = new YamlFactoryConfigurationService(mockConfigSource, mockEnvironment, mockJacksonService)
+				.factory(Bean1.class, "b1");
 		assertNotNull(b1);
 		assertEquals("SS", b1.getS());
 		assertEquals(55, b1.getI());
 	}
 
 	@Test
-	public void testSubconfig_MultiLevel() {
+	public void testCreateFactory_Subconfig_MultiLevel() {
 
 		when(mockConfigSource.readConfig(any())).thenAnswer(i -> {
 
@@ -103,15 +103,15 @@ public void testSubconfig_MultiLevel() {
 			return processor.apply(in);
 		});
 
-		Bean1 b1 = new YamlConfigurationFactory(mockConfigSource, mockEnvironment, mockJacksonService)
-				.subconfig("b0.b1", Bean1.class);
+		Bean1 b1 = new YamlFactoryConfigurationService(mockConfigSource, mockEnvironment, mockJacksonService)
+				.factory(Bean1.class, "b0.b1");
 		assertNotNull(b1);
 		assertEquals("SS", b1.getS());
 		assertEquals(55, b1.getI());
 	}
 
 	@Test
-	public void testSubconfig_Missing() {
+	public void testCreateFactory_Subconfig_Missing() {
 
 		when(mockConfigSource.readConfig(any())).thenAnswer(i -> {
 
@@ -122,15 +122,15 @@ public void testSubconfig_Missing() {
 			return processor.apply(in);
 		});
 
-		Bean1 b1 = new YamlConfigurationFactory(mockConfigSource, mockEnvironment, mockJacksonService)
-				.subconfig("no.such.path", Bean1.class);
+		Bean1 b1 = new YamlFactoryConfigurationService(mockConfigSource, mockEnvironment, mockJacksonService)
+				.factory(Bean1.class, "no.such.path");
 		assertNotNull(b1);
 		assertEquals(null, b1.getS());
 		assertEquals(0, b1.getI());
 	}
 
 	@Test
-	public void testConfig_PropSubstitution() {
+	public void testCreateFactory_PropSubstitution() {
 
 		when(mockEnvironment.frameworkProperties()).thenReturn(new HashMap<String, String>() {
 			private static final long serialVersionUID = 1L;
@@ -150,15 +150,15 @@ public void testConfig_PropSubstitution() {
 			return processor.apply(in);
 		});
 
-		Bean1 b1 = new YamlConfigurationFactory(mockConfigSource, mockEnvironment, mockJacksonService)
-				.config(Bean1.class);
+		Bean1 b1 = new YamlFactoryConfigurationService(mockConfigSource, mockEnvironment, mockJacksonService)
+				.factory(Bean1.class, "");
 		assertNotNull(b1);
 		assertEquals("SS", b1.getS());
 		assertEquals(55, b1.getI());
 	}
 
 	@Test
-	public void testConfig_PropSubstitution_Nested() {
+	public void testCreateFactory_PropSubstitution_Nested() {
 
 		when(mockEnvironment.frameworkProperties()).thenReturn(new HashMap<String, String>() {
 			private static final long serialVersionUID = 1L;
@@ -178,8 +178,8 @@ public void testConfig_PropSubstitution_Nested() {
 			return processor.apply(in);
 		});
 
-		Bean1 b1 = new YamlConfigurationFactory(mockConfigSource, mockEnvironment, mockJacksonService).subconfig("b1",
-				Bean1.class);
+		Bean1 b1 = new YamlFactoryConfigurationService(mockConfigSource, mockEnvironment, mockJacksonService)
+				.factory(Bean1.class, "b1");
 		assertNotNull(b1);
 		assertEquals("SS", b1.getS());
 		assertEquals(55, b1.getI());