Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FindBugs fix; Windows build fix. #271

Merged
merged 6 commits into from
Jan 7, 2017
Merged

FindBugs fix; Windows build fix. #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
662e33e
Fix FindBugs warning in ApplicationContextHolder.
cameronxm Oct 19, 2016
f24a74b
Workaround for failing tests on Windows. TODO: Raise ticket to make
cameronxm Oct 19, 2016
628d928
Workaround for failing tests on Windows. TODO: Raise ticket to make
cameronxm Oct 19, 2016
8cb4964
Commit.
cameronxm Oct 19, 2016
c766e57
Fix whitespace per PR review comments.
cameronxm Oct 20, 2016
c386ab8
Increase code coverage (now 91%).
cameronxm Oct 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...ouscompany/business/java/fizzbuzz/packagenamingpackage/impl/ApplicationContextHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
11 changes: 0 additions & 11 deletions ...seriouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/BuzzPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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());
}

}
11 changes: 0 additions & 11 deletions ...seriouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/FizzPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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());
}

}
14 changes: 0 additions & 14 deletions ...iouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/IntegerPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}

}
12 changes: 0 additions & 12 deletions ...iouscompany/business/java/fizzbuzz/packagenamingpackage/impl/printers/NewLinePrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}

}
3 changes: 2 additions & 1 deletion src/test/java/FizzBuzzTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down