Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

whitespace changes

This commit is contained in:
Gavin King 2023-06-26 19:52:56 +02:00
parent bec6cfab12
commit 5141e2b40e
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java
View File

@ -293,7 +293,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
private void addQueryMethods(List<ExecutableElement> queryMethods) { private void addQueryMethods(List<ExecutableElement> queryMethods) {
for ( ExecutableElement method : queryMethods) { for ( ExecutableElement method : queryMethods) {
addQueryMethod(method); addQueryMethod( method );
} }
} }
@ -309,27 +309,27 @@ public class AnnotationMetaEntity extends AnnotationMeta {
addQueryMethod(method, methodName, typeName, null); addQueryMethod(method, methodName, typeName, null);
} }
else { else {
if (isLegalRawResultType(typeName)) { if ( isLegalRawResultType( typeName ) ) {
addQueryMethod(method, methodName, null, typeName); addQueryMethod( method, methodName, null, typeName );
} }
else { else {
// probably a projection // probably a projection
addQueryMethod(method, methodName, typeName, null); addQueryMethod( method, methodName, typeName, null );
} }
} }
} }
else if ( typeArguments.size() == 1 ) { else if ( typeArguments.size() == 1 ) {
final String containerTypeName = declaredType.asElement().toString(); final String containerTypeName = declaredType.asElement().toString();
final String returnTypeName = typeArguments.get(0).toString(); final String returnTypeName = typeArguments.get(0).toString();
if (isLegalGenericResultType(containerTypeName)) { if ( isLegalGenericResultType( containerTypeName ) ) {
addQueryMethod(method, methodName, returnTypeName, containerTypeName); addQueryMethod( method, methodName, returnTypeName, containerTypeName );
} }
else { else {
displayError(method, "incorrect return type '" + containerTypeName + "'"); displayError( method, "incorrect return type '" + containerTypeName + "'" );
} }
} }
else { else {
displayError(method, "incorrect return type '" + declaredType + "'"); displayError( method, "incorrect return type '" + declaredType + "'" );
} }
} }
} }
@ -352,13 +352,13 @@ public class AnnotationMetaEntity extends AnnotationMeta {
String methodName, String methodName,
@Nullable String returnTypeName, @Nullable String returnTypeName,
@Nullable String containerTypeName) { @Nullable String containerTypeName) {
final AnnotationMirror hql = getAnnotationMirror(method, Constants.HQL); final AnnotationMirror hql = getAnnotationMirror( method, Constants.HQL );
if ( hql != null ) { if ( hql != null ) {
addQueryMethod(method, methodName, returnTypeName, containerTypeName, hql, false); addQueryMethod( method, methodName, returnTypeName, containerTypeName, hql, false );
} }
final AnnotationMirror sql = getAnnotationMirror(method, Constants.SQL); final AnnotationMirror sql = getAnnotationMirror( method, Constants.SQL );
if ( sql != null ) { if ( sql != null ) {
addQueryMethod(method, methodName, returnTypeName, containerTypeName, sql, true); addQueryMethod( method, methodName, returnTypeName, containerTypeName, sql, true );
} }
} }
@ -371,16 +371,16 @@ public class AnnotationMetaEntity extends AnnotationMeta {
String containerTypeName, String containerTypeName,
AnnotationMirror mirror, AnnotationMirror mirror,
boolean isNative) { boolean isNative) {
final Object queryString = getAnnotationValue(mirror, "value" ); final Object queryString = getAnnotationValue( mirror, "value" );
if ( queryString instanceof String ) { if ( queryString instanceof String ) {
final List<String> paramNames = final List<String> paramNames =
method.getParameters().stream() method.getParameters().stream()
.map(param -> param.getSimpleName().toString()) .map( param -> param.getSimpleName().toString() )
.collect(toList()); .collect( toList() );
final List<String> paramTypes = final List<String> paramTypes =
method.getParameters().stream() method.getParameters().stream()
.map(param -> param.asType().toString()) .map( param -> param.asType().toString() )
.collect(toList()); .collect( toList() );
final String hql = (String) queryString; final String hql = (String) queryString;
final QueryMethod attribute = final QueryMethod attribute =
new QueryMethod( new QueryMethod(
@ -395,9 +395,9 @@ public class AnnotationMetaEntity extends AnnotationMeta {
); );
putMember( attribute.getPropertyName(), attribute ); putMember( attribute.getPropertyName(), attribute );
checkParameters(method, paramNames, mirror, hql); checkParameters( method, paramNames, mirror, hql );
if (!isNative) { if ( !isNative ) {
checkHqlSyntax(method, mirror, hql); checkHqlSyntax( method, mirror, hql );
} }
} }
} }
@ -406,8 +406,8 @@ public class AnnotationMetaEntity extends AnnotationMeta {
for (int i = 1; i <= paramNames.size(); i++) { for (int i = 1; i <= paramNames.size(); i++) {
final String param = paramNames.get(i-1); final String param = paramNames.get(i-1);
if ( !hql.contains(":" + param) && !hql.contains("?" + i) ) { if ( !hql.contains(":" + param) && !hql.contains("?" + i) ) {
displayError(method, mirror, "missing query parameter for '" + param displayError( method, mirror, "missing query parameter for '" + param
+ "' (no parameter named :" + param + " or ?" + i + ")"); + "' (no parameter named :" + param + " or ?" + i + ")" );
} }
} }
} }
@ -416,8 +416,8 @@ public class AnnotationMetaEntity extends AnnotationMeta {
ANTLRErrorListener errorListener = new ANTLRErrorListener() { ANTLRErrorListener errorListener = new ANTLRErrorListener() {
@Override @Override
public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String message, RecognitionException e) { public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String message, RecognitionException e) {
displayError(method, mirror, "illegal HQL syntax - " displayError( method, mirror, "illegal HQL syntax - "
+ prettifyAntlrError( offendingSymbol, line, charPositionInLine, message, e, queryString, false )); + prettifyAntlrError( offendingSymbol, line, charPositionInLine, message, e, queryString, false ) );
} }
@Override @Override