Skip to content

Commit 65aa03f

Browse files
dk2kschauder
authored andcommitted
Minor changes based on FindBugs findings.
Original pull request #2324
1 parent 08bcf55 commit 65aa03f

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> fr
160160
PathNode node = currentNode.add(attribute.getName(), attributeValue);
161161
if (node.spansCycle()) {
162162
throw new InvalidDataAccessApiUsageException(
163-
String.format("Path '%s' from root %s must not span a cyclic property reference!\r\n%s", currentPath,
163+
String.format("Path '%s' from root %s must not span a cyclic property reference!%n%s", currentPath,
164164
ClassUtils.getShortName(probeType), node));
165165
}
166166

src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java

+1
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ private boolean detectUpdatability() {
333333
continue;
334334
}
335335

336+
// may cause NullPointerException if the returned value is null
336337
return (boolean) AnnotationUtils.getValue(annotation, "updatable");
337338
}
338339

src/main/java/org/springframework/data/jpa/repository/query/StringQuery.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@ private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(St
266266
String expression = spelExtractor.getParameter(parameterName == null ? parameterIndexString : parameterName);
267267
String replacement = null;
268268

269-
Assert.isTrue(parameterIndexString != null || parameterName != null, () -> String.format("We need either a name or an index! Offending query string: %s", query));
270-
271269
expressionParameterIndex++;
272270
if ("".equals(parameterIndexString)) {
273271

@@ -293,7 +291,7 @@ private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(St
293291
} else {
294292
checkAndRegister(new LikeParameterBinding(parameterName, likeType, expression), bindings);
295293

296-
replacement = expression != null ? ":" + parameterName : matcher.group(5);
294+
replacement = ":" + parameterName;
297295
}
298296

299297
break;

0 commit comments

Comments
 (0)