Polishing.

Reduce test class and method visibility. Convert JUnit 4 test to JUnit 5. Reformat code.

Original pull request: #4862
See #4850

Author: mp911de

Diff for: spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java

@@ -196,7 +196,7 @@ public Criteria and(String key) {
 	 */
 	public Criteria is(@Nullable Object value) {
 
-		if (!isValue.equals(NOT_SET)) {
+		if (!NOT_SET.equals(isValue)) {
 			throw new InvalidMongoDbApiUsageException(
 					"Multiple 'is' values declared; You need to use 'and' with multiple criteria");
 		}
@@ -945,11 +945,10 @@ protected Document getSingleCriteriaObject() {
 		Document queryCriteria = new Document();
 
 		if (!NOT_SET.equals(isValue)) {
-			if(document.isEmpty()) {
+			if (document.isEmpty()) {
 				queryCriteria.put(this.key, this.isValue);
-			}
-			else {
-				if(isValue instanceof Pattern || isValue instanceof BsonRegularExpression) {
+			} else {
+				if (isValue instanceof Pattern || isValue instanceof BsonRegularExpression) {
 					document.put("$regex", isValue);
 				} else {
 					document.put("$eq", isValue);

Diff for: spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java

@@ -64,84 +64,84 @@ void beforeEach() {
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllClearWithBitPositions() {
+	void bitsAllClearWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().allClear(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllClearWithNumericBitmask() {
+	void bitsAllClearWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allClear(35)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllClearWithStringBitmask() {
+	void bitsAllClearWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allClear("ID==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllSetWithBitPositions() {
+	void bitsAllSetWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().allSet(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllSetWithNumericBitmask() {
+	void bitsAllSetWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allSet(50)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllSetWithStringBitmask() {
+	void bitsAllSetWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allSet("MC==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnyClearWithBitPositions() {
+	void bitsAnyClearWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().anyClear(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnyClearWithNumericBitmask() {
+	void bitsAnyClearWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anyClear(35)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnyClearWithStringBitmask() {
+	void bitsAnyClearWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anyClear("MC==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnySetWithBitPositions() {
+	void bitsAnySetWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().anySet(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnySetWithNumericBitmask() {
+	void bitsAnySetWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anySet(35)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnySetWithStringBitmask() {
+	void bitsAnySetWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anySet("MC==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);