Revert "Add support for NotEmpty annotation from Bean Validation"

This reverts commit 96b379d
j-easy · Feb 12, 2019 · 0fe66af · 0fe66af
1 parent 5886032
commit 0fe66af
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 111 deletions.
diff --git a/...rc/main/java/io/github/benas/randombeans/validation/BeanValidationRandomizerRegistry.java b/...rc/main/java/io/github/benas/randombeans/validation/BeanValidationRandomizerRegistry.java
@@ -69,7 +69,6 @@ public void init(EnhancedRandomParameters parameters) {
  annotationHandlers.put(NegativeOrZero.class, new NegativeOrZeroAnnotationHandler(seed));
  annotationHandlers.put(NotBlank.class, new NotBlankAnnotationHandler(seed));
  annotationHandlers.put(Email.class, new EmailAnnotationHandler(seed));
- annotationHandlers.put(NotEmpty.class, new NotEmptyAnnotationHandler(seed));
  }
 
  @Override

diff --git a/...ation/src/main/java/io/github/benas/randombeans/validation/NotEmptyAnnotationHandler.java b/...ation/src/main/java/io/github/benas/randombeans/validation/NotEmptyAnnotationHandler.java
diff --git a/...ion/src/test/java/io/github/benas/randombeans/validation/BeanValidationAnnotatedBean.java b/...ion/src/test/java/io/github/benas/randombeans/validation/BeanValidationAnnotatedBean.java
@@ -26,7 +26,6 @@
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.Date;
 
 class BeanValidationAnnotatedBean {
@@ -101,12 +100,6 @@ class BeanValidationAnnotatedBean {
  @Pattern(regexp="[a-z]{4}")
  private String regexString;
 
- @NotEmpty
- private String notEmptyCharSequence;
-
- @NotEmpty
- private String[] notEmptyArray;
-
  public BeanValidationAnnotatedBean() {
  }
 
@@ -295,22 +288,6 @@ public void setPastOrPresent(Date pastOrPresent) {
  this.pastOrPresent = pastOrPresent;
  }
 
- public String getNotEmptyCharSequence() {
- return notEmptyCharSequence;
- }
-
- public void setNotEmptyCharSequence(String notEmptyCharSequence) {
- this.notEmptyCharSequence = notEmptyCharSequence;
- }
-
- public String[] getNotEmptyArray() {
- return notEmptyArray;
- }
-
- public void setNotEmptyArray(String[] notEmptyArray) {
- this.notEmptyArray = notEmptyArray;
- }
-
  @Override
  public String toString() {
  return "BeanValidationAnnotatedBean{" +
@@ -337,8 +314,6 @@ public String toString() {
  ", unusedString='" + unusedString + '\'' +
  ", briefMessage='" + briefMessage + '\'' +
  ", regexString='" + regexString + '\'' +
- ", notEmptyCharSequence='" + notEmptyCharSequence + '\'' +
- ", notEmptyArray='" + Arrays.toString(notEmptyArray) + '\'' +
  '}';
  }
 }
diff --git a/...c/test/java/io/github/benas/randombeans/validation/BeanValidationMethodAnnotatedBean.java b/...c/test/java/io/github/benas/randombeans/validation/BeanValidationMethodAnnotatedBean.java
@@ -26,7 +26,6 @@
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.Date;
 
 class BeanValidationMethodAnnotatedBean {
@@ -74,10 +73,6 @@ class BeanValidationMethodAnnotatedBean {
 
  private String regexString;
 
- private String notEmptyCharSequence;
-
- private String[] notEmptyArray;
-
  @AssertFalse
  public boolean isUnsupported() {
  return unsupported;
@@ -287,24 +282,6 @@ public void setEmail(String email) {
  this.email = email;
  }
 
- @NotEmpty
- public String getNotEmptyCharSequence() {
- return notEmptyCharSequence;
- }
-
- public void setNotEmptyCharSequence(String notEmptyCharSequence) {
- this.notEmptyCharSequence = notEmptyCharSequence;
- }
-
- @NotEmpty
- public String[] getNotEmptyArray() {
- return notEmptyArray;
- }
-
- public void setNotEmptyArray(String[] notEmptyArray) {
- this.notEmptyArray = notEmptyArray;
- }
-
  @Override
  public String toString() {
  return "BeanValidationMethodAnnotatedBean{" +
@@ -331,8 +308,6 @@ public String toString() {
  ", unusedString='" + unusedString + '\'' +
  ", briefMessage='" + briefMessage + '\'' +
  ", regexString='" + regexString + '\'' +
- ", notEmptyCharSequence='" + notEmptyCharSequence + '\'' +
- ", notEmptyArray='" + Arrays.toString(notEmptyArray) + '\'' +
  '}';
  }
 }
diff --git a/...s-validation/src/test/java/io/github/benas/randombeans/validation/BeanValidationTest.java b/...s-validation/src/test/java/io/github/benas/randombeans/validation/BeanValidationTest.java
@@ -105,10 +105,6 @@ public void generatedValuesShouldBeValidAccordingToValidationConstraints() {
  assertThat(bean.getBriefMessage().length()).isBetween(2, 10);// @Size(min=2, max=10) String briefMessage;
 
  assertThat(bean.getRegexString()).matches("[a-z]{4}");
-
- assertThat(bean.getNotEmptyCharSequence()).isNotBlank(); // @NotEmpty String notEmptyString
-
- assertThat(bean.getNotEmptyArray()).isNotEmpty();// @NotEmpty String notEmptyArray
  }
 
  @Test
@@ -165,10 +161,6 @@ public void generatedValuesShouldBeValidAccordingToValidationConstraintsOnMethod
  assertThat(bean.getBriefMessage().length()).isBetween(2, 10);// @Size(min=2, max=10) String briefMessage;
 
  assertThat(bean.getRegexString()).matches("[a-z]{4}");
-
- assertThat(bean.getNotEmptyCharSequence()).isNotBlank(); // @NotEmpty String notEmptyString
-
- assertThat(bean.getNotEmptyArray()).isNotEmpty();// @NotEmpty String notEmptyArray
  }
 
  @Test
@@ -203,8 +195,6 @@ public void shouldGenerateTheSameValueForTheSameSeed() {
  assertThat(bean.getNegativeOrZero()).isEqualTo(-2055951746);
  assertThat(bean.getEmail()).isEqualTo("celine.schoen@hotmail.com");
  assertThat(bean.getNotBlank()).isEqualTo("tg");
- assertThat(bean.getNotEmptyCharSequence()).isNotBlank();
- assertThat(bean.getNotEmptyArray()).isNotEmpty();
  }
 
  @Test