Skip to content

Commit b57eb85

Browse files
jxblumjxblum
committed
Remove punctuation in Exception messages.
Closes #2566.
1 parent 48790ad commit b57eb85

File tree

77 files changed

+323
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+323
-323
lines changed

‎spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
7777
public EnversRevisionRepositoryImpl(JpaEntityInformation<T, ?> entityInformation,
7878
RevisionEntityInformation revisionEntityInformation, EntityManager entityManager) {
7979

80-
Assert.notNull(revisionEntityInformation, "RevisionEntityInformation must not be null!");
80+
Assert.notNull(revisionEntityInformation, "RevisionEntityInformation must not be null");
8181

8282
this.entityInformation = entityInformation;
8383
this.entityManager = entityManager;
@@ -91,7 +91,7 @@ public Optional<Revision<N, T>> findLastChangeRevision(ID id) {
9191
.setMaxResults(1) //
9292
.getResultList();
9393

94-
Assert.state(singleResult.size() <= 1, "We expect at most one result.");
94+
Assert.state(singleResult.size() <= 1, "We expect at most one result");
9595

9696
if (singleResult.isEmpty()) {
9797
return Optional.empty();
@@ -104,14 +104,14 @@ public Optional<Revision<N, T>> findLastChangeRevision(ID id) {
104104
@SuppressWarnings("unchecked")
105105
public Optional<Revision<N, T>> findRevision(ID id, N revisionNumber) {
106106

107-
Assert.notNull(id, "Identifier must not be null!");
108-
Assert.notNull(revisionNumber, "Revision number must not be null!");
107+
Assert.notNull(id, "Identifier must not be null");
108+
Assert.notNull(revisionNumber, "Revision number must not be null");
109109

110110
List<Object[]> singleResult = (List<Object[]>) createBaseQuery(id) //
111111
.add(AuditEntity.revisionNumber().eq(revisionNumber)) //
112112
.getResultList();
113113

114-
Assert.state(singleResult.size() <= 1, "We expect at most one result.");
114+
Assert.state(singleResult.size() <= 1, "We expect at most one result");
115115

116116
if (singleResult.isEmpty()) {
117117
return Optional.empty();
@@ -185,7 +185,7 @@ static class QueryResult<T> {
185185
Assert.notNull(data, "Data must not be null");
186186
Assert.isTrue( //
187187
data.length == 3, //
188-
() -> String.format("Data must have length three, but has length %d.", data.length));
188+
() -> String.format("Data must have length three, but has length %d", data.length));
189189
Assert.isTrue( //
190190
data[2] instanceof RevisionType, //
191191
() -> String.format("The third array element must be of type Revision type, but is of type %s",

‎spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/ReflectionRevisionEntityInformation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class ReflectionRevisionEntityInformation implements RevisionEntityInform
4040
*/
4141
public ReflectionRevisionEntityInformation(Class<?> revisionEntityClass) {
4242

43-
Assert.notNull(revisionEntityClass, "Revision entity type must not be null!");
43+
Assert.notNull(revisionEntityClass, "Revision entity type must not be null");
4444

4545
AnnotationDetectionFieldCallback fieldCallback = new AnnotationDetectionFieldCallback(RevisionNumber.class);
4646
ReflectionUtils.doWithFields(revisionEntityClass, fieldCallback);

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Examp
9696
public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Example<T> example,
9797
EscapeCharacter escapeCharacter) {
9898

99-
Assert.notNull(root, "Root must not be null!");
100-
Assert.notNull(cb, "CriteriaBuilder must not be null!");
101-
Assert.notNull(example, "Example must not be null!");
99+
Assert.notNull(root, "Root must not be null");
100+
Assert.notNull(cb, "CriteriaBuilder must not be null");
101+
Assert.notNull(example, "Example must not be null");
102102

103103
ExampleMatcher matcher = example.getMatcher();
104104

@@ -167,7 +167,7 @@ static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> fr
167167
PathNode node = currentNode.add(attribute.getName(), attributeValue);
168168
if (node.spansCycle()) {
169169
throw new InvalidDataAccessApiUsageException(
170-
String.format("Path '%s' from root %s must not span a cyclic property reference!%n%s", currentPath,
170+
String.format("Path '%s' from root %s must not span a cyclic property reference%n%s", currentPath,
171171
ClassUtils.getShortName(probeType), node));
172172
}
173173

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/JpaSort.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public static JpaSort of(Direction direction, Path<?, ?>... paths) {
145145
*/
146146
public JpaSort and(@Nullable Direction direction, Attribute<?, ?>... attributes) {
147147

148-
Assert.notNull(attributes, "Attributes must not be null!");
148+
Assert.notNull(attributes, "Attributes must not be null");
149149

150150
return and(direction, paths(attributes));
151151
}
@@ -159,7 +159,7 @@ public JpaSort and(@Nullable Direction direction, Attribute<?, ?>... attributes)
159159
*/
160160
public JpaSort and(@Nullable Direction direction, Path<?, ?>... paths) {
161161

162-
Assert.notNull(paths, "Paths must not be null!");
162+
Assert.notNull(paths, "Paths must not be null");
163163

164164
List<Order> existing = new ArrayList<>();
165165

@@ -179,7 +179,7 @@ public JpaSort and(@Nullable Direction direction, Path<?, ?>... paths) {
179179
*/
180180
public JpaSort andUnsafe(@Nullable Direction direction, String... properties) {
181181

182-
Assert.notEmpty(properties, "Properties must not be empty!");
182+
Assert.notEmpty(properties, "Properties must not be empty");
183183

184184
List<Order> orders = new ArrayList<>();
185185

@@ -202,8 +202,8 @@ public JpaSort andUnsafe(@Nullable Direction direction, String... properties) {
202202
*/
203203
private static Path<?, ?>[] paths(Attribute<?, ?>[] attributes) {
204204

205-
Assert.notNull(attributes, "Attributes must not be null!");
206-
Assert.notEmpty(attributes, "Attributes must not be empty!");
205+
Assert.notNull(attributes, "Attributes must not be null");
206+
Assert.notEmpty(attributes, "Attributes must not be empty");
207207

208208
Path<?, ?>[] paths = new Path[attributes.length];
209209

@@ -233,7 +233,7 @@ private static List<Order> combine(List<Order> orders, @Nullable Direction direc
233233
*/
234234
public static <A extends Attribute<T, S>, T, S> Path<T, S> path(A attribute) {
235235

236-
Assert.notNull(attribute, "Attribute must not be null!");
236+
Assert.notNull(attribute, "Attribute must not be null");
237237
return new Path<>(Collections.singletonList(attribute));
238238
}
239239

@@ -245,7 +245,7 @@ public static <A extends Attribute<T, S>, T, S> Path<T, S> path(A attribute) {
245245
*/
246246
public static <P extends PluralAttribute<T, ?, S>, T, S> Path<T, S> path(P attribute) {
247247

248-
Assert.notNull(attribute, "Attribute must not be null!");
248+
Assert.notNull(attribute, "Attribute must not be null");
249249
return new Path<>(Collections.singletonList(attribute));
250250
}
251251

@@ -268,9 +268,9 @@ public static JpaSort unsafe(String... properties) {
268268
*/
269269
public static JpaSort unsafe(Direction direction, String... properties) {
270270

271-
Assert.notNull(direction, "Direction must not be null!");
272-
Assert.notEmpty(properties, "Properties must not be empty!");
273-
Assert.noNullElements(properties, "Properties must not contain null values!");
271+
Assert.notNull(direction, "Direction must not be null");
272+
Assert.notEmpty(properties, "Properties must not be empty");
273+
Assert.noNullElements(properties, "Properties must not contain null values");
274274

275275
return unsafe(direction, Arrays.asList(properties));
276276
}
@@ -284,7 +284,7 @@ public static JpaSort unsafe(Direction direction, String... properties) {
284284
*/
285285
public static JpaSort unsafe(Direction direction, List<String> properties) {
286286

287-
Assert.notEmpty(properties, "Properties must not be empty!");
287+
Assert.notEmpty(properties, "Properties must not be empty");
288288

289289
List<Order> orders = new ArrayList<>(properties.size());
290290

@@ -330,7 +330,7 @@ public <A extends Attribute<S, U>, U> Path<S, U> dot(A attribute) {
330330

331331
private List<Attribute<?, ?>> add(Attribute<?, ?> attribute) {
332332

333-
Assert.notNull(attribute, "Attribute must not be null!");
333+
Assert.notNull(attribute, "Attribute must not be null");
334334

335335
List<Attribute<?, ?>> newAttributes = new ArrayList<Attribute<?, ?>>(attributes.size() + 1);
336336
newAttributes.addAll(attributes);
@@ -415,8 +415,8 @@ public JpaOrder with(NullHandling nullHandling) {
415415
*/
416416
public Sort withUnsafe(String... properties) {
417417

418-
Assert.notEmpty(properties, "Properties must not be empty!");
419-
Assert.noNullElements(properties, "Properties must not contain null values!");
418+
Assert.notEmpty(properties, "Properties must not be empty");
419+
Assert.noNullElements(properties, "Properties must not contain null values");
420420

421421
List<Order> orders = new ArrayList<>(properties.length);
422422

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
4444
getBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME, beanFactory);
4545
} catch (NoSuchBeanDefinitionException o_O) {
4646
throw new IllegalStateException(
47-
"Invalid auditing setup! Make sure you've used @EnableJpaAuditing or <jpa:auditing /> correctly!", o_O);
47+
"Invalid auditing setup; Make sure you've used @EnableJpaAuditing or <jpa:auditing /> correctly", o_O);
4848
}
4949

5050
for (String beanName : getEntityManagerFactoryBeanNames(beanFactory)) {

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class AuditingEntityListener {
7070
*/
7171
public void setAuditingHandler(ObjectFactory<AuditingHandler> auditingHandler) {
7272

73-
Assert.notNull(auditingHandler, "AuditingHandler must not be null!");
73+
Assert.notNull(auditingHandler, "AuditingHandler must not be null");
7474
this.handler = auditingHandler;
7575
}
7676

@@ -83,7 +83,7 @@ public void setAuditingHandler(ObjectFactory<AuditingHandler> auditingHandler) {
8383
@PrePersist
8484
public void touchForCreate(Object target) {
8585

86-
Assert.notNull(target, "Entity must not be null!");
86+
Assert.notNull(target, "Entity must not be null");
8787

8888
if (handler != null) {
8989

@@ -103,7 +103,7 @@ public void touchForCreate(Object target) {
103103
@PreUpdate
104104
public void touchForUpdate(Object target) {
105105

106-
Assert.notNull(target, "Entity must not be null!");
106+
Assert.notNull(target, "Entity must not be null");
107107

108108
if (handler != null) {
109109

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public class JpaMetamodelMappingContext
5454
*/
5555
public JpaMetamodelMappingContext(Set<Metamodel> models) {
5656

57-
Assert.notNull(models, "JPA metamodel must not be null!");
58-
Assert.notEmpty(models, "JPA metamodel must not be empty!");
57+
Assert.notNull(models, "JPA metamodel must not be null");
58+
Assert.notEmpty(models, "JPA metamodel must not be empty");
5959

6060
this.models = new Metamodels(models);
6161
this.persistenceProvider = PersistenceProvider.fromMetamodel(models.iterator().next());
@@ -137,7 +137,7 @@ public JpaMetamodel getRequiredMetamodel(TypeInformation<?> type) {
137137
JpaMetamodel metamodel = getMetamodel(type);
138138

139139
if (metamodel == null) {
140-
throw new IllegalArgumentException(String.format("Required JpaMetamodel not found for %s!", type));
140+
throw new IllegalArgumentException(String.format("Required JpaMetamodel not found for %s", type));
141141
}
142142

143143
return metamodel;

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class JpaPersistentEntityImpl<T> extends BasicPersistentEntity<T, JpaPersistentP
4141

4242
private static final String INVALID_VERSION_ANNOTATION = "%s is annotated with "
4343
+ org.springframework.data.annotation.Version.class.getName() + " but needs to use "
44-
+ jakarta.persistence.Version.class.getName() + " to trigger optimistic locking correctly!";
44+
+ jakarta.persistence.Version.class.getName() + " to trigger optimistic locking correctly";
4545

4646
private final ProxyIdAccessor proxyIdAccessor;
4747
private final JpaMetamodel metamodel;
@@ -58,7 +58,7 @@ public JpaPersistentEntityImpl(TypeInformation<T> information, ProxyIdAccessor p
5858

5959
super(information, null);
6060

61-
Assert.notNull(proxyIdAccessor, "ProxyIdAccessor must not be null!");
61+
Assert.notNull(proxyIdAccessor, "ProxyIdAccessor must not be null");
6262
this.proxyIdAccessor = proxyIdAccessor;
6363
this.metamodel = metamodel;
6464
}
@@ -113,7 +113,7 @@ private static class JpaProxyAwareIdentifierAccessor extends IdPropertyIdentifie
113113

114114
super(entity, bean);
115115

116-
Assert.notNull(proxyIdAccessor, "Proxy identifier accessor must not be null!");
116+
Assert.notNull(proxyIdAccessor, "Proxy identifier accessor must not be null");
117117

118118
this.proxyIdAccessor = proxyIdAccessor;
119119
this.bean = bean;

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public JpaPersistentPropertyImpl(JpaMetamodel metamodel, Property property,
9999

100100
super(property, owner, simpleTypeHolder);
101101

102-
Assert.notNull(metamodel, "Metamodel must not be null!");
102+
Assert.notNull(metamodel, "Metamodel must not be null");
103103

104104
this.isAssociation = Lazy.of(() -> super.isAssociation() //
105105
|| ASSOCIATION_ANNOTATIONS.stream().anyMatch(this::isAnnotationPresent));

‎spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public static boolean isMetamodelOfType(Metamodel metamodel, String type) {
6161

6262
private static boolean isOfType(Object source, String typeName, @Nullable ClassLoader classLoader) {
6363

64-
Assert.notNull(source, "Source instance must not be null!");
65-
Assert.hasText(typeName, "Target type name must not be null or empty!");
64+
Assert.notNull(source, "Source instance must not be null");
65+
Assert.hasText(typeName, "Target type name must not be null or empty");
6666

6767
try {
6868
return ClassUtils.forName(typeName, classLoader).isInstance(source);

0 commit comments

Comments
 (0)