merged master branch

src/main/java/teetime/framework/pipe/PipeFactoryLoader.java

@@ -52,7 +52,7 @@ public class PipeFactoryLoader {
 		return pipeFactories;
 	}
 
-	public static List<IPipeFactory> loadPipefactoriesFromClasspath(final String configFileName) {
+	public static List<IPipeFactory> loadPipeFactoriesFromClasspath(final String configFileName) {
 
 		List<URL> files = null;
 

src/main/java/teetime/framework/pipe/PipeFactoryRegistry.java

@@ -48,7 +48,7 @@ public final class PipeFactoryRegistry {
 	public static PipeFactoryRegistry INSTANCE = new PipeFactoryRegistry("pipe-factories.conf");
 
 	private PipeFactoryRegistry(final String configFileName) {
-		List<IPipeFactory> pipeFactories = PipeFactoryLoader.loadPipefactoriesFromClasspath(configFileName);
+		List<IPipeFactory> pipeFactories = PipeFactoryLoader.loadPipeFactoriesFromClasspath(configFileName);
 		for (IPipeFactory pipeFactory : pipeFactories) {
 			this.register(pipeFactory);
 		}

src/test/java/teetime/framework/FileSearcherTest.java

@@ -37,13 +37,13 @@ public class FileSearcherTest {
 
 	@Test
 	public void emptyConfig() throws IOException {
-		List<IPipeFactory> list = PipeFactoryLoader.loadPipefactoriesFromClasspath("data/empty-test.conf");
+		List<IPipeFactory> list = PipeFactoryLoader.loadPipeFactoriesFromClasspath("data/empty-test.conf");
 		Assert.assertEquals(true, list.isEmpty());
 	}
 
 	@Test
 	public void singleConfig() throws IOException {
-		List<IPipeFactory> list = PipeFactoryLoader.loadPipefactoriesFromClasspath("pipe-factories.conf");
+		List<IPipeFactory> list = PipeFactoryLoader.loadPipeFactoriesFromClasspath("pipe-factories.conf");
 		int lines = this.countLines(new File("conf/pipe-factories.conf"));
 		Assert.assertEquals(lines, list.size());
 	}