Merge pull request #8 from kemitix/remove-get-value
Remove getValue() from TypeAlias public API
This commit is contained in:
commit
526f7ab6f2
2 changed files with 49 additions and 11 deletions
|
@ -38,13 +38,20 @@ public abstract class TypeAlias<T> {
|
|||
*/
|
||||
private final T value;
|
||||
|
||||
private final Class<? super T> type;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param value the value
|
||||
* @param type the type of the value
|
||||
*/
|
||||
protected TypeAlias(final T value) {
|
||||
protected TypeAlias(
|
||||
final T value,
|
||||
final Class<? super T> type
|
||||
) {
|
||||
this.value = value;
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -56,25 +63,30 @@ public abstract class TypeAlias<T> {
|
|||
* @return a TypeAlias
|
||||
*/
|
||||
public final <R> R map(final Function<T, R> f) {
|
||||
return f.apply(value);
|
||||
return f.apply(getValue());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return value.hashCode();
|
||||
return getValue().hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public final boolean equals(final Object o) {
|
||||
if (o instanceof TypeAlias) {
|
||||
return value.equals(((TypeAlias) o).value);
|
||||
if (((TypeAlias) o).type.equals(type)) {
|
||||
return ((TypeAlias<T>) o).map(getValue()::equals);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return value.equals(o);
|
||||
return map(o::equals);
|
||||
}
|
||||
|
||||
@Override
|
||||
public final String toString() {
|
||||
return value.toString();
|
||||
return getValue().toString();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -82,7 +94,7 @@ public abstract class TypeAlias<T> {
|
|||
*
|
||||
* @return the value
|
||||
*/
|
||||
public T getValue() {
|
||||
private T getValue() {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@ package net.kemitix.mon;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.function.Function;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
@ -13,10 +14,26 @@ public class TypeAliasTest {
|
|||
//given
|
||||
final String value = "value";
|
||||
//when
|
||||
final TypeAlias<String> typeAlias = new TypeAlias<String>(value) {
|
||||
final TypeAlias<String> typeAlias = givenTypeAlias(value);
|
||||
//then
|
||||
assertThat(typeAlias.<Boolean>map(value::equals)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldCreateATypeAliasWithNestedGenericTypes() {
|
||||
//given
|
||||
final Iterable<String> iterable = Collections.emptyList();
|
||||
//when
|
||||
final TypeAlias<Iterable<String>> typeAlias =
|
||||
new TypeAlias<Iterable<String>>(iterable, Iterable.class) {
|
||||
};
|
||||
//then
|
||||
assertThat(typeAlias.getValue()).isEqualTo(value);
|
||||
assertThat(typeAlias.<Boolean>map(iterable::equals)).isTrue();
|
||||
}
|
||||
|
||||
private TypeAlias<String> givenTypeAlias(final String value) {
|
||||
return new TypeAlias<String>(value, String.class) {
|
||||
};
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -26,7 +43,16 @@ public class TypeAliasTest {
|
|||
//when
|
||||
final AnAlias anAlias = AnAlias.of(value);
|
||||
//then
|
||||
assertThat(anAlias.getValue()).isEqualTo(value);
|
||||
assertThat(anAlias.<Boolean>map(value::equals)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldNotBeEqualWhenValueTypesAreDifferent() {
|
||||
//given
|
||||
final TypeAlias<String> stringTypeAlias = givenTypeAlias("1");
|
||||
final TypeAlias<Integer> integerTypeAlias = new TypeAlias<Integer>(1, Integer.class){};
|
||||
//then
|
||||
assertThat(stringTypeAlias).isNotEqualTo(integerTypeAlias);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -86,7 +112,7 @@ public class TypeAliasTest {
|
|||
* @param value the value
|
||||
*/
|
||||
protected AnAlias(final String value) {
|
||||
super(value);
|
||||
super(value, String.class);
|
||||
}
|
||||
|
||||
protected static AnAlias of(final String value) {
|
||||
|
|
Loading…
Reference in a new issue