Skip to content

Commit

Permalink
DATACMNS-937 - Fixed spelling of Javaslang related code.
Browse files Browse the repository at this point in the history
Using a lower case "s" now.
  • Loading branch information
odrotbohm committed Nov 21, 2016
1 parent cde3404 commit 34002d8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ public abstract class QueryExecutionConverters {
}

if (JAVASLANG_PRESENT) {
WRAPPER_TYPES.add(NullableWrapperToJavaSlangOptionConverter.getWrapperType());
UNWRAPPERS.add(JavaSlangOptionUnwrapper.INSTANCE);
WRAPPER_TYPES.add(NullableWrapperToJavaslangOptionConverter.getWrapperType());
UNWRAPPERS.add(JavaslangOptionUnwrapper.INSTANCE);
}
}

Expand Down Expand Up @@ -145,7 +145,7 @@ public static void registerConvertersIn(ConfigurableConversionService conversion
}

if (JAVASLANG_PRESENT) {
conversionService.addConverter(new NullableWrapperToJavaSlangOptionConverter(conversionService));
conversionService.addConverter(new NullableWrapperToJavaslangOptionConverter(conversionService));
}

conversionService.addConverter(new NullableWrapperToFutureConverter(conversionService));
Expand Down Expand Up @@ -392,7 +392,7 @@ public static Class<?> getWrapperType() {
* @author Oliver Gierke
* @since 1.13
*/
private static class NullableWrapperToJavaSlangOptionConverter extends AbstractWrapperTypeConverter {
private static class NullableWrapperToJavaslangOptionConverter extends AbstractWrapperTypeConverter {

private static final Method OF_METHOD;
private static final Method NONE_METHOD;
Expand All @@ -403,11 +403,11 @@ private static class NullableWrapperToJavaSlangOptionConverter extends AbstractW
}

/**
* Creates a new {@link NullableWrapperToJavaSlangOptionConverter} using the given {@link ConversionService}.
* Creates a new {@link NullableWrapperToJavaslangOptionConverter} using the given {@link ConversionService}.
*
* @param conversionService must not be {@literal null}.
*/
public NullableWrapperToJavaSlangOptionConverter(ConversionService conversionService) {
public NullableWrapperToJavaslangOptionConverter(ConversionService conversionService) {
super(conversionService, createEmptyOption(), getWrapperType());
}

Expand Down Expand Up @@ -505,12 +505,12 @@ public Object convert(Object source) {
}

/**
* Converter to unwrap JavaSlang {@link javaslang.control.Option} instances.
* Converter to unwrap Javaslang {@link javaslang.control.Option} instances.
*
* @author Oliver Gierke
* @since 1.13
*/
private static enum JavaSlangOptionUnwrapper implements Converter<Object, Object> {
private static enum JavaslangOptionUnwrapper implements Converter<Object, Object> {

INSTANCE;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public void unwrapsEmptyScalaOption() {
* @see DATACMNS-937
*/
@Test
public void turnsNullIntoJavaSlangOption() {
public void turnsNullIntoJavaslangOption() {
assertThat(conversionService.convert(new NullableWrapper(null), javaslang.control.Option.class),
is((Object) optionNone()));
}
Expand All @@ -180,7 +180,7 @@ public void turnsNullIntoJavaSlangOption() {
* @see DATACMNS-937
*/
@Test
public void wrapsValueIntoJavaSlangOption() {
public void wrapsValueIntoJavaslangOption() {

javaslang.control.Option<?> result = conversionService.convert(new NullableWrapper("string"),
javaslang.control.Option.class);
Expand All @@ -193,15 +193,15 @@ public void wrapsValueIntoJavaSlangOption() {
* @see DATACMNS-937
*/
@Test
public void unwrapsEmptyJavaSlangOption() {
public void unwrapsEmptyJavaslangOption() {
assertThat(QueryExecutionConverters.unwrap(optionNone()), is(nullValue()));
}

/**
* @see DATACMNS-937
*/
@Test
public void unwrapsJavaSlangOption() {
public void unwrapsJavaslangOption() {
assertThat(QueryExecutionConverters.unwrap(option("string")), is((Object) "string"));
}

Expand Down

0 comments on commit 34002d8

Please sign in to comment.