From 74d907bbce3f55d9b8ef268a89486fef217664d8 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Wed, 10 Feb 2021 15:12:28 +1300 Subject: [PATCH] Refactor kotlin querybean generator ProcessingContext extract asElement() method --- .../querybean/generator/ProcessingContext.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 5580c3b09..b01075a53 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -321,19 +321,13 @@ class ProcessingContext implements Constants { List typeArguments = declaredType.getTypeArguments(); if (typeArguments.size() == 1) { TypeMirror argType = typeArguments.get(0); - if (argType.getKind() == TypeKind.WILDCARD) { - argType = ((WildcardType) argType).getExtendsBound(); - } - Element argElement = typeUtils.asElement(argType); + Element argElement = asElement(argType); if (isEntityOrEmbedded(argElement)) { return createPropertyTypeAssoc(typeDef(argElement.asType())); } } else if (typeArguments.size() == 2) { TypeMirror argType = typeArguments.get(1); - if (argType.getKind() == TypeKind.WILDCARD) { - argType = ((WildcardType) argType).getExtendsBound(); - } - Element argElement = typeUtils.asElement(argType); + Element argElement = asElement(argType); if (isEntityOrEmbedded(argElement)) { return createPropertyTypeAssoc(typeDef(argElement.asType())); } @@ -347,6 +341,13 @@ class ProcessingContext implements Constants { } } + private Element asElement(TypeMirror argType) { + if (argType.getKind() == TypeKind.WILDCARD) { + argType = ((WildcardType) argType).getExtendsBound(); + } + return typeUtils.asElement(argType); + } + private boolean typeInstanceOf(final TypeMirror typeMirror, final CharSequence desiredInterface) { TypeElement typeElement = (TypeElement) typeUtils.asElement(typeMirror); if (typeElement == null || typeElement.getQualifiedName().contentEquals("java.lang.Object")) {