kemitix/conditional
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove deprecated methods

Browse source
This commit is contained in:
Paul Campbell 2018-08-25 15:25:25 +01:00
parent 0617c8d673
commit 6b4b98cc13
4 changed files with 37 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/net/kemitix/conditional/Condition.java
View file

@ -45,18 +45,6 @@ public interface Condition {
return FalseCondition.FALSE;
}
/**
* Create a new {@code Condition} for the boolean opposite of the clause.
*
* @param clause the condition to test
* @return the Condition
* @deprecated use {@link #not()}
*/
@Deprecated
static Condition whereNot(final boolean clause) {
return where(clause).not();
}
/**
* Checks if the Condition is true or not.
*
@ -98,18 +86,6 @@ public interface Condition {
return Condition.where(isTrue()).and(other::isTrue);
}
/**
* Logically AND combine the current {@code Condition} with boolean opposite of the clause.
*
* @param clause the condition to test
* @return the Condition
* @deprecated use {@link #not()}
*/
@Deprecated
default Condition andNot(final Supplier<Boolean> clause) {
return and(clause).not();
}
/**
* Logically OR combine the current {@code Condition} with the clause.
*
@ -129,18 +105,6 @@ public interface Condition {
return where(isTrue()).or(other::isTrue);
}
/**
* Logically OR combine the current {@code Condition} with the boolean opposite of the clause.
*
* @param clause the condition to test
* @return the Condition
* @deprecated use {@link #not()}
*/
@Deprecated
default Condition orNot(final Supplier<Boolean> clause) {
return or(clause).not();
}
/**
* Perform this response if the {@code Condition} is {@code true}.
*

13
src/main/java/net/kemitix/conditional/Value.java
View file

@ -124,19 +124,6 @@ public interface Value {
return Value.where(clause.isTrue());
}
/**
* Create a new {@link ValueClause} for the boolean opposite of the clause.
*
* @param clause the condition to test
* @param <T> the type of the value
* @return a true or false value clause
* @deprecated use {@link #where(boolean)}.{@link ValueClause#not()}
*/
@Deprecated
static <T> ValueClause<T> whereNot(final boolean clause) {
return Value.<T>where(clause).not();
}
/**
* An intermediate state in determining the final {@link Value}.
*

12
src/test/java/net/kemitix/conditional/ConditionalTest.java
View file

@ -121,7 +121,7 @@ public class ConditionalTest implements WithAssertions {
@Test
public void whereNotFalseThenRuns() {
//when
Condition.whereNot(false)
Condition.where(false).not()
.then(thenResponse);
//then
assertThatTheThenResponseRuns();
@ -130,7 +130,7 @@ public class ConditionalTest implements WithAssertions {
@Test
public void whereNotTrueThenOtherwiseRuns() {
//when
Condition.whereNot(true)
Condition.where(true).not()
.then(thenResponse)
.otherwise(otherwiseResponse);
//then
@ -141,7 +141,7 @@ public class ConditionalTest implements WithAssertions {
public void whereTrueAndNotFalseThenRuns() {
//when
Condition.where(true)
.andNot(() -> false)
.and(() -> false).not()
.then(thenResponse);
//then
assertThatTheThenResponseRuns();
@ -151,7 +151,7 @@ public class ConditionalTest implements WithAssertions {
public void whereTrueAndNotTrueThenOtherwiseRuns() {
//when
Condition.where(true)
.andNot(() -> true)
.and(() -> true).not()
.then(thenResponse)
.otherwise(otherwiseResponse);
//then
@ -162,7 +162,7 @@ public class ConditionalTest implements WithAssertions {
public void whereFalseOrNotFalseThenRuns() {
//when
Condition.where(false)
.orNot(() -> false)
.or(() -> false).not()
.then(thenResponse);
//then
assertThatTheThenResponseRuns();
@ -172,7 +172,7 @@ public class ConditionalTest implements WithAssertions {
public void whereFalseOrNotTrueThenOtherwiseRuns() {
//when
Condition.where(false)
.orNot(() -> true)
.or(() -> true).not()
.then(thenResponse)
.otherwise(otherwiseResponse);
//then

53
src/test/java/net/kemitix/conditional/ValueTest.java
View file

@ -53,7 +53,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereClauseIsTrue() {
//when
val result = Value.<String>where(TRUE_CONDITION).then(() -> TRUE)
final val result = Value.<String>where(TRUE_CONDITION).then(() -> TRUE)
.otherwise(() -> FALSE);
//then
assertThat(result).isEqualTo(TRUE);
@ -62,7 +62,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereClauseIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).then(() -> TRUE)
final val result = Value.<String>where(FALSE_CONDITION).then(() -> TRUE)
.otherwise(() -> FALSE);
//then
assertThat(result).isEqualTo(FALSE);
@ -71,7 +71,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueAndTrueIsTrue() {
//when
val result = Value.<String>where(TRUE_CONDITION).and(() -> true)
final val result = Value.<String>where(TRUE_CONDITION).and(() -> true)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -81,7 +81,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueAndFalseIsFalse() {
//when
val result = Value.<String>where(TRUE_CONDITION).and(() -> false)
final val result = Value.<String>where(TRUE_CONDITION).and(() -> false)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -91,7 +91,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseAndTrueIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).and(() -> true)
final val result = Value.<String>where(FALSE_CONDITION).and(() -> true)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -101,7 +101,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseAndFalseIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).and(() -> false)
final val result = Value.<String>where(FALSE_CONDITION).and(() -> false)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -111,7 +111,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueOrTrueIsTrue() {
//when
val result = Value.<String>where(TRUE_CONDITION).or(() -> true)
final val result = Value.<String>where(TRUE_CONDITION).or(() -> true)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -121,7 +121,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueOrFalseIsTrue() {
//when
val result = Value.<String>where(TRUE_CONDITION).or(() -> false)
final val result = Value.<String>where(TRUE_CONDITION).or(() -> false)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -131,7 +131,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseOrTrueIsTrue() {
//when
val result = Value.<String>where(FALSE_CONDITION).or(() -> true)
final val result = Value.<String>where(FALSE_CONDITION).or(() -> true)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -141,7 +141,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseOrFalseIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).or(() -> false)
final val result = Value.<String>where(FALSE_CONDITION).or(() -> false)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -151,7 +151,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereNotTrueIsFalse() {
//when
val result = Value.<String>whereNot(true).then(() -> TRUE)
final val result = Value.<String>where(true).not().then(() -> TRUE)
.otherwise(() -> FALSE);
//then
assertThat(result).isEqualTo(FALSE);
@ -160,7 +160,7 @@ public class ValueTest implements WithAssertions {
@Test
public void deprecatedValueWhereNotFalseIsTrue() {
//when
val result = Value.<String>whereNot(false).then(() -> TRUE)
final val result = Value.<String>where(false).not().then(() -> TRUE)
.otherwise(() -> FALSE);
//then
assertThat(result).isEqualTo(TRUE);
@ -169,7 +169,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereNotFalseIsTrue() {
//when
val result = Value.<String>where(false).not().then(() -> TRUE)
final val result = Value.<String>where(false).not().then(() -> TRUE)
.otherwise(() -> FALSE);
//then
assertThat(result).isEqualTo(TRUE);
@ -178,7 +178,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueAndNotTrueIsFalse() {
//when
val result = Value.<String>where(TRUE_CONDITION).andNot(() -> true)
final val result = Value.<String>where(TRUE_CONDITION).and(() -> true).not()
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -188,7 +188,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueAndNotFalseIsTrue() {
//when
val result = Value.<String>where(TRUE_CONDITION).andNot(() -> false)
final val result = Value.<String>where(TRUE_CONDITION).and(() -> false).not()
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -198,7 +198,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseAndNotTrueIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).and(() -> true)
final val result = Value.<String>where(FALSE_CONDITION).and(() -> true)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -208,7 +208,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseAndNotFalseIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).and(() -> false)
final val result = Value.<String>where(FALSE_CONDITION).and(() -> false)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -218,7 +218,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueOrNotTrueIsTrue() {
//when
val result = Value.<String>where(true).orNot(() -> true)
final val result = Value.<String>where(true).orNot(() -> true)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -228,7 +228,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereTrueOrNotFalseIsTrue() {
//when
val result = Value.<String>where(TRUE_CONDITION).orNot(() -> false)
final val result = Value.<String>where(TRUE_CONDITION).orNot(() -> false)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -238,7 +238,7 @@ public class ValueTest implements WithAssertions {
@Test
public void deprecatedValueWhereFalseOrNotTrueIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).orNot(() -> true)
final val result = Value.<String>where(FALSE_CONDITION).orNot(() -> true)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -248,7 +248,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseOrNotTrueIsFalse() {
//when
val result = Value.<String>where(FALSE_CONDITION).or(() -> true).not()
final val result = Value.<String>where(FALSE_CONDITION).or(() -> true).not()
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -258,7 +258,7 @@ public class ValueTest implements WithAssertions {
@Test
public void valueWhereFalseOrNotFalseIsTrue() {
//when
val result = Value.<String>where(false).orNot(() -> false)
final val result = Value.<String>where(false).orNot(() -> false)
.then(() -> TRUE)
.otherwise(() -> FALSE);
//then
@ -308,4 +308,13 @@ public class ValueTest implements WithAssertions {
assertThat(result).isEmpty();
assertThat(atomicInteger).hasValue(0);
}
@Test
public void deprecatedAndNot() {
//when
final String result = Value.<String>where(TRUE_CONDITION).andNot(() -> false)
.then(() -> TRUE).otherwise(() -> FALSE);
//then
assertThat(result).isSameAs(TRUE);
}
}