Merge pull request EnterpriseQualityCoding#271 from cameronxm/master

FindBugs fix; Windows build fix.
hatzav-ox · Jan 7, 2017 · 4590711 · 4590711
2 parents 6880465 + c386ab8
commit 4590711
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 50 deletions.
diff --git a/...ouscompany/business/java/fizzbuzz/packagenamingpackage/impl/ApplicationContextHolder.java b/...ouscompany/business/java/fizzbuzz/packagenamingpackage/impl/ApplicationContextHolder.java
@@ -10,12 +10,23 @@ public class ApplicationContextHolder implements ApplicationContextAware {
 
 	private static ApplicationContext applicationContext;
 
+	private static class ApplicationContextReferenceUpdater {
+		void updateApplicationContextReference(final ApplicationContext applicationContext) {
+			ApplicationContextHolder.applicationContext = applicationContext;
+		}
+	}
+
+	private static class ApplicationContextReferenceUpdaterHolder {
+		static ApplicationContextReferenceUpdater INSTANCE = new ApplicationContextReferenceUpdater();
+	}
+
 	private ApplicationContextHolder() {
 		super();
 	}
 
+	@Override
 	public void setApplicationContext(final ApplicationContext applicationContext) throws BeansException {
-		ApplicationContextHolder.applicationContext = applicationContext;
+		ApplicationContextReferenceUpdaterHolder.INSTANCE.updateApplicationContextReference(applicationContext);
 	}
 
 	public static ApplicationContext getApplicationContext() {

diff --git a/...seriouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/BuzzPrinter.java b/...seriouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/BuzzPrinter.java
@@ -4,8 +4,6 @@
 import org.springframework.stereotype.Service;
 
 import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.factories.SystemOutFizzBuzzOutputStrategyFactory;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.strategies.adapters.FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.stringreturners.BuzzStringReturner;
 
 @Service
 public class BuzzPrinter {
@@ -18,13 +16,4 @@ public BuzzPrinter(final SystemOutFizzBuzzOutputStrategyFactory _systemOutFizzBu
 		this._systemOutFizzBuzzOutputStrategyFactory = _systemOutFizzBuzzOutputStrategyFactory;
 	}
 
-	public void printBuzz() {
-		final BuzzStringReturner myBuzzStringReturner = new BuzzStringReturner();
-		final FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter myOutputAdapter =
-				new FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter(
-						this._systemOutFizzBuzzOutputStrategyFactory.createOutputStrategy());
-
-		myOutputAdapter.output(myBuzzStringReturner.getReturnString());
-	}
-
 }
diff --git a/...seriouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/FizzPrinter.java b/...seriouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/FizzPrinter.java
@@ -4,8 +4,6 @@
 import org.springframework.stereotype.Service;
 
 import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.factories.SystemOutFizzBuzzOutputStrategyFactory;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.strategies.adapters.FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.stringreturners.FizzStringReturner;
 
 @Service
 public class FizzPrinter {
@@ -18,13 +16,4 @@ public FizzPrinter(final SystemOutFizzBuzzOutputStrategyFactory _systemOutFizzBu
 		this._systemOutFizzBuzzOutputStrategyFactory = _systemOutFizzBuzzOutputStrategyFactory;
 	}
 
-	public void printFizz() {
-		final FizzStringReturner myFizzStringReturner = new FizzStringReturner();
-		final FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter myOutputAdapter =
-				new FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter(
-						this._systemOutFizzBuzzOutputStrategyFactory.createOutputStrategy());
-
-		myOutputAdapter.output(myFizzStringReturner.getReturnString());
-	}
-
 }
diff --git a/...iouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/IntegerPrinter.java b/...iouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/IntegerPrinter.java
@@ -4,9 +4,6 @@
 import org.springframework.stereotype.Service;
 
 import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.factories.SystemOutFizzBuzzOutputStrategyFactory;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.strategies.adapters.FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.stringreturners.IntegerIntegerStringReturner;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.interfaces.stringreturners.IntegerStringReturner;
 
 @Service
 public class IntegerPrinter {
@@ -19,15 +16,4 @@ public IntegerPrinter(final SystemOutFizzBuzzOutputStrategyFactory _systemOutFiz
 		this._systemOutFizzBuzzOutputStrategyFactory = _systemOutFizzBuzzOutputStrategyFactory;
 	}
 
-	public void printInteger(final int theInteger) {
-		final IntegerStringReturner myIntegerIntegerStringReturner = new IntegerIntegerStringReturner();
-		final String myIntegerString = myIntegerIntegerStringReturner
-			.getIntegerReturnString(theInteger);
-		final FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter myOutputAdapter =
-				new FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter(
-						this._systemOutFizzBuzzOutputStrategyFactory.createOutputStrategy());
-
-		myOutputAdapter.output(myIntegerString);
-	}
-
 }
diff --git a/...iouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/NewLinePrinter.java b/...iouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/NewLinePrinter.java
@@ -4,8 +4,6 @@
 import org.springframework.stereotype.Service;
 
 import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.factories.SystemOutFizzBuzzOutputStrategyFactory;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.strategies.adapters.FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter;
-import com.seriouscompany.business.java.fizzbuzz.packagenamingpackage.impl.stringreturners.NewLineStringReturner;
 
 @Service
 public class NewLinePrinter {
@@ -18,14 +16,4 @@ public NewLinePrinter(final SystemOutFizzBuzzOutputStrategyFactory _systemOutFiz
 		this._systemOutFizzBuzzOutputStrategyFactory = _systemOutFizzBuzzOutputStrategyFactory;
 	}
 
-	public void printNewLine() {
-		final NewLineStringReturner myNewLineStringReturner = new NewLineStringReturner();
-		final String myNewLineString = myNewLineStringReturner.getReturnString();
-		final FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter myOutputAdapter =
-				new FizzBuzzOutputStrategyToFizzBuzzExceptionSafeOutputStrategyAdapter(
-						this._systemOutFizzBuzzOutputStrategyFactory.createOutputStrategy());
-
-		myOutputAdapter.output(myNewLineString);
-	}
-
 }
diff --git a/src/test/java/FizzBuzzTest.java b/src/test/java/FizzBuzzTest.java
@@ -40,7 +40,8 @@ private void doFizzBuzz(final int n, final String s) throws IOException {
 		this.fb.fizzBuzz(n);
 
 		System.out.flush();
-		assertEquals(s, baos.toString());
+		String platformDependentExpectedResult = s.replaceAll("\\n", System.getProperty("line.separator"));
+		assertEquals(platformDependentExpectedResult, baos.toString());
 	}
 
 	@Test