emptySet());
- return out.toString();
- } catch (IOException e) {
- throw new AssertionError();
- }
- }
-
- public static Builder methodBuilder(String name) {
- return new Builder(name);
- }
-
- public static Builder constructorBuilder() {
- return new Builder(CONSTRUCTOR);
- }
-
- /**
- * Returns a new method spec builder that overrides {@code method}.
- *
- * This will copy its visibility modifiers, type parameters, return type, name, parameters, and
- * throws declarations. An {@link Override} annotation will be added.
- */
- public static Builder overriding(ExecutableElement method) {
- checkNotNull(method, "method == null");
-
- Set modifiers = method.getModifiers();
- if (modifiers.contains(Modifier.PRIVATE)
- || modifiers.contains(Modifier.FINAL)
- || modifiers.contains(Modifier.STATIC)) {
- throw new IllegalArgumentException("cannot override method with modifiers: " + modifiers);
- }
-
- String methodName = method.getSimpleName().toString();
- Builder methodBuilder = MethodSpec.methodBuilder(methodName);
-
- methodBuilder.addAnnotation(OVERRIDE);
- for (AnnotationMirror mirror : method.getAnnotationMirrors()) {
- AnnotationSpec annotationSpec = AnnotationSpec.get(mirror);
- if (annotationSpec.type.equals(OVERRIDE)) continue;
- methodBuilder.addAnnotation(annotationSpec);
- }
-
- modifiers = new LinkedHashSet<>(modifiers);
- modifiers.remove(Modifier.ABSTRACT);
- methodBuilder.addModifiers(modifiers);
-
- for (TypeParameterElement typeParameterElement : method.getTypeParameters()) {
- TypeVariable var = (TypeVariable) typeParameterElement.asType();
- methodBuilder.addTypeVariable(TypeVariableName.get(var));
- }
-
- methodBuilder.returns(TypeName.get(method.getReturnType()));
-
- List parameters = method.getParameters();
- for (VariableElement parameter : parameters) {
- TypeName type = TypeName.get(parameter.asType());
- String name = parameter.getSimpleName().toString();
- Set parameterModifiers = parameter.getModifiers();
- ParameterSpec.Builder parameterBuilder = ParameterSpec.builder(type, name)
- .addModifiers(parameterModifiers.toArray(new Modifier[parameterModifiers.size()]));
- for (AnnotationMirror mirror : parameter.getAnnotationMirrors()) {
- parameterBuilder.addAnnotation(AnnotationSpec.get(mirror));
- }
- methodBuilder.addParameter(parameterBuilder.build());
- }
- methodBuilder.varargs(method.isVarArgs());
-
- for (TypeMirror thrownType : method.getThrownTypes()) {
- methodBuilder.addException(TypeName.get(thrownType));
- }
-
- return methodBuilder;
- }
-
- /**
- * Returns a new method spec builder that overrides {@code method} as a member of {@code
- * enclosing}. This will resolve type parameters: for example overriding {@link
- * Comparable#compareTo} in a type that implements {@code Comparable}, the {@code T}
- * parameter will be resolved to {@code Movie}.
- *
- * This will copy its visibility modifiers, type parameters, return type, name, parameters, and
- * throws declarations. An {@link Override} annotation will be added.
- */
- public static Builder overriding(
- ExecutableElement method, DeclaredType enclosing, Types types) {
- ExecutableType executableType = (ExecutableType) types.asMemberOf(enclosing, method);
- List resolvedParameterTypes = executableType.getParameterTypes();
- TypeMirror resolvedReturnType = executableType.getReturnType();
-
- Builder builder = overriding(method);
- builder.returns(TypeName.get(resolvedReturnType));
- for (int i = 0, size = builder.parameters.size(); i < size; i++) {
- ParameterSpec parameter = builder.parameters.get(i);
- TypeName type = TypeName.get(resolvedParameterTypes.get(i));
- builder.parameters.set(i, parameter.toBuilder(type, parameter.name).build());
- }
-
- return builder;
- }
-
- public Builder toBuilder() {
- Builder builder = new Builder(name);
- builder.javadoc.add(javadoc);
- builder.annotations.addAll(annotations);
- builder.modifiers.addAll(modifiers);
- builder.typeVariables.addAll(typeVariables);
- builder.returnType = returnType;
- builder.parameters.addAll(parameters);
- builder.exceptions.addAll(exceptions);
- builder.code.add(code);
- builder.varargs = varargs;
- builder.defaultValue = defaultValue;
- return builder;
- }
-
- public static final class Builder {
- private final String name;
-
- private final CodeBlock.Builder javadoc = CodeBlock.builder();
- private final List annotations = new ArrayList<>();
- private final List modifiers = new ArrayList<>();
- private List typeVariables = new ArrayList<>();
- private TypeName returnType;
- private final List parameters = new ArrayList<>();
- private final Set exceptions = new LinkedHashSet<>();
- private final CodeBlock.Builder code = CodeBlock.builder();
- private boolean varargs;
- private CodeBlock defaultValue;
-
- private Builder(String name) {
- checkArgument(name.equals(CONSTRUCTOR) || SourceVersion.isName(name),
- "not a valid name: %s", name);
- this.name = name;
- this.returnType = name.equals(CONSTRUCTOR) ? null : TypeName.VOID;
- }
-
- public Builder addJavadoc(String format, Object... args) {
- javadoc.add(format, args);
- return this;
- }
-
- public Builder addAnnotations(Iterable annotationSpecs) {
- checkArgument(annotationSpecs != null, "annotationSpecs == null");
- for (AnnotationSpec annotationSpec : annotationSpecs) {
- this.annotations.add(annotationSpec);
- }
- return this;
- }
-
- public Builder addAnnotation(AnnotationSpec annotationSpec) {
- this.annotations.add(annotationSpec);
- return this;
- }
-
- public Builder addAnnotation(ClassName annotation) {
- this.annotations.add(AnnotationSpec.builder(annotation).build());
- return this;
- }
-
- public Builder addAnnotation(Class annotation) {
- return addAnnotation(ClassName.get(annotation));
- }
-
- public Builder addModifiers(Modifier... modifiers) {
- Collections.addAll(this.modifiers, modifiers);
- return this;
- }
-
- public Builder addModifiers(Iterable modifiers) {
- checkNotNull(modifiers, "modifiers == null");
- for (Modifier modifier : modifiers) {
- this.modifiers.add(modifier);
- }
- return this;
- }
-
- public Builder addTypeVariables(Iterable typeVariables) {
- checkArgument(typeVariables != null, "typeVariables == null");
- for (TypeVariableName typeVariable : typeVariables) {
- this.typeVariables.add(typeVariable);
- }
- return this;
- }
-
- public Builder addTypeVariable(TypeVariableName typeVariable) {
- typeVariables.add(typeVariable);
- return this;
- }
-
- public Builder returns(TypeName returnType) {
- checkState(!name.equals(CONSTRUCTOR), "constructor cannot have return type.");
- this.returnType = returnType;
- return this;
- }
-
- public Builder returns(Type returnType) {
- return returns(TypeName.get(returnType));
- }
-
- public Builder addParameters(Iterable parameterSpecs) {
- checkArgument(parameterSpecs != null, "parameterSpecs == null");
- for (ParameterSpec parameterSpec : parameterSpecs) {
- this.parameters.add(parameterSpec);
- }
- return this;
- }
-
- public Builder addParameter(ParameterSpec parameterSpec) {
- this.parameters.add(parameterSpec);
- return this;
- }
-
- public Builder addParameter(TypeName type, String name, Modifier... modifiers) {
- return addParameter(ParameterSpec.builder(type, name, modifiers).build());
- }
-
- public Builder addParameter(Type type, String name, Modifier... modifiers) {
- return addParameter(TypeName.get(type), name, modifiers);
- }
-
- public Builder varargs() {
- return varargs(true);
- }
-
- public Builder varargs(boolean varargs) {
- this.varargs = varargs;
- return this;
- }
-
- public Builder addExceptions(Iterable exceptions) {
- checkArgument(exceptions != null, "exceptions == null");
- for (TypeName exception : exceptions) {
- this.exceptions.add(exception);
- }
- return this;
- }
-
- public Builder addException(TypeName exception) {
- this.exceptions.add(exception);
- return this;
- }
-
- public Builder addException(Type exception) {
- return addException(TypeName.get(exception));
- }
-
- public Builder addCode(String format, Object... args) {
- code.add(format, args);
- return this;
- }
-
- public Builder addCode(CodeBlock codeBlock) {
- code.add(codeBlock);
- return this;
- }
-
- public Builder defaultValue(String format, Object... args) {
- return defaultValue(CodeBlock.of(format, args));
- }
-
- public Builder defaultValue(CodeBlock codeBlock) {
- checkState(this.defaultValue == null, "defaultValue was already set");
- this.defaultValue = checkNotNull(codeBlock, "codeBlock == null");
- return this;
- }
-
- /**
- * @param controlFlow the control flow construct and its code, such as "if (foo == 5)".
- * Shouldn't contain braces or newline characters.
- */
- public Builder beginControlFlow(String controlFlow, Object... args) {
- code.beginControlFlow(controlFlow, args);
- return this;
- }
-
- /**
- * @param controlFlow the control flow construct and its code, such as "else if (foo == 10)".
- * Shouldn't contain braces or newline characters.
- */
- public Builder nextControlFlow(String controlFlow, Object... args) {
- code.nextControlFlow(controlFlow, args);
- return this;
- }
-
- public Builder endControlFlow() {
- code.endControlFlow();
- return this;
- }
-
- /**
- * @param controlFlow the optional control flow construct and its code, such as
- * "while(foo == 20)". Only used for "do/while" control flows.
- */
- public Builder endControlFlow(String controlFlow, Object... args) {
- code.endControlFlow(controlFlow, args);
- return this;
- }
-
- public Builder addStatement(String format, Object... args) {
- code.addStatement(format, args);
- return this;
- }
-
- public MethodSpec build() {
- return new MethodSpec(this);
- }
- }
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/NameAllocator.java b/apt/src/main/java/com/squareup/javapoet/NameAllocator.java
deleted file mode 100644
index 8fd16c5..0000000
--- a/apt/src/main/java/com/squareup/javapoet/NameAllocator.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.lang.model.SourceVersion;
-
-import static com.squareup.javapoet.Util.checkNotNull;
-
-/**
- * Assigns Java identifier names to avoid collisions, keywords, and invalid characters. To use,
- * first create an instance and allocate all of the names that you need. Typically this is a
- * mix of user-supplied names and constants: {@code
- *
- * NameAllocator nameAllocator = new NameAllocator();
- * for (MyProperty property : properties) {
- * nameAllocator.newName(property.name(), property);
- * }
- * nameAllocator.newName("sb", "string builder");
- * }
- *
- * Pass a unique tag object to each allocation. The tag scopes the name, and can be used to look up
- * the allocated name later. Typically the tag is the object that is being named. In the above
- * example we use {@code property} for the user-supplied property names, and {@code "string
- * builder"} for our constant string builder.
- *
- * Once we've allocated names we can use them when generating code:
{@code
- *
- * MethodSpec.Builder builder = MethodSpec.methodBuilder("toString")
- * .addAnnotation(Override.class)
- * .addModifiers(Modifier.PUBLIC)
- * .returns(String.class);
- *
- * builder.addStatement("$1T $2N = new $1T()",
- * StringBuilder.class, nameAllocator.get("string builder"));
- * for (MyProperty property : properties) {
- * builder.addStatement("$N.append($N)",
- * nameAllocator.get("string builder"), nameAllocator.get(property));
- * }
- * builder.addStatement("return $N", nameAllocator.get("string builder"));
- * return builder.build();
- * }
- *
- * The above code generates unique names if presented with conflicts. Given user-supplied properties
- * with names {@code ab} and {@code sb} this generates the following: {@code
- *
- * @Override
- * public String toString() {
- * StringBuilder sb_ = new StringBuilder();
- * sb_.append(ab);
- * sb_.append(sb);
- * return sb_.toString();
- * }
- * }
- *
- * The underscore is appended to {@code sb} to avoid conflicting with the user-supplied {@code sb}
- * property. Underscores are also prefixed for names that start with a digit, and used to replace
- * name-unsafe characters like space or dash.
- *
- * When dealing with multiple independent inner scopes, use a {@link #clone()} of the
- * NameAllocator used for the outer scope to further refine name allocation for a specific inner
- * scope.
- */
-public final class NameAllocator implements Cloneable {
- private final Set allocatedNames;
- private final Map tagToName;
-
- public NameAllocator() {
- this(new LinkedHashSet(), new LinkedHashMap());
- }
-
- private NameAllocator(LinkedHashSet allocatedNames,
- LinkedHashMap tagToName) {
- this.allocatedNames = allocatedNames;
- this.tagToName = tagToName;
- }
-
- /**
- * Return a new name using {@code suggestion} that will not be a Java identifier or clash with
- * other names.
- */
- public String newName(String suggestion) {
- return newName(suggestion, UUID.randomUUID().toString());
- }
-
- /**
- * Return a new name using {@code suggestion} that will not be a Java identifier or clash with
- * other names. The returned value can be queried multiple times by passing {@code tag} to
- * {@link #get(Object)}.
- */
- public String newName(String suggestion, Object tag) {
- checkNotNull(suggestion, "suggestion");
- checkNotNull(tag, "tag");
-
- suggestion = toJavaIdentifier(suggestion);
-
- while (SourceVersion.isKeyword(suggestion) || !allocatedNames.add(suggestion)) {
- suggestion = suggestion + "_";
- }
-
- String replaced = tagToName.put(tag, suggestion);
- if (replaced != null) {
- tagToName.put(tag, replaced); // Put things back as they were!
- throw new IllegalArgumentException("tag " + tag + " cannot be used for both '" + replaced
- + "' and '" + suggestion + "'");
- }
-
- return suggestion;
- }
-
- public static String toJavaIdentifier(String suggestion) {
- StringBuilder result = new StringBuilder();
- for (int i = 0; i < suggestion.length(); ) {
- int codePoint = suggestion.codePointAt(i);
- if (i == 0
- && !Character.isJavaIdentifierStart(codePoint)
- && Character.isJavaIdentifierPart(codePoint)) {
- result.append("_");
- }
-
- int validCodePoint = Character.isJavaIdentifierPart(codePoint) ? codePoint : '_';
- result.appendCodePoint(validCodePoint);
- i += Character.charCount(codePoint);
- }
- return result.toString();
- }
-
- /** Retrieve a name created with {@link #newName(String, Object)}. */
- public String get(Object tag) {
- String result = tagToName.get(tag);
- if (result == null) {
- throw new IllegalArgumentException("unknown tag: " + tag);
- }
- return result;
- }
-
- /**
- * Create a deep copy of this NameAllocator. Useful to create multiple independent refinements
- * of a NameAllocator to be used in the respective definition of multiples, independently-scoped,
- * inner code blocks.
- *
- * @return A deep copy of this NameAllocator.
- */
- @Override
- public NameAllocator clone() {
- return new NameAllocator(
- new LinkedHashSet<>(this.allocatedNames),
- new LinkedHashMap<>(this.tagToName));
- }
-
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/ParameterSpec.java b/apt/src/main/java/com/squareup/javapoet/ParameterSpec.java
deleted file mode 100644
index 7d0c72c..0000000
--- a/apt/src/main/java/com/squareup/javapoet/ParameterSpec.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Modifier;
-
-import static com.squareup.javapoet.Util.checkArgument;
-import static com.squareup.javapoet.Util.checkNotNull;
-
-/** A generated parameter declaration. */
-public final class ParameterSpec {
- public final String name;
- public final List annotations;
- public final Set modifiers;
- public final TypeName type;
-
- private ParameterSpec(Builder builder) {
- this.name = checkNotNull(builder.name, "name == null");
- this.annotations = Util.immutableList(builder.annotations);
- this.modifiers = Util.immutableSet(builder.modifiers);
- this.type = checkNotNull(builder.type, "type == null");
- }
-
- public boolean hasModifier(Modifier modifier) {
- return modifiers.contains(modifier);
- }
-
- void emit(CodeWriter codeWriter, boolean varargs) throws IOException {
- codeWriter.emitAnnotations(annotations, true);
- codeWriter.emitModifiers(modifiers);
- if (varargs) {
- codeWriter.emit("$T... $L", TypeName.arrayComponent(type), name);
- } else {
- codeWriter.emit("$T $L", type, name);
- }
- }
-
- @Override public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null) return false;
- if (getClass() != o.getClass()) return false;
- return toString().equals(o.toString());
- }
-
- @Override public int hashCode() {
- return toString().hashCode();
- }
-
- @Override public String toString() {
- StringWriter out = new StringWriter();
- try {
- CodeWriter codeWriter = new CodeWriter(out);
- emit(codeWriter, false);
- return out.toString();
- } catch (IOException e) {
- throw new AssertionError();
- }
- }
-
- public static Builder builder(TypeName type, String name, Modifier... modifiers) {
- checkNotNull(type, "type == null");
- checkArgument(SourceVersion.isName(name), "not a valid name: %s", name);
- return new Builder(type, name)
- .addModifiers(modifiers);
- }
-
- public static Builder builder(Type type, String name, Modifier... modifiers) {
- return builder(TypeName.get(type), name, modifiers);
- }
-
- public Builder toBuilder() {
- return toBuilder(type, name);
- }
-
- Builder toBuilder(TypeName type, String name) {
- Builder builder = new Builder(type, name);
- builder.annotations.addAll(annotations);
- builder.modifiers.addAll(modifiers);
- return builder;
- }
-
- public static final class Builder {
- private final TypeName type;
- private final String name;
-
- private final List annotations = new ArrayList<>();
- private final List modifiers = new ArrayList<>();
-
- private Builder(TypeName type, String name) {
- this.type = type;
- this.name = name;
- }
-
- public Builder addAnnotations(Iterable annotationSpecs) {
- checkArgument(annotationSpecs != null, "annotationSpecs == null");
- for (AnnotationSpec annotationSpec : annotationSpecs) {
- this.annotations.add(annotationSpec);
- }
- return this;
- }
-
- public Builder addAnnotation(AnnotationSpec annotationSpec) {
- this.annotations.add(annotationSpec);
- return this;
- }
-
- public Builder addAnnotation(ClassName annotation) {
- this.annotations.add(AnnotationSpec.builder(annotation).build());
- return this;
- }
-
- public Builder addAnnotation(Class annotation) {
- return addAnnotation(ClassName.get(annotation));
- }
-
- public Builder addModifiers(Modifier... modifiers) {
- Collections.addAll(this.modifiers, modifiers);
- return this;
- }
-
- public ParameterSpec build() {
- return new ParameterSpec(this);
- }
- }
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java b/apt/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java
deleted file mode 100644
index bbd4116..0000000
--- a/apt/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.io.IOException;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.squareup.javapoet.Util.checkArgument;
-import static com.squareup.javapoet.Util.checkNotNull;
-
-public final class ParameterizedTypeName extends TypeName {
- private final ParameterizedTypeName enclosingType;
- public final ClassName rawType;
- public final List typeArguments;
-
- ParameterizedTypeName(ParameterizedTypeName enclosingType, ClassName rawType,
- List typeArguments) {
- this(enclosingType, rawType, typeArguments, new ArrayList());
- }
-
- private ParameterizedTypeName(ParameterizedTypeName enclosingType, ClassName rawType,
- List typeArguments, List annotations) {
- super(annotations);
- this.rawType = checkNotNull(rawType, "rawType == null");
- this.enclosingType = enclosingType;
- this.typeArguments = Util.immutableList(typeArguments);
-
- checkArgument(!this.typeArguments.isEmpty() || enclosingType != null,
- "no type arguments: %s", rawType);
- for (TypeName typeArgument : this.typeArguments) {
- checkArgument(!typeArgument.isPrimitive() && typeArgument != VOID,
- "invalid type parameter: %s", typeArgument);
- }
- }
-
- @Override public ParameterizedTypeName annotated(List annotations) {
- return new ParameterizedTypeName(
- enclosingType, rawType, typeArguments, concatAnnotations(annotations));
- }
-
- @Override public TypeName withoutAnnotations() {
- return new ParameterizedTypeName(
- enclosingType, rawType, typeArguments, new ArrayList());
- }
-
- @Override
- CodeWriter emit(CodeWriter out) throws IOException {
- if (enclosingType != null) {
- enclosingType.emitAnnotations(out);
- enclosingType.emit(out);
- out.emit("." + rawType.simpleName());
- } else {
- rawType.emitAnnotations(out);
- rawType.emit(out);
- }
- if (!typeArguments.isEmpty()) {
- out.emitAndIndent("<");
- boolean firstParameter = true;
- for (TypeName parameter : typeArguments) {
- if (!firstParameter) out.emitAndIndent(", ");
- parameter.emitAnnotations(out);
- parameter.emit(out);
- firstParameter = false;
- }
- out.emitAndIndent(">");
- }
- return out;
- }
-
- /**
- * Returns a new {@link ParameterizedTypeName} instance for the specified {@code name} as nested
- * inside this class.
- */
- public ParameterizedTypeName nestedClass(String name) {
- checkNotNull(name, "name == null");
- return new ParameterizedTypeName(this, rawType.nestedClass(name), new ArrayList(),
- new ArrayList());
- }
-
- /**
- * Returns a new {@link ParameterizedTypeName} instance for the specified {@code name} as nested
- * inside this class, with the specified {@code typeArguments}.
- */
- public ParameterizedTypeName nestedClass(String name, List typeArguments) {
- checkNotNull(name, "name == null");
- return new ParameterizedTypeName(this, rawType.nestedClass(name), typeArguments,
- new ArrayList());
- }
-
- /** Returns a parameterized type, applying {@code typeArguments} to {@code rawType}. */
- public static ParameterizedTypeName get(ClassName rawType, TypeName... typeArguments) {
- return new ParameterizedTypeName(null, rawType, Arrays.asList(typeArguments));
- }
-
- /** Returns a parameterized type, applying {@code typeArguments} to {@code rawType}. */
- public static ParameterizedTypeName get(Class rawType, Type... typeArguments) {
- return new ParameterizedTypeName(null, ClassName.get(rawType), list(typeArguments));
- }
-
- /** Returns a parameterized type equivalent to {@code type}. */
- public static ParameterizedTypeName get(ParameterizedType type) {
- return get(type, new LinkedHashMap());
- }
-
- /** Returns a parameterized type equivalent to {@code type}. */
- static ParameterizedTypeName get(ParameterizedType type, Map map) {
- ClassName rawType = ClassName.get((Class) type.getRawType());
- ParameterizedType ownerType = (type.getOwnerType() instanceof ParameterizedType)
- && !Modifier.isStatic(((Class) type.getRawType()).getModifiers())
- ? (ParameterizedType) type.getOwnerType() : null;
- List typeArguments = TypeName.list(type.getActualTypeArguments(), map);
- return (ownerType != null)
- ? get(ownerType, map).nestedClass(rawType.simpleName(), typeArguments)
- : new ParameterizedTypeName(null, rawType, typeArguments);
- }
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/TypeName.java b/apt/src/main/java/com/squareup/javapoet/TypeName.java
deleted file mode 100644
index d02a60f..0000000
--- a/apt/src/main/java/com/squareup/javapoet/TypeName.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.io.IOException;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.TypeParameterElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.ErrorType;
-import javax.lang.model.type.NoType;
-import javax.lang.model.type.PrimitiveType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.SimpleTypeVisitor7;
-
-/**
- * Any type in Java's type system, plus {@code void}. This class is an identifier for primitive
- * types like {@code int} and raw reference types like {@code String} and {@code List}. It also
- * identifies composite types like {@code char[]} and {@code Set}.
- *
- * Type names are dumb identifiers only and do not model the values they name. For example, the
- * type name for {@code java.lang.List} doesn't know about the {@code size()} method, the fact that
- * lists are collections, or even that it accepts a single type parameter.
- *
- *
Instances of this class are immutable value objects that implement {@code equals()} and {@code
- * hashCode()} properly.
- *
- *
Referencing existing types
- *
- * Primitives and void are constants that you can reference directly: see {@link #INT}, {@link
- * #DOUBLE}, and {@link #VOID}.
- *
- *
In an annotation processor you can get a type name instance for a type mirror by calling
- * {@link #get(TypeMirror)}. In reflection code, you can use {@link #get(Type)}.
- *
- *
Defining new types
- *
- * Create new reference types like {@code com.example.HelloWorld} with {@link
- * ClassName#get(String, String, String...)}. To build composite types like {@code char[]} and
- * {@code Set}, use the factory methods on {@link ArrayTypeName}, {@link
- * ParameterizedTypeName}, {@link TypeVariableName}, and {@link WildcardTypeName}.
- */
-public class TypeName {
- public static final TypeName VOID = new TypeName("void");
- public static final TypeName BOOLEAN = new TypeName("boolean");
- public static final TypeName BYTE = new TypeName("byte");
- public static final TypeName SHORT = new TypeName("short");
- public static final TypeName INT = new TypeName("int");
- public static final TypeName LONG = new TypeName("long");
- public static final TypeName CHAR = new TypeName("char");
- public static final TypeName FLOAT = new TypeName("float");
- public static final TypeName DOUBLE = new TypeName("double");
- public static final ClassName OBJECT = ClassName.get("java.lang", "Object");
-
- private static final ClassName BOXED_VOID = ClassName.get("java.lang", "Void");
- private static final ClassName BOXED_BOOLEAN = ClassName.get("java.lang", "Boolean");
- private static final ClassName BOXED_BYTE = ClassName.get("java.lang", "Byte");
- private static final ClassName BOXED_SHORT = ClassName.get("java.lang", "Short");
- private static final ClassName BOXED_INT = ClassName.get("java.lang", "Integer");
- private static final ClassName BOXED_LONG = ClassName.get("java.lang", "Long");
- private static final ClassName BOXED_CHAR = ClassName.get("java.lang", "Character");
- private static final ClassName BOXED_FLOAT = ClassName.get("java.lang", "Float");
- private static final ClassName BOXED_DOUBLE = ClassName.get("java.lang", "Double");
-
- /** The name of this type if it is a keyword, or null. */
- private final String keyword;
- public final List annotations;
-
- /** Lazily-initialized toString of this type name. */
- private String cachedString;
-
- private TypeName(String keyword) {
- this(keyword, new ArrayList());
- }
-
- private TypeName(String keyword, List annotations) {
- this.keyword = keyword;
- this.annotations = Util.immutableList(annotations);
- }
-
- // Package-private constructor to prevent third-party subclasses.
- TypeName(List annotations) {
- this(null, annotations);
- }
-
- public final TypeName annotated(AnnotationSpec... annotations) {
- return annotated(Arrays.asList(annotations));
- }
-
- public TypeName annotated(List annotations) {
- Util.checkNotNull(annotations, "annotations == null");
- return new TypeName(keyword, concatAnnotations(annotations));
- }
-
- public TypeName withoutAnnotations() {
- return new TypeName(keyword);
- }
-
- protected final List concatAnnotations(List annotations) {
- List allAnnotations = new ArrayList<>(this.annotations);
- allAnnotations.addAll(annotations);
- return allAnnotations;
- }
-
- public boolean isAnnotated() {
- return !annotations.isEmpty();
- }
-
- /**
- * Returns true if this is a primitive type like {@code int}. Returns false for all other types
- * types including boxed primitives and {@code void}.
- */
- public boolean isPrimitive() {
- return keyword != null && this != VOID;
- }
-
- /**
- * Returns true if this is a boxed primitive type like {@code Integer}. Returns false for all
- * other types types including unboxed primitives and {@code java.lang.Void}.
- */
- public boolean isBoxedPrimitive() {
- return this.equals(BOXED_BOOLEAN)
- || this.equals(BOXED_BYTE)
- || this.equals(BOXED_SHORT)
- || this.equals(BOXED_INT)
- || this.equals(BOXED_LONG)
- || this.equals(BOXED_CHAR)
- || this.equals(BOXED_FLOAT)
- || this.equals(BOXED_DOUBLE);
- }
-
- /**
- * Returns a boxed type if this is a primitive type (like {@code Integer} for {@code int}) or
- * {@code void}. Returns this type if boxing doesn't apply.
- */
- public TypeName box() {
- if (keyword == null) return this; // Doesn't need boxing.
- if (this == VOID) return BOXED_VOID;
- if (this == BOOLEAN) return BOXED_BOOLEAN;
- if (this == BYTE) return BOXED_BYTE;
- if (this == SHORT) return BOXED_SHORT;
- if (this == INT) return BOXED_INT;
- if (this == LONG) return BOXED_LONG;
- if (this == CHAR) return BOXED_CHAR;
- if (this == FLOAT) return BOXED_FLOAT;
- if (this == DOUBLE) return BOXED_DOUBLE;
- throw new AssertionError(keyword);
- }
-
- /**
- * Returns an unboxed type if this is a boxed primitive type (like {@code int} for {@code
- * Integer}) or {@code Void}. Returns this type if it is already unboxed.
- *
- * @throws UnsupportedOperationException if this type isn't eligible for unboxing.
- */
- public TypeName unbox() {
- if (keyword != null) return this; // Already unboxed.
- if (this.equals(BOXED_VOID)) return VOID;
- if (this.equals(BOXED_BOOLEAN)) return BOOLEAN;
- if (this.equals(BOXED_BYTE)) return BYTE;
- if (this.equals(BOXED_SHORT)) return SHORT;
- if (this.equals(BOXED_INT)) return INT;
- if (this.equals(BOXED_LONG)) return LONG;
- if (this.equals(BOXED_CHAR)) return CHAR;
- if (this.equals(BOXED_FLOAT)) return FLOAT;
- if (this.equals(BOXED_DOUBLE)) return DOUBLE;
- throw new UnsupportedOperationException("cannot unbox " + this);
- }
-
- @Override public final boolean equals(Object o) {
- if (this == o) return true;
- if (o == null) return false;
- if (getClass() != o.getClass()) return false;
- return toString().equals(o.toString());
- }
-
- @Override public final int hashCode() {
- return toString().hashCode();
- }
-
- @Override public final String toString() {
- String result = cachedString;
- if (result == null) {
- try {
- StringBuilder resultBuilder = new StringBuilder();
- CodeWriter codeWriter = new CodeWriter(resultBuilder);
- emitAnnotations(codeWriter);
- emit(codeWriter);
- result = resultBuilder.toString();
- cachedString = result;
- } catch (IOException e) {
- throw new AssertionError();
- }
- }
- return result;
- }
-
- CodeWriter emit(CodeWriter out) throws IOException {
- if (keyword == null) throw new AssertionError();
- return out.emitAndIndent(keyword);
- }
-
- CodeWriter emitAnnotations(CodeWriter out) throws IOException {
- for (AnnotationSpec annotation : annotations) {
- annotation.emit(out, true);
- out.emit(" ");
- }
- return out;
- }
-
- /** Returns a type name equivalent to {@code mirror}. */
- public static TypeName get(TypeMirror mirror) {
- return get(mirror, new LinkedHashMap());
- }
-
- static TypeName get(TypeMirror mirror,
- final Map typeVariables) {
- return mirror.accept(new SimpleTypeVisitor7() {
- @Override public TypeName visitPrimitive(PrimitiveType t, Void p) {
- switch (t.getKind()) {
- case BOOLEAN:
- return TypeName.BOOLEAN;
- case BYTE:
- return TypeName.BYTE;
- case SHORT:
- return TypeName.SHORT;
- case INT:
- return TypeName.INT;
- case LONG:
- return TypeName.LONG;
- case CHAR:
- return TypeName.CHAR;
- case FLOAT:
- return TypeName.FLOAT;
- case DOUBLE:
- return TypeName.DOUBLE;
- default:
- throw new AssertionError();
- }
- }
-
- @Override public TypeName visitDeclared(DeclaredType t, Void p) {
- ClassName rawType = ClassName.get((TypeElement) t.asElement());
- TypeMirror enclosingType = t.getEnclosingType();
- TypeName enclosing =
- (enclosingType.getKind() != TypeKind.NONE)
- && !t.asElement().getModifiers().contains(Modifier.STATIC)
- ? enclosingType.accept(this, null)
- : null;
- if (t.getTypeArguments().isEmpty() && !(enclosing instanceof ParameterizedTypeName)) {
- return rawType;
- }
-
- List typeArgumentNames = new ArrayList<>();
- for (TypeMirror mirror : t.getTypeArguments()) {
- typeArgumentNames.add(get(mirror, typeVariables));
- }
- return enclosing instanceof ParameterizedTypeName
- ? ((ParameterizedTypeName) enclosing).nestedClass(
- rawType.simpleName(), typeArgumentNames)
- : new ParameterizedTypeName(null, rawType, typeArgumentNames);
- }
-
- @Override public TypeName visitError(ErrorType t, Void p) {
- return visitDeclared(t, p);
- }
-
- @Override public ArrayTypeName visitArray(ArrayType t, Void p) {
- return ArrayTypeName.get(t, typeVariables);
- }
-
- @Override public TypeName visitTypeVariable(javax.lang.model.type.TypeVariable t, Void p) {
- return TypeVariableName.get(t, typeVariables);
- }
-
- @Override public TypeName visitWildcard(javax.lang.model.type.WildcardType t, Void p) {
- return WildcardTypeName.get(t, typeVariables);
- }
-
- @Override public TypeName visitNoType(NoType t, Void p) {
- if (t.getKind() == TypeKind.VOID) return TypeName.VOID;
- return super.visitUnknown(t, p);
- }
-
- @Override protected TypeName defaultAction(TypeMirror e, Void p) {
- throw new IllegalArgumentException("Unexpected type mirror: " + e);
- }
- }, null);
- }
-
- /** Returns a type name equivalent to {@code type}. */
- public static TypeName get(Type type) {
- return get(type, new LinkedHashMap());
- }
-
- static TypeName get(Type type, Map map) {
- if (type instanceof Class) {
- Class classType = (Class) type;
- if (type == void.class) return VOID;
- if (type == boolean.class) return BOOLEAN;
- if (type == byte.class) return BYTE;
- if (type == short.class) return SHORT;
- if (type == int.class) return INT;
- if (type == long.class) return LONG;
- if (type == char.class) return CHAR;
- if (type == float.class) return FLOAT;
- if (type == double.class) return DOUBLE;
- if (classType.isArray()) return ArrayTypeName.of(get(classType.getComponentType(), map));
- return ClassName.get(classType);
-
- } else if (type instanceof ParameterizedType) {
- return ParameterizedTypeName.get((ParameterizedType) type, map);
-
- } else if (type instanceof WildcardType) {
- return WildcardTypeName.get((WildcardType) type, map);
-
- } else if (type instanceof TypeVariable) {
- return TypeVariableName.get((TypeVariable) type, map);
-
- } else if (type instanceof GenericArrayType) {
- return ArrayTypeName.get((GenericArrayType) type, map);
-
- } else {
- throw new IllegalArgumentException("unexpected type: " + type);
- }
- }
-
- /** Converts an array of types to a list of type names. */
- static List list(Type[] types) {
- return list(types, new LinkedHashMap());
- }
-
- static List list(Type[] types, Map map) {
- List result = new ArrayList<>(types.length);
- for (Type type : types) {
- result.add(get(type, map));
- }
- return result;
- }
-
- /** Returns the array component of {@code type}, or null if {@code type} is not an array. */
- static TypeName arrayComponent(TypeName type) {
- return type instanceof ArrayTypeName
- ? ((ArrayTypeName) type).componentType
- : null;
- }
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/TypeSpec.java b/apt/src/main/java/com/squareup/javapoet/TypeSpec.java
deleted file mode 100644
index 83a87e0..0000000
--- a/apt/src/main/java/com/squareup/javapoet/TypeSpec.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.Modifier;
-
-import static com.squareup.javapoet.Util.checkArgument;
-import static com.squareup.javapoet.Util.checkNotNull;
-import static com.squareup.javapoet.Util.checkState;
-import static com.squareup.javapoet.Util.hasDefaultModifier;
-import static com.squareup.javapoet.Util.requireExactlyOneOf;
-
-/** A generated class, interface, or enum declaration. */
-public final class TypeSpec {
- public final Kind kind;
- public final String name;
- public final CodeBlock anonymousTypeArguments;
- public final CodeBlock javadoc;
- public final List annotations;
- public final Set modifiers;
- public final List typeVariables;
- public final TypeName superclass;
- public final List superinterfaces;
- public final Map enumConstants;
- public final List fieldSpecs;
- public final CodeBlock staticBlock;
- public final CodeBlock initializerBlock;
- public final List methodSpecs;
- public final List typeSpecs;
- public final List originatingElements;
-
- private TypeSpec(Builder builder) {
- this.kind = builder.kind;
- this.name = builder.name;
- this.anonymousTypeArguments = builder.anonymousTypeArguments;
- this.javadoc = builder.javadoc.build();
- this.annotations = Util.immutableList(builder.annotations);
- this.modifiers = Util.immutableSet(builder.modifiers);
- this.typeVariables = Util.immutableList(builder.typeVariables);
- this.superclass = builder.superclass;
- this.superinterfaces = Util.immutableList(builder.superinterfaces);
- this.enumConstants = Util.immutableMap(builder.enumConstants);
- this.fieldSpecs = Util.immutableList(builder.fieldSpecs);
- this.staticBlock = builder.staticBlock.build();
- this.initializerBlock = builder.initializerBlock.build();
- this.methodSpecs = Util.immutableList(builder.methodSpecs);
- this.typeSpecs = Util.immutableList(builder.typeSpecs);
-
- List originatingElementsMutable = new ArrayList<>();
- originatingElementsMutable.addAll(builder.originatingElements);
- for (TypeSpec typeSpec : builder.typeSpecs) {
- originatingElementsMutable.addAll(typeSpec.originatingElements);
- }
- this.originatingElements = Util.immutableList(originatingElementsMutable);
- }
-
- public boolean hasModifier(Modifier modifier) {
- return modifiers.contains(modifier);
- }
-
- public static Builder classBuilder(String name) {
- return new Builder(Kind.CLASS, checkNotNull(name, "name == null"), null);
- }
-
- public static Builder classBuilder(ClassName className) {
- return classBuilder(checkNotNull(className, "className == null").simpleName());
- }
-
- public static Builder interfaceBuilder(String name) {
- return new Builder(Kind.INTERFACE, checkNotNull(name, "name == null"), null);
- }
-
- public static Builder interfaceBuilder(ClassName className) {
- return interfaceBuilder(checkNotNull(className, "className == null").simpleName());
- }
-
- public static Builder enumBuilder(String name) {
- return new Builder(Kind.ENUM, checkNotNull(name, "name == null"), null);
- }
-
- public static Builder enumBuilder(ClassName className) {
- return enumBuilder(checkNotNull(className, "className == null").simpleName());
- }
-
- public static Builder anonymousClassBuilder(String typeArgumentsFormat, Object... args) {
- return new Builder(Kind.CLASS, null, CodeBlock.builder()
- .add(typeArgumentsFormat, args)
- .build());
- }
-
- public static Builder annotationBuilder(String name) {
- return new Builder(Kind.ANNOTATION, checkNotNull(name, "name == null"), null);
- }
-
- public static Builder annotationBuilder(ClassName className) {
- return annotationBuilder(checkNotNull(className, "className == null").simpleName());
- }
-
- public Builder toBuilder() {
- Builder builder = new Builder(kind, name, anonymousTypeArguments);
- builder.javadoc.add(javadoc);
- builder.annotations.addAll(annotations);
- builder.modifiers.addAll(modifiers);
- builder.typeVariables.addAll(typeVariables);
- builder.superclass = superclass;
- builder.superinterfaces.addAll(superinterfaces);
- builder.enumConstants.putAll(enumConstants);
- builder.fieldSpecs.addAll(fieldSpecs);
- builder.methodSpecs.addAll(methodSpecs);
- builder.typeSpecs.addAll(typeSpecs);
- builder.initializerBlock.add(initializerBlock);
- builder.staticBlock.add(staticBlock);
- return builder;
- }
-
- void emit(CodeWriter codeWriter, String enumName, Set implicitModifiers)
- throws IOException {
- // Nested classes interrupt wrapped line indentation. Stash the current wrapping state and put
- // it back afterwards when this type is complete.
- int previousStatementLine = codeWriter.statementLine;
- codeWriter.statementLine = -1;
-
- try {
- if (enumName != null) {
- codeWriter.emitJavadoc(javadoc);
- codeWriter.emitAnnotations(annotations, false);
- codeWriter.emit("$L", enumName);
- if (!anonymousTypeArguments.formatParts.isEmpty()) {
- codeWriter.emit("(");
- codeWriter.emit(anonymousTypeArguments);
- codeWriter.emit(")");
- }
- if (fieldSpecs.isEmpty() && methodSpecs.isEmpty() && typeSpecs.isEmpty()) {
- return; // Avoid unnecessary braces "{}".
- }
- codeWriter.emit(" {\n");
- } else if (anonymousTypeArguments != null) {
- TypeName supertype = !superinterfaces.isEmpty() ? superinterfaces.get(0) : superclass;
- codeWriter.emit("new $T(", supertype);
- codeWriter.emit(anonymousTypeArguments);
- codeWriter.emit(") {\n");
- } else {
- codeWriter.emitJavadoc(javadoc);
- codeWriter.emitAnnotations(annotations, false);
- codeWriter.emitModifiers(modifiers, Util.union(implicitModifiers, kind.asMemberModifiers));
- if (kind == Kind.ANNOTATION) {
- codeWriter.emit("$L $L", "@interface", name);
- } else {
- codeWriter.emit("$L $L", kind.name().toLowerCase(Locale.US), name);
- }
- codeWriter.emitTypeVariables(typeVariables);
-
- List extendsTypes;
- List implementsTypes;
- if (kind == Kind.INTERFACE) {
- extendsTypes = superinterfaces;
- implementsTypes = Collections.emptyList();
- } else {
- extendsTypes = superclass.equals(ClassName.OBJECT)
- ? Collections.emptyList()
- : Collections.singletonList(superclass);
- implementsTypes = superinterfaces;
- }
-
- if (!extendsTypes.isEmpty()) {
- codeWriter.emit(" extends");
- boolean firstType = true;
- for (TypeName type : extendsTypes) {
- if (!firstType) codeWriter.emit(",");
- codeWriter.emit(" $T", type);
- firstType = false;
- }
- }
-
- if (!implementsTypes.isEmpty()) {
- codeWriter.emit(" implements");
- boolean firstType = true;
- for (TypeName type : implementsTypes) {
- if (!firstType) codeWriter.emit(",");
- codeWriter.emit(" $T", type);
- firstType = false;
- }
- }
-
- codeWriter.emit(" {\n");
- }
-
- codeWriter.pushType(this);
- codeWriter.indent();
- boolean firstMember = true;
- for (Iterator> i = enumConstants.entrySet().iterator();
- i.hasNext(); ) {
- Map.Entry enumConstant = i.next();
- if (!firstMember) codeWriter.emit("\n");
- enumConstant.getValue()
- .emit(codeWriter, enumConstant.getKey(), Collections.emptySet());
- firstMember = false;
- if (i.hasNext()) {
- codeWriter.emit(",\n");
- } else if (!fieldSpecs.isEmpty() || !methodSpecs.isEmpty() || !typeSpecs.isEmpty()) {
- codeWriter.emit(";\n");
- } else {
- codeWriter.emit("\n");
- }
- }
-
- // Static fields.
- for (FieldSpec fieldSpec : fieldSpecs) {
- if (!fieldSpec.hasModifier(Modifier.STATIC)) continue;
- if (!firstMember) codeWriter.emit("\n");
- fieldSpec.emit(codeWriter, kind.implicitFieldModifiers);
- firstMember = false;
- }
-
- if (!staticBlock.isEmpty()) {
- if (!firstMember) codeWriter.emit("\n");
- codeWriter.emit(staticBlock);
- firstMember = false;
- }
-
- // Non-static fields.
- for (FieldSpec fieldSpec : fieldSpecs) {
- if (fieldSpec.hasModifier(Modifier.STATIC)) continue;
- if (!firstMember) codeWriter.emit("\n");
- fieldSpec.emit(codeWriter, kind.implicitFieldModifiers);
- firstMember = false;
- }
-
- // Initializer block.
- if (!initializerBlock.isEmpty()) {
- if (!firstMember) codeWriter.emit("\n");
- codeWriter.emit(initializerBlock);
- firstMember = false;
- }
-
- // Constructors.
- for (MethodSpec methodSpec : methodSpecs) {
- if (!methodSpec.isConstructor()) continue;
- if (!firstMember) codeWriter.emit("\n");
- methodSpec.emit(codeWriter, name, kind.implicitMethodModifiers);
- firstMember = false;
- }
-
- // Methods (static and non-static).
- for (MethodSpec methodSpec : methodSpecs) {
- if (methodSpec.isConstructor()) continue;
- if (!firstMember) codeWriter.emit("\n");
- methodSpec.emit(codeWriter, name, kind.implicitMethodModifiers);
- firstMember = false;
- }
-
- // Types.
- for (TypeSpec typeSpec : typeSpecs) {
- if (!firstMember) codeWriter.emit("\n");
- typeSpec.emit(codeWriter, null, kind.implicitTypeModifiers);
- firstMember = false;
- }
-
- codeWriter.unindent();
- codeWriter.popType();
-
- codeWriter.emit("}");
- if (enumName == null && anonymousTypeArguments == null) {
- codeWriter.emit("\n"); // If this type isn't also a value, include a trailing newline.
- }
- } finally {
- codeWriter.statementLine = previousStatementLine;
- }
- }
-
- @Override public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null) return false;
- if (getClass() != o.getClass()) return false;
- return toString().equals(o.toString());
- }
-
- @Override public int hashCode() {
- return toString().hashCode();
- }
-
- @Override public String toString() {
- StringWriter out = new StringWriter();
- try {
- CodeWriter codeWriter = new CodeWriter(out);
- emit(codeWriter, null, Collections.emptySet());
- return out.toString();
- } catch (IOException e) {
- throw new AssertionError();
- }
- }
-
- public enum Kind {
- CLASS(
- Collections.emptySet(),
- Collections.emptySet(),
- Collections.emptySet(),
- Collections.emptySet()),
-
- INTERFACE(
- Util.immutableSet(Arrays.asList(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)),
- Util.immutableSet(Arrays.asList(Modifier.PUBLIC, Modifier.ABSTRACT)),
- Util.immutableSet(Arrays.asList(Modifier.PUBLIC, Modifier.STATIC)),
- Util.immutableSet(Arrays.asList(Modifier.STATIC))),
-
- ENUM(
- Collections.emptySet(),
- Collections.emptySet(),
- Collections.emptySet(),
- Collections.singleton(Modifier.STATIC)),
-
- ANNOTATION(
- Util.immutableSet(Arrays.asList(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)),
- Util.immutableSet(Arrays.asList(Modifier.PUBLIC, Modifier.ABSTRACT)),
- Util.immutableSet(Arrays.asList(Modifier.PUBLIC, Modifier.STATIC)),
- Util.immutableSet(Arrays.asList(Modifier.STATIC)));
-
- private final Set implicitFieldModifiers;
- private final Set implicitMethodModifiers;
- private final Set implicitTypeModifiers;
- private final Set asMemberModifiers;
-
- Kind(Set implicitFieldModifiers,
- Set implicitMethodModifiers,
- Set implicitTypeModifiers,
- Set asMemberModifiers) {
- this.implicitFieldModifiers = implicitFieldModifiers;
- this.implicitMethodModifiers = implicitMethodModifiers;
- this.implicitTypeModifiers = implicitTypeModifiers;
- this.asMemberModifiers = asMemberModifiers;
- }
- }
-
- public static final class Builder {
- private final Kind kind;
- private final String name;
- private final CodeBlock anonymousTypeArguments;
-
- private final CodeBlock.Builder javadoc = CodeBlock.builder();
- private final List annotations = new ArrayList<>();
- private final List modifiers = new ArrayList<>();
- private final List typeVariables = new ArrayList<>();
- private TypeName superclass = ClassName.OBJECT;
- private final List superinterfaces = new ArrayList<>();
- private final Map enumConstants = new LinkedHashMap<>();
- private final List fieldSpecs = new ArrayList<>();
- private final CodeBlock.Builder staticBlock = CodeBlock.builder();
- private final CodeBlock.Builder initializerBlock = CodeBlock.builder();
- private final List methodSpecs = new ArrayList<>();
- private final List typeSpecs = new ArrayList<>();
- private final List originatingElements = new ArrayList<>();
-
- private Builder(Kind kind, String name,
- CodeBlock anonymousTypeArguments) {
- checkArgument(name == null || SourceVersion.isName(name), "not a valid name: %s", name);
- this.kind = kind;
- this.name = name;
- this.anonymousTypeArguments = anonymousTypeArguments;
- }
-
- public Builder addJavadoc(String format, Object... args) {
- javadoc.add(format, args);
- return this;
- }
-
- public Builder addAnnotations(Iterable annotationSpecs) {
- checkArgument(annotationSpecs != null, "annotationSpecs == null");
- for (AnnotationSpec annotationSpec : annotationSpecs) {
- this.annotations.add(annotationSpec);
- }
- return this;
- }
-
- public Builder addAnnotation(AnnotationSpec annotationSpec) {
- this.annotations.add(annotationSpec);
- return this;
- }
-
- public Builder addAnnotation(ClassName annotation) {
- return addAnnotation(AnnotationSpec.builder(annotation).build());
- }
-
- public Builder addAnnotation(Class annotation) {
- return addAnnotation(ClassName.get(annotation));
- }
-
- public Builder addModifiers(Modifier... modifiers) {
- checkState(anonymousTypeArguments == null, "forbidden on anonymous types.");
- Collections.addAll(this.modifiers, modifiers);
- return this;
- }
-
- public Builder addTypeVariables(Iterable typeVariables) {
- checkState(anonymousTypeArguments == null, "forbidden on anonymous types.");
- checkArgument(typeVariables != null, "typeVariables == null");
- for (TypeVariableName typeVariable : typeVariables) {
- this.typeVariables.add(typeVariable);
- }
- return this;
- }
-
- public Builder addTypeVariable(TypeVariableName typeVariable) {
- checkState(anonymousTypeArguments == null, "forbidden on anonymous types.");
- typeVariables.add(typeVariable);
- return this;
- }
-
- public Builder superclass(TypeName superclass) {
- checkState(this.superclass == ClassName.OBJECT,
- "superclass already set to " + this.superclass);
- checkArgument(!superclass.isPrimitive(), "superclass may not be a primitive");
- this.superclass = superclass;
- return this;
- }
-
- public Builder superclass(Type superclass) {
- return superclass(TypeName.get(superclass));
- }
-
- public Builder addSuperinterfaces(Iterable superinterfaces) {
- checkArgument(superinterfaces != null, "superinterfaces == null");
- for (TypeName superinterface : superinterfaces) {
- this.superinterfaces.add(superinterface);
- }
- return this;
- }
-
- public Builder addSuperinterface(TypeName superinterface) {
- this.superinterfaces.add(superinterface);
- return this;
- }
-
- public Builder addSuperinterface(Type superinterface) {
- return addSuperinterface(TypeName.get(superinterface));
- }
-
- public Builder addEnumConstant(String name) {
- return addEnumConstant(name, anonymousClassBuilder("").build());
- }
-
- public Builder addEnumConstant(String name, TypeSpec typeSpec) {
- checkState(kind == Kind.ENUM, "%s is not enum", this.name);
- checkArgument(typeSpec.anonymousTypeArguments != null,
- "enum constants must have anonymous type arguments");
- checkArgument(SourceVersion.isName(name), "not a valid enum constant: %s", name);
- enumConstants.put(name, typeSpec);
- return this;
- }
-
- public Builder addFields(Iterable fieldSpecs) {
- checkArgument(fieldSpecs != null, "fieldSpecs == null");
- for (FieldSpec fieldSpec : fieldSpecs) {
- addField(fieldSpec);
- }
- return this;
- }
-
- public Builder addField(FieldSpec fieldSpec) {
- checkState(kind != Kind.ANNOTATION, "%s %s cannot have fields", kind, name);
- if (kind == Kind.INTERFACE) {
- requireExactlyOneOf(fieldSpec.modifiers, Modifier.PUBLIC, Modifier.PRIVATE);
- Set check = EnumSet.of(Modifier.STATIC, Modifier.FINAL);
- checkState(fieldSpec.modifiers.containsAll(check), "%s %s.%s requires modifiers %s",
- kind, name, fieldSpec.name, check);
- }
- fieldSpecs.add(fieldSpec);
- return this;
- }
-
- public Builder addField(TypeName type, String name, Modifier... modifiers) {
- return addField(FieldSpec.builder(type, name, modifiers).build());
- }
-
- public Builder addField(Type type, String name, Modifier... modifiers) {
- return addField(TypeName.get(type), name, modifiers);
- }
-
- public Builder addStaticBlock(CodeBlock block) {
- staticBlock.beginControlFlow("static").add(block).endControlFlow();
- return this;
- }
-
- public Builder addInitializerBlock(CodeBlock block) {
- if ((kind != Kind.CLASS && kind != Kind.ENUM)) {
- throw new UnsupportedOperationException(kind + " can't have initializer blocks");
- }
- initializerBlock.add("{\n")
- .indent()
- .add(block)
- .unindent()
- .add("}\n");
- return this;
- }
-
- public Builder addMethods(Iterable methodSpecs) {
- checkArgument(methodSpecs != null, "methodSpecs == null");
- for (MethodSpec methodSpec : methodSpecs) {
- addMethod(methodSpec);
- }
- return this;
- }
-
- public Builder addMethod(MethodSpec methodSpec) {
- if (kind == Kind.INTERFACE) {
- requireExactlyOneOf(methodSpec.modifiers, Modifier.ABSTRACT, Modifier.STATIC, Util.DEFAULT);
- requireExactlyOneOf(methodSpec.modifiers, Modifier.PUBLIC, Modifier.PRIVATE);
- } else if (kind == Kind.ANNOTATION) {
- checkState(methodSpec.modifiers.equals(kind.implicitMethodModifiers),
- "%s %s.%s requires modifiers %s",
- kind, name, methodSpec.name, kind.implicitMethodModifiers);
- }
- if (kind != Kind.ANNOTATION) {
- checkState(methodSpec.defaultValue == null, "%s %s.%s cannot have a default value",
- kind, name, methodSpec.name);
- }
- if (kind != Kind.INTERFACE) {
- checkState(!hasDefaultModifier(methodSpec.modifiers), "%s %s.%s cannot be default",
- kind, name, methodSpec.name);
- }
- methodSpecs.add(methodSpec);
- return this;
- }
-
- public Builder addTypes(Iterable typeSpecs) {
- checkArgument(typeSpecs != null, "typeSpecs == null");
- for (TypeSpec typeSpec : typeSpecs) {
- addType(typeSpec);
- }
- return this;
- }
-
- public Builder addType(TypeSpec typeSpec) {
- checkArgument(typeSpec.modifiers.containsAll(kind.implicitTypeModifiers),
- "%s %s.%s requires modifiers %s", kind, name, typeSpec.name,
- kind.implicitTypeModifiers);
- typeSpecs.add(typeSpec);
- return this;
- }
-
- public Builder addOriginatingElement(Element originatingElement) {
- originatingElements.add(originatingElement);
- return this;
- }
-
- public TypeSpec build() {
- checkArgument(kind != Kind.ENUM || !enumConstants.isEmpty(),
- "at least one enum constant is required for %s", name);
-
- boolean isAbstract = modifiers.contains(Modifier.ABSTRACT) || kind != Kind.CLASS;
- for (MethodSpec methodSpec : methodSpecs) {
- checkArgument(isAbstract || !methodSpec.hasModifier(Modifier.ABSTRACT),
- "non-abstract type %s cannot declare abstract method %s", name, methodSpec.name);
- }
-
- boolean superclassIsObject = superclass.equals(ClassName.OBJECT);
- int interestingSupertypeCount = (superclassIsObject ? 0 : 1) + superinterfaces.size();
- checkArgument(anonymousTypeArguments == null || interestingSupertypeCount <= 1,
- "anonymous type has too many supertypes");
-
- return new TypeSpec(this);
- }
- }
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/TypeVariableName.java b/apt/src/main/java/com/squareup/javapoet/TypeVariableName.java
deleted file mode 100644
index c53fa26..0000000
--- a/apt/src/main/java/com/squareup/javapoet/TypeVariableName.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.lang.model.element.TypeParameterElement;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.type.TypeVariable;
-
-import static com.squareup.javapoet.Util.checkArgument;
-import static com.squareup.javapoet.Util.checkNotNull;
-
-public final class TypeVariableName extends TypeName {
- public final String name;
- public final List bounds;
-
- private TypeVariableName(String name, List bounds) {
- this(name, bounds, new ArrayList());
- }
-
- private TypeVariableName(String name, List bounds, List annotations) {
- super(annotations);
- this.name = checkNotNull(name, "name == null");
- this.bounds = bounds;
-
- for (TypeName bound : this.bounds) {
- checkArgument(!bound.isPrimitive() && bound != VOID, "invalid bound: %s", bound);
- }
- }
-
- @Override public TypeVariableName annotated(List annotations) {
- return new TypeVariableName(name, bounds, annotations);
- }
-
- @Override public TypeName withoutAnnotations() {
- return new TypeVariableName(name, bounds);
- }
-
- public TypeVariableName withBounds(Type... bounds) {
- return withBounds(TypeName.list(bounds));
- }
-
- public TypeVariableName withBounds(TypeName... bounds) {
- return withBounds(Arrays.asList(bounds));
- }
-
- public TypeVariableName withBounds(List bounds) {
- ArrayList newBounds = new ArrayList<>();
- newBounds.addAll(this.bounds);
- newBounds.addAll(bounds);
- return new TypeVariableName(name, newBounds, annotations);
- }
-
- private static TypeVariableName of(String name, List bounds) {
- // Strip java.lang.Object from bounds if it is present.
- List boundsNoObject = new ArrayList<>(bounds);
- boundsNoObject.remove(OBJECT);
- return new TypeVariableName(name, Collections.unmodifiableList(boundsNoObject));
- }
-
- @Override
- CodeWriter emit(CodeWriter out) throws IOException {
- return out.emitAndIndent(name);
- }
-
- /** Returns type variable named {@code name} without bounds. */
- public static TypeVariableName get(String name) {
- return TypeVariableName.of(name, Collections.emptyList());
- }
-
- /** Returns type variable named {@code name} with {@code bounds}. */
- public static TypeVariableName get(String name, TypeName... bounds) {
- return TypeVariableName.of(name, Arrays.asList(bounds));
- }
-
- /** Returns type variable named {@code name} with {@code bounds}. */
- public static TypeVariableName get(String name, Type... bounds) {
- return TypeVariableName.of(name, TypeName.list(bounds));
- }
-
- /** Returns type variable equivalent to {@code mirror}. */
- public static TypeVariableName get(TypeVariable mirror) {
- return get((TypeParameterElement) mirror.asElement());
- }
-
- /**
- * Make a TypeVariableName for the given TypeMirror. This form is used internally to avoid
- * infinite recursion in cases like {@code Enum>}. When we encounter such a
- * thing, we will make a TypeVariableName without bounds and add that to the {@code typeVariables}
- * map before looking up the bounds. Then if we encounter this TypeVariable again while
- * constructing the bounds, we can just return it from the map. And, the code that put the entry
- * in {@code variables} will make sure that the bounds are filled in before returning.
- */
- static TypeVariableName get(
- TypeVariable mirror, Map typeVariables) {
- TypeParameterElement element = (TypeParameterElement) mirror.asElement();
- TypeVariableName typeVariableName = typeVariables.get(element);
- if (typeVariableName == null) {
- // Since the bounds field is public, we need to make it an unmodifiableList. But we control
- // the List that that wraps, which means we can change it before returning.
- List bounds = new ArrayList<>();
- List visibleBounds = Collections.unmodifiableList(bounds);
- typeVariableName = new TypeVariableName(element.getSimpleName().toString(), visibleBounds);
- typeVariables.put(element, typeVariableName);
- for (TypeMirror typeMirror : element.getBounds()) {
- bounds.add(TypeName.get(typeMirror, typeVariables));
- }
- bounds.remove(OBJECT);
- }
- return typeVariableName;
- }
-
- /** Returns type variable equivalent to {@code element}. */
- public static TypeVariableName get(TypeParameterElement element) {
- String name = element.getSimpleName().toString();
- List boundsMirrors = element.getBounds();
-
- List boundsTypeNames = new ArrayList<>();
- for (TypeMirror typeMirror : boundsMirrors) {
- boundsTypeNames.add(TypeName.get(typeMirror));
- }
-
- return TypeVariableName.of(name, boundsTypeNames);
- }
-
- /** Returns type variable equivalent to {@code type}. */
- public static TypeVariableName get(java.lang.reflect.TypeVariable type) {
- return get(type, new LinkedHashMap());
- }
-
- /** @see #get(java.lang.reflect.TypeVariable, Map) */
- static TypeVariableName get(java.lang.reflect.TypeVariable type,
- Map map) {
- TypeVariableName result = map.get(type);
- if (result == null) {
- List bounds = new ArrayList<>();
- List visibleBounds = Collections.unmodifiableList(bounds);
- result = new TypeVariableName(type.getName(), visibleBounds);
- map.put(type, result);
- for (Type bound : type.getBounds()) {
- bounds.add(TypeName.get(bound, map));
- }
- bounds.remove(OBJECT);
- }
- return result;
- }
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/Util.java b/apt/src/main/java/com/squareup/javapoet/Util.java
deleted file mode 100644
index 4667c22..0000000
--- a/apt/src/main/java/com/squareup/javapoet/Util.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.lang.model.element.Modifier;
-
-import static java.lang.Character.isISOControl;
-
-/**
- * Like Guava, but worse and standalone. This makes it easier to mix JavaPoet with libraries that
- * bring their own version of Guava.
- */
-final class Util {
- private Util() {
- }
-
- /** Modifier.DEFAULT doesn't exist until Java 8, but we want to run on earlier releases. */
- static final Modifier DEFAULT;
- static {
- Modifier def = null;
- try {
- def = Modifier.valueOf("DEFAULT");
- } catch (IllegalArgumentException ignored) {
- }
- DEFAULT = def;
- }
-
- static Map> immutableMultimap(Map> multimap) {
- LinkedHashMap> result = new LinkedHashMap<>();
- for (Map.Entry> entry : multimap.entrySet()) {
- if (entry.getValue().isEmpty()) continue;
- result.put(entry.getKey(), immutableList(entry.getValue()));
- }
- return Collections.unmodifiableMap(result);
- }
-
- static Map immutableMap(Map map) {
- return Collections.unmodifiableMap(new LinkedHashMap<>(map));
- }
-
- static void checkArgument(boolean condition, String format, Object... args) {
- if (!condition) throw new IllegalArgumentException(String.format(format, args));
- }
-
- static T checkNotNull(T reference, String format, Object... args) {
- if (reference == null) throw new NullPointerException(String.format(format, args));
- return reference;
- }
-
- static void checkState(boolean condition, String format, Object... args) {
- if (!condition) throw new IllegalStateException(String.format(format, args));
- }
-
- static List immutableList(Collection collection) {
- return Collections.unmodifiableList(new ArrayList<>(collection));
- }
-
- static Set immutableSet(Collection set) {
- return Collections.unmodifiableSet(new LinkedHashSet<>(set));
- }
-
- static String join(String separator, List parts) {
- if (parts.isEmpty()) return "";
- StringBuilder result = new StringBuilder();
- result.append(parts.get(0));
- for (int i = 1; i < parts.size(); i++) {
- result.append(separator).append(parts.get(i));
- }
- return result.toString();
- }
-
- static Set union(Set a, Set b) {
- Set result = new LinkedHashSet<>();
- result.addAll(a);
- result.addAll(b);
- return result;
- }
-
- static void requireExactlyOneOf(Set modifiers, Modifier... mutuallyExclusive) {
- int count = 0;
- for (Modifier modifier : mutuallyExclusive) {
- if (modifier == null && Util.DEFAULT == null) continue; // Skip 'DEFAULT' if it doesn't exist!
- if (modifiers.contains(modifier)) count++;
- }
- checkArgument(count == 1, "modifiers %s must contain one of %s",
- modifiers, Arrays.toString(mutuallyExclusive));
- }
-
- static boolean hasDefaultModifier(Collection modifiers) {
- return DEFAULT != null && modifiers.contains(DEFAULT);
- }
-
- static String characterLiteralWithoutSingleQuotes(char c) {
- // see https://docs.oracle.com/javase/specs/jls/se7/html/jls-3.html#jls-3.10.6
- switch (c) {
- case '\b': return "\\b"; /* \u0008: backspace (BS) */
- case '\t': return "\\t"; /* \u0009: horizontal tab (HT) */
- case '\n': return "\\n"; /* \u000a: linefeed (LF) */
- case '\f': return "\\f"; /* \u000c: form feed (FF) */
- case '\r': return "\\r"; /* \u000d: carriage return (CR) */
- case '\"': return "\""; /* \u0022: double quote (") */
- case '\'': return "\\'"; /* \u0027: single quote (') */
- case '\\': return "\\\\"; /* \u005c: backslash (\) */
- default:
- return isISOControl(c) ? String.format("\\u%04x", (int) c) : Character.toString(c);
- }
- }
-
- /** Returns the string literal representing {@code value}, including wrapping double quotes. */
- static String stringLiteralWithDoubleQuotes(String value, String indent) {
- StringBuilder result = new StringBuilder(value.length() + 2);
- result.append('"');
- for (int i = 0; i < value.length(); i++) {
- char c = value.charAt(i);
- // trivial case: single quote must not be escaped
- if (c == '\'') {
- result.append("'");
- continue;
- }
- // trivial case: double quotes must be escaped
- if (c == '\"') {
- result.append("\\\"");
- continue;
- }
- // default case: just let character literal do its work
- result.append(characterLiteralWithoutSingleQuotes(c));
- // need to append indent after linefeed?
- if (c == '\n' && i + 1 < value.length()) {
- result.append("\"\n").append(indent).append(indent).append("+ \"");
- }
- }
- result.append('"');
- return result.toString();
- }
-}
diff --git a/apt/src/main/java/com/squareup/javapoet/WildcardTypeName.java b/apt/src/main/java/com/squareup/javapoet/WildcardTypeName.java
deleted file mode 100644
index c8c6fe5..0000000
--- a/apt/src/main/java/com/squareup/javapoet/WildcardTypeName.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.squareup.javapoet;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.lang.reflect.WildcardType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.lang.model.element.TypeParameterElement;
-import javax.lang.model.type.TypeMirror;
-
-import static com.squareup.javapoet.Util.checkArgument;
-
-public final class WildcardTypeName extends TypeName {
- public final List upperBounds;
- public final List lowerBounds;
-
- private WildcardTypeName(List upperBounds, List lowerBounds) {
- this(upperBounds, lowerBounds, new ArrayList());
- }
-
- private WildcardTypeName(List upperBounds, List lowerBounds,
- List annotations) {
- super(annotations);
- this.upperBounds = Util.immutableList(upperBounds);
- this.lowerBounds = Util.immutableList(lowerBounds);
-
- checkArgument(this.upperBounds.size() == 1, "unexpected extends bounds: %s", upperBounds);
- for (TypeName upperBound : this.upperBounds) {
- checkArgument(!upperBound.isPrimitive() && upperBound != VOID,
- "invalid upper bound: %s", upperBound);
- }
- for (TypeName lowerBound : this.lowerBounds) {
- checkArgument(!lowerBound.isPrimitive() && lowerBound != VOID,
- "invalid lower bound: %s", lowerBound);
- }
- }
-
- @Override public WildcardTypeName annotated(List annotations) {
- return new WildcardTypeName(upperBounds, lowerBounds, concatAnnotations(annotations));
- }
-
- @Override public TypeName withoutAnnotations() {
- return new WildcardTypeName(upperBounds, lowerBounds);
- }
-
- @Override
- CodeWriter emit(CodeWriter out) throws IOException {
- if (lowerBounds.size() == 1) {
- return out.emit("? super $T", lowerBounds.get(0));
- }
- return upperBounds.get(0).equals(TypeName.OBJECT)
- ? out.emit("?")
- : out.emit("? extends $T", upperBounds.get(0));
- }
-
- /**
- * Returns a type that represents an unknown type that extends {@code bound}. For example, if
- * {@code bound} is {@code CharSequence.class}, this returns {@code ? extends CharSequence}. If
- * {@code bound} is {@code Object.class}, this returns {@code ?}, which is shorthand for {@code
- * ? extends Object}.
- */
- public static WildcardTypeName subtypeOf(TypeName upperBound) {
- return new WildcardTypeName(Arrays.asList(upperBound), Collections.emptyList());
- }
-
- public static WildcardTypeName subtypeOf(Type upperBound) {
- return subtypeOf(TypeName.get(upperBound));
- }
-
- /**
- * Returns a type that represents an unknown supertype of {@code bound}. For example, if {@code
- * bound} is {@code String.class}, this returns {@code ? super String}.
- */
- public static WildcardTypeName supertypeOf(TypeName lowerBound) {
- return new WildcardTypeName(Arrays.asList(OBJECT), Arrays.asList(lowerBound));
- }
-
- public static WildcardTypeName supertypeOf(Type lowerBound) {
- return supertypeOf(TypeName.get(lowerBound));
- }
-
- public static TypeName get(javax.lang.model.type.WildcardType mirror) {
- return get(mirror, new LinkedHashMap());
- }
-
- static TypeName get(
- javax.lang.model.type.WildcardType mirror,
- Map typeVariables) {
- TypeMirror extendsBound = mirror.getExtendsBound();
- if (extendsBound == null) {
- TypeMirror superBound = mirror.getSuperBound();
- if (superBound == null) {
- return subtypeOf(Object.class);
- } else {
- return supertypeOf(TypeName.get(superBound, typeVariables));
- }
- } else {
- return subtypeOf(TypeName.get(extendsBound, typeVariables));
- }
- }
-
- public static TypeName get(WildcardType wildcardName) {
- return get(wildcardName, new LinkedHashMap());
- }
-
- static TypeName get(WildcardType wildcardName, Map map) {
- return new WildcardTypeName(
- list(wildcardName.getUpperBounds(), map),
- list(wildcardName.getLowerBounds(), map));
- }
-}
diff --git a/build.gradle b/build.gradle
index ccde60e..f49404b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
}
}
@@ -21,3 +23,7 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
+tasks.withType(Javadoc) {
+ options.addStringOption('Xdoclint:none', '-quiet')
+ options.addStringOption('encoding', 'UTF-8')
+}
\ No newline at end of file
diff --git a/lib/build.gradle b/lib/build.gradle
deleted file mode 100644
index 6c51369..0000000
--- a/lib/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 28
-
- defaultConfig {
- minSdkVersion 15
- targetSdkVersion 28
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
- javaCompileOptions {
- annotationProcessorOptions.includeCompileClasspath = true
- }
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-}
-
diff --git a/settings.gradle b/settings.gradle
index e1203b9..28145e7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':app', ':sup-databinding', ':plugin', ':app-module'
-include ':apt'
-include ':lib'
+include ':app', ':x2c-binding', ':plugin', ':app-module', ':app-databinding'
+include ':x2c-apt'
+include ':x2c-lib'
include ':plugin'
diff --git a/sup-databinding/build.gradle b/sup-databinding/build.gradle
deleted file mode 100644
index 682e024..0000000
--- a/sup-databinding/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 28
-
-
-
- defaultConfig {
- minSdkVersion 15
- targetSdkVersion 28
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- compileOnly fileTree(include: ['*.jar'], dir: 'libs-provided')
-}
diff --git a/lib/.gitignore b/x2c-apt/.gitignore
similarity index 100%
rename from lib/.gitignore
rename to x2c-apt/.gitignore
diff --git a/x2c-apt/build.gradle b/x2c-apt/build.gradle
new file mode 100644
index 0000000..456b5e4
--- /dev/null
+++ b/x2c-apt/build.gradle
@@ -0,0 +1,98 @@
+apply plugin: 'java'
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.squareup:javapoet:1.11.1'
+}
+
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"
+
+
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+//项目主页
+def siteUrl = 'https://github.com/chengweidev' // project homepage
+//项目的版本控制地址
+def gitUrl = 'https://github.com/chengweidev' // project git
+
+//发布到组织名称名字，必须填写
+group = "com.zhangyue.we"
+//发布到JCenter上的项目名字，必须填写
+def libName = "x2c-apt"
+// 版本号，下次更新是只需要更改版本号即可
+version = "1.0.5"
+
+//生成源文件
+task sourcesJar(type: Jar) {
+ from sourceSets.main.java.srcDirs
+ classifier = 'sources'
+}
+
+//文档打包成jar
+task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+}
+//拷贝javadoc文件
+task copyDoc(type: Copy) {
+ from "${buildDir}/docs/"
+ into "docs"
+}
+
+//上传到jcenter所需要的源码文件
+artifacts {
+ archives javadocJar
+ archives sourcesJar
+}
+
+// 配置maven库，生成POM.xml文件
+install {
+ repositories.mavenInstaller {
+ // This generates POM.xml with proper parameters
+ pom {
+ project {
+ packaging 'aar'
+ name 'xml 2 code libraray'
+ url siteUrl
+ licenses {
+ license {
+ name 'xml 2 code apt'
+ url 'https://github.com/chengweidev'
+ }
+ }
+ developers {
+ developer {
+ id 'chengweidev'
+ name 'chengweidev'
+ email 'chengweidev@gmail.com'
+ }
+ }
+ scm {
+ connection gitUrl
+ developerConnection gitUrl
+ url siteUrl
+ }
+ }
+ }
+ }
+}
+
+//上传到jcenter
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+bintray {
+ user = properties.getProperty("bintray.user") //读取 local.properties 文件里面的 bintray.user
+ key = properties.getProperty("bintray.apikey") //读取 local.properties 文件里面的 bintray.apikey
+ configurations = ['archives']
+ pkg {
+ repo = "maven"
+ name = libName //发布到JCenter上的项目名字，必须填写
+ desc = 'xml to code' //项目描述
+ websiteUrl = siteUrl
+ vcsUrl = gitUrl
+ licenses = ["Apache-2.0"]
+ publish = true
+ }
+}
\ No newline at end of file
diff --git a/apt/src/main/java/com/squareup/javapoet/JavaFile.java b/x2c-apt/src/main/java/com/squareup/javapoet/WeJavaFile.java
similarity index 89%
rename from apt/src/main/java/com/squareup/javapoet/JavaFile.java
rename to x2c-apt/src/main/java/com/squareup/javapoet/WeJavaFile.java
index 75b0737..0cab62c 100644
--- a/apt/src/main/java/com/squareup/javapoet/JavaFile.java
+++ b/x2c-apt/src/main/java/com/squareup/javapoet/WeJavaFile.java
@@ -33,18 +33,18 @@
import javax.annotation.processing.Filer;
import javax.lang.model.element.Element;
-import javax.lang.model.element.Modifier;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
import javax.tools.SimpleJavaFileObject;
import static com.squareup.javapoet.Util.checkArgument;
import static com.squareup.javapoet.Util.checkNotNull;
+import static java.nio.charset.StandardCharsets.UTF_8;
/**
* A Java file containing a single top level class.
*/
-public final class JavaFile {
+public final class WeJavaFile {
private static final Appendable NULL_APPENDABLE = new Appendable() {
@Override
public Appendable append(CharSequence charSequence) {
@@ -67,16 +67,16 @@ public Appendable append(char c) {
public final TypeSpec typeSpec;
public final boolean skipJavaLangImports;
private final Set staticImports;
- private final Set imports;
+ private Set imports;
private final String indent;
- private JavaFile(Builder builder) {
+ private WeJavaFile(Builder builder) {
this.fileComment = builder.fileComment.build();
this.packageName = builder.packageName;
this.typeSpec = builder.typeSpec;
this.skipJavaLangImports = builder.skipJavaLangImports;
this.staticImports = Util.immutableSet(builder.staticImports);
- this.imports = Util.immutableSet(builder.imports);
+ this.imports = builder.imports;
this.indent = builder.indent;
}
@@ -92,7 +92,7 @@ public void writeTo(Appendable out) throws IOException {
}
/**
- * Writes this to {@code directory} the standard directory structure.
+ * Writes this to {@code directory} as UTF-8 using the standard directory structure.
*/
public void writeTo(Path directory) throws IOException {
checkArgument(Files.notExists(directory) || Files.isDirectory(directory),
@@ -106,13 +106,13 @@ public void writeTo(Path directory) throws IOException {
}
Path outputPath = outputDirectory.resolve(typeSpec.name + ".java");
- try (Writer writer = new OutputStreamWriter(Files.newOutputStream(outputPath))) {
+ try (Writer writer = new OutputStreamWriter(Files.newOutputStream(outputPath), UTF_8)) {
writeTo(writer);
}
}
/**
- * Writes this to {@code directory} the standard directory structure.
+ * Writes this to {@code directory} as UTF-8 using the standard directory structure.
*/
public void writeTo(File directory) throws IOException {
writeTo(directory.toPath());
@@ -165,10 +165,13 @@ private void emit(CodeWriter codeWriter) throws IOException {
codeWriter.emit("\n");
}
+
int importedTypesCount = 0;
for (ClassName className : new TreeSet<>(codeWriter.importedTypes().values())) {
- if (skipJavaLangImports && className.packageName().equals("java.lang")) continue;
- codeWriter.emit("import $L;\n", className);
+ if (skipJavaLangImports && className.packageName().equals("java.lang")) {
+ continue;
+ }
+ codeWriter.emit("import $L;\n", className.withoutAnnotations());
importedTypesCount++;
}
@@ -176,15 +179,19 @@ private void emit(CodeWriter codeWriter) throws IOException {
codeWriter.emit("\n");
}
- typeSpec.emit(codeWriter, null, Collections.emptySet());
+ typeSpec.emit(codeWriter, null, Collections.emptySet());
codeWriter.popPackage();
}
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null) {
+ return false;
+ }
if (getClass() != o.getClass()) return false;
return toString().equals(o.toString());
}
@@ -215,12 +222,12 @@ public JavaFileObject toJavaFileObject() {
@Override
public String getCharContent(boolean ignoreEncodingErrors) {
- return JavaFile.this.toString();
+ return WeJavaFile.this.toString();
}
@Override
public InputStream openInputStream() throws IOException {
- return new ByteArrayInputStream(getCharContent(true).getBytes());
+ return new ByteArrayInputStream(getCharContent(true).getBytes(UTF_8));
}
@Override
@@ -267,6 +274,13 @@ public Builder addStaticImport(Enum constant) {
return addStaticImport(ClassName.get(constant.getDeclaringClass()), constant.name());
}
+ public Builder addImports(TreeSet imports) {
+ if (imports != null) {
+ this.imports.addAll(imports);
+ }
+ return this;
+ }
+
public Builder addStaticImport(Class clazz, String... names) {
return addStaticImport(ClassName.get(clazz), names);
}
@@ -282,21 +296,6 @@ public Builder addStaticImport(ClassName className, String... names) {
return this;
}
- public Builder addImport(ClassName className) {
- imports.add(className.canonicalName);
- return this;
- }
-
- public Builder addImports(TreeSet clzNames) {
- int lastDotIndex;
- for (String str : clzNames) {
- lastDotIndex = str.lastIndexOf(".");
- imports.add(ClassName.get(str.substring(0, lastDotIndex ), str.substring(lastDotIndex + 1)).canonicalName);
- }
- return this;
- }
-
-
/**
* Call this to omit imports for classes in {@code java.lang}, such as {@code java.lang.String}.
*
@@ -315,8 +314,8 @@ public Builder indent(String indent) {
return this;
}
- public JavaFile build() {
- return new JavaFile(this);
+ public WeJavaFile build() {
+ return new WeJavaFile(this);
}
}
}
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/FileFilter.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/FileFilter.java
similarity index 98%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/FileFilter.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/FileFilter.java
index 4f37ff6..ba3bf75 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/FileFilter.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/FileFilter.java
@@ -5,8 +5,7 @@
import java.util.HashMap;
/**
- * @author：chengwei 2018/9/7
- * @description
+ * @author chengwei 2018/9/7
*/
public class FileFilter {
private File mRoot;
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/Log.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/Log.java
similarity index 92%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/Log.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/Log.java
index b7d5984..6baca8c 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/Log.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/Log.java
@@ -4,8 +4,7 @@
import javax.tools.Diagnostic;
/**
- * @author：chengwei 2018/8/7
- * @description
+ * @author chengwei 2018/8/7
*/
public class Log {
private static Messager sMessager;
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/Util.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/Util.java
similarity index 97%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/Util.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/Util.java
index bec8cdb..fdedb02 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/Util.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/Util.java
@@ -7,8 +7,7 @@
import java.util.Comparator;
/**
- * @author：chengwei 2018/9/7
- * @description
+ * @author chengwei 2018/9/7
*/
public class Util {
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/XmlProcessor.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/XmlProcessor.java
similarity index 97%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/XmlProcessor.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/XmlProcessor.java
index e00ed34..c2cd8ae 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/XmlProcessor.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/XmlProcessor.java
@@ -17,8 +17,7 @@
import javax.lang.model.element.TypeElement;
/**
- * @author：chengwei 2018/8/7
- * @description
+ * @author chengwei 2018/8/7
*/
@SupportedSourceVersion(SourceVersion.RELEASE_7)
@SupportedAnnotationTypes("com.zhangyue.we.x2c.ano.Xml")
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr.java
similarity index 94%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr.java
index a5afe85..4d64ca7 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr.java
@@ -3,8 +3,7 @@
import java.util.HashMap;
/**
- * @author：chengwei 2018/8/25
- * @description
+ * @author chengwei 2018/8/25
*/
public class Attr implements Comparable {
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr2FuncReader.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr2FuncReader.java
similarity index 97%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr2FuncReader.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr2FuncReader.java
index 45e4047..3911dbe 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr2FuncReader.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Attr2FuncReader.java
@@ -11,8 +11,7 @@
import javax.xml.parsers.SAXParserFactory;
/**
- * @author：chengwei 2018/8/25
- * @description
+ * @author chengwei 2018/8/25
*/
public class Attr2FuncReader {
private File mFile;
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/AttrReader.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/AttrReader.java
similarity index 97%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/AttrReader.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/AttrReader.java
index 1d605b2..ee01329 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/AttrReader.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/AttrReader.java
@@ -1,7 +1,5 @@
package com.zhangyue.we.anoprocesser.xml;
-import com.zhangyue.we.anoprocesser.Log;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -15,8 +13,7 @@
import javax.xml.parsers.SAXParserFactory;
/**
- * @author：chengwei 2018/8/25
- * @description
+ * @author chengwei 2018/8/25
*/
public class AttrReader {
private HashMap mAttrs = new HashMap<>();
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Func.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Func.java
similarity index 92%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Func.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Func.java
index f75b564..8e5ef09 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Func.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Func.java
@@ -1,10 +1,7 @@
package com.zhangyue.we.anoprocesser.xml;
-import com.zhangyue.we.anoprocesser.Log;
-
/**
- * @author：chengwei 2018/8/25
- * @description
+ * @author chengwei 2018/8/25
*/
public class Func {
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutManager.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutManager.java
similarity index 96%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutManager.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutManager.java
index 55afd47..ad69223 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutManager.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutManager.java
@@ -21,8 +21,7 @@
import javax.xml.parsers.SAXParserFactory;
/**
- * @author：chengwei 2018/8/10
- * @description
+ * @author chengwei 2018/8/10
*/
public class LayoutManager {
@@ -167,7 +166,7 @@ public Style getStyle(String name) {
}
if (mStyles == null) {
mStyles = new HashMap();
- new StyleReader(mRootFile.getParentFile(), mStyles).parse();
+ new StyleReader(mRootFile, mStyles).parse();
}
return mStyles.get(name);
}
@@ -224,10 +223,10 @@ private File getRootFile() {
private void findPackageName() {
String sep = File.separator;
- File androidMainfest = new File(mRootFile + sep + "build" + sep + "intermediates" + sep + "manifests"
- + sep + "full" + sep + "debug" + sep + "AndroidManifest.xml");
+ File androidMainfest = new File(mRootFile + sep + "src" + sep + "main" + sep + "AndroidManifest.xml");
if (!androidMainfest.exists()) {
- androidMainfest = new File(mRootFile + sep + "src" + sep + "main" + sep + "AndroidManifest.xml");
+ androidMainfest = new File(mRootFile + sep + "build" + sep + "intermediates" + sep + "manifests"
+ + sep + "full" + sep + "debug" + sep + "AndroidManifest.xml");
}
SAXParser parser = null;
try {
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutReader.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutReader.java
similarity index 98%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutReader.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutReader.java
index 7691d9c..58e224e 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutReader.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutReader.java
@@ -15,8 +15,7 @@
import javax.xml.parsers.SAXParserFactory;
/**
- * @author：chengwei 2018/8/7
- * @description
+ * @author chengwei 2018/8/7
*/
public class LayoutReader {
private Filer mFiler;
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutWriter.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutWriter.java
similarity index 93%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutWriter.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutWriter.java
index 4b8b99b..cb7b2b7 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutWriter.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/LayoutWriter.java
@@ -1,7 +1,7 @@
package com.zhangyue.we.anoprocesser.xml;
import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.WeJavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec;
@@ -12,8 +12,7 @@
import javax.lang.model.element.Modifier;
/**
- * @author：chengwei 2018/8/8
- * @description
+ * @author chengwei 2018/8/8
*/
public class LayoutWriter {
private Filer mFiler;
@@ -60,7 +59,7 @@ public String write() {
if (mLayoutCategory != null && mLayoutCategory.length() > 0) {
pkgName += ("." + mLayoutCategory);
}
- JavaFile javaFile = JavaFile.builder(pkgName, typeSpec)
+ WeJavaFile javaFile = WeJavaFile.builder(pkgName, typeSpec)
.addImports(mImports)
.build();
try {
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/MapWriter.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/MapWriter.java
similarity index 95%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/MapWriter.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/MapWriter.java
index 9cfc44e..e31eaa3 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/MapWriter.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/MapWriter.java
@@ -1,7 +1,7 @@
package com.zhangyue.we.anoprocesser.xml;
import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.WeJavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec;
import com.zhangyue.we.anoprocesser.Util;
@@ -15,8 +15,7 @@
import javax.lang.model.element.Modifier;
/**
- * @author：chengwei 2018/8/9
- * @description
+ * @author chengwei 2018/8/9
*/
public class MapWriter {
@@ -82,7 +81,7 @@ public void write() {
"\nauthor chengwei \nemail chengwei@zhangyue.com\n"))
.build();
- JavaFile javaFile = JavaFile.builder("com.zhangyue.we.x2c", typeSpec)
+ WeJavaFile javaFile = WeJavaFile.builder("com.zhangyue.we.x2c", typeSpec)
.addImports(imports)
.build();
try {
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Style.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Style.java
similarity index 81%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Style.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Style.java
index df4ca82..28ed7e3 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Style.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/Style.java
@@ -3,8 +3,7 @@
import java.util.HashMap;
/**
- * @author：chengwei 2018/8/15
- * @description
+ * @author chengwei 2018/8/15
*/
public class Style {
public String name;
diff --git a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/StyleReader.java b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/StyleReader.java
similarity index 95%
rename from apt/src/main/java/com/zhangyue/we/anoprocesser/xml/StyleReader.java
rename to x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/StyleReader.java
index 3c81a7d..11bcc3b 100644
--- a/apt/src/main/java/com/zhangyue/we/anoprocesser/xml/StyleReader.java
+++ b/x2c-apt/src/main/java/com/zhangyue/we/anoprocesser/xml/StyleReader.java
@@ -1,6 +1,7 @@
package com.zhangyue.we.anoprocesser.xml;
import com.zhangyue.we.anoprocesser.FileFilter;
+import com.zhangyue.we.anoprocesser.Log;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -14,8 +15,7 @@
import javax.xml.parsers.SAXParserFactory;
/**
- * @author：chengwei 2018/8/15
- * @description
+ * @author chengwei 2018/8/15
*/
public class StyleReader {
private HashMap mStyles;
@@ -35,9 +35,11 @@ public StyleReader(File file, HashMap