diff options
Diffstat (limited to 'src/main/java/com/squareup/javapoet')
-rw-r--r-- | src/main/java/com/squareup/javapoet/MethodSpec.java | 12 | ||||
-rw-r--r-- | src/main/java/com/squareup/javapoet/ParameterSpec.java | 21 |
2 files changed, 13 insertions, 20 deletions
diff --git a/src/main/java/com/squareup/javapoet/MethodSpec.java b/src/main/java/com/squareup/javapoet/MethodSpec.java index 2284ef5..67722c7 100644 --- a/src/main/java/com/squareup/javapoet/MethodSpec.java +++ b/src/main/java/com/squareup/javapoet/MethodSpec.java @@ -24,7 +24,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; @@ -233,16 +232,7 @@ public final class MethodSpec { } methodBuilder.returns(TypeName.get(method.getReturnType())); - // Copying parameter annotations from the overridden method can be incorrect so we're - // deliberately dropping them. See https://github.com/square/javapoet/issues/482. - methodBuilder.addParameters(ParameterSpec.parametersOf(method) - .stream() - .map(parameterSpec -> { - ParameterSpec.Builder builder = parameterSpec.toBuilder(); - builder.annotations.clear(); - return builder.build(); - }) - .collect(Collectors.toList())); + methodBuilder.addParameters(ParameterSpec.parametersOf(method)); methodBuilder.varargs(method.isVarArgs()); for (TypeMirror thrownType : method.getThrownTypes()) { diff --git a/src/main/java/com/squareup/javapoet/ParameterSpec.java b/src/main/java/com/squareup/javapoet/ParameterSpec.java index b8f3129..8b2b6ed 100644 --- a/src/main/java/com/squareup/javapoet/ParameterSpec.java +++ b/src/main/java/com/squareup/javapoet/ParameterSpec.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import javax.lang.model.SourceVersion; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; @@ -87,17 +86,12 @@ public final class ParameterSpec { public static ParameterSpec get(VariableElement element) { checkArgument(element.getKind().equals(ElementKind.PARAMETER), "element is not a parameter"); - // Copy over any annotations from element. - List<AnnotationSpec> annotations = element.getAnnotationMirrors() - .stream() - .map((mirror) -> AnnotationSpec.get(mirror)) - .collect(Collectors.toList()); - TypeName type = TypeName.get(element.asType()); String name = element.getSimpleName().toString(); + // Copying parameter annotations can be incorrect so we're deliberately not including them. + // See https://github.com/square/javapoet/issues/482. return ParameterSpec.builder(type, name) .addModifiers(element.getModifiers()) - .addAnnotations(annotations) .build(); } @@ -109,9 +103,18 @@ public final class ParameterSpec { return result; } + private static boolean isValidParameterName(String name) { + // Allow "this" for explicit receiver parameters + // See https://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.1. + if (name.endsWith(".this")) { + return SourceVersion.isIdentifier(name.substring(0, name.length() - ".this".length())); + } + return name.equals("this") || SourceVersion.isName(name); + } + public static Builder builder(TypeName type, String name, Modifier... modifiers) { checkNotNull(type, "type == null"); - checkArgument(SourceVersion.isName(name), "not a valid name: %s", name); + checkArgument(isValidParameterName(name), "not a valid name: %s", name); return new Builder(type, name) .addModifiers(modifiers); } |