tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-15 02:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes #2268] make lombok generate qualified types in order to avoid name clashes.

Browse Source
This commit is contained in:
Reinier Zwitserloot committed 2020-01-06 05:19:37 +01:00
1 parent 0bb5619230
commit 889c935ec9
166 files changed
+1451 -3425
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

doc/changelog.markdown
+1
View File
@@ -5,6 +5,7 @@ Lombok Changelog
* PLATFORM: Support for JDK13 (including `yield` in switch expressions, as well as delombok having a nicer style for arrow-style switch blocks, and text blocks).
* FEATURE: You can now configure a builder's 'setter' prefixes via `@Builder(setterPrefix = "set")` for example. We discourage doing this, but if some library you use requires them, have at it. [Pull Request #2174](https://github.com/rzwitserloot/lombok/pull/2174], [Issue #1805](https://github.com/rzwitserloot/lombok/issues/1805).
* BUGFIX: Referring to an inner class inside the generics on a class marked with `@SuperBuilder` would cause the error `wrong number of type arguments; required 3` [Issue #2262](https://github.com/rzwitserloot/lombok/issues/2262); fixed by github user [`@Lekanich`](https://github.com/rzwitserloot/lombok/issues/2262) - thank you!
* IMPROBABLE BREAKING CHANGE: Lombok now generates qualified types (so, `Outer.Inner` instead of just `Inner`) in most type signatures that it generates; this should avoid exotic scenarios where the types lombok puts in signatures end up referring to unintended other types, which can occur if your class implements an interface that itself defines a type with the same name as one defined in your source file. I told you it was exotic. Thanks to Hunter Anderson for doing some preliminary work on this change. [Issue #2268](https://github.com/rzwitserloot/lombok/issues/2268)
### v1.18.10 (September 10th, 2019)
src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+146 -5
View File
@@ -505,7 +505,13 @@ public class EclipseHandlerUtil {
} catch (Exception ignore) {}
}
public static TypeReference namePlusTypeParamsToTypeReference(char[] typeName, TypeParameter[] params, long p) {
public static TypeReference namePlusTypeParamsToTypeReference(EclipseNode type, TypeParameter[] params, long p) {
TypeDeclaration td = (TypeDeclaration) type.get();
boolean instance = (td.modifiers & ClassFileConstants.AccStatic) == 0;
return namePlusTypeParamsToTypeReference(type.up(), td.name, instance, params, p);
}
public static TypeReference namePlusTypeParamsToTypeReference(EclipseNode parentType, char[] typeName, boolean instance, TypeParameter[] params, long p) {
if (params != null && params.length > 0) {
TypeReference[] refs = new TypeReference[params.length];
int idx = 0;
@@ -513,10 +519,10 @@ public class EclipseHandlerUtil {
TypeReference typeRef = new SingleTypeReference(param.name, p);
refs[idx++] = typeRef;
}
return new ParameterizedSingleTypeReference(typeName, refs, 0, p);
return generateParameterizedTypeReference(parentType, typeName, instance, refs, p);
}
return new SingleTypeReference(typeName, p);
return generateTypeReference(parentType, typeName, instance, p);
}
public static TypeReference[] copyTypes(TypeReference[] refs) {
@@ -851,15 +857,150 @@ public class EclipseHandlerUtil {
if (source != null) setGeneratedBy(typeRef, source);
refs[idx++] = typeRef;
}
result = new ParameterizedSingleTypeReference(typeDecl.name, refs, 0, p);
result = generateParameterizedTypeReference(type, refs, p);
} else {
result = new SingleTypeReference(((TypeDeclaration)type.get()).name, p);
result = generateTypeReference(type, p);
}
}
if (result != null && source != null) setGeneratedBy(result, source);
return result;
}
public static TypeReference generateParameterizedTypeReference(EclipseNode type, TypeReference[] typeParams, long p) {
TypeDeclaration td = (TypeDeclaration) type.get();
char[][] tn = getQualifiedInnerName(type.up(), td.name);
if (tn.length == 1) return new ParameterizedSingleTypeReference(tn[0], typeParams, 0, p);
int tnLen = tn.length;
long[] ps = new long[tnLen];
for (int i = 0; i < tnLen; i++) ps[i] = p;
TypeReference[][] rr = new TypeReference[tnLen][];
rr[tnLen - 1] = typeParams;
boolean instance = (td.modifiers & ClassFileConstants.AccStatic) == 0;
if (instance) fillOuterTypeParams(rr, tnLen - 2, type.up(), p);
return new ParameterizedQualifiedTypeReference(tn, rr, 0, ps);
}
public static TypeReference generateParameterizedTypeReference(EclipseNode parent, char[] name, boolean instance, TypeReference[] typeParams, long p) {
char[][] tn = getQualifiedInnerName(parent, name);
if (tn.length == 1) return new ParameterizedSingleTypeReference(tn[0], typeParams, 0, p);
int tnLen = tn.length;
long[] ps = new long[tnLen];
for (int i = 0; i < tnLen; i++) ps[i] = p;
TypeReference[][] rr = new TypeReference[tnLen][];
rr[tnLen - 1] = typeParams;
if (instance) fillOuterTypeParams(rr, tnLen - 2, parent, p);
return new ParameterizedQualifiedTypeReference(tn, rr, 0, ps);
}
/**
* This class will add type params to fully qualified chain of type references for inner types, such as {@code GrandParent.Parent.Child}; this is needed only as long as the chain does not involve static.
*
* @return {@code true} if at least one parameterization is actually added, {@code false} otherwise.
*/
private static boolean fillOuterTypeParams(TypeReference[][] rr, int idx, EclipseNode node, long p) {
if (idx < 0 || node == null || !(node.get() instanceof TypeDeclaration)) return false;
boolean filled = false;
TypeDeclaration td = (TypeDeclaration) node.get();
TypeParameter[] tps = td.typeParameters;
if (tps != null && tps.length > 0) {
TypeReference[] trs = new TypeReference[tps.length];
for (int i = 0; i < tps.length; i++) {
trs[i] = new SingleTypeReference(tps[i].name, p);
}
rr[idx] = trs;
filled = true;
}
if ((td.modifiers & ClassFileConstants.AccStatic) != 0) return filled; // Once we hit a static class, no further typeparams needed.
boolean f2 = fillOuterTypeParams(rr, idx - 1, node.up(), p);
return f2 || filled;
}
public static NameReference generateNameReference(EclipseNode type, long p) {
char[][] tn = getQualifiedInnerName(type.up(), ((TypeDeclaration) type.get()).name);
if (tn.length == 1) return new SingleNameReference(tn[0], p);
int tnLen = tn.length;
long[] ps = new long[tnLen];
for (int i = 0; i < tnLen; i++) ps[i] = p;
int ss = (int) (p >> 32);
int se = (int) p;
return new QualifiedNameReference(tn, ps, ss, se);
}
public static NameReference generateNameReference(EclipseNode parent, char[] name, long p) {
char[][] tn = getQualifiedInnerName(parent, name);
if (tn.length == 1) return new SingleNameReference(tn[0], p);
int tnLen = tn.length;
long[] ps = new long[tnLen];
for (int i = 0; i < tnLen; i++) ps[i] = p;
int ss = (int) (p >> 32);
int se = (int) p;
return new QualifiedNameReference(tn, ps, ss, se);
}
public static TypeReference generateTypeReference(EclipseNode type, long p) {
TypeDeclaration td = (TypeDeclaration) type.get();
char[][] tn = getQualifiedInnerName(type.up(), td.name);
if (tn.length == 1) return new SingleTypeReference(tn[0], p);
int tnLen = tn.length;
long[] ps = new long[tnLen];
for (int i = 0; i < tnLen; i++) ps[i] = p;
boolean instance = (td.modifiers & ClassFileConstants.AccStatic) == 0 && type.up() != null && type.up().get() instanceof TypeDeclaration;
if (instance) {
TypeReference[][] trs = new TypeReference[tn.length][];
boolean filled = fillOuterTypeParams(trs, trs.length - 2, type.up(), p);
if (filled) return new ParameterizedQualifiedTypeReference(tn, trs, 0, ps);
}
return new QualifiedTypeReference(tn, ps);
}
public static TypeReference generateTypeReference(EclipseNode parent, char[] name, boolean instance, long p) {
char[][] tn = getQualifiedInnerName(parent, name);
if (tn.length == 1) return new SingleTypeReference(tn[0], p);
int tnLen = tn.length;
long[] ps = new long[tnLen];
for (int i = 0; i < tnLen; i++) ps[i] = p;
if (instance && parent != null && parent.get() instanceof TypeDeclaration) {
TypeReference[][] trs = new TypeReference[tn.length][];
if (fillOuterTypeParams(trs, tn.length - 2, parent, p)) return new ParameterizedQualifiedTypeReference(tn, trs, 0, ps);
}
return new QualifiedTypeReference(tn, ps);
}
/**
* Generate a chain of names for the enclosing classes.
*
* Given for example {@code class Outer { class Inner {} }} this would generate {@code char[][] { "Outer", "Inner" }}.
* For method local and top level types, this generates a size-1 char[][] where the only char[] element is {@code name} itself.
*/
private static char[][] getQualifiedInnerName(EclipseNode parent, char[] name) {
int count = 0;
EclipseNode n = parent;
while (n != null && n.getKind() == Kind.TYPE && n.get() instanceof TypeDeclaration) {
TypeDeclaration td = (TypeDeclaration) n.get();
if (td.name == null || td.name.length == 0) break;
count++;
n = n.up();
}
if (count == 0) return new char[][] { name };
char[][] res = new char[count + 1][];
res[count] = name;
n = parent;
while (n != null && n.getKind() == Kind.TYPE && n.get() instanceof TypeDeclaration) {
TypeDeclaration td = (TypeDeclaration) n.get();
res[--count] = td.name;
n = n.up();
}
return res;
}
public static TypeReference makeType(TypeBinding binding, ASTNode pos, boolean allowCompound) {
if (binding.getClass() == EclipseReflectiveMembers.INTERSECTION_BINDING) {
Object[] arr = (Object[]) EclipseReflectiveMembers.reflect(EclipseReflectiveMembers.INTERSECTION_BINDING_TYPES, binding);
src/core/lombok/eclipse/handlers/HandleBuilder.java
+29 -14
View File
@@ -55,6 +55,7 @@ import org.eclipse.jdt.internal.compiler.ast.NullLiteral;
import org.eclipse.jdt.internal.compiler.ast.OperatorIds;
import org.eclipse.jdt.internal.compiler.ast.ParameterizedQualifiedTypeReference;
import org.eclipse.jdt.internal.compiler.ast.ParameterizedSingleTypeReference;
import org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;
import org.eclipse.jdt.internal.compiler.ast.QualifiedThisReference;
import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference;
import org.eclipse.jdt.internal.compiler.ast.ReturnStatement;
@@ -274,7 +275,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
handleConstructor.generateConstructor(tdParent, AccessLevel.PACKAGE, allFields, false, null, SkipIfConstructorExists.I_AM_BUILDER,
Collections.<Annotation>emptyList(), annotationNode);
returnType = namePlusTypeParamsToTypeReference(td.name, td.typeParameters, p);
returnType = namePlusTypeParamsToTypeReference(tdParent, td.typeParameters, p);
typeParams = td.typeParameters;
thrownExceptions = null;
nameOfStaticBuilderMethod = null;
@@ -289,7 +290,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
tdParent = parent.up();
TypeDeclaration td = (TypeDeclaration) tdParent.get();
returnType = namePlusTypeParamsToTypeReference(td.name, td.typeParameters, p);
returnType = namePlusTypeParamsToTypeReference(tdParent, td.typeParameters, p);
typeParams = td.typeParameters;
thrownExceptions = cd.thrownExceptions;
nameOfStaticBuilderMethod = null;
@@ -539,7 +540,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
tps[i].name = typeArgsForToBuilder.get(i);
}
}
MethodDeclaration md = generateToBuilderMethod(cfv, toBuilderMethodName, builderClassName, tdParent, tps, builderFields, fluent, ast, accessForOuters, builderInstance.setterPrefix());
MethodDeclaration md = generateToBuilderMethod(cfv, isStatic, toBuilderMethodName, builderClassName, tdParent, tps, builderFields, fluent, ast, accessForOuters, builderInstance.setterPrefix());
if (md != null) injectMethod(tdParent, md);
}
@@ -552,7 +553,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
}
private static final char[] BUILDER_TEMP_VAR = {'b', 'u', 'i', 'l', 'd', 'e', 'r'};
private MethodDeclaration generateToBuilderMethod(CheckerFrameworkVersion cfv, String methodName, String builderClassName, EclipseNode type, TypeParameter[] typeParams, List<BuilderFieldData> builderFields, boolean fluent, ASTNode source, AccessLevel access, String prefix) {
private MethodDeclaration generateToBuilderMethod(CheckerFrameworkVersion cfv, boolean isStatic, String methodName, String builderClassName, EclipseNode type, TypeParameter[] typeParams, List<BuilderFieldData> builderFields, boolean fluent, ASTNode source, AccessLevel access, String prefix) {
int pS = source.sourceStart, pE = source.sourceEnd;
long p = (long) pS << 32 | pE;
@@ -560,9 +561,9 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
out.selector = methodName.toCharArray();
out.modifiers = toEclipseModifier(access);
out.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG;
out.returnType = namePlusTypeParamsToTypeReference(builderClassName.toCharArray(), typeParams, p);
out.returnType = namePlusTypeParamsToTypeReference(type, builderClassName.toCharArray(), !isStatic, typeParams, p);
AllocationExpression invoke = new AllocationExpression();
invoke.type = namePlusTypeParamsToTypeReference(builderClassName.toCharArray(), typeParams, p);
invoke.type = namePlusTypeParamsToTypeReference(type, builderClassName.toCharArray(), !isStatic, typeParams, p);
Expression receiver = invoke;
List<Statement> statements = null;
@@ -593,7 +594,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
obtainExpr.typeArguments[j] = new SingleTypeReference(typeParams[j].name, 0);
}
}
obtainExpr.receiver = new SingleNameReference(type.getName().toCharArray(), 0);
obtainExpr.receiver = generateNameReference(type, 0);
} else {
obtainExpr.receiver = new ThisReference(0, 0);
}
@@ -623,7 +624,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
LocalDeclaration b = new LocalDeclaration(BUILDER_TEMP_VAR, pS, pE);
out.statements[0] = b;
b.modifiers |= Modifier.FINAL;
b.type = namePlusTypeParamsToTypeReference(builderClassName.toCharArray(), typeParams, p);
b.type = namePlusTypeParamsToTypeReference(type, builderClassName.toCharArray(), !isStatic, typeParams, p);
b.type.sourceStart = pS; b.type.sourceEnd = pE;
b.initialization = receiver;
out.statements[out.statements.length - 1] = new ReturnStatement(new SingleNameReference(BUILDER_TEMP_VAR, p), pS, pE);
@@ -684,7 +685,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
}
ann.memberValue = arr;
}
Argument arg = new Argument(new char[] { 't', 'h', 'i', 's' }, 0, new SingleTypeReference(type.getName().toCharArray(), source.sourceStart), Modifier.FINAL);
Argument arg = new Argument(new char[] { 't', 'h', 'i', 's' }, 0, generateTypeReference(type, source.sourceStart), Modifier.FINAL);
arg.annotations = new Annotation[] {ann};
return new Argument[] {arg};
}
@@ -751,7 +752,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
if (isStatic) {
invoke.receiver = new SingleNameReference(type.up().getName().toCharArray(), 0);
} else {
invoke.receiver = new QualifiedThisReference(new SingleTypeReference(type.up().getName().toCharArray(), 0) , 0, 0);
invoke.receiver = new QualifiedThisReference(generateTypeReference(type.up(), 0) , 0, 0);
}
invoke.typeArguments = typeParameterNames(((TypeDeclaration) type.get()).typeParameters);
@@ -801,17 +802,31 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
public MethodDeclaration generateBuilderMethod(CheckerFrameworkVersion cfv, boolean isStatic, String builderMethodName, String builderClassName, EclipseNode type, TypeParameter[] typeParams, ASTNode source, AccessLevel access) {
int pS = source.sourceStart, pE = source.sourceEnd;
long p = (long) pS << 32 | pE;
char[] builderClassName_ = builderClassName.toCharArray();
MethodDeclaration out = new MethodDeclaration(((CompilationUnitDeclaration) type.top().get()).compilationResult);
out.selector = builderMethodName.toCharArray();
out.modifiers = toEclipseModifier(access);
if (isStatic) out.modifiers |= ClassFileConstants.AccStatic;
out.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG;
out.returnType = namePlusTypeParamsToTypeReference(builderClassName.toCharArray(), typeParams, p);
out.returnType = namePlusTypeParamsToTypeReference(type, builderClassName_, !isStatic, typeParams, p);
out.typeParameters = copyTypeParams(typeParams, source);
AllocationExpression invoke = new AllocationExpression();
invoke.type = namePlusTypeParamsToTypeReference(builderClassName.toCharArray(), typeParams, p);
out.statements = new Statement[] {new ReturnStatement(invoke, pS, pE)};
if (isStatic) {
invoke.type = namePlusTypeParamsToTypeReference(type, builderClassName_, false, typeParams, p);
out.statements = new Statement[] {new ReturnStatement(invoke, pS, pE)};
} else {
// return this.new Builder();
QualifiedAllocationExpression qualifiedInvoke = new QualifiedAllocationExpression();
qualifiedInvoke.enclosingInstance = new ThisReference(pS, pE);
if (typeParams == null || typeParams.length == 0) {
qualifiedInvoke.type = new SingleTypeReference(builderClassName_, p);
} else {
qualifiedInvoke.type = namePlusTypeParamsToTypeReference(null, builderClassName_, false, typeParams, p);
}
out.statements = new Statement[] {new ReturnStatement(qualifiedInvoke, pS, pE)};
}
Annotation uniqueAnn = cfv.generateUnique() ? generateNamedAnnotation(source, CheckerFrameworkVersion.NAME__UNIQUE) : null;
Annotation sefAnn = cfv.generateSideEffectFree() ? generateNamedAnnotation(source, CheckerFrameworkVersion.NAME__SIDE_EFFECT_FREE) : null;
if (uniqueAnn != null && sefAnn != null) {
@@ -904,7 +919,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
Argument[] arr = setter.arguments == null ? new Argument[0] : setter.arguments;
Argument[] newArr = new Argument[arr.length + 1];
System.arraycopy(arr, 0, newArr, 1, arr.length);
newArr[0] = new Argument(new char[] { 't', 'h', 'i', 's' }, 0, new SingleTypeReference(builderType.getName().toCharArray(), 0), Modifier.FINAL);
newArr[0] = new Argument(new char[] { 't', 'h', 'i', 's' }, 0, generateTypeReference(builderType, 0), Modifier.FINAL);
char[][] nameNotCalled = fromQualifiedName(CheckerFrameworkVersion.NAME__NOT_CALLED);
SingleMemberAnnotation ann = new SingleMemberAnnotation(new QualifiedTypeReference(nameNotCalled, poss(
source, nameNotCalled.length)), source.sourceStart);
src/core/lombok/eclipse/handlers/HandleConstructor.java
+1 -1
View File
@@ -530,7 +530,7 @@ public class HandleConstructor {
constructor.modifiers = toEclipseModifier(level) | ClassFileConstants.AccStatic;
TypeDeclaration typeDecl = (TypeDeclaration) type.get();
constructor.returnType = EclipseHandlerUtil.namePlusTypeParamsToTypeReference(typeDecl.name, typeDecl.typeParameters, p);
constructor.returnType = EclipseHandlerUtil.namePlusTypeParamsToTypeReference(type, typeDecl.typeParameters, p);
constructor.annotations = null;
constructor.selector = name.toCharArray();
constructor.thrownExceptions = null;
src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
+35 -26
View File
@@ -217,7 +217,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
String builderImplClassName = builderClassName + "Impl";
typeParams = td.typeParameters != null ? td.typeParameters : new TypeParameter[0];
returnType = namePlusTypeParamsToTypeReference(td.name, typeParams, p);
returnType = namePlusTypeParamsToTypeReference(tdParent, typeParams, p);
// <C, B> are the generics for our builder.
String classGenericName = "C";
@@ -438,7 +438,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
o = new TypeParameter();
o.name = builderGenericName.toCharArray();
TypeReference[] typerefs = appendBuilderTypeReferences(typeParams, classGenericName, builderGenericName);
o.type = new ParameterizedSingleTypeReference(builderClass.toCharArray(), typerefs, 0, 0);
o.type = generateParameterizedTypeReference(tdParent, builderClass.toCharArray(), false, typerefs, 0);
builder.typeParameters[builder.typeParameters.length - 1] = o;
builder.superclass = copyType(superclassBuilderClass, source);
@@ -469,8 +469,8 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
// 2. The return type for the build() method (named "C" in the abstract builder), which is the annotated class.
// 3. The return type for all setter methods (named "B" in the abstract builder), which is this builder class.
typeArgs[typeArgs.length - 2] = cloneSelfType(tdParent, source);
typeArgs[typeArgs.length - 1] = createTypeReferenceWithTypeParameters(builderImplClass, typeParams);
builder.superclass = new ParameterizedSingleTypeReference(builderAbstractClass.toCharArray(), typeArgs, 0, 0);
typeArgs[typeArgs.length - 1] = createTypeReferenceWithTypeParameters(tdParent, builderImplClass, typeParams);
builder.superclass = generateParameterizedTypeReference(tdParent, builderAbstractClass.toCharArray(), false, typeArgs, 0);
}
builder.createDefaultConstructor(false, true);
@@ -523,7 +523,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
constructor.bodyEnd = constructor.declarationSourceEnd = constructor.sourceEnd = source.sourceEnd;
TypeReference[] wildcards = new TypeReference[] {new Wildcard(Wildcard.UNBOUND), new Wildcard(Wildcard.UNBOUND)};
TypeReference builderType = new ParameterizedSingleTypeReference(builderClassName.toCharArray(), mergeToTypeReferences(typeParams, wildcards), 0, p);
TypeReference builderType = generateParameterizedTypeReference(typeNode, builderClassName.toCharArray(), false, mergeToTypeReferences(typeParams, wildcards), p);
constructor.arguments = new Argument[] {new Argument(BUILDER_VARIABLE_NAME, p, builderType, Modifier.FINAL)};
List<Statement> statements = new ArrayList<Statement>();
@@ -554,7 +554,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
MessageSend defaultMethodCall = new MessageSend();
defaultMethodCall.sourceStart = source.sourceStart;
defaultMethodCall.sourceEnd = source.sourceEnd;
defaultMethodCall.receiver = new SingleNameReference(((TypeDeclaration) typeNode.get()).name, 0L);
defaultMethodCall.receiver = generateNameReference(typeNode, 0L);
defaultMethodCall.selector = fieldNode.nameOfDefaultProvider;
defaultMethodCall.typeArguments = typeParameterNames(((TypeDeclaration) typeNode.get()).typeParameters);
@@ -591,10 +591,10 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
if (typeParams != null && typeParams.length > 0) out.typeParameters = copyTypeParams(typeParams, source);
TypeReference[] wildcards = new TypeReference[] {new Wildcard(Wildcard.UNBOUND), new Wildcard(Wildcard.UNBOUND) };
out.returnType = new ParameterizedSingleTypeReference(builderClassName.toCharArray(), mergeToTypeReferences(typeParams, wildcards), 0, p);
out.returnType = generateParameterizedTypeReference(type, builderClassName.toCharArray(), false, mergeToTypeReferences(typeParams, wildcards), p);
AllocationExpression invoke = new AllocationExpression();
invoke.type = namePlusTypeParamsToTypeReference(builderImplClassName.toCharArray(), typeParams, p);
invoke.type = namePlusTypeParamsToTypeReference(type, builderImplClassName.toCharArray(), false, typeParams, p);
out.statements = new Statement[] {new ReturnStatement(invoke, pS, pE)};
if (cfv.generateUnique()) out.annotations = new Annotation[] {generateNamedAnnotation(source, CheckerFrameworkVersion.NAME__UNIQUE)};
@@ -606,8 +606,8 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
/**
* Generates a <code>toBuilder()</code> method in the annotated class that looks like this:
* <pre>
* public ParentBuilder&lt;?, ?&gt; toBuilder() {
* return new <i>Foobar</i>BuilderImpl().$fillValuesFrom(this);
* public <i>Foobar</i>.<i>Foobar</i>Builder&lt;?, ?&gt; toBuilder() {
* return new <i.Foobar</i>.<i>Foobar</i>BuilderImpl().$fillValuesFrom(this);
* }
* </pre>
*/
@@ -621,10 +621,10 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
out.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG;
TypeReference[] wildcards = new TypeReference[] {new Wildcard(Wildcard.UNBOUND), new Wildcard(Wildcard.UNBOUND) };
out.returnType = new ParameterizedSingleTypeReference(builderClassName.toCharArray(), mergeToTypeReferences(typeParams, wildcards), 0, p);
out.returnType = generateParameterizedTypeReference(type, builderClassName.toCharArray(), false, mergeToTypeReferences(typeParams, wildcards), p);
AllocationExpression newClass = new AllocationExpression();
newClass.type = namePlusTypeParamsToTypeReference(builderImplClassName.toCharArray(), typeParams, p);
newClass.type = namePlusTypeParamsToTypeReference(type, builderImplClassName.toCharArray(), false, typeParams, p);
MessageSend invokeFillMethod = new MessageSend();
invokeFillMethod.receiver = newClass;
invokeFillMethod.selector = FILL_VALUES_METHOD_NAME;
@@ -643,7 +643,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
* <pre>
* protected B $fillValuesFrom(final C instance) {
* super.$fillValuesFrom(instance);
* FoobarBuilderImpl.$fillValuesFromInstanceIntoBuilder(instance, this);
* Foobar.FoobarBuilderImpl.$fillValuesFromInstanceIntoBuilder(instance, this);
* return self();
* }
* </pre>
@@ -672,7 +672,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
// Call the builder implemention's helper method that actually fills the values from the instance.
MessageSend callStaticFillValuesMethod = new MessageSend();
callStaticFillValuesMethod.receiver = new SingleNameReference(builderClassName.toCharArray(), 0);
callStaticFillValuesMethod.receiver = generateNameReference(tdParent, builderClassName.toCharArray(), 0);
callStaticFillValuesMethod.selector = FILL_VALUES_STATIC_METHOD_NAME;
callStaticFillValuesMethod.arguments = new Expression[] {new SingleNameReference(INSTANCE_VARIABLE_NAME, 0), new ThisReference(0, 0)};
body.add(callStaticFillValuesMethod);
@@ -707,16 +707,25 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
out.returnType = TypeReference.baseTypeReference(TypeIds.T_void, 0);
TypeReference[] wildcards = new TypeReference[] {new Wildcard(Wildcard.UNBOUND), new Wildcard(Wildcard.UNBOUND)};
TypeReference builderType = new ParameterizedSingleTypeReference(builderClassName.toCharArray(), mergeToTypeReferences(typeParams, wildcards), 0, 0);
TypeReference builderType = generateParameterizedTypeReference(tdParent, builderClassName.toCharArray(), false, mergeToTypeReferences(typeParams, wildcards), 0);
Argument builderArgument = new Argument(BUILDER_VARIABLE_NAME, 0, builderType, Modifier.FINAL);
TypeReference parentArgument = createTypeReferenceWithTypeParameters(tdParent.getName(), typeParams);
TypeReference[] typerefs = null;
if (typeParams.length > 0) {
typerefs = new TypeReference[typeParams.length];
for (int i = 0; i < typeParams.length; i++) typerefs[i] = new SingleTypeReference(typeParams[i].name, 0);
}
long p = source.sourceStart;
p = (p << 32) | source.sourceEnd;
TypeReference parentArgument = typerefs == null ? generateTypeReference(tdParent, p) : generateParameterizedTypeReference(tdParent, typerefs, p);
out.arguments = new Argument[] {new Argument(INSTANCE_VARIABLE_NAME, 0, parentArgument, Modifier.FINAL), builderArgument};
// Add type params if there are any.
if (typeParams.length > 0) out.typeParameters = copyTypeParams(typeParams, source);
List<Statement> body = new ArrayList<Statement>();
// Call the builder's setter methods to fill the values from the instance.
for (BuilderFieldData bfd : builderFields) {
MessageSend exec = createSetterCallWithInstanceValue(bfd, tdParent, source);
@@ -727,7 +736,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
return out;
}
private MessageSend createSetterCallWithInstanceValue(BuilderFieldData bfd, EclipseNode type, ASTNode source) {
char[] setterName = bfd.name;
MessageSend ms = new MessageSend();
@@ -745,7 +754,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
boolean obtainIsStatic = bfd.obtainVia.isStatic();
for (int i = 0; i < tgt.length; i++) {
MessageSend obtainExpr = new MessageSend();
obtainExpr.receiver = obtainIsStatic ? new SingleNameReference(type.getName().toCharArray(), 0) : new SingleNameReference(INSTANCE_VARIABLE_NAME, 0);
obtainExpr.receiver = obtainIsStatic ? generateNameReference(type, 0) : new SingleNameReference(INSTANCE_VARIABLE_NAME, 0);
obtainExpr.selector = obtainName.toCharArray();
if (obtainIsStatic) obtainExpr.arguments = new Expression[] {new SingleNameReference(INSTANCE_VARIABLE_NAME, 0)};
tgt[i] = obtainExpr;
@@ -796,7 +805,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
else if (rrAnn != null) out.annotations = new Annotation[] {overrideAnn, rrAnn};
else if (sefAnn != null) out.annotations = new Annotation[] {overrideAnn, sefAnn};
else out.annotations = new Annotation[] {overrideAnn};
out.returnType = namePlusTypeParamsToTypeReference(builderImplType.getName().toCharArray(), typeParams, p);
out.returnType = namePlusTypeParamsToTypeReference(builderImplType, typeParams, p);
out.statements = new Statement[] {new ReturnStatement(new ThisReference(0, 0), 0, 0)};
return out;
}
@@ -959,7 +968,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
Argument[] arr = setter.arguments == null ? new Argument[0] : setter.arguments;
Argument[] newArr = new Argument[arr.length + 1];
System.arraycopy(arr, 0, newArr, 1, arr.length);
newArr[0] = new Argument(new char[] { 't', 'h', 'i', 's' }, 0, new SingleTypeReference(builderType.getName().toCharArray(), 0), Modifier.FINAL);
newArr[0] = new Argument(new char[] { 't', 'h', 'i', 's' }, 0, generateTypeReference(builderType, 0), Modifier.FINAL);
char[][] nameNotCalled = fromQualifiedName(CheckerFrameworkVersion.NAME__NOT_CALLED);
SingleMemberAnnotation ann = new SingleMemberAnnotation(new QualifiedTypeReference(nameNotCalled, poss(source, nameNotCalled.length)), source.sourceStart);
ann.memberValue = new StringLiteral(setterName.toCharArray(), 0, 0, 0);
@@ -1067,15 +1076,15 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
return typeArgs;
}
private static SingleTypeReference createTypeReferenceWithTypeParameters(String referenceName, TypeParameter[] typeParams) {
private static TypeReference createTypeReferenceWithTypeParameters(EclipseNode parent, String referenceName, TypeParameter[] typeParams) {
if (typeParams.length > 0) {
TypeReference[] typerefs = new TypeReference[typeParams.length];
for (int i = 0; i < typeParams.length; i++) {
typerefs[i] = new SingleTypeReference(typeParams[i].name, 0);
}
return new ParameterizedSingleTypeReference(referenceName.toCharArray(), typerefs, 0, 0);
return generateParameterizedTypeReference(parent, referenceName.toCharArray(), false, typerefs, 0);
} else {
return new SingleTypeReference(referenceName.toCharArray(), 0);
return generateTypeReference(parent, referenceName.toCharArray(), false, 0);
}
}
src/core/lombok/javac/handlers/HandleBuilder.java
+30 -29
View File
@@ -21,6 +21,12 @@
*/
package lombok.javac.handlers;
import static lombok.core.handlers.HandlerUtil.*;
import static lombok.javac.Javac.*;
import static lombok.javac.JavacTreeMaker.TypeTag.typeTag;
import static lombok.javac.handlers.JavacHandlerUtil.*;
import static lombok.javac.handlers.JavacHandlerUtil.isFieldDeprecated;
import java.util.ArrayList;
import javax.lang.model.element.Modifier;
@@ -40,6 +46,7 @@ import com.sun.tools.javac.tree.JCTree.JCIf;
import com.sun.tools.javac.tree.JCTree.JCLiteral;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.JCTree.JCModifiers;
import com.sun.tools.javac.tree.JCTree.JCNewClass;
import com.sun.tools.javac.tree.JCTree.JCPrimitiveTypeTree;
import com.sun.tools.javac.tree.JCTree.JCStatement;
import com.sun.tools.javac.tree.JCTree.JCTypeApply;
@@ -60,6 +67,7 @@ import lombok.core.AnnotationValues;
import lombok.core.HandlerPriority;
import lombok.core.configuration.CheckerFrameworkVersion;
import lombok.core.handlers.HandlerUtil;
import lombok.core.handlers.HandlerUtil.FieldAccess;
import lombok.core.handlers.InclusionExclusionUtils.Included;
import lombok.experimental.NonFinal;
import lombok.javac.Javac;
@@ -67,12 +75,10 @@ import lombok.javac.JavacAnnotationHandler;
import lombok.javac.JavacNode;
import lombok.javac.JavacTreeMaker;
import lombok.javac.handlers.HandleConstructor.SkipIfConstructorExists;
import lombok.javac.handlers.JavacHandlerUtil.CopyJavadoc;
import lombok.javac.handlers.JavacHandlerUtil.MemberExistsResult;
import lombok.javac.handlers.JavacSingularsRecipes.JavacSingularizer;
import lombok.javac.handlers.JavacSingularsRecipes.SingularData;
import static lombok.core.handlers.HandlerUtil.*;
import static lombok.javac.handlers.JavacHandlerUtil.*;
import static lombok.javac.Javac.*;
import static lombok.javac.JavacTreeMaker.TypeTag.*;
@ProviderFor(JavacAnnotationHandler.class)
@HandlerPriority(-1024) //-2^10; to ensure we've picked up @FieldDefault's changes (-2048) but @Value hasn't removed itself yet (-512), so that we can error on presence of it on the builder classes.
@@ -216,7 +222,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
handleConstructor.generateConstructor(tdParent, AccessLevel.PACKAGE, List.<JCAnnotation>nil(), allFields.toList(), false, null, SkipIfConstructorExists.I_AM_BUILDER, annotationNode);
returnType = namePlusTypeParamsToTypeReference(tdParent.getTreeMaker(), td.name, td.typarams);
returnType = namePlusTypeParamsToTypeReference(tdParent.getTreeMaker(), tdParent, td.typarams);
typeParams = td.typarams;
thrownExceptions = List.nil();
nameOfBuilderMethod = null;
@@ -231,7 +237,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
tdParent = parent.up();
JCClassDecl td = (JCClassDecl) tdParent.get();
returnType = namePlusTypeParamsToTypeReference(tdParent.getTreeMaker(), td.name, td.typarams);
returnType = namePlusTypeParamsToTypeReference(tdParent.getTreeMaker(), tdParent, td.typarams);
typeParams = td.typarams;
thrownExceptions = jmd.thrown;
nameOfBuilderMethod = null;
@@ -487,7 +493,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
}
tps = lb.toList();
}
JCMethodDecl md = generateToBuilderMethod(cfv, toBuilderMethodName, builderClassName, tdParent, tps, builderFields, fluent, ast, accessForOuters, builderInstance.setterPrefix());
JCMethodDecl md = generateToBuilderMethod(cfv, toBuilderMethodName, builderClassName, tdParent, isStatic, tps, builderFields, fluent, ast, accessForOuters, builderInstance.setterPrefix());
if (md != null) {
recursiveSetGeneratedBy(md, ast, annotationNode.getContext());
injectMethod(tdParent, md);
@@ -536,7 +542,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
}
private static final String BUILDER_TEMP_VAR = "builder";
private JCMethodDecl generateToBuilderMethod(CheckerFrameworkVersion cfv, String toBuilderMethodName, String builderClassName, JavacNode type, List<JCTypeParameter> typeParams, java.util.List<BuilderFieldData> builderFields, boolean fluent, JCAnnotation ast, AccessLevel access, String prefix) {
private JCMethodDecl generateToBuilderMethod(CheckerFrameworkVersion cfv, String toBuilderMethodName, String builderClassName, JavacNode type, boolean isStatic, List<JCTypeParameter> typeParams, java.util.List<BuilderFieldData> builderFields, boolean fluent, JCAnnotation ast, AccessLevel access, String prefix) {
// return new ThingieBuilder<A, B>().setA(this.a).setB(this.b);
JavacTreeMaker maker = type.getTreeMaker();
@@ -545,7 +551,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
typeArgs.append(maker.Ident(typeParam.name));
}
JCExpression call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams), List.<JCExpression>nil(), null);
JCExpression call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassName), !isStatic, typeParams), List.<JCExpression>nil(), null);
JCExpression invoke = call;
ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
for (BuilderFieldData bfd : builderFields) {
@@ -584,7 +590,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
}
}
if (!statements.isEmpty()) {
JCExpression tempVarType = namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams);
JCExpression tempVarType = namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassName), !isStatic, typeParams);
statements.prepend(maker.VarDef(maker.Modifiers(Flags.FINAL), type.toName(BUILDER_TEMP_VAR), tempVarType, invoke));
statements.append(maker.Return(maker.Ident(type.toName(BUILDER_TEMP_VAR))));
} else {
@@ -592,7 +598,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
}
JCBlock body = maker.Block(0, statements.toList());
List<JCAnnotation> annsOnMethod = cfv.generateUnique() ? List.of(maker.Annotation(genTypeRef(type, CheckerFrameworkVersion.NAME__UNIQUE), List.<JCExpression>nil())) : List.<JCAnnotation>nil();
return maker.MethodDef(maker.Modifiers(toJavacModifier(access), annsOnMethod), type.toName(toBuilderMethodName), namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams), List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
return maker.MethodDef(maker.Modifiers(toJavacModifier(access), annsOnMethod), type.toName(toBuilderMethodName), namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassName), !isStatic, typeParams), List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
}
private JCMethodDecl generateCleanMethod(java.util.List<BuilderFieldData> builderFields, JavacNode type, JCTree source) {
@@ -610,18 +616,6 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
JCMethodDecl method = maker.MethodDef(maker.Modifiers(toJavacModifier(AccessLevel.PRIVATE)), type.toName("$lombokClean"), maker.Type(Javac.createVoidType(type.getSymbolTable(), CTC_VOID)), List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
recursiveSetGeneratedBy(method, source, type.getContext());
return method;
/*
* if (shouldReturnThis) {
methodType = cloneSelfType(field);
}
if (methodType == null) {
//WARNING: Do not use field.getSymbolTable().voidType - that field has gone through non-backwards compatible API changes within javac1.6.
methodType = treeMaker.Type(Javac.createVoidType(treeMaker, CTC_VOID));
shouldReturnThis = false;
}
*/
}
static List<JCVariableDecl> generateBuildArgs(CheckerFrameworkVersion cfv, JavacNode type, java.util.List<BuilderFieldData> builderFields) {
@@ -643,10 +637,10 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
}
JCAnnotation recvAnno = maker.Annotation(genTypeRef(type, CheckerFrameworkVersion.NAME__CALLED), List.of(arg));
JCClassDecl builderTypeNode = (JCClassDecl) type.get();
JCVariableDecl recv = maker.VarDef(maker.Modifiers(0L, List.<JCAnnotation>of(recvAnno)), type.toName("this"), maker.Ident(builderTypeNode.name), null);
JCVariableDecl recv = maker.VarDef(maker.Modifiers(0L, List.<JCAnnotation>of(recvAnno)), type.toName("this"), namePlusTypeParamsToTypeReference(maker, type, builderTypeNode.typarams), null);
return List.of(recv);
}
private JCMethodDecl generateBuildMethod(CheckerFrameworkVersion cfv, JavacNode tdParent, boolean isStatic, String buildName, Name builderName, JCExpression returnType, java.util.List<BuilderFieldData> builderFields, JavacNode type, List<JCExpression> thrownExceptions, JCTree source, boolean addCleaning, AccessLevel access) {
JavacTreeMaker maker = type.getTreeMaker();
@@ -725,7 +719,14 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
typeArgs.append(maker.Ident(typeParam.name));
}
JCExpression call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams), List.<JCExpression>nil(), null);
JCExpression call;
if (isStatic) {
call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassName), false, typeParams), List.<JCExpression>nil(), null);
} else {
call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, null, type.toName(builderClassName), false, typeParams), List.<JCExpression>nil(), null);
((JCNewClass) call).encl = maker.Ident(type.toName("this"));
}
JCStatement statement = maker.Return(call);
JCBlock body = maker.Block(0, List.<JCStatement>of(statement));
@@ -738,7 +739,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
else if (annUnique != null) annsOnMethod = List.of(annUnique);
else if (annSef != null) annsOnMethod = List.of(annSef);
else annsOnMethod = List.nil();
return maker.MethodDef(maker.Modifiers(modifiers, annsOnMethod), type.toName(builderMethodName), namePlusTypeParamsToTypeReference(maker, type.toName(builderClassName), typeParams), copyTypeParams(source, typeParams), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
return maker.MethodDef(maker.Modifiers(modifiers, annsOnMethod), type.toName(builderMethodName), namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassName), !isStatic, typeParams), copyTypeParams(source, typeParams), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
}
public void generateBuilderFields(JavacNode builderType, java.util.List<BuilderFieldData> builderFields, JCTree source) {
@@ -785,7 +786,6 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
if (fieldNode.singularData == null || fieldNode.singularData.getSingularizer() == null) {
makePrefixedSetterMethodForBuilder(cfv, builderType, deprecate, fieldNode.createdFields.get(0), fieldNode.name, fieldNode.nameOfSetFlag, source, fluent, chain, fieldNode.annotations, fieldNode.originalFieldNode, access, prefix);
} else {
// TODO prefixed version
fieldNode.singularData.getSingularizer().generateMethods(cfv, fieldNode.singularData, deprecate, builderType, source.get(), fluent, chain, access);
}
}
@@ -809,7 +809,8 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
if (cfv.generateCalledMethods()) {
JCAnnotation ncAnno = maker.Annotation(genTypeRef(source, CheckerFrameworkVersion.NAME__NOT_CALLED), List.<JCExpression>of(maker.Literal(newMethod.getName().toString())));
JCClassDecl builderTypeNode = (JCClassDecl) builderType.get();
JCVariableDecl recv = maker.VarDef(maker.Modifiers(0L, List.<JCAnnotation>of(ncAnno)), builderType.toName("this"), maker.Ident(builderTypeNode.name), null);
JCExpression selfType = namePlusTypeParamsToTypeReference(maker, builderType, builderTypeNode.typarams);
JCVariableDecl recv = maker.VarDef(maker.Modifiers(0L, List.<JCAnnotation>of(ncAnno)), builderType.toName("this"), selfType, null);
newMethod.params = List.of(recv, newMethod.params.get(0));
}
recursiveSetGeneratedBy(newMethod, source.get(), builderType.getContext());
src/core/lombok/javac/handlers/HandleSuperBuilder.java
+22 -27
View File
@@ -408,18 +408,15 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
allTypeParams.addAll(copyTypeParams(source, typeParams));
// Add builder-specific type params required for inheritable builders.
// 1. The return type for the build() method, named "C", which extends the annotated class.
JCExpression annotatedClass = maker.Ident(tdParent.toName(tdParent.getName()));
if (typeParams.nonEmpty()) {
// Add type params of the annotated class.
annotatedClass = maker.TypeApply(annotatedClass, getTypeParamExpressions(typeParams, maker).toList());
}
JCExpression annotatedClass = namePlusTypeParamsToTypeReference(maker, tdParent, typeParams);
allTypeParams.add(maker.TypeParameter(tdParent.toName(classGenericName), List.<JCExpression>of(annotatedClass)));
// 2. The return type for all setter methods, named "B", which extends this builder class.
Name builderClassName = tdParent.toName(builderClass);
ListBuffer<JCExpression> typeParamsForBuilder = getTypeParamExpressions(typeParams, maker);
typeParamsForBuilder.add(maker.Ident(tdParent.toName(classGenericName)));
typeParamsForBuilder.add(maker.Ident(tdParent.toName(builderGenericName)));
JCTypeApply typeApply = maker.TypeApply(maker.Ident(builderClassName), typeParamsForBuilder.toList());
JCTypeApply typeApply = maker.TypeApply(namePlusTypeParamsToTypeReference(maker, tdParent, builderClassName, false, List.<JCTypeParameter>nil()), typeParamsForBuilder.toList());
allTypeParams.add(maker.TypeParameter(tdParent.toName(builderGenericName), List.<JCExpression>of(typeApply)));
JCExpression extending = null;
@@ -445,22 +442,16 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
JCModifiers mods = maker.Modifiers(Flags.STATIC | Flags.PRIVATE | Flags.FINAL);
// Extend the abstract builder.
JCExpression extending = maker.Ident(tdParent.toName(builderAbstractClass));
JCExpression extending = namePlusTypeParamsToTypeReference(maker, tdParent, tdParent.toName(builderAbstractClass), false, List.<JCTypeParameter>nil());
// Add any type params of the annotated class.
ListBuffer<JCTypeParameter> allTypeParams = new ListBuffer<JCTypeParameter>();
allTypeParams.addAll(copyTypeParams(source, typeParams));
// Add builder-specific type params required for inheritable builders.
// 1. The return type for the build() method (named "C" in the abstract builder), which is the annotated class.
JCExpression annotatedClass = maker.Ident(tdParent.toName(tdParent.getName()));
if (typeParams.nonEmpty()) {
// Add type params of the annotated class.
annotatedClass = maker.TypeApply(annotatedClass, getTypeParamExpressions(typeParams, maker).toList());
}
JCExpression annotatedClass = namePlusTypeParamsToTypeReference(maker, tdParent, typeParams);
// 2. The return type for all setter methods (named "B" in the abstract builder), which is this builder class.
JCExpression builderImplClassExpression = maker.Ident(tdParent.toName(builderImplClass));
if (typeParams.nonEmpty()) {
builderImplClassExpression = maker.TypeApply(builderImplClassExpression, getTypeParamExpressions(typeParams, maker).toList());
}
JCExpression builderImplClassExpression = namePlusTypeParamsToTypeReference(maker, tdParent, tdParent.toName(builderImplClass), false, typeParams);
ListBuffer<JCExpression> typeParamsForBuilder = getTypeParamExpressions(typeParams, maker);
typeParamsForBuilder.add(annotatedClass);
typeParamsForBuilder.add(builderImplClassExpression);
@@ -509,7 +500,8 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
if (bfd.nameOfSetFlag != null) {
JCFieldAccess setField = maker.Select(maker.Ident(builderVariableName), bfd.nameOfSetFlag);
fieldInThis = maker.Select(maker.Ident(typeNode.toName("this")), bfd.rawName);
JCAssign assignDefault = maker.Assign(fieldInThis, maker.Apply(typeParameterNames(maker, ((JCClassDecl) typeNode.get()).typarams), maker.Select(maker.Ident(((JCClassDecl) typeNode.get()).name), bfd.nameOfDefaultProvider), List.<JCExpression>nil()));
JCExpression parentTypeRef = namePlusTypeParamsToTypeReference(maker, typeNode, List.<JCTypeParameter>nil());
JCAssign assignDefault = maker.Assign(fieldInThis, maker.Apply(typeParameterNames(maker, ((JCClassDecl) typeNode.get()).typarams), maker.Select(parentTypeRef, bfd.nameOfDefaultProvider), List.<JCExpression>nil()));
statements.append(maker.If(setField, assign, maker.Exec(assignDefault)));
} else {
statements.append(assign);
@@ -535,7 +527,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
typeParamsForBuilderParameter.add(wildcard);
wildcard = maker.Wildcard(maker.TypeBoundKind(BoundKind.UNBOUND), null);
typeParamsForBuilderParameter.add(wildcard);
JCTypeApply paramType = maker.TypeApply(maker.Ident(builderClassname), typeParamsForBuilderParameter.toList());
JCTypeApply paramType = maker.TypeApply(namePlusTypeParamsToTypeReference(maker, typeNode, builderClassname, false, List.<JCTypeParameter>nil()), typeParamsForBuilderParameter.toList());
JCVariableDecl param = maker.VarDef(maker.Modifiers(flags), builderVariableName, paramType, null);
params.append(param);
@@ -560,7 +552,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
ListBuffer<JCExpression> typeArgs = new ListBuffer<JCExpression>();
for (JCTypeParameter typeParam : typeParams) typeArgs.append(maker.Ident(typeParam.name));
JCExpression call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type.toName(builderImplClassName), typeParams), List.<JCExpression>nil(), null);
JCExpression call = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type, type.toName(builderImplClassName), false, typeParams), List.<JCExpression>nil(), null);
JCStatement statement = maker.Return(call);
JCBlock body = maker.Block(0, List.<JCStatement>of(statement));
@@ -574,7 +566,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
JCWildcard wildcard = maker.Wildcard(maker.TypeBoundKind(BoundKind.UNBOUND), null);
typeParameterNames.add(wildcard);
typeParameterNames.add(wildcard);
JCTypeApply returnType = maker.TypeApply(maker.Ident(type.toName(builderClassName)), typeParameterNames.toList());
JCTypeApply returnType = maker.TypeApply(namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassName), false, List.<JCTypeParameter>nil()), typeParameterNames.toList());
List<JCAnnotation> annsOnMethod = cfv.generateUnique() ? List.of(maker.Annotation(genTypeRef(type, CheckerFrameworkVersion.NAME__SIDE_EFFECT_FREE), List.<JCExpression>nil())) : List.<JCAnnotation>nil();
return maker.MethodDef(maker.Modifiers(modifiers, annsOnMethod), type.toName(builderMethodName), returnType, copyTypeParams(source, typeParams), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
@@ -594,7 +586,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
ListBuffer<JCExpression> typeArgs = new ListBuffer<JCExpression>();
for (JCTypeParameter typeParam : typeParams) typeArgs.append(maker.Ident(typeParam.name));
JCExpression newClass = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type.toName(builderImplClassName), typeParams), List.<JCExpression>nil(), null);
JCExpression newClass = maker.NewClass(null, List.<JCExpression>nil(), namePlusTypeParamsToTypeReference(maker, type, type.toName(builderImplClassName), false, typeParams), List.<JCExpression>nil(), null);
List<JCExpression> methodArgs = List.<JCExpression>of(maker.Ident(type.toName("this")));
JCMethodInvocation invokeFillMethod = maker.Apply(List.<JCExpression>nil(), maker.Select(newClass, type.toName(FILL_VALUES_METHOD_NAME)), methodArgs);
JCStatement statement = maker.Return(invokeFillMethod);
@@ -609,7 +601,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
JCWildcard wildcard = maker.Wildcard(maker.TypeBoundKind(BoundKind.UNBOUND), null);
typeParameterNames.add(wildcard);
typeParameterNames.add(wildcard);
JCTypeApply returnType = maker.TypeApply(maker.Ident(type.toName(builderClassName)), typeParameterNames.toList());
JCTypeApply returnType = maker.TypeApply(namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassName), false, List.<JCTypeParameter>nil()), typeParameterNames.toList());
List<JCAnnotation> annsOnMethod = cfv.generateUnique() ? List.of(maker.Annotation(genTypeRef(type, CheckerFrameworkVersion.NAME__SIDE_EFFECT_FREE), List.<JCExpression>nil())) : List.<JCAnnotation>nil();
return maker.MethodDef(maker.Modifiers(modifiers, annsOnMethod), type.toName(TO_BUILDER_METHOD_NAME), returnType, List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
@@ -651,8 +643,9 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
}
// Call the builder implemention's helper method that actually fills the values from the instance.
JCExpression ref = namePlusTypeParamsToTypeReference(maker, type, type.toName(builderImplClassName), false, List.<JCTypeParameter>nil());
JCMethodInvocation callStaticFillValuesMethod = maker.Apply(List.<JCExpression>nil(),
maker.Select(maker.Ident(type.toName(builderImplClassName)), type.toName(STATIC_FILL_VALUES_METHOD_NAME)),
maker.Select(ref, type.toName(STATIC_FILL_VALUES_METHOD_NAME)),
List.<JCExpression>of(maker.Ident(type.toName(INSTANCE_VARIABLE_NAME)), maker.Ident(type.toName("this"))));
body.append(maker.Exec(callStaticFillValuesMethod));
@@ -692,7 +685,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
typeParamsForBuilderParameter.add(wildcard);
wildcard = maker.Wildcard(maker.TypeBoundKind(BoundKind.UNBOUND), null);
typeParamsForBuilderParameter.add(wildcard);
JCTypeApply builderType = maker.TypeApply(maker.Ident(type.toName(builderClassname)), typeParamsForBuilderParameter.toList());
JCTypeApply builderType = maker.TypeApply(namePlusTypeParamsToTypeReference(maker, type, type.toName(builderClassname), false, List.<JCTypeParameter>nil()), typeParamsForBuilderParameter.toList());
JCVariableDecl paramBuilder = maker.VarDef(maker.Modifiers(Flags.LocalVarFlags), type.toName(BUILDER_VARIABLE_NAME), builderType, null);
ListBuffer<JCStatement> body = new ListBuffer<JCStatement>();
@@ -717,7 +710,8 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
} else {
if (bfd.obtainVia.isStatic()) {
for (int i = 0; i < tgt.length; i++) {
JCExpression c = maker.Select(maker.Ident(type.toName(type.getName())), type.toName(bfd.obtainVia.method()));
JCExpression typeRef = namePlusTypeParamsToTypeReference(maker, type, List.<JCTypeParameter>nil());
JCExpression c = maker.Select(typeRef, type.toName(bfd.obtainVia.method()));
tgt[i] = maker.Apply(List.<JCExpression>nil(), c, List.<JCExpression>of(maker.Ident(type.toName(INSTANCE_VARIABLE_NAME))));
}
} else {
@@ -772,7 +766,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
JCModifiers modifiers = maker.Modifiers(Flags.PROTECTED, annsOnMethod);
Name name = builderImplType.toName(SELF_METHOD);
JCExpression returnType = namePlusTypeParamsToTypeReference(maker, builderImplType.toName(builderImplType.getName()), typeParams);
JCExpression returnType = namePlusTypeParamsToTypeReference(maker, builderImplType.up(), builderImplType.toName(builderImplType.getName()), false, typeParams);
JCStatement statement = maker.Return(maker.Ident(builderImplType.toName("this")));
JCBlock body = maker.Block(0, List.<JCStatement>of(statement));
@@ -908,7 +902,8 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
if (cfv.generateCalledMethods()) {
JCAnnotation ncAnno = maker.Annotation(genTypeRef(source, CheckerFrameworkVersion.NAME__NOT_CALLED), List.<JCExpression>of(maker.Literal(newMethod.getName().toString())));
JCClassDecl builderTypeNode = (JCClassDecl) builderType.get();
JCVariableDecl recv = maker.VarDef(maker.Modifiers(0L, List.<JCAnnotation>of(ncAnno)), builderType.toName("this"), maker.Ident(builderTypeNode.name), null);
JCExpression selfType = namePlusTypeParamsToTypeReference(maker, builderType, builderTypeNode.typarams);
JCVariableDecl recv = maker.VarDef(maker.Modifiers(0L, List.<JCAnnotation>of(ncAnno)), builderType.toName("this"), selfType, null);
newMethod.params = List.of(recv, newMethod.params.get(0));
}
if (cfv.generateReturnsReceiver()) {
src/core/lombok/javac/handlers/JavacHandlerUtil.java
+19 -18
View File
@@ -622,20 +622,7 @@ public class JavacHandlerUtil {
JavacNode typeNode = childOfType;
JavacTreeMaker maker = childOfType.getTreeMaker();
while (typeNode != null && typeNode.getKind() != Kind.TYPE) typeNode = typeNode.up();
if (typeNode != null && typeNode.get() instanceof JCClassDecl) {
JCClassDecl type = (JCClassDecl) typeNode.get();
ListBuffer<JCExpression> typeArgs = new ListBuffer<JCExpression>();
if (!type.typarams.isEmpty()) {
for (JCTypeParameter tp : type.typarams) {
typeArgs.append(maker.Ident(tp.name));
}
return maker.TypeApply(maker.Ident(type.name), typeArgs.toList());
} else {
return maker.Ident(type.name);
}
} else {
return null;
}
return JavacHandlerUtil.namePlusTypeParamsToTypeReference(maker, typeNode, ((JCClassDecl) typeNode.get()).typarams);
}
public static boolean isBoolean(JavacNode field) {
@@ -1722,11 +1709,25 @@ public class JavacHandlerUtil {
return JCAnnotatedTypeReflect.getUnderlyingType(from);
}
public static JCExpression namePlusTypeParamsToTypeReference(JavacTreeMaker maker, Name typeName, List<JCTypeParameter> params) {
if (params.isEmpty()) {
return maker.Ident(typeName);
public static JCExpression namePlusTypeParamsToTypeReference(JavacTreeMaker maker, JavacNode type, List<JCTypeParameter> params) {
JCClassDecl td = (JCClassDecl) type.get();
boolean instance = (td.mods.flags & Flags.STATIC) == 0;
return namePlusTypeParamsToTypeReference(maker, type.up(), td.name, instance, params);
}
public static JCExpression namePlusTypeParamsToTypeReference(JavacTreeMaker maker, JavacNode parentType, Name typeName, boolean instance, List<JCTypeParameter> params) {
JCExpression r = null;
if (parentType != null && parentType.getKind() == Kind.TYPE) {
JCClassDecl td = (JCClassDecl) parentType.get();
boolean outerInstance = instance && ((td.mods.flags & Flags.STATIC) == 0);
List<JCTypeParameter> outerParams = instance ? td.typarams : List.<JCTypeParameter>nil();
r = namePlusTypeParamsToTypeReference(maker, parentType.up(), td.name, outerInstance, outerParams);
}
return maker.TypeApply(maker.Ident(typeName), typeParameterNames(maker, params));
r = r == null ? maker.Ident(typeName) : maker.Select(r, typeName);
if (!params.isEmpty()) r = maker.TypeApply(r, typeParameterNames(maker, params));
return r;
}
public static List<JCExpression> typeParameterNames(JavacTreeMaker maker, List<JCTypeParameter> params) {
test/transform/resource/after-delombok/BuilderComplex.java
+6 -6
View File
@@ -16,22 +16,22 @@ class BuilderComplex {
TestVoidName() {
}
@java.lang.SuppressWarnings("all")
public TestVoidName<T> number(final T number) {
public BuilderComplex.TestVoidName<T> number(final T number) {
this.number = number;
return this;
}
@java.lang.SuppressWarnings("all")
public TestVoidName<T> arg2(final int arg2) {
public BuilderComplex.TestVoidName<T> arg2(final int arg2) {
this.arg2 = arg2;
return this;
}
@java.lang.SuppressWarnings("all")
public TestVoidName<T> arg3(final String arg3) {
public BuilderComplex.TestVoidName<T> arg3(final String arg3) {
this.arg3 = arg3;
return this;
}
@java.lang.SuppressWarnings("all")
public TestVoidName<T> selfRef(final BuilderComplex selfRef) {
public BuilderComplex.TestVoidName<T> selfRef(final BuilderComplex selfRef) {
this.selfRef = selfRef;
return this;
}
@@ -46,7 +46,7 @@ class BuilderComplex {
}
}
@java.lang.SuppressWarnings("all")
public static <T extends Number> TestVoidName<T> builder() {
return new TestVoidName<T>();
public static <T extends Number> BuilderComplex.TestVoidName<T> builder() {
return new BuilderComplex.TestVoidName<T>();
}
}
test/transform/resource/after-delombok/BuilderCustomName.java
+6 -6
View File
@@ -2,7 +2,7 @@ import java.util.List;
class BuilderCustomName<T> {
private final int field;
@java.lang.SuppressWarnings("all")
public static abstract class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends SimpleTestBuilder<T, C, B>> {
public static abstract class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends BuilderCustomName.SimpleTestBuilder<T, C, B>> {
@java.lang.SuppressWarnings("all")
private int field;
@java.lang.SuppressWarnings("all")
@@ -21,13 +21,13 @@ class BuilderCustomName<T> {
}
}
@java.lang.SuppressWarnings("all")
private static final class SimpleTestBuilderImpl<T> extends SimpleTestBuilder<T, BuilderCustomName<T>, SimpleTestBuilderImpl<T>> {
private static final class SimpleTestBuilderImpl<T> extends BuilderCustomName.SimpleTestBuilder<T, BuilderCustomName<T>, BuilderCustomName.SimpleTestBuilderImpl<T>> {
@java.lang.SuppressWarnings("all")
private SimpleTestBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected SimpleTestBuilderImpl<T> self() {
protected BuilderCustomName.SimpleTestBuilderImpl<T> self() {
return this;
}
@java.lang.Override
@@ -37,11 +37,11 @@ class BuilderCustomName<T> {
}
}
@java.lang.SuppressWarnings("all")
protected BuilderCustomName(final SimpleTestBuilder<T, ?, ?> b) {
protected BuilderCustomName(final BuilderCustomName.SimpleTestBuilder<T, ?, ?> b) {
this.field = b.field;
}
@java.lang.SuppressWarnings("all")
public static <T> SimpleTestBuilder<T, ?, ?> builder() {
return new SimpleTestBuilderImpl<T>();
public static <T> BuilderCustomName.SimpleTestBuilder<T, ?, ?> builder() {
return new BuilderCustomName.SimpleTestBuilderImpl<T>();
}
}
test/transform/resource/after-delombok/BuilderDefaults.java
+5 -5
View File
@@ -32,18 +32,18 @@ public final class BuilderDefaults {
BuilderDefaultsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsBuilder x(final int x) {
public BuilderDefaults.BuilderDefaultsBuilder x(final int x) {
this.x$value = x;
x$set = true;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsBuilder name(final String name) {
public BuilderDefaults.BuilderDefaultsBuilder name(final String name) {
this.name = name;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsBuilder z(final long z) {
public BuilderDefaults.BuilderDefaultsBuilder z(final long z) {
this.z$value = z;
z$set = true;
return this;
@@ -63,8 +63,8 @@ public final class BuilderDefaults {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderDefaultsBuilder builder() {
return new BuilderDefaultsBuilder();
public static BuilderDefaults.BuilderDefaultsBuilder builder() {
return new BuilderDefaults.BuilderDefaultsBuilder();
}
@java.lang.SuppressWarnings("all")
public int getX() {
test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
+5 -5
View File
@@ -39,19 +39,19 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> {
BuilderDefaultsGenericsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
this.callable$value = callable;
callable$set = true;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
this.tee$value = tee;
tee$set = true;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
this.arrr$value = arrr;
arrr$set = true;
return this;
@@ -73,7 +73,7 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> {
}
}
@java.lang.SuppressWarnings("all")
public static <N extends Number, T, R extends List<T>> BuilderDefaultsGenericsBuilder<N, T, R> builder() {
return new BuilderDefaultsGenericsBuilder<N, T, R>();
public static <N extends Number, T, R extends List<T>> BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> builder() {
return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R>();
}
}
test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
+9 -9
View File
@@ -21,29 +21,29 @@ public class BuilderDefaultsWarnings {
BuilderDefaultsWarningsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsWarningsBuilder x(final long x) {
public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) {
this.x = x;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsWarningsBuilder z(final int z) {
public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) {
this.z = z;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsWarningsBuilder item(final String item) {
public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) {
if (this.items == null) this.items = new java.util.ArrayList<String>();
this.items.add(item);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
if (this.items == null) this.items = new java.util.ArrayList<String>();
this.items.addAll(items);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderDefaultsWarningsBuilder clearItems() {
public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() {
if (this.items != null) this.items.clear();
return this;
}
@@ -69,8 +69,8 @@ public class BuilderDefaultsWarnings {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderDefaultsWarningsBuilder builder() {
return new BuilderDefaultsWarningsBuilder();
public static BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() {
return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder();
}
}
class NoBuilderButHasDefaults {
@@ -93,7 +93,7 @@ class NoBuilderButHasDefaults {
}
}
@java.lang.SuppressWarnings("all")
public static NoBuilderButHasDefaultsBuilder builder() {
return new NoBuilderButHasDefaultsBuilder();
public static NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() {
return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder();
}
}
test/transform/resource/after-delombok/BuilderGenericMethod.java
+4 -4
View File
@@ -14,12 +14,12 @@ class BuilderGenericMethod<T> {
MapBuilder() {
}
@java.lang.SuppressWarnings("all")
public MapBuilder<N> a(final int a) {
public BuilderGenericMethod<T>.MapBuilder<N> a(final int a) {
this.a = a;
return this;
}
@java.lang.SuppressWarnings("all")
public MapBuilder<N> b(final long b) {
public BuilderGenericMethod<T>.MapBuilder<N> b(final long b) {
this.b = b;
return this;
}
@@ -34,7 +34,7 @@ class BuilderGenericMethod<T> {
}
}
@java.lang.SuppressWarnings("all")
public <N extends Number> MapBuilder<N> builder() {
return new MapBuilder<N>();
public <N extends Number> BuilderGenericMethod<T>.MapBuilder<N> builder() {
return this.new MapBuilder<N>();
}
}
test/transform/resource/after-delombok/BuilderInstanceMethod.java
+6 -6
View File
@@ -17,22 +17,22 @@ class BuilderInstanceMethod<T> {
StringBuilder() {
}
@java.lang.SuppressWarnings("all")
public StringBuilder show(final int show) {
public BuilderInstanceMethod<T>.StringBuilder show(final int show) {
this.show = show;
return this;
}
@java.lang.SuppressWarnings("all")
public StringBuilder yes(final int yes) {
public BuilderInstanceMethod<T>.StringBuilder yes(final int yes) {
this.yes = yes;
return this;
}
@java.lang.SuppressWarnings("all")
public StringBuilder also(final List<T> also) {
public BuilderInstanceMethod<T>.StringBuilder also(final List<T> also) {
this.also = also;
return this;
}
@java.lang.SuppressWarnings("all")
public StringBuilder $andMe(final int $andMe) {
public BuilderInstanceMethod<T>.StringBuilder $andMe(final int $andMe) {
this.$andMe = $andMe;
return this;
}
@@ -47,7 +47,7 @@ class BuilderInstanceMethod<T> {
}
}
@java.lang.SuppressWarnings("all")
public StringBuilder builder() {
return new StringBuilder();
public BuilderInstanceMethod<T>.StringBuilder builder() {
return this.new StringBuilder();
}
}
test/transform/resource/after-delombok/BuilderJavadoc.java
+4 -4
View File
@@ -54,7 +54,7 @@ class BuilderJavadoc<T> {
* @param tag is moved to the setter.
*/
@java.lang.SuppressWarnings("all")
public BuilderJavadocBuilder<T> basic(final int basic) {
public BuilderJavadoc.BuilderJavadocBuilder<T> basic(final int basic) {
this.basic = basic;
return this;
}
@@ -63,7 +63,7 @@ class BuilderJavadoc<T> {
* @param tag is moved to the setters and wither.
*/
@java.lang.SuppressWarnings("all")
public BuilderJavadocBuilder<T> getsetwith(final int getsetwith) {
public BuilderJavadoc.BuilderJavadocBuilder<T> getsetwith(final int getsetwith) {
this.getsetwith = getsetwith;
return this;
}
@@ -85,8 +85,8 @@ class BuilderJavadoc<T> {
this.predefWithJavadoc = predefWithJavadoc;
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderJavadocBuilder<T> builder() {
return new BuilderJavadocBuilder<T>();
public static <T> BuilderJavadoc.BuilderJavadocBuilder<T> builder() {
return new BuilderJavadoc.BuilderJavadocBuilder<T>();
}
/**
* getsetwith gets a builder setter, an instance getter and setter, and a wither.
test/transform/resource/after-delombok/BuilderSimple.java
+4 -4
View File
@@ -19,12 +19,12 @@ class BuilderSimple<T> {
BuilderSimpleBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSimpleBuilder<T> yes(final int yes) {
public BuilderSimple.BuilderSimpleBuilder<T> yes(final int yes) {
this.yes = yes;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSimpleBuilder<T> also(final List<T> also) {
public BuilderSimple.BuilderSimpleBuilder<T> also(final List<T> also) {
this.also = also;
return this;
}
@@ -39,7 +39,7 @@ class BuilderSimple<T> {
}
}
@java.lang.SuppressWarnings("all")
protected static <T> BuilderSimpleBuilder<T> builder() {
return new BuilderSimpleBuilder<T>();
protected static <T> BuilderSimple.BuilderSimpleBuilder<T> builder() {
return new BuilderSimple.BuilderSimpleBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
+3 -3
View File
@@ -13,7 +13,7 @@ class BuilderSimpleWithSetterPrefix<T> {
BuilderSimpleWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
this.unprefixed = unprefixed;
return this;
}
@@ -28,7 +28,7 @@ class BuilderSimpleWithSetterPrefix<T> {
}
}
@java.lang.SuppressWarnings("all")
protected static <T> BuilderSimpleWithSetterPrefixBuilder<T> builder() {
return new BuilderSimpleWithSetterPrefixBuilder<T>();
protected static <T> BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> builder() {
return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java
+8 -8
View File
@@ -26,7 +26,7 @@ class BuilderSingularAnnotatedTypes {
BuilderSingularAnnotatedTypesBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesBuilder foo(@MyAnnotation @NonNull final String foo) {
public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(@MyAnnotation @NonNull final String foo) {
if (foo == null) {
throw new java.lang.NullPointerException("foo is marked non-null but is null");
}
@@ -35,18 +35,18 @@ class BuilderSingularAnnotatedTypes {
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>();
this.foos.addAll(foos);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesBuilder clearFoos() {
public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() {
if (this.foos != null) this.foos.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesBuilder bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) {
public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) {
if (barKey == null) {
throw new java.lang.NullPointerException("barKey is marked non-null but is null");
}
@@ -62,7 +62,7 @@ class BuilderSingularAnnotatedTypes {
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
if (this.bars$key == null) {
this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>();
this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>();
@@ -74,7 +74,7 @@ class BuilderSingularAnnotatedTypes {
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesBuilder clearBars() {
public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() {
if (this.bars$key != null) {
this.bars$key.clear();
this.bars$value.clear();
@@ -118,7 +118,7 @@ class BuilderSingularAnnotatedTypes {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularAnnotatedTypesBuilder builder() {
return new BuilderSingularAnnotatedTypesBuilder();
public static BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() {
return new BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder();
}
}
test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
+8 -8
View File
@@ -26,7 +26,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix {
BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(@MyAnnotation @NonNull final String foo) {
public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(@MyAnnotation @NonNull final String foo) {
if (foo == null) {
throw new java.lang.NullPointerException("foo is marked non-null but is null");
}
@@ -35,18 +35,18 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix {
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>();
this.foos.addAll(foos);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() {
public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() {
if (this.foos != null) this.foos.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) {
public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) {
if (barKey == null) {
throw new java.lang.NullPointerException("barKey is marked non-null but is null");
}
@@ -62,7 +62,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix {
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
if (this.bars$key == null) {
this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>();
this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>();
@@ -74,7 +74,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix {
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() {
public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() {
if (this.bars$key != null) {
this.bars$key.clear();
this.bars$value.clear();
@@ -118,7 +118,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() {
return new BuilderSingularAnnotatedTypesWithSetterPrefixBuilder();
public static BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() {
return new BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
+17 -17
View File
@@ -34,87 +34,87 @@ class BuilderSingularGuavaListsSets<T> {
BuilderSingularGuavaListsSetsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.add(card);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.addAll(cards);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
this.cards = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.add(frog);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.addAll(frogs);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
this.frogs = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.add(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.addAll(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
this.rawSet = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.add(pass);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.addAll(passes);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
this.passes = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) {
if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
this.users.put(rowKey, columnKey, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
this.users.putAll(users);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
this.users = null;
return this;
}
@@ -134,7 +134,7 @@ class BuilderSingularGuavaListsSets<T> {
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() {
return new BuilderSingularGuavaListsSetsBuilder<T>();
public static <T> BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> builder() {
return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java
-140
View File
@@ -1,140 +0,0 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.ImmutableTable;
class BuilderSingularGuavaListsSetsWithSetterPrefix<T> {
private ImmutableList<T> cards;
private ImmutableCollection<? extends Number> frogs;
@SuppressWarnings("all")
private ImmutableSet rawSet;
private ImmutableSortedSet<String> passes;
private ImmutableTable<? extends Number, ? extends Number, String> users;
@java.lang.SuppressWarnings("all")
BuilderSingularGuavaListsSetsWithSetterPrefix(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
this.cards = cards;
this.frogs = frogs;
this.rawSet = rawSet;
this.passes = passes;
this.users = users;
}
@java.lang.SuppressWarnings("all")
public static class BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> {
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableList.Builder<T> cards;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableList.Builder<Number> frogs;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users;
@java.lang.SuppressWarnings("all")
BuilderSingularGuavaListsSetsWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withCard(final T card) {
if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.add(card);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withCards(final java.lang.Iterable<? extends T> cards) {
if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.addAll(cards);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearCards() {
this.cards = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withFrog(final Number frog) {
if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.add(frog);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withFrogs(final java.lang.Iterable<? extends Number> frogs) {
if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.addAll(frogs);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearFrogs() {
this.frogs = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Object rawSet) {
if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.add(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Iterable<?> rawSet) {
if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.addAll(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearRawSet() {
this.rawSet = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withPass(final String pass) {
if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.add(pass);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withPasses(final java.lang.Iterable<? extends String> passes) {
if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.addAll(passes);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearPasses() {
this.passes = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withUser(final Number rowKey, final Number columnKey, final String value) {
if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
this.users.put(rowKey, columnKey, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withUsers(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
this.users.putAll(users);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearUsers() {
this.users = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaListsSetsWithSetterPrefix<T> build() {
com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build();
com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build();
com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = this.rawSet == null ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build();
com.google.common.collect.ImmutableSortedSet<String> passes = this.passes == null ? com.google.common.collect.ImmutableSortedSet.<String>of() : this.passes.build();
com.google.common.collect.ImmutableTable<Number, Number, String> users = this.users == null ? com.google.common.collect.ImmutableTable.<Number, Number, String>of() : this.users.build();
return new BuilderSingularGuavaListsSetsWithSetterPrefix<T>(cards, frogs, rawSet, passes, users);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderSingularGuavaListsSetsWithSetterPrefix.BuilderSingularGuavaListsSetsWithSetterPrefixBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")";
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> builder() {
return new BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
+11 -11
View File
@@ -24,53 +24,53 @@ class BuilderSingularGuavaMaps<K, V> {
BuilderSingularGuavaMapsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) {
if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.putAll(battleaxes);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
this.battleaxes = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) {
if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.putAll(vertices);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
this.vertices = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object key, final java.lang.Object value) {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object key, final java.lang.Object value) {
if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.putAll(rawMap);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
this.rawMap = null;
return this;
}
@@ -88,7 +88,7 @@ class BuilderSingularGuavaMaps<K, V> {
}
}
@java.lang.SuppressWarnings("all")
public static <K, V> BuilderSingularGuavaMapsBuilder<K, V> builder() {
return new BuilderSingularGuavaMapsBuilder<K, V>();
public static <K, V> BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> builder() {
return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V>();
}
}
test/transform/resource/after-delombok/BuilderSingularGuavaMapsWithSetterPrefix.java
-94
View File
@@ -1,94 +0,0 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableSortedMap;
class BuilderSingularGuavaMapsWithSetterPrefix<K, V> {
private ImmutableMap<K, V> battleaxes;
private ImmutableSortedMap<Integer, ? extends V> vertices;
@SuppressWarnings("all")
private ImmutableBiMap rawMap;
@java.lang.SuppressWarnings("all")
BuilderSingularGuavaMapsWithSetterPrefix(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
this.battleaxes = battleaxes;
this.vertices = vertices;
this.rawMap = rawMap;
}
@java.lang.SuppressWarnings("all")
public static class BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> {
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
@java.lang.SuppressWarnings("all")
BuilderSingularGuavaMapsWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withBattleaxe(final K key, final V value) {
if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withBattleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.putAll(battleaxes);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearBattleaxes() {
this.battleaxes = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withVertex(final Integer key, final V value) {
if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withVertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.putAll(vertices);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearVertices() {
this.vertices = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.lang.Object key, final java.lang.Object value) {
if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.util.Map<?, ?> rawMap) {
if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.putAll(rawMap);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearRawMap() {
this.rawMap = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularGuavaMapsWithSetterPrefix<K, V> build() {
com.google.common.collect.ImmutableMap<K, V> battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build();
com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build();
com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = this.rawMap == null ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build();
return new BuilderSingularGuavaMapsWithSetterPrefix<K, V>(battleaxes, vertices, rawMap);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderSingularGuavaMapsWithSetterPrefix.BuilderSingularGuavaMapsWithSetterPrefixBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")";
}
}
@java.lang.SuppressWarnings("all")
public static <K, V> BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> builder() {
return new BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V>();
}
}
test/transform/resource/after-delombok/BuilderSingularLists.java
+11 -11
View File
@@ -23,53 +23,53 @@ class BuilderSingularLists<T> {
BuilderSingularListsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> child(final T child) {
public BuilderSingularLists.BuilderSingularListsBuilder<T> child(final T child) {
if (this.children == null) this.children = new java.util.ArrayList<T>();
this.children.add(child);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
public BuilderSingularLists.BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
if (this.children == null) this.children = new java.util.ArrayList<T>();
this.children.addAll(children);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> clearChildren() {
public BuilderSingularLists.BuilderSingularListsBuilder<T> clearChildren() {
if (this.children != null) this.children.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> scarf(final Number scarf) {
public BuilderSingularLists.BuilderSingularListsBuilder<T> scarf(final Number scarf) {
if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
this.scarves.add(scarf);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
public BuilderSingularLists.BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
this.scarves.addAll(scarves);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> clearScarves() {
public BuilderSingularLists.BuilderSingularListsBuilder<T> clearScarves() {
if (this.scarves != null) this.scarves.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) {
public BuilderSingularLists.BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) {
if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.add(rawList);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
public BuilderSingularLists.BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.addAll(rawList);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsBuilder<T> clearRawList() {
public BuilderSingularLists.BuilderSingularListsBuilder<T> clearRawList() {
if (this.rawList != null) this.rawList.clear();
return this;
}
@@ -117,7 +117,7 @@ class BuilderSingularLists<T> {
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderSingularListsBuilder<T> builder() {
return new BuilderSingularListsBuilder<T>();
public static <T> BuilderSingularLists.BuilderSingularListsBuilder<T> builder() {
return new BuilderSingularLists.BuilderSingularListsBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java
-123
View File
@@ -1,123 +0,0 @@
import java.util.List;
import java.util.Collection;
class BuilderSingularListsWithSetterPrefix<T> {
private List<T> children;
private Collection<? extends Number> scarves;
@SuppressWarnings("all")
private List rawList;
@java.lang.SuppressWarnings("all")
BuilderSingularListsWithSetterPrefix(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
this.children = children;
this.scarves = scarves;
this.rawList = rawList;
}
@java.lang.SuppressWarnings("all")
public static class BuilderSingularListsWithSetterPrefixBuilder<T> {
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<T> children;
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<Number> scarves;
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<java.lang.Object> rawList;
@java.lang.SuppressWarnings("all")
BuilderSingularListsWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> withChild(final T child) {
if (this.children == null) this.children = new java.util.ArrayList<T>();
this.children.add(child);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> withChildren(final java.util.Collection<? extends T> children) {
if (this.children == null) this.children = new java.util.ArrayList<T>();
this.children.addAll(children);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> clearChildren() {
if (this.children != null) this.children.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> withScarf(final Number scarf) {
if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
this.scarves.add(scarf);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> withScarves(final java.util.Collection<? extends Number> scarves) {
if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
this.scarves.addAll(scarves);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> clearScarves() {
if (this.scarves != null) this.scarves.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.lang.Object rawList) {
if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.add(rawList);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.util.Collection<?> rawList) {
if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.addAll(rawList);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefixBuilder<T> clearRawList() {
if (this.rawList != null) this.rawList.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularListsWithSetterPrefix<T> build() {
java.util.List<T> children;
switch (this.children == null ? 0 : this.children.size()) {
case 0:
children = java.util.Collections.emptyList();
break;
case 1:
children = java.util.Collections.singletonList(this.children.get(0));
break;
default:
children = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.children));
}
java.util.Collection<Number> scarves;
switch (this.scarves == null ? 0 : this.scarves.size()) {
case 0:
scarves = java.util.Collections.emptyList();
break;
case 1:
scarves = java.util.Collections.singletonList(this.scarves.get(0));
break;
default:
scarves = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.scarves));
}
java.util.List<java.lang.Object> rawList;
switch (this.rawList == null ? 0 : this.rawList.size()) {
case 0:
rawList = java.util.Collections.emptyList();
break;
case 1:
rawList = java.util.Collections.singletonList(this.rawList.get(0));
break;
default:
rawList = java.util.Collections.unmodifiableList(new java.util.ArrayList<java.lang.Object>(this.rawList));
}
return new BuilderSingularListsWithSetterPrefix<T>(children, scarves, rawList);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderSingularListsWithSetterPrefix.BuilderSingularListsWithSetterPrefixBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderSingularListsWithSetterPrefixBuilder<T> builder() {
return new BuilderSingularListsWithSetterPrefixBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSingularMaps.java
+14 -14
View File
@@ -35,7 +35,7 @@ class BuilderSingularMaps<K, V> {
BuilderSingularMapsBuilder() {
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) {
if (this.women$key == null) {
this.women$key = new java.util.ArrayList<K>();
this.women$value = new java.util.ArrayList<V>();
@@ -45,7 +45,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
if (this.women$key == null) {
this.women$key = new java.util.ArrayList<K>();
this.women$value = new java.util.ArrayList<V>();
@@ -57,7 +57,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> clearWomen() {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearWomen() {
if (this.women$key != null) {
this.women$key.clear();
this.women$value.clear();
@@ -65,7 +65,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
if (this.men$key == null) {
this.men$key = new java.util.ArrayList<K>();
this.men$value = new java.util.ArrayList<Number>();
@@ -75,7 +75,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
if (this.men$key == null) {
this.men$key = new java.util.ArrayList<K>();
this.men$value = new java.util.ArrayList<Number>();
@@ -87,7 +87,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> clearMen() {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearMen() {
if (this.men$key != null) {
this.men$key.clear();
this.men$value.clear();
@@ -95,7 +95,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> rawMap(Object rawMapKey, Object rawMapValue) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> rawMap(Object rawMapKey, Object rawMapValue) {
if (this.rawMap$key == null) {
this.rawMap$key = new java.util.ArrayList<Object>();
this.rawMap$value = new java.util.ArrayList<Object>();
@@ -105,7 +105,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
if (this.rawMap$key == null) {
this.rawMap$key = new java.util.ArrayList<Object>();
this.rawMap$value = new java.util.ArrayList<Object>();
@@ -117,7 +117,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> clearRawMap() {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearRawMap() {
if (this.rawMap$key != null) {
this.rawMap$key.clear();
this.rawMap$value.clear();
@@ -125,7 +125,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
if (this.stringMap$key == null) {
this.stringMap$key = new java.util.ArrayList<String>();
this.stringMap$value = new java.util.ArrayList<V>();
@@ -135,7 +135,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
if (this.stringMap$key == null) {
this.stringMap$key = new java.util.ArrayList<String>();
this.stringMap$value = new java.util.ArrayList<V>();
@@ -147,7 +147,7 @@ class BuilderSingularMaps<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsBuilder<K, V> clearStringMap() {
public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearStringMap() {
if (this.stringMap$key != null) {
this.stringMap$key.clear();
this.stringMap$value.clear();
@@ -207,7 +207,7 @@ class BuilderSingularMaps<K, V> {
}
}
@SuppressWarnings("all")
public static <K, V> BuilderSingularMapsBuilder<K, V> builder() {
return new BuilderSingularMapsBuilder<K, V>();
public static <K, V> BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> builder() {
return new BuilderSingularMaps.BuilderSingularMapsBuilder<K, V>();
}
}
test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
+14 -14
View File
@@ -35,7 +35,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
BuilderSingularMapsWithSetterPrefixBuilder() {
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWoman(K womanKey, V womanValue) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWoman(K womanKey, V womanValue) {
if (this.women$key == null) {
this.women$key = new java.util.ArrayList<K>();
this.women$value = new java.util.ArrayList<V>();
@@ -45,7 +45,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWomen(java.util.Map<? extends K, ? extends V> women) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWomen(java.util.Map<? extends K, ? extends V> women) {
if (this.women$key == null) {
this.women$key = new java.util.ArrayList<K>();
this.women$value = new java.util.ArrayList<V>();
@@ -57,7 +57,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearWomen() {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearWomen() {
if (this.women$key != null) {
this.women$key.clear();
this.women$value.clear();
@@ -65,7 +65,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMan(K manKey, Number manValue) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMan(K manKey, Number manValue) {
if (this.men$key == null) {
this.men$key = new java.util.ArrayList<K>();
this.men$value = new java.util.ArrayList<Number>();
@@ -75,7 +75,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMen(java.util.Map<? extends K, ? extends Number> men) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMen(java.util.Map<? extends K, ? extends Number> men) {
if (this.men$key == null) {
this.men$key = new java.util.ArrayList<K>();
this.men$value = new java.util.ArrayList<Number>();
@@ -87,7 +87,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearMen() {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearMen() {
if (this.men$key != null) {
this.men$key.clear();
this.men$value.clear();
@@ -95,7 +95,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(Object rawMapKey, Object rawMapValue) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(Object rawMapKey, Object rawMapValue) {
if (this.rawMap$key == null) {
this.rawMap$key = new java.util.ArrayList<Object>();
this.rawMap$value = new java.util.ArrayList<Object>();
@@ -105,7 +105,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(java.util.Map<?, ?> rawMap) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(java.util.Map<?, ?> rawMap) {
if (this.rawMap$key == null) {
this.rawMap$key = new java.util.ArrayList<Object>();
this.rawMap$value = new java.util.ArrayList<Object>();
@@ -117,7 +117,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearRawMap() {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearRawMap() {
if (this.rawMap$key != null) {
this.rawMap$key.clear();
this.rawMap$value.clear();
@@ -125,7 +125,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(String stringMapKey, V stringMapValue) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(String stringMapKey, V stringMapValue) {
if (this.stringMap$key == null) {
this.stringMap$key = new java.util.ArrayList<String>();
this.stringMap$value = new java.util.ArrayList<V>();
@@ -135,7 +135,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(java.util.Map<? extends String, ? extends V> stringMap) {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(java.util.Map<? extends String, ? extends V> stringMap) {
if (this.stringMap$key == null) {
this.stringMap$key = new java.util.ArrayList<String>();
this.stringMap$value = new java.util.ArrayList<V>();
@@ -147,7 +147,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
return this;
}
@SuppressWarnings("all")
public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearStringMap() {
public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearStringMap() {
if (this.stringMap$key != null) {
this.stringMap$key.clear();
this.stringMap$value.clear();
@@ -207,7 +207,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
}
}
@SuppressWarnings("all")
public static <K, V> BuilderSingularMapsWithSetterPrefixBuilder<K, V> builder() {
return new BuilderSingularMapsWithSetterPrefixBuilder<K, V>();
public static <K, V> BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> builder() {
return new BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V>();
}
}
test/transform/resource/after-delombok/BuilderSingularNoAuto.java
+11 -11
View File
@@ -21,53 +21,53 @@ class BuilderSingularNoAuto {
BuilderSingularNoAutoBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder things(final String things) {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final String things) {
if (this.things == null) this.things = new java.util.ArrayList<String>();
this.things.add(things);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder things(final java.util.Collection<? extends String> things) {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection<? extends String> things) {
if (this.things == null) this.things = new java.util.ArrayList<String>();
this.things.addAll(things);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder clearThings() {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() {
if (this.things != null) this.things.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder widget(final String widget) {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widget(final String widget) {
if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
this.widgets.add(widget);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder widgets(final java.util.Collection<? extends String> widgets) {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection<? extends String> widgets) {
if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
this.widgets.addAll(widgets);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder clearWidgets() {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() {
if (this.widgets != null) this.widgets.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder items(final String items) {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final String items) {
if (this.items == null) this.items = new java.util.ArrayList<String>();
this.items.add(items);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder items(final java.util.Collection<? extends String> items) {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection<? extends String> items) {
if (this.items == null) this.items = new java.util.ArrayList<String>();
this.items.addAll(items);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoBuilder clearItems() {
public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() {
if (this.items != null) this.items.clear();
return this;
}
@@ -115,7 +115,7 @@ class BuilderSingularNoAuto {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularNoAutoBuilder builder() {
return new BuilderSingularNoAutoBuilder();
public static BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() {
return new BuilderSingularNoAuto.BuilderSingularNoAutoBuilder();
}
}
test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java
+11 -11
View File
@@ -21,53 +21,53 @@ class BuilderSingularNoAutoWithSetterPrefix {
BuilderSingularNoAutoWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) {
if (this.things == null) this.things = new java.util.ArrayList<String>();
this.things.add(things);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection<? extends String> things) {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection<? extends String> things) {
if (this.things == null) this.things = new java.util.ArrayList<String>();
this.things.addAll(things);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() {
if (this.things != null) this.things.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) {
if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
this.widgets.add(widget);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection<? extends String> widgets) {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection<? extends String> widgets) {
if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
this.widgets.addAll(widgets);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() {
if (this.widgets != null) this.widgets.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) {
if (this.items == null) this.items = new java.util.ArrayList<String>();
this.items.add(items);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection<? extends String> items) {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection<? extends String> items) {
if (this.items == null) this.items = new java.util.ArrayList<String>();
this.items.addAll(items);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() {
public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() {
if (this.items != null) this.items.clear();
return this;
}
@@ -115,7 +115,7 @@ class BuilderSingularNoAutoWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularNoAutoWithSetterPrefixBuilder builder() {
return new BuilderSingularNoAutoWithSetterPrefixBuilder();
public static BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() {
return new BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
+11 -11
View File
@@ -23,53 +23,53 @@ class BuilderSingularRedirectToGuava {
BuilderSingularRedirectToGuavaBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) {
if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
this.dangerMice.add(dangerMouse);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) {
if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
this.dangerMice.addAll(dangerMice);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder clearDangerMice() {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() {
this.dangerMice = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) {
if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.things.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) {
if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.things.putAll(things);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder clearThings() {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() {
this.things = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) {
if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
this.doohickeys.add(doohickey);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
this.doohickeys.addAll(doohickeys);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() {
public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() {
this.doohickeys = null;
return this;
}
@@ -87,7 +87,7 @@ class BuilderSingularRedirectToGuava {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularRedirectToGuavaBuilder builder() {
return new BuilderSingularRedirectToGuavaBuilder();
public static BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() {
return new BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder();
}
}
test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java
-93
View File
@@ -1,93 +0,0 @@
import java.util.Set;
import java.util.NavigableMap;
import java.util.Collection;
class BuilderSingularRedirectToGuavaWithSetterPrefix {
private Set<String> dangerMice;
private NavigableMap<Integer, Number> things;
private Collection<Class<?>> doohickeys;
@java.lang.SuppressWarnings("all")
BuilderSingularRedirectToGuavaWithSetterPrefix(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
this.dangerMice = dangerMice;
this.things = things;
this.doohickeys = doohickeys;
}
@java.lang.SuppressWarnings("all")
public static class BuilderSingularRedirectToGuavaWithSetterPrefixBuilder {
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
@java.lang.SuppressWarnings("all")
BuilderSingularRedirectToGuavaWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMouse(final String dangerMouse) {
if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
this.dangerMice.add(dangerMouse);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMice(final java.lang.Iterable<? extends String> dangerMice) {
if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
this.dangerMice.addAll(dangerMice);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDangerMice() {
this.dangerMice = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withThing(final Integer key, final Number value) {
if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.things.put(key, value);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withThings(final java.util.Map<? extends Integer, ? extends Number> things) {
if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.things.putAll(things);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearThings() {
this.things = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickey(final Class<?> doohickey) {
if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
this.doohickeys.add(doohickey);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
this.doohickeys.addAll(doohickeys);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDoohickeys() {
this.doohickeys = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularRedirectToGuavaWithSetterPrefix build() {
java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build();
java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build();
java.util.Collection<Class<?>> doohickeys = this.doohickeys == null ? com.google.common.collect.ImmutableList.<Class<?>>of() : this.doohickeys.build();
return new BuilderSingularRedirectToGuavaWithSetterPrefix(dangerMice, things, doohickeys);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderSingularRedirectToGuavaWithSetterPrefix.BuilderSingularRedirectToGuavaWithSetterPrefixBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")";
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularRedirectToGuavaWithSetterPrefixBuilder builder() {
return new BuilderSingularRedirectToGuavaWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderSingularSets.java
+14 -14
View File
@@ -27,70 +27,70 @@ class BuilderSingularSets<T> {
BuilderSingularSetsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) {
if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
this.dangerMice.add(dangerMouse);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) {
if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
this.dangerMice.addAll(dangerMice);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> clearDangerMice() {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearDangerMice() {
if (this.dangerMice != null) this.dangerMice.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> octopus(final Number octopus) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> octopus(final Number octopus) {
if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
this.octopodes.add(octopus);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) {
if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
this.octopodes.addAll(octopodes);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> clearOctopodes() {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearOctopodes() {
if (this.octopodes != null) this.octopodes.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
this.rawSet.add(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) {
if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
this.rawSet.addAll(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> clearRawSet() {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearRawSet() {
if (this.rawSet != null) this.rawSet.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> stringSet(final String stringSet) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> stringSet(final String stringSet) {
if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
this.stringSet.add(stringSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) {
if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
this.stringSet.addAll(stringSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsBuilder<T> clearStringSet() {
public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearStringSet() {
if (this.stringSet != null) this.stringSet.clear();
return this;
}
@@ -147,7 +147,7 @@ class BuilderSingularSets<T> {
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderSingularSetsBuilder<T> builder() {
return new BuilderSingularSetsBuilder<T>();
public static <T> BuilderSingularSets.BuilderSingularSetsBuilder<T> builder() {
return new BuilderSingularSets.BuilderSingularSetsBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java
+14 -14
View File
@@ -27,70 +27,70 @@ class BuilderSingularSetsWithSetterPrefix<T> {
BuilderSingularSetsWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMouse(final T dangerMouse) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMouse(final T dangerMouse) {
if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
this.dangerMice.add(dangerMouse);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMice(final java.util.Collection<? extends T> dangerMice) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMice(final java.util.Collection<? extends T> dangerMice) {
if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
this.dangerMice.addAll(dangerMice);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> clearDangerMice() {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearDangerMice() {
if (this.dangerMice != null) this.dangerMice.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopus(final Number octopus) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopus(final Number octopus) {
if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
this.octopodes.add(octopus);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopodes(final java.util.Collection<? extends Number> octopodes) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopodes(final java.util.Collection<? extends Number> octopodes) {
if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
this.octopodes.addAll(octopodes);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> clearOctopodes() {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearOctopodes() {
if (this.octopodes != null) this.octopodes.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Object rawSet) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Object rawSet) {
if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
this.rawSet.add(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.util.Collection<?> rawSet) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.util.Collection<?> rawSet) {
if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
this.rawSet.addAll(rawSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> clearRawSet() {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearRawSet() {
if (this.rawSet != null) this.rawSet.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final String stringSet) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final String stringSet) {
if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
this.stringSet.add(stringSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final java.util.Collection<? extends String> stringSet) {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final java.util.Collection<? extends String> stringSet) {
if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
this.stringSet.addAll(stringSet);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularSetsWithSetterPrefixBuilder<T> clearStringSet() {
public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearStringSet() {
if (this.stringSet != null) this.stringSet.clear();
return this;
}
@@ -147,7 +147,7 @@ class BuilderSingularSetsWithSetterPrefix<T> {
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderSingularSetsWithSetterPrefixBuilder<T> builder() {
return new BuilderSingularSetsWithSetterPrefixBuilder<T>();
public static <T> BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> builder() {
return new BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T>();
}
}
test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java
+7 -7
View File
@@ -15,19 +15,19 @@ class BuilderSingularToBuilderWithNull {
BuilderSingularToBuilderWithNullBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullBuilder elem(final String elem) {
public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.add(elem);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection<? extends String> elems) {
public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection<? extends String> elems) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.addAll(elems);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullBuilder clearElems() {
public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() {
if (this.elems != null) this.elems.clear();
return this;
}
@@ -53,12 +53,12 @@ class BuilderSingularToBuilderWithNull {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularToBuilderWithNullBuilder builder() {
return new BuilderSingularToBuilderWithNullBuilder();
public static BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() {
return new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder();
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullBuilder toBuilder() {
final BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNullBuilder();
public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() {
final BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder();
if (this.elems != null) builder.elems(this.elems);
return builder;
}
test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java
+7 -7
View File
@@ -15,19 +15,19 @@ class BuilderSingularToBuilderWithNullWithSetterPrefix {
BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) {
public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.add(elem);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) {
public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.addAll(elems);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() {
public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() {
if (this.elems != null) this.elems.clear();
return this;
}
@@ -53,12 +53,12 @@ class BuilderSingularToBuilderWithNullWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() {
return new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
public static BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() {
return new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
}
@java.lang.SuppressWarnings("all")
public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() {
final BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() {
final BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
if (this.elems != null) builder.withElems(this.elems);
return builder;
}
test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java
+10 -10
View File
@@ -18,36 +18,36 @@ class BuilderSingularWildcardListsWithToBuilder {
BuilderSingularWildcardListsWithToBuilderBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) {
public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) {
if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
this.objects.add(object);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection<?> objects) {
public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection<?> objects) {
if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
this.objects.addAll(objects);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() {
public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() {
if (this.objects != null) this.objects.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) {
public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) {
if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
this.numbers.add(number);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection<? extends Number> numbers) {
public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection<? extends Number> numbers) {
if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
this.numbers.addAll(numbers);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() {
public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() {
if (this.numbers != null) this.numbers.clear();
return this;
}
@@ -84,12 +84,12 @@ class BuilderSingularWildcardListsWithToBuilder {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularWildcardListsWithToBuilderBuilder builder() {
return new BuilderSingularWildcardListsWithToBuilderBuilder();
public static BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() {
return new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder();
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() {
final BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilderBuilder();
public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() {
final BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder();
if (this.objects != null) builder.objects(this.objects);
if (this.numbers != null) builder.numbers(this.numbers);
return builder;
test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
-97
View File
@@ -1,97 +0,0 @@
import java.util.List;
import java.util.Collection;
class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
private List<?> objects;
private Collection<? extends Number> numbers;
@java.lang.SuppressWarnings("all")
BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(final List<?> objects, final Collection<? extends Number> numbers) {
this.objects = objects;
this.numbers = numbers;
}
@java.lang.SuppressWarnings("all")
public static class BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder {
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<java.lang.Object> objects;
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<Number> numbers;
@java.lang.SuppressWarnings("all")
BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObject(final java.lang.Object object) {
if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
this.objects.add(object);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObjects(final java.util.Collection<?> objects) {
if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
this.objects.addAll(objects);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearObjects() {
if (this.objects != null) this.objects.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumber(final Number number) {
if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
this.numbers.add(number);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumbers(final java.util.Collection<? extends Number> numbers) {
if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
this.numbers.addAll(numbers);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearNumbers() {
if (this.numbers != null) this.numbers.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefix build() {
java.util.List<java.lang.Object> objects;
switch (this.objects == null ? 0 : this.objects.size()) {
case 0:
objects = java.util.Collections.emptyList();
break;
case 1:
objects = java.util.Collections.singletonList(this.objects.get(0));
break;
default:
objects = java.util.Collections.unmodifiableList(new java.util.ArrayList<java.lang.Object>(this.objects));
}
java.util.Collection<Number> numbers;
switch (this.numbers == null ? 0 : this.numbers.size()) {
case 0:
numbers = java.util.Collections.emptyList();
break;
case 1:
numbers = java.util.Collections.singletonList(this.numbers.get(0));
break;
default:
numbers = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.numbers));
}
return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(objects, numbers);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")";
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder() {
return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder();
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder toBuilder() {
final BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder = new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder();
if (this.objects != null) builder.withObjects(this.objects);
if (this.numbers != null) builder.withNumbers(this.numbers);
return builder;
}
}
test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java
+5 -5
View File
@@ -12,19 +12,19 @@ class BuilderSingularWithPrefixes {
BuilderSingularWithPrefixesBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWithPrefixesBuilder elem(final String elem) {
public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.add(elem);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWithPrefixesBuilder elems(final java.util.Collection<? extends String> elems) {
public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection<? extends String> elems) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.addAll(elems);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWithPrefixesBuilder clearElems() {
public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() {
if (this.elems != null) this.elems.clear();
return this;
}
@@ -50,7 +50,7 @@ class BuilderSingularWithPrefixes {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularWithPrefixesBuilder builder() {
return new BuilderSingularWithPrefixesBuilder();
public static BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() {
return new BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder();
}
}
test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java
+5 -5
View File
@@ -12,19 +12,19 @@ class BuilderSingularWithPrefixesWithSetterPrefix {
BuilderSingularWithPrefixesWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) {
public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.add(elem);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) {
public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) {
if (this.elems == null) this.elems = new java.util.ArrayList<String>();
this.elems.addAll(elems);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() {
public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() {
if (this.elems != null) this.elems.clear();
return this;
}
@@ -50,7 +50,7 @@ class BuilderSingularWithPrefixesWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() {
return new BuilderSingularWithPrefixesWithSetterPrefixBuilder();
public static BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() {
return new BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderTypeAnnos.java
+3 -3
View File
@@ -23,7 +23,7 @@ class BuilderTypeAnnos {
BuilderTypeAnnosBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderTypeAnnosBuilder foo(@TA final List<String> foo) {
public BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(@TA final List<String> foo) {
this.foo = foo;
return this;
}
@@ -38,8 +38,8 @@ class BuilderTypeAnnos {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderTypeAnnosBuilder builder() {
return new BuilderTypeAnnosBuilder();
public static BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() {
return new BuilderTypeAnnos.BuilderTypeAnnosBuilder();
}
}
test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java
+3 -3
View File
@@ -23,7 +23,7 @@ class BuilderTypeAnnosWithSetterPrefix {
BuilderTypeAnnosWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List<String> foo) {
public BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List<String> foo) {
this.foo = foo;
return this;
}
@@ -38,8 +38,8 @@ class BuilderTypeAnnosWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderTypeAnnosWithSetterPrefixBuilder builder() {
return new BuilderTypeAnnosWithSetterPrefixBuilder();
public static BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() {
return new BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderValueData.java
+4 -4
View File
@@ -20,8 +20,8 @@ final class BuilderAndValue {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderAndValueBuilder builder() {
return new BuilderAndValueBuilder();
public static BuilderAndValue.BuilderAndValueBuilder builder() {
return new BuilderAndValue.BuilderAndValueBuilder();
}
@java.lang.SuppressWarnings("all")
public int getZero() {
@@ -72,8 +72,8 @@ class BuilderAndData {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderAndDataBuilder builder() {
return new BuilderAndDataBuilder();
public static BuilderAndData.BuilderAndDataBuilder builder() {
return new BuilderAndData.BuilderAndDataBuilder();
}
@java.lang.SuppressWarnings("all")
public int getZero() {
test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java
+4 -4
View File
@@ -20,8 +20,8 @@ final class BuilderAndValueWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderAndValueWithSetterPrefixBuilder builder() {
return new BuilderAndValueWithSetterPrefixBuilder();
public static BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() {
return new BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder();
}
@java.lang.SuppressWarnings("all")
public int getZero() {
@@ -72,8 +72,8 @@ class BuilderAndDataWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderAndDataWithSetterPrefixBuilder builder() {
return new BuilderAndDataWithSetterPrefixBuilder();
public static BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() {
return new BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder();
}
@java.lang.SuppressWarnings("all")
public int getZero() {
test/transform/resource/after-delombok/BuilderWithAccessors.java
+6 -6
View File
@@ -24,22 +24,22 @@ class BuilderWithAccessors {
BuilderWithAccessorsBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsBuilder plower(final int plower) {
public BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) {
this.plower = plower;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsBuilder upper(final int upper) {
public BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) {
this.upper = upper;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsBuilder foo(final int foo) {
public BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) {
this.foo = foo;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsBuilder _bar(final int _bar) {
public BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) {
this._bar = _bar;
return this;
}
@@ -54,7 +54,7 @@ class BuilderWithAccessors {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithAccessorsBuilder builder() {
return new BuilderWithAccessorsBuilder();
public static BuilderWithAccessors.BuilderWithAccessorsBuilder builder() {
return new BuilderWithAccessors.BuilderWithAccessorsBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java
-60
View File
@@ -1,60 +0,0 @@
class BuilderWithAccessorsWithSetterPrefix {
private final int plower;
private final int pUpper;
private int _foo;
private int __bar;
@java.lang.SuppressWarnings("all")
BuilderWithAccessorsWithSetterPrefix(final int plower, final int upper, final int foo, final int _bar) {
this.plower = plower;
this.pUpper = upper;
this._foo = foo;
this.__bar = _bar;
}
@java.lang.SuppressWarnings("all")
public static class BuilderWithAccessorsWithSetterPrefixBuilder {
@java.lang.SuppressWarnings("all")
private int plower;
@java.lang.SuppressWarnings("all")
private int upper;
@java.lang.SuppressWarnings("all")
private int foo;
@java.lang.SuppressWarnings("all")
private int _bar;
@java.lang.SuppressWarnings("all")
BuilderWithAccessorsWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsWithSetterPrefixBuilder withPlower(final int plower) {
this.plower = plower;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsWithSetterPrefixBuilder withUpper(final int upper) {
this.upper = upper;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsWithSetterPrefixBuilder withFoo(final int foo) {
this.foo = foo;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsWithSetterPrefixBuilder with_bar(final int _bar) {
this._bar = _bar;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithAccessorsWithSetterPrefix build() {
return new BuilderWithAccessorsWithSetterPrefix(plower, upper, foo, _bar);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithAccessorsWithSetterPrefix.BuilderWithAccessorsWithSetterPrefixBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")";
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithAccessorsWithSetterPrefixBuilder builder() {
return new BuilderWithAccessorsWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithBadNames.java
+4 -4
View File
@@ -16,12 +16,12 @@ public class BuilderWithBadNames {
BuilderWithBadNamesBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithBadNamesBuilder build(final String build) {
public BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) {
this.build = build;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithBadNamesBuilder toString(final String toString) {
public BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) {
this.toString = toString;
return this;
}
@@ -36,7 +36,7 @@ public class BuilderWithBadNames {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithBadNamesBuilder builder() {
return new BuilderWithBadNamesBuilder();
public static BuilderWithBadNames.BuilderWithBadNamesBuilder builder() {
return new BuilderWithBadNames.BuilderWithBadNamesBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java
-42
View File
@@ -1,42 +0,0 @@
public class BuilderWithBadNamesWithSetterPrefix {
String build;
String toString;
@java.lang.SuppressWarnings("all")
BuilderWithBadNamesWithSetterPrefix(final String build, final String toString) {
this.build = build;
this.toString = toString;
}
@java.lang.SuppressWarnings("all")
public static class BuilderWithBadNamesWithSetterPrefixBuilder {
@java.lang.SuppressWarnings("all")
private String build;
@java.lang.SuppressWarnings("all")
private String toString;
@java.lang.SuppressWarnings("all")
BuilderWithBadNamesWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithBadNamesWithSetterPrefixBuilder withBuild(final String build) {
this.build = build;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithBadNamesWithSetterPrefixBuilder withToString(final String toString) {
this.toString = toString;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithBadNamesWithSetterPrefix build() {
return new BuilderWithBadNamesWithSetterPrefix(build, toString);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithBadNamesWithSetterPrefix.BuilderWithBadNamesWithSetterPrefixBuilder(build=" + this.build + ", toString=" + this.toString + ")";
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithBadNamesWithSetterPrefixBuilder builder() {
return new BuilderWithBadNamesWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithDeprecated.java
+10 -10
View File
@@ -35,53 +35,53 @@ public class BuilderWithDeprecated {
*/
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder dep1(final String dep1) {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) {
this.dep1 = dep1;
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder dep2(final int dep2) {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) {
this.dep2 = dep2;
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder string(final String string) {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) {
if (this.strings == null) this.strings = new java.util.ArrayList<String>();
this.strings.add(string);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder strings(final java.util.Collection<? extends String> strings) {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection<? extends String> strings) {
if (this.strings == null) this.strings = new java.util.ArrayList<String>();
this.strings.addAll(strings);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder clearStrings() {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() {
if (this.strings != null) this.strings.clear();
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder number(final Integer number) {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) {
if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
this.numbers.add(number);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable<? extends Integer> numbers) {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable<? extends Integer> numbers) {
if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
this.numbers.addAll(numbers);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedBuilder clearNumbers() {
public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() {
this.numbers = null;
return this;
}
@@ -108,7 +108,7 @@ public class BuilderWithDeprecated {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithDeprecatedBuilder builder() {
return new BuilderWithDeprecatedBuilder();
public static BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() {
return new BuilderWithDeprecated.BuilderWithDeprecatedBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java
-114
View File
@@ -1,114 +0,0 @@
import com.google.common.collect.ImmutableList;
public class BuilderWithDeprecatedWithSetterPrefix {
/**
* @deprecated since always
*/
String dep1;
@Deprecated
int dep2;
@Deprecated
java.util.List<String> strings;
@Deprecated
ImmutableList<Integer> numbers;
@java.lang.SuppressWarnings("all")
BuilderWithDeprecatedWithSetterPrefix(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) {
this.dep1 = dep1;
this.dep2 = dep2;
this.strings = strings;
this.numbers = numbers;
}
@java.lang.SuppressWarnings("all")
public static class BuilderWithDeprecatedWithSetterPrefixBuilder {
@java.lang.SuppressWarnings("all")
private String dep1;
@java.lang.SuppressWarnings("all")
private int dep2;
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<String> strings;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableList.Builder<Integer> numbers;
@java.lang.SuppressWarnings("all")
BuilderWithDeprecatedWithSetterPrefixBuilder() {
}
/**
* @deprecated since always
*/
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder withDep1(final String dep1) {
this.dep1 = dep1;
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder withDep2(final int dep2) {
this.dep2 = dep2;
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder withString(final String string) {
if (this.strings == null) this.strings = new java.util.ArrayList<String>();
this.strings.add(string);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder withStrings(final java.util.Collection<? extends String> strings) {
if (this.strings == null) this.strings = new java.util.ArrayList<String>();
this.strings.addAll(strings);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder clearStrings() {
if (this.strings != null) this.strings.clear();
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder withNumber(final Integer number) {
if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
this.numbers.add(number);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder withNumbers(final java.lang.Iterable<? extends Integer> numbers) {
if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
this.numbers.addAll(numbers);
return this;
}
@java.lang.Deprecated
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefixBuilder clearNumbers() {
this.numbers = null;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithDeprecatedWithSetterPrefix build() {
java.util.List<String> strings;
switch (this.strings == null ? 0 : this.strings.size()) {
case 0:
strings = java.util.Collections.emptyList();
break;
case 1:
strings = java.util.Collections.singletonList(this.strings.get(0));
break;
default:
strings = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.strings));
}
com.google.common.collect.ImmutableList<Integer> numbers = this.numbers == null ? com.google.common.collect.ImmutableList.<Integer>of() : this.numbers.build();
return new BuilderWithDeprecatedWithSetterPrefix(dep1, dep2, strings, numbers);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithDeprecatedWithSetterPrefix.BuilderWithDeprecatedWithSetterPrefixBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")";
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithDeprecatedWithSetterPrefixBuilder builder() {
return new BuilderWithDeprecatedWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
+4 -4
View File
@@ -14,12 +14,12 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
BuilderWithExistingBuilderClassBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
this.arg1 = arg1;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
this.arg3 = arg3;
return this;
}
@@ -34,7 +34,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
}
}
@java.lang.SuppressWarnings("all")
public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() {
return new BuilderWithExistingBuilderClassBuilder<Z>();
public static <Z extends Number> BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> builder() {
return new BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z>();
}
}
test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
+4 -4
View File
@@ -14,12 +14,12 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
BuilderWithExistingBuilderClassWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) {
public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) {
this.arg1 = arg1;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) {
public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) {
this.arg3 = arg3;
return this;
}
@@ -34,7 +34,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
}
}
@java.lang.SuppressWarnings("all")
public static <Z extends Number> BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> builder() {
return new BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z>();
public static <Z extends Number> BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> builder() {
return new BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z>();
}
}
test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java
+3 -3
View File
@@ -12,7 +12,7 @@ class BuilderWithNoBuilderMethod {
BuilderWithNoBuilderMethodBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithNoBuilderMethodBuilder a(final String a) {
public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) {
this.a = a;
return this;
}
@@ -27,7 +27,7 @@ class BuilderWithNoBuilderMethod {
}
}
@java.lang.SuppressWarnings("all")
public BuilderWithNoBuilderMethodBuilder toBuilder() {
return new BuilderWithNoBuilderMethodBuilder().a(this.a);
public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() {
return new BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder().a(this.a);
}
}
test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java
-33
View File
@@ -1,33 +0,0 @@
class BuilderWithNoBuilderMethodWithSetterPrefix {
private String a = "";
@java.lang.SuppressWarnings("all")
BuilderWithNoBuilderMethodWithSetterPrefix(final String a) {
this.a = a;
}
@java.lang.SuppressWarnings("all")
public static class BuilderWithNoBuilderMethodWithSetterPrefixBuilder {
@java.lang.SuppressWarnings("all")
private String a;
@java.lang.SuppressWarnings("all")
BuilderWithNoBuilderMethodWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithNoBuilderMethodWithSetterPrefixBuilder withA(final String a) {
this.a = a;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithNoBuilderMethodWithSetterPrefix build() {
return new BuilderWithNoBuilderMethodWithSetterPrefix(a);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithNoBuilderMethodWithSetterPrefix.BuilderWithNoBuilderMethodWithSetterPrefixBuilder(a=" + this.a + ")";
}
}
@java.lang.SuppressWarnings("all")
public BuilderWithNoBuilderMethodWithSetterPrefixBuilder toBuilder() {
return new BuilderWithNoBuilderMethodWithSetterPrefixBuilder().withA(this.a);
}
}
test/transform/resource/after-delombok/BuilderWithNonNull.java
+3 -3
View File
@@ -16,7 +16,7 @@ class BuilderWithNonNull {
BuilderWithNonNullBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithNonNullBuilder id(@lombok.NonNull final String id) {
public BuilderWithNonNull.BuilderWithNonNullBuilder id(@lombok.NonNull final String id) {
if (id == null) {
throw new java.lang.NullPointerException("id is marked non-null but is null");
}
@@ -34,7 +34,7 @@ class BuilderWithNonNull {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithNonNullBuilder builder() {
return new BuilderWithNonNullBuilder();
public static BuilderWithNonNull.BuilderWithNonNullBuilder builder() {
return new BuilderWithNonNull.BuilderWithNonNullBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java
+3 -3
View File
@@ -16,7 +16,7 @@ class BuilderWithNonNullWithSetterPrefix {
BuilderWithNonNullWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) {
public BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) {
if (id == null) {
throw new java.lang.NullPointerException("id is marked non-null but is null");
}
@@ -34,7 +34,7 @@ class BuilderWithNonNullWithSetterPrefix {
}
}
@java.lang.SuppressWarnings("all")
public static BuilderWithNonNullWithSetterPrefixBuilder builder() {
return new BuilderWithNonNullWithSetterPrefixBuilder();
public static BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() {
return new BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java
+6 -6
View File
@@ -20,18 +20,18 @@ public class BuilderWithRecursiveGenerics {
TestBuilder() {
}
@java.lang.SuppressWarnings("all")
public TestBuilder<Foo, Bar, Quz> foo(final Foo foo) {
public BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> foo(final Foo foo) {
this.foo = foo;
return this;
}
@java.lang.SuppressWarnings("all")
public TestBuilder<Foo, Bar, Quz> bar(final Bar bar) {
public BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> bar(final Bar bar) {
this.bar = bar;
return this;
}
@java.lang.SuppressWarnings("all")
public Test<Foo, Bar, Quz> build() {
return new Test<Foo, Bar, Quz>(foo, bar);
public BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz> build() {
return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(foo, bar);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
@@ -40,8 +40,8 @@ public class BuilderWithRecursiveGenerics {
}
}
@java.lang.SuppressWarnings("all")
public static <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> TestBuilder<Foo, Bar, Quz> builder() {
return new TestBuilder<Foo, Bar, Quz>();
public static <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> builder() {
return new BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz>();
}
@java.lang.SuppressWarnings("all")
public Foo getFoo() {
test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java
-85
View File
@@ -1,85 +0,0 @@
import java.util.Set;
public class BuilderWithRecursiveGenericsWithSetterPrefix {
interface Inter<T, U extends Inter<T, U>> {
}
public static final class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
private final Foo foo;
private final Bar bar;
@java.lang.SuppressWarnings("all")
Test(final Foo foo, final Bar bar) {
this.foo = foo;
this.bar = bar;
}
@java.lang.SuppressWarnings("all")
public static class TestBuilder<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
@java.lang.SuppressWarnings("all")
private Foo foo;
@java.lang.SuppressWarnings("all")
private Bar bar;
@java.lang.SuppressWarnings("all")
TestBuilder() {
}
@java.lang.SuppressWarnings("all")
public TestBuilder<Foo, Bar, Quz> withFoo(final Foo foo) {
this.foo = foo;
return this;
}
@java.lang.SuppressWarnings("all")
public TestBuilder<Foo, Bar, Quz> withBar(final Bar bar) {
this.bar = bar;
return this;
}
@java.lang.SuppressWarnings("all")
public Test<Foo, Bar, Quz> build() {
return new Test<Foo, Bar, Quz>(foo, bar);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithRecursiveGenericsWithSetterPrefix.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")";
}
}
@java.lang.SuppressWarnings("all")
public static <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> TestBuilder<Foo, Bar, Quz> builder() {
return new TestBuilder<Foo, Bar, Quz>();
}
@java.lang.SuppressWarnings("all")
public Foo getFoo() {
return this.foo;
}
@java.lang.SuppressWarnings("all")
public Bar getBar() {
return this.bar;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public boolean equals(final java.lang.Object o) {
if (o == this) return true;
if (!(o instanceof BuilderWithRecursiveGenericsWithSetterPrefix.Test)) return false;
final BuilderWithRecursiveGenericsWithSetterPrefix.Test<?, ?, ?> other = (BuilderWithRecursiveGenericsWithSetterPrefix.Test<?, ?, ?>) o;
final java.lang.Object this$foo = this.getFoo();
final java.lang.Object other$foo = other.getFoo();
if (this$foo == null ? other$foo != null : !this$foo.equals(other$foo)) return false;
final java.lang.Object this$bar = this.getBar();
final java.lang.Object other$bar = other.getBar();
if (this$bar == null ? other$bar != null : !this$bar.equals(other$bar)) return false;
return true;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public int hashCode() {
final int PRIME = 59;
int result = 1;
final java.lang.Object $foo = this.getFoo();
result = result * PRIME + ($foo == null ? 43 : $foo.hashCode());
final java.lang.Object $bar = this.getBar();
result = result * PRIME + ($bar == null ? 43 : $bar.hashCode());
return result;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithRecursiveGenericsWithSetterPrefix.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")";
}
}
}
test/transform/resource/after-delombok/BuilderWithToBuilder.java
+17 -17
View File
@@ -28,34 +28,34 @@ class BuilderWithToBuilder<T> {
BuilderWithToBuilderBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderBuilder<T> one(final String one) {
public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> one(final String one) {
this.one = one;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderBuilder<T> two(final String two) {
public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> two(final String two) {
this.two = two;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderBuilder<T> foo(final T foo) {
public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> foo(final T foo) {
this.foo = foo;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderBuilder<T> bar(final T bar) {
public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> bar(final T bar) {
if (this.bars == null) this.bars = new java.util.ArrayList<T>();
this.bars.add(bar);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderBuilder<T> bars(final java.util.Collection<? extends T> bars) {
public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> bars(final java.util.Collection<? extends T> bars) {
if (this.bars == null) this.bars = new java.util.ArrayList<T>();
this.bars.addAll(bars);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderBuilder<T> clearBars() {
public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> clearBars() {
if (this.bars != null) this.bars.clear();
return this;
}
@@ -81,12 +81,12 @@ class BuilderWithToBuilder<T> {
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderWithToBuilderBuilder<T> builder() {
return new BuilderWithToBuilderBuilder<T>();
public static <T> BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> builder() {
return new BuilderWithToBuilder.BuilderWithToBuilderBuilder<T>();
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderBuilder<T> toBuilder() {
final BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.<T>rrr(this));
public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> toBuilder() {
final BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilder.BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.<T>rrr(this));
if (this.bars != null) builder.bars(this.bars);
return builder;
}
@@ -111,17 +111,17 @@ class ConstructorWithToBuilder<T> {
ConstructorWithToBuilderBuilder() {
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderBuilder<T> mOne(final String mOne) {
public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> mOne(final String mOne) {
this.mOne = mOne;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderBuilder<T> baz(final T baz) {
public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> baz(final T baz) {
this.baz = baz;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) {
public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) {
this.bars = bars;
return this;
}
@@ -136,11 +136,11 @@ class ConstructorWithToBuilder<T> {
}
}
@java.lang.SuppressWarnings("all")
public static <T> ConstructorWithToBuilderBuilder<T> builder() {
return new ConstructorWithToBuilderBuilder<T>();
public static <T> ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> builder() {
return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T>();
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderBuilder<T> toBuilder() {
return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).baz(this.foo).bars(this.bars);
public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> toBuilder() {
return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).baz(this.foo).bars(this.bars);
}
}
test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java
-146
View File
@@ -1,146 +0,0 @@
import java.util.List;
class BuilderWithToBuilderWithSetterPrefix<T> {
private String mOne;
private String mTwo;
private T foo;
private List<T> bars;
public static <K> K rrr(BuilderWithToBuilderWithSetterPrefix<K> x) {
return x.foo;
}
@java.lang.SuppressWarnings("all")
BuilderWithToBuilderWithSetterPrefix(final String one, final String two, final T foo, final List<T> bars) {
this.mOne = one;
this.mTwo = two;
this.foo = foo;
this.bars = bars;
}
@java.lang.SuppressWarnings("all")
public static class BuilderWithToBuilderWithSetterPrefixBuilder<T> {
@java.lang.SuppressWarnings("all")
private String one;
@java.lang.SuppressWarnings("all")
private String two;
@java.lang.SuppressWarnings("all")
private T foo;
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<T> bars;
@java.lang.SuppressWarnings("all")
BuilderWithToBuilderWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefixBuilder<T> withOne(final String one) {
this.one = one;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefixBuilder<T> withTwo(final String two) {
this.two = two;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefixBuilder<T> withFoo(final T foo) {
this.foo = foo;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefixBuilder<T> withBar(final T bar) {
if (this.bars == null) this.bars = new java.util.ArrayList<T>();
this.bars.add(bar);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefixBuilder<T> withBars(final java.util.Collection<? extends T> bars) {
if (this.bars == null) this.bars = new java.util.ArrayList<T>();
this.bars.addAll(bars);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefixBuilder<T> clearBars() {
if (this.bars != null) this.bars.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefix<T> build() {
java.util.List<T> bars;
switch (this.bars == null ? 0 : this.bars.size()) {
case 0:
bars = java.util.Collections.emptyList();
break;
case 1:
bars = java.util.Collections.singletonList(this.bars.get(0));
break;
default:
bars = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.bars));
}
return new BuilderWithToBuilderWithSetterPrefix<T>(one, two, foo, bars);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithToBuilderWithSetterPrefix.BuilderWithToBuilderWithSetterPrefixBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")";
}
}
@java.lang.SuppressWarnings("all")
public static <T> BuilderWithToBuilderWithSetterPrefixBuilder<T> builder() {
return new BuilderWithToBuilderWithSetterPrefixBuilder<T>();
}
@java.lang.SuppressWarnings("all")
public BuilderWithToBuilderWithSetterPrefixBuilder<T> toBuilder() {
final BuilderWithToBuilderWithSetterPrefixBuilder<T> builder = new BuilderWithToBuilderWithSetterPrefixBuilder<T>().withOne(this.mOne).withTwo(this.mTwo).withFoo(BuilderWithToBuilderWithSetterPrefix.<T>rrr(this));
if (this.bars != null) builder.withBars(this.bars);
return builder;
}
}
class ConstructorWithToBuilderWithSetterPrefix<T> {
private String mOne;
private String mTwo;
private T foo;
@lombok.Singular
private com.google.common.collect.ImmutableList<T> bars;
public ConstructorWithToBuilderWithSetterPrefix(String mOne, T baz, com.google.common.collect.ImmutableList<T> bars) {
}
@java.lang.SuppressWarnings("all")
public static class ConstructorWithToBuilderWithSetterPrefixBuilder<T> {
@java.lang.SuppressWarnings("all")
private String mOne;
@java.lang.SuppressWarnings("all")
private T baz;
@java.lang.SuppressWarnings("all")
private com.google.common.collect.ImmutableList<T> bars;
@java.lang.SuppressWarnings("all")
ConstructorWithToBuilderWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withMOne(final String mOne) {
this.mOne = mOne;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withBaz(final T baz) {
this.baz = baz;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withBars(final com.google.common.collect.ImmutableList<T> bars) {
this.bars = bars;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderWithSetterPrefix<T> build() {
return new ConstructorWithToBuilderWithSetterPrefix<T>(mOne, baz, bars);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "ConstructorWithToBuilderWithSetterPrefix.ConstructorWithToBuilderWithSetterPrefixBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")";
}
}
@java.lang.SuppressWarnings("all")
public static <T> ConstructorWithToBuilderWithSetterPrefixBuilder<T> builder() {
return new ConstructorWithToBuilderWithSetterPrefixBuilder<T>();
}
@java.lang.SuppressWarnings("all")
public ConstructorWithToBuilderWithSetterPrefixBuilder<T> toBuilder() {
return new ConstructorWithToBuilderWithSetterPrefixBuilder<T>().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars);
}
}
test/transform/resource/after-delombok/BuilderWithTolerate.java
+3 -3
View File
@@ -15,7 +15,7 @@ public class BuilderWithTolerate {
BuilderWithTolerateBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithTolerateBuilder value(final int value) {
public BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) {
this.value = value;
return this;
}
@@ -34,7 +34,7 @@ public class BuilderWithTolerate {
this.value = value;
}
@java.lang.SuppressWarnings("all")
public static BuilderWithTolerateBuilder builder() {
return new BuilderWithTolerateBuilder();
public static BuilderWithTolerate.BuilderWithTolerateBuilder builder() {
return new BuilderWithTolerate.BuilderWithTolerateBuilder();
}
}
test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java
-40
View File
@@ -1,40 +0,0 @@
import lombok.experimental.Tolerate;
public class BuilderWithTolerateWithSetterPrefix {
private final int value;
public static void main(String[] args) {
BuilderWithTolerateWithSetterPrefix.builder().withValue("42").build();
}
public static class BuilderWithTolerateWithSetterPrefixBuilder {
@java.lang.SuppressWarnings("all")
private int value;
@Tolerate
public BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) {
return this.withValue(Integer.parseInt(s));
}
@java.lang.SuppressWarnings("all")
BuilderWithTolerateWithSetterPrefixBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderWithTolerateWithSetterPrefixBuilder withValue(final int value) {
this.value = value;
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderWithTolerateWithSetterPrefix build() {
return new BuilderWithTolerateWithSetterPrefix(value);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderWithTolerateWithSetterPrefix.BuilderWithTolerateWithSetterPrefixBuilder(value=" + this.value + ")";
}
}
@java.lang.SuppressWarnings("all")
BuilderWithTolerateWithSetterPrefix(final int value) {
this.value = value;
}
@java.lang.SuppressWarnings("all")
public static BuilderWithTolerateWithSetterPrefixBuilder builder() {
return new BuilderWithTolerateWithSetterPrefixBuilder();
}
}
test/transform/resource/after-delombok/CheckerFrameworkBuilder.java
+9 -9
View File
@@ -35,46 +35,46 @@ class CheckerFrameworkBuilder {
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public CheckerFrameworkBuilderBuilder x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkBuilderBuilder this, final int x) {
public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this, final int x) {
this.x$value = x;
x$set = true;
return this;
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public CheckerFrameworkBuilderBuilder y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkBuilderBuilder this, final int y) {
public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this, final int y) {
this.y = y;
return this;
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public CheckerFrameworkBuilderBuilder z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkBuilderBuilder this, final int z) {
public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this, final int z) {
this.z = z;
return this;
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public CheckerFrameworkBuilderBuilder name(final String name) {
public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder name(final String name) {
if (this.names == null) this.names = new java.util.ArrayList<String>();
this.names.add(name);
return this;
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public CheckerFrameworkBuilderBuilder names(final java.util.Collection<? extends String> names) {
public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder names(final java.util.Collection<? extends String> names) {
if (this.names == null) this.names = new java.util.ArrayList<String>();
this.names.addAll(names);
return this;
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public CheckerFrameworkBuilderBuilder clearNames() {
public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder clearNames() {
if (this.names != null) this.names.clear();
return this;
}
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
public CheckerFrameworkBuilder build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) {
public CheckerFrameworkBuilder build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this) {
java.util.List<String> names;
switch (this.names == null ? 0 : this.names.size()) {
case 0:
@@ -100,7 +100,7 @@ class CheckerFrameworkBuilder {
@org.checkerframework.common.aliasing.qual.Unique
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
public static CheckerFrameworkBuilderBuilder builder() {
return new CheckerFrameworkBuilderBuilder();
public static CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder builder() {
return new CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder();
}
}
test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
+25 -25
View File
@@ -11,7 +11,7 @@ class CheckerFrameworkSuperBuilder {
return 5;
}
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
public static abstract class ParentBuilder<C extends CheckerFrameworkSuperBuilder.Parent, B extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private boolean x$set;
@java.lang.SuppressWarnings("all")
@@ -28,23 +28,23 @@ class CheckerFrameworkSuperBuilder {
protected abstract B self();
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) Parent this);
public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkSuperBuilder.Parent this);
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public B x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") ParentBuilder this, final int x) {
public B x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B> this, final int x) {
this.x$value = x;
x$set = true;
return self();
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public B y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") ParentBuilder this, final int y) {
public B y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B> this, final int y) {
this.y = y;
return self();
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public B z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") ParentBuilder this, final int z) {
public B z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B> this, final int z) {
this.z = z;
return self();
}
@@ -76,7 +76,7 @@ class CheckerFrameworkSuperBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
private static final class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder<CheckerFrameworkSuperBuilder.Parent, CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl> {
@org.checkerframework.common.aliasing.qual.Unique
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
@@ -85,21 +85,21 @@ class CheckerFrameworkSuperBuilder {
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl self() {
protected CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() {
return this;
}
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) {
return new Parent(this);
public CheckerFrameworkSuperBuilder.Parent build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl this) {
return new CheckerFrameworkSuperBuilder.Parent(this);
}
}
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<?, ?> b) {
protected Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder<?, ?> b) {
if (b.x$set) this.x = b.x$value;
else this.x = Parent.$default$x();
else this.x = CheckerFrameworkSuperBuilder.Parent.$default$x();
this.y = b.y;
this.z = b.z;
java.util.List<String> names;
@@ -117,8 +117,8 @@ class CheckerFrameworkSuperBuilder {
}
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
public static ParentBuilder<?, ?> builder() {
return new ParentBuilderImpl();
public static CheckerFrameworkSuperBuilder.Parent.ParentBuilder<?, ?> builder() {
return new CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl();
}
}
public static class Child extends Parent {
@@ -129,7 +129,7 @@ class CheckerFrameworkSuperBuilder {
return 1;
}
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
public static abstract class ChildBuilder<C extends CheckerFrameworkSuperBuilder.Child, B extends CheckerFrameworkSuperBuilder.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private boolean a$set;
@java.lang.SuppressWarnings("all")
@@ -144,17 +144,17 @@ class CheckerFrameworkSuperBuilder {
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.Override
@java.lang.SuppressWarnings("all")
public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods("b") Child this);
public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods("b") CheckerFrameworkSuperBuilder.Child this);
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public B a(@org.checkerframework.checker.builder.qual.NotCalledMethods("a") ChildBuilder this, final int a) {
public B a(@org.checkerframework.checker.builder.qual.NotCalledMethods("a") CheckerFrameworkSuperBuilder.Child.ChildBuilder<C, B> this, final int a) {
this.a$value = a;
a$set = true;
return self();
}
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@java.lang.SuppressWarnings("all")
public B b(@org.checkerframework.checker.builder.qual.NotCalledMethods("b") ChildBuilder this, final int b) {
public B b(@org.checkerframework.checker.builder.qual.NotCalledMethods("b") CheckerFrameworkSuperBuilder.Child.ChildBuilder<C, B> this, final int b) {
this.b = b;
return self();
}
@@ -166,7 +166,7 @@ class CheckerFrameworkSuperBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
private static final class ChildBuilderImpl extends CheckerFrameworkSuperBuilder.Child.ChildBuilder<CheckerFrameworkSuperBuilder.Child, CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl> {
@org.checkerframework.common.aliasing.qual.Unique
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
@@ -175,28 +175,28 @@ class CheckerFrameworkSuperBuilder {
@org.checkerframework.checker.builder.qual.ReturnsReceiver
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl self() {
return this;
}
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child build(@org.checkerframework.checker.builder.qual.CalledMethods("b") ChildBuilderImpl this) {
return new Child(this);
public CheckerFrameworkSuperBuilder.Child build(@org.checkerframework.checker.builder.qual.CalledMethods("b") CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl this) {
return new CheckerFrameworkSuperBuilder.Child(this);
}
}
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final CheckerFrameworkSuperBuilder.Child.ChildBuilder<?, ?> b) {
super(b);
if (b.a$set) this.a = b.a$value;
else this.a = Child.$default$a();
else this.a = CheckerFrameworkSuperBuilder.Child.$default$a();
this.b = b.b;
}
@org.checkerframework.dataflow.qual.SideEffectFree
@java.lang.SuppressWarnings("all")
public static ChildBuilder<?, ?> builder() {
return new ChildBuilderImpl();
public static CheckerFrameworkSuperBuilder.Child.ChildBuilder<?, ?> builder() {
return new CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl();
}
}
}
test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java
+4 -4
View File
@@ -17,13 +17,13 @@ final class ConstructorsWithBuilderDefaults {
ConstructorsWithBuilderDefaultsBuilder() {
}
@java.lang.SuppressWarnings("all")
public ConstructorsWithBuilderDefaultsBuilder x(final int x) {
public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) {
this.x$value = x;
x$set = true;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorsWithBuilderDefaultsBuilder y(final int y) {
public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) {
this.y = y;
return this;
}
@@ -40,8 +40,8 @@ final class ConstructorsWithBuilderDefaults {
}
}
@java.lang.SuppressWarnings("all")
public static ConstructorsWithBuilderDefaultsBuilder builder() {
return new ConstructorsWithBuilderDefaultsBuilder();
public static ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() {
return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder();
}
@java.lang.SuppressWarnings("all")
public int getX() {
test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java
+5 -5
View File
@@ -34,19 +34,19 @@ final class ConstructorsWithBuilderDefaults<T> {
ConstructorsWithBuilderDefaultsBuilder() {
}
@java.lang.SuppressWarnings("all")
public ConstructorsWithBuilderDefaultsBuilder<T> z(final java.util.List<T> z) {
public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> z(final java.util.List<T> z) {
this.z$value = z;
z$set = true;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorsWithBuilderDefaultsBuilder<T> x(final T x) {
public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> x(final T x) {
this.x$value = x;
x$set = true;
return this;
}
@java.lang.SuppressWarnings("all")
public ConstructorsWithBuilderDefaultsBuilder<T> q(final T q) {
public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> q(final T q) {
this.q = q;
return this;
}
@@ -66,8 +66,8 @@ final class ConstructorsWithBuilderDefaults<T> {
}
}
@java.lang.SuppressWarnings("all")
public static <T> ConstructorsWithBuilderDefaultsBuilder<T> builder() {
return new ConstructorsWithBuilderDefaultsBuilder<T>();
public static <T> ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> builder() {
return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T>();
}
@java.lang.SuppressWarnings("all")
private ConstructorsWithBuilderDefaults() {
test/transform/resource/after-delombok/JacksonJsonProperty.java
+3 -3
View File
@@ -19,7 +19,7 @@ public class JacksonJsonProperty {
@JsonProperty("kebab-case-prop")
@JsonSetter(nulls = Nulls.SKIP)
@java.lang.SuppressWarnings("all")
public JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) {
public JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) {
this.kebabCaseProp = kebabCaseProp;
return this;
}
@@ -34,8 +34,8 @@ public class JacksonJsonProperty {
}
}
@java.lang.SuppressWarnings("all")
public static JacksonJsonPropertyBuilder builder() {
return new JacksonJsonPropertyBuilder();
public static JacksonJsonProperty.JacksonJsonPropertyBuilder builder() {
return new JacksonJsonProperty.JacksonJsonPropertyBuilder();
}
@JsonProperty("kebab-case-prop")
@JsonSetter(nulls = Nulls.SKIP)
test/transform/resource/after-delombok/SuperBuilderAbstract.java
+18 -18
View File
@@ -2,7 +2,7 @@ public class SuperBuilderAbstract {
public static class Parent {
int parentField;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
public static abstract class ParentBuilder<C extends SuperBuilderAbstract.Parent, B extends SuperBuilderAbstract.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int parentField;
@java.lang.SuppressWarnings("all")
@@ -21,34 +21,34 @@ public class SuperBuilderAbstract {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
private static final class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder<SuperBuilderAbstract.Parent, SuperBuilderAbstract.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl self() {
protected SuperBuilderAbstract.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent build() {
return new Parent(this);
public SuperBuilderAbstract.Parent build() {
return new SuperBuilderAbstract.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<?, ?> b) {
protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder<?, ?> b) {
this.parentField = b.parentField;
}
@java.lang.SuppressWarnings("all")
public static ParentBuilder<?, ?> builder() {
return new ParentBuilderImpl();
public static SuperBuilderAbstract.Parent.ParentBuilder<?, ?> builder() {
return new SuperBuilderAbstract.Parent.ParentBuilderImpl();
}
}
public static abstract class Child extends Parent {
double childField;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderAbstract.Child, B extends SuperBuilderAbstract.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double childField;
@java.lang.Override
@@ -69,7 +69,7 @@ public class SuperBuilderAbstract {
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderAbstract.Child.ChildBuilder<?, ?> b) {
super(b);
this.childField = b.childField;
}
@@ -77,7 +77,7 @@ public class SuperBuilderAbstract {
public static class GrandChild extends Child {
String grandChildField;
@java.lang.SuppressWarnings("all")
public static abstract class GrandChildBuilder<C extends GrandChild, B extends GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
public static abstract class GrandChildBuilder<C extends SuperBuilderAbstract.GrandChild, B extends SuperBuilderAbstract.GrandChild.GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private String grandChildField;
@java.lang.Override
@@ -98,29 +98,29 @@ public class SuperBuilderAbstract {
}
}
@java.lang.SuppressWarnings("all")
private static final class GrandChildBuilderImpl extends GrandChildBuilder<GrandChild, GrandChildBuilderImpl> {
private static final class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder<SuperBuilderAbstract.GrandChild, SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private GrandChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected GrandChildBuilderImpl self() {
protected SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public GrandChild build() {
return new GrandChild(this);
public SuperBuilderAbstract.GrandChild build() {
return new SuperBuilderAbstract.GrandChild(this);
}
}
@java.lang.SuppressWarnings("all")
protected GrandChild(final GrandChildBuilder<?, ?> b) {
protected GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder<?, ?> b) {
super(b);
this.grandChildField = b.grandChildField;
}
@java.lang.SuppressWarnings("all")
public static GrandChildBuilder<?, ?> builder() {
return new GrandChildBuilderImpl();
public static SuperBuilderAbstract.GrandChild.GrandChildBuilder<?, ?> builder() {
return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl();
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
+28 -28
View File
@@ -2,16 +2,16 @@ public class SuperBuilderAbstractToBuilder {
public static class Parent {
int parentField;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
public static abstract class ParentBuilder<C extends SuperBuilderAbstractToBuilder.Parent, B extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int parentField;
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {
private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> b) {
b.parentField(instance.parentField);
}
@java.lang.SuppressWarnings("all")
@@ -30,49 +30,49 @@ public class SuperBuilderAbstractToBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
private static final class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder<SuperBuilderAbstractToBuilder.Parent, SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl self() {
protected SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent build() {
return new Parent(this);
public SuperBuilderAbstractToBuilder.Parent build() {
return new SuperBuilderAbstractToBuilder.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<?, ?> b) {
protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> b) {
this.parentField = b.parentField;
}
@java.lang.SuppressWarnings("all")
public static ParentBuilder<?, ?> builder() {
return new ParentBuilderImpl();
public static SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> builder() {
return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl();
}
@java.lang.SuppressWarnings("all")
public ParentBuilder<?, ?> toBuilder() {
return new ParentBuilderImpl().$fillValuesFrom(this);
public SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> toBuilder() {
return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this);
}
}
public static abstract class Child extends Parent {
double childField;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderAbstractToBuilder.Child, B extends SuperBuilderAbstractToBuilder.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double childField;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {
private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder<?, ?> b) {
b.childField(instance.childField);
}
@java.lang.Override
@@ -93,7 +93,7 @@ public class SuperBuilderAbstractToBuilder {
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder<?, ?> b) {
super(b);
this.childField = b.childField;
}
@@ -101,18 +101,18 @@ public class SuperBuilderAbstractToBuilder {
public static class GrandChild extends Child {
String grandChildField;
@java.lang.SuppressWarnings("all")
public static abstract class GrandChildBuilder<C extends GrandChild, B extends GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
public static abstract class GrandChildBuilder<C extends SuperBuilderAbstractToBuilder.GrandChild, B extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private String grandChildField;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
private static void $fillValuesFromInstanceIntoBuilder(final GrandChild instance, final GrandChildBuilder<?, ?> b) {
private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> b) {
b.grandChildField(instance.grandChildField);
}
@java.lang.Override
@@ -133,33 +133,33 @@ public class SuperBuilderAbstractToBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class GrandChildBuilderImpl extends GrandChildBuilder<GrandChild, GrandChildBuilderImpl> {
private static final class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<SuperBuilderAbstractToBuilder.GrandChild, SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private GrandChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected GrandChildBuilderImpl self() {
protected SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public GrandChild build() {
return new GrandChild(this);
public SuperBuilderAbstractToBuilder.GrandChild build() {
return new SuperBuilderAbstractToBuilder.GrandChild(this);
}
}
@java.lang.SuppressWarnings("all")
protected GrandChild(final GrandChildBuilder<?, ?> b) {
protected GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> b) {
super(b);
this.grandChildField = b.grandChildField;
}
@java.lang.SuppressWarnings("all")
public static GrandChildBuilder<?, ?> builder() {
return new GrandChildBuilderImpl();
public static SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> builder() {
return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl();
}
@java.lang.SuppressWarnings("all")
public GrandChildBuilder<?, ?> toBuilder() {
return new GrandChildBuilderImpl().$fillValuesFrom(this);
public SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> toBuilder() {
return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this);
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderBasic.java
+16 -16
View File
@@ -4,7 +4,7 @@ public class SuperBuilderBasic {
int field1;
List<String> items;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
public static abstract class ParentBuilder<C extends SuperBuilderBasic.Parent, B extends SuperBuilderBasic.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int field1;
@java.lang.SuppressWarnings("all")
@@ -42,23 +42,23 @@ public class SuperBuilderBasic {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
private static final class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder<SuperBuilderBasic.Parent, SuperBuilderBasic.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl self() {
protected SuperBuilderBasic.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent build() {
return new Parent(this);
public SuperBuilderBasic.Parent build() {
return new SuperBuilderBasic.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<?, ?> b) {
protected Parent(final SuperBuilderBasic.Parent.ParentBuilder<?, ?> b) {
this.field1 = b.field1;
java.util.List<String> items;
switch (b.items == null ? 0 : b.items.size()) {
@@ -74,14 +74,14 @@ public class SuperBuilderBasic {
this.items = items;
}
@java.lang.SuppressWarnings("all")
public static ParentBuilder<?, ?> builder() {
return new ParentBuilderImpl();
public static SuperBuilderBasic.Parent.ParentBuilder<?, ?> builder() {
return new SuperBuilderBasic.Parent.ParentBuilderImpl();
}
}
public static class Child extends Parent {
double field3;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderBasic.Child, B extends SuperBuilderBasic.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@@ -102,29 +102,29 @@ public class SuperBuilderBasic {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
private static final class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder<SuperBuilderBasic.Child, SuperBuilderBasic.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected SuperBuilderBasic.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child build() {
return new Child(this);
public SuperBuilderBasic.Child build() {
return new SuperBuilderBasic.Child(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderBasic.Child.ChildBuilder<?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
public static ChildBuilder<?, ?> builder() {
return new ChildBuilderImpl();
public static SuperBuilderBasic.Child.ChildBuilder<?, ?> builder() {
return new SuperBuilderBasic.Child.ChildBuilderImpl();
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
+25 -25
View File
@@ -13,7 +13,7 @@ public class SuperBuilderBasicToBuilder {
return "staticMethod";
}
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
public static abstract class ParentBuilder<C extends SuperBuilderBasicToBuilder.Parent, B extends SuperBuilderBasicToBuilder.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int field1;
@java.lang.SuppressWarnings("all")
@@ -26,15 +26,15 @@ public class SuperBuilderBasicToBuilder {
private java.util.ArrayList<String> items;
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {
private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> b) {
b.field1(instance.field1);
b.obtainViaField(instance.field1);
b.obtainViaMethod(instance.method());
b.obtainViaStaticMethod(Parent.staticMethod(instance));
b.obtainViaStaticMethod(SuperBuilderBasicToBuilder.Parent.staticMethod(instance));
b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items);
}
@java.lang.SuppressWarnings("all")
@@ -85,23 +85,23 @@ public class SuperBuilderBasicToBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
private static final class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder<SuperBuilderBasicToBuilder.Parent, SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl self() {
protected SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent build() {
return new Parent(this);
public SuperBuilderBasicToBuilder.Parent build() {
return new SuperBuilderBasicToBuilder.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<?, ?> b) {
protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> b) {
this.field1 = b.field1;
this.obtainViaField = b.obtainViaField;
this.obtainViaMethod = b.obtainViaMethod;
@@ -120,29 +120,29 @@ public class SuperBuilderBasicToBuilder {
this.items = items;
}
@java.lang.SuppressWarnings("all")
public static ParentBuilder<?, ?> builder() {
return new ParentBuilderImpl();
public static SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> builder() {
return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl();
}
@java.lang.SuppressWarnings("all")
public ParentBuilder<?, ?> toBuilder() {
return new ParentBuilderImpl().$fillValuesFrom(this);
public SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> toBuilder() {
return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this);
}
}
public static class Child extends Parent {
private double field3;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderBasicToBuilder.Child, B extends SuperBuilderBasicToBuilder.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {
private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> b) {
b.field3(instance.field3);
}
@java.lang.Override
@@ -163,33 +163,33 @@ public class SuperBuilderBasicToBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
private static final class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder<SuperBuilderBasicToBuilder.Child, SuperBuilderBasicToBuilder.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child build() {
return new Child(this);
public SuperBuilderBasicToBuilder.Child build() {
return new SuperBuilderBasicToBuilder.Child(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
public static ChildBuilder<?, ?> builder() {
return new ChildBuilderImpl();
public static SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> builder() {
return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl();
}
@java.lang.SuppressWarnings("all")
public ChildBuilder<?, ?> toBuilder() {
return new ChildBuilderImpl().$fillValuesFrom(this);
public SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> toBuilder() {
return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this);
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderCustomized.java
+10 -10
View File
@@ -25,28 +25,28 @@ public class SuperBuilderCustomized {
}
int field1;
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
private static final class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder<SuperBuilderCustomized.Parent, SuperBuilderCustomized.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl self() {
protected SuperBuilderCustomized.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent build() {
return new Parent(this);
public SuperBuilderCustomized.Parent build() {
return new SuperBuilderCustomized.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<?, ?> b) {
protected Parent(final SuperBuilderCustomized.Parent.ParentBuilder<?, ?> b) {
this.field1 = b.field1;
}
@java.lang.SuppressWarnings("all")
public static ParentBuilder<?, ?> builder() {
return new ParentBuilderImpl();
public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?> builder() {
return new SuperBuilderCustomized.Parent.ParentBuilderImpl();
}
}
public static class Child extends Parent {
@@ -61,7 +61,7 @@ public class SuperBuilderCustomized {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected SuperBuilderCustomized.Child.ChildBuilderImpl self() {
return this;
}
}
@@ -70,7 +70,7 @@ public class SuperBuilderCustomized {
return new ChildBuilderImpl().field2(10.0);
}
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderCustomized.Child, B extends SuperBuilderCustomized.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double field2;
@java.lang.Override
@@ -91,7 +91,7 @@ public class SuperBuilderCustomized {
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderCustomized.Child.ChildBuilder<?, ?> b) {
super(b);
this.field2 = b.field2;
}
test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java
+6 -6
View File
@@ -10,7 +10,7 @@ class SuperBuilderSingularAnnotatedTypes {
private Set<@MyAnnotation @NonNull String> foos;
private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars;
@java.lang.SuppressWarnings("all")
public static abstract class SuperBuilderSingularAnnotatedTypesBuilder<C extends SuperBuilderSingularAnnotatedTypes, B extends SuperBuilderSingularAnnotatedTypesBuilder<C, B>> {
public static abstract class SuperBuilderSingularAnnotatedTypesBuilder<C extends SuperBuilderSingularAnnotatedTypes, B extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<@MyAnnotation @NonNull String> foos;
@java.lang.SuppressWarnings("all")
@@ -84,13 +84,13 @@ class SuperBuilderSingularAnnotatedTypes {
}
}
@java.lang.SuppressWarnings("all")
private static final class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypesBuilder<SuperBuilderSingularAnnotatedTypes, SuperBuilderSingularAnnotatedTypesBuilderImpl> {
private static final class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<SuperBuilderSingularAnnotatedTypes, SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl> {
@java.lang.SuppressWarnings("all")
private SuperBuilderSingularAnnotatedTypesBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected SuperBuilderSingularAnnotatedTypesBuilderImpl self() {
protected SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() {
return this;
}
@java.lang.Override
@@ -100,7 +100,7 @@ class SuperBuilderSingularAnnotatedTypes {
}
}
@java.lang.SuppressWarnings("all")
protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypesBuilder<?, ?> b) {
protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<?, ?> b) {
java.util.Set<@MyAnnotation @NonNull String> foos;
switch (b.foos == null ? 0 : b.foos.size()) {
case 0:
@@ -131,7 +131,7 @@ class SuperBuilderSingularAnnotatedTypes {
this.bars = bars;
}
@java.lang.SuppressWarnings("all")
public static SuperBuilderSingularAnnotatedTypesBuilder<?, ?> builder() {
return new SuperBuilderSingularAnnotatedTypesBuilderImpl();
public static SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<?, ?> builder() {
return new SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl();
}
}
test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java
+14 -14
View File
@@ -4,7 +4,7 @@ public class SuperBuilderWithCustomBuilderMethod {
A field1;
List<String> items;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
public static abstract class ParentBuilder<A, C extends SuperBuilderWithCustomBuilderMethod.Parent<A>, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private A field1;
@java.lang.SuppressWarnings("all")
@@ -42,23 +42,23 @@ public class SuperBuilderWithCustomBuilderMethod {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
private static final class ParentBuilderImpl<A> extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, SuperBuilderWithCustomBuilderMethod.Parent<A>, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl<A> self() {
protected SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent<A> build() {
return new Parent<A>(this);
public SuperBuilderWithCustomBuilderMethod.Parent<A> build() {
return new SuperBuilderWithCustomBuilderMethod.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<A, ?, ?> b) {
protected Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.List<String> items;
switch (b.items == null ? 0 : b.items.size()) {
@@ -74,8 +74,8 @@ public class SuperBuilderWithCustomBuilderMethod {
this.items = items;
}
@java.lang.SuppressWarnings("all")
public static <A> ParentBuilder<A, ?, ?> builder() {
return new ParentBuilderImpl<A>();
public static <A> SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, ?, ?> builder() {
return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl<A>();
}
}
public static class Child<A> extends Parent<A> {
@@ -84,7 +84,7 @@ public class SuperBuilderWithCustomBuilderMethod {
return new ChildBuilderImpl<A>().item("default item");
}
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
public static abstract class ChildBuilder<A, C extends SuperBuilderWithCustomBuilderMethod.Child<A>, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@@ -105,23 +105,23 @@ public class SuperBuilderWithCustomBuilderMethod {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
private static final class ChildBuilderImpl<A> extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder<A, SuperBuilderWithCustomBuilderMethod.Child<A>, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl<A> self() {
protected SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child<A> build() {
return new Child<A>(this);
public SuperBuilderWithCustomBuilderMethod.Child<A> build() {
return new SuperBuilderWithCustomBuilderMethod.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<A, ?, ?> b) {
protected Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
test/transform/resource/after-delombok/SuperBuilderWithDefaults.java
+19 -19
View File
@@ -12,7 +12,7 @@ public class SuperBuilderWithDefaults {
return null;
}
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<N extends Number, C extends Parent<N>, B extends ParentBuilder<N, C, B>> {
public static abstract class ParentBuilder<N extends Number, C extends SuperBuilderWithDefaults.Parent<N>, B extends SuperBuilderWithDefaults.Parent.ParentBuilder<N, C, B>> {
@java.lang.SuppressWarnings("all")
private boolean millis$set;
@java.lang.SuppressWarnings("all")
@@ -44,31 +44,31 @@ public class SuperBuilderWithDefaults {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl<N extends Number> extends ParentBuilder<N, Parent<N>, ParentBuilderImpl<N>> {
private static final class ParentBuilderImpl<N extends Number> extends SuperBuilderWithDefaults.Parent.ParentBuilder<N, SuperBuilderWithDefaults.Parent<N>, SuperBuilderWithDefaults.Parent.ParentBuilderImpl<N>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl<N> self() {
protected SuperBuilderWithDefaults.Parent.ParentBuilderImpl<N> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent<N> build() {
return new Parent<N>(this);
public SuperBuilderWithDefaults.Parent<N> build() {
return new SuperBuilderWithDefaults.Parent<N>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<N, ?, ?> b) {
protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder<N, ?, ?> b) {
if (b.millis$set) this.millis = b.millis$value;
else this.millis = Parent.<N>$default$millis();
else this.millis = SuperBuilderWithDefaults.Parent.<N>$default$millis();
if (b.numberField$set) this.numberField = b.numberField$value;
else this.numberField = Parent.<N>$default$numberField();
else this.numberField = SuperBuilderWithDefaults.Parent.<N>$default$numberField();
}
@java.lang.SuppressWarnings("all")
public static <N extends Number> ParentBuilder<N, ?, ?> builder() {
return new ParentBuilderImpl<N>();
public static <N extends Number> SuperBuilderWithDefaults.Parent.ParentBuilder<N, ?, ?> builder() {
return new SuperBuilderWithDefaults.Parent.ParentBuilderImpl<N>();
}
}
public static class Child extends Parent<Integer> {
@@ -78,7 +78,7 @@ public class SuperBuilderWithDefaults {
return Math.PI;
}
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<Integer, C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderWithDefaults.Child, B extends SuperBuilderWithDefaults.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<Integer, C, B> {
@java.lang.SuppressWarnings("all")
private boolean doubleField$set;
@java.lang.SuppressWarnings("all")
@@ -102,30 +102,30 @@ public class SuperBuilderWithDefaults {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
private static final class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder<SuperBuilderWithDefaults.Child, SuperBuilderWithDefaults.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected SuperBuilderWithDefaults.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child build() {
return new Child(this);
public SuperBuilderWithDefaults.Child build() {
return new SuperBuilderWithDefaults.Child(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderWithDefaults.Child.ChildBuilder<?, ?> b) {
super(b);
if (b.doubleField$set) this.doubleField = b.doubleField$value;
else this.doubleField = Child.$default$doubleField();
else this.doubleField = SuperBuilderWithDefaults.Child.$default$doubleField();
}
@java.lang.SuppressWarnings("all")
public static ChildBuilder<?, ?> builder() {
return new ChildBuilderImpl();
public static SuperBuilderWithDefaults.Child.ChildBuilder<?, ?> builder() {
return new SuperBuilderWithDefaults.Child.ChildBuilderImpl();
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderWithGenerics.java
+16 -16
View File
@@ -4,7 +4,7 @@ public class SuperBuilderWithGenerics {
A field1;
List<String> items;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenerics.Parent<A>, B extends SuperBuilderWithGenerics.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private A field1;
@java.lang.SuppressWarnings("all")
@@ -42,23 +42,23 @@ public class SuperBuilderWithGenerics {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenerics.Parent.ParentBuilder<A, SuperBuilderWithGenerics.Parent<A>, SuperBuilderWithGenerics.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl<A> self() {
protected SuperBuilderWithGenerics.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent<A> build() {
return new Parent<A>(this);
public SuperBuilderWithGenerics.Parent<A> build() {
return new SuperBuilderWithGenerics.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<A, ?, ?> b) {
protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.List<String> items;
switch (b.items == null ? 0 : b.items.size()) {
@@ -74,14 +74,14 @@ public class SuperBuilderWithGenerics {
this.items = items;
}
@java.lang.SuppressWarnings("all")
public static <A> ParentBuilder<A, ?, ?> builder() {
return new ParentBuilderImpl<A>();
public static <A> SuperBuilderWithGenerics.Parent.ParentBuilder<A, ?, ?> builder() {
return new SuperBuilderWithGenerics.Parent.ParentBuilderImpl<A>();
}
}
public static class Child<A> extends Parent<A> {
double field3;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
public static abstract class ChildBuilder<A, C extends SuperBuilderWithGenerics.Child<A>, B extends SuperBuilderWithGenerics.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@@ -102,29 +102,29 @@ public class SuperBuilderWithGenerics {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
private static final class ChildBuilderImpl<A> extends SuperBuilderWithGenerics.Child.ChildBuilder<A, SuperBuilderWithGenerics.Child<A>, SuperBuilderWithGenerics.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl<A> self() {
protected SuperBuilderWithGenerics.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child<A> build() {
return new Child<A>(this);
public SuperBuilderWithGenerics.Child<A> build() {
return new SuperBuilderWithGenerics.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<A, ?, ?> b) {
protected Child(final SuperBuilderWithGenerics.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
public static <A> ChildBuilder<A, ?, ?> builder() {
return new ChildBuilderImpl<A>();
public static <A> SuperBuilderWithGenerics.Child.ChildBuilder<A, ?, ?> builder() {
return new SuperBuilderWithGenerics.Child.ChildBuilderImpl<A>();
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java
+16 -16
View File
@@ -4,7 +4,7 @@ public class SuperBuilderWithGenerics2 {
A field1;
List<String> items;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenerics2.Parent<A>, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private A field1;
@java.lang.SuppressWarnings("all")
@@ -42,23 +42,23 @@ public class SuperBuilderWithGenerics2 {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenerics2.Parent.ParentBuilder<A, SuperBuilderWithGenerics2.Parent<A>, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl<A> self() {
protected SuperBuilderWithGenerics2.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent<A> build() {
return new Parent<A>(this);
public SuperBuilderWithGenerics2.Parent<A> build() {
return new SuperBuilderWithGenerics2.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<A, ?, ?> b) {
protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.List<String> items;
switch (b.items == null ? 0 : b.items.size()) {
@@ -74,14 +74,14 @@ public class SuperBuilderWithGenerics2 {
this.items = items;
}
@java.lang.SuppressWarnings("all")
public static <A> ParentBuilder<A, ?, ?> builder() {
return new ParentBuilderImpl<A>();
public static <A> SuperBuilderWithGenerics2.Parent.ParentBuilder<A, ?, ?> builder() {
return new SuperBuilderWithGenerics2.Parent.ParentBuilderImpl<A>();
}
}
public static class Child<A> extends Parent<String> {
A field3;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<String, C, B> {
public static abstract class ChildBuilder<A, C extends SuperBuilderWithGenerics2.Child<A>, B extends SuperBuilderWithGenerics2.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<String, C, B> {
@java.lang.SuppressWarnings("all")
private A field3;
@java.lang.Override
@@ -102,29 +102,29 @@ public class SuperBuilderWithGenerics2 {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
private static final class ChildBuilderImpl<A> extends SuperBuilderWithGenerics2.Child.ChildBuilder<A, SuperBuilderWithGenerics2.Child<A>, SuperBuilderWithGenerics2.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl<A> self() {
protected SuperBuilderWithGenerics2.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child<A> build() {
return new Child<A>(this);
public SuperBuilderWithGenerics2.Child<A> build() {
return new SuperBuilderWithGenerics2.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<A, ?, ?> b) {
protected Child(final SuperBuilderWithGenerics2.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
public static <A> ChildBuilder<A, ?, ?> builder2() {
return new ChildBuilderImpl<A>();
public static <A> SuperBuilderWithGenerics2.Child.ChildBuilder<A, ?, ?> builder2() {
return new SuperBuilderWithGenerics2.Child.ChildBuilderImpl<A>();
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java
+16 -16
View File
@@ -3,7 +3,7 @@ public class SuperBuilderWithGenerics3 {
public static class Parent<A> {
private final String str;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenerics3.Parent<A>, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private String str;
@java.lang.SuppressWarnings("all")
@@ -22,28 +22,28 @@ public class SuperBuilderWithGenerics3 {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenerics3.Parent.ParentBuilder<A, SuperBuilderWithGenerics3.Parent<A>, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl<A> self() {
protected SuperBuilderWithGenerics3.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent<A> build() {
return new Parent<A>(this);
public SuperBuilderWithGenerics3.Parent<A> build() {
return new SuperBuilderWithGenerics3.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<A, ?, ?> b) {
protected Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder<A, ?, ?> b) {
this.str = b.str;
}
@java.lang.SuppressWarnings("all")
public static <A> ParentBuilder<A, ?, ?> builder() {
return new ParentBuilderImpl<A>();
public static <A> SuperBuilderWithGenerics3.Parent.ParentBuilder<A, ?, ?> builder() {
return new SuperBuilderWithGenerics3.Parent.ParentBuilderImpl<A>();
}
}
public static class Child extends Parent<Child.SomeInnerStaticClass> {
@@ -51,7 +51,7 @@ public class SuperBuilderWithGenerics3 {
}
double field3;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<Child.SomeInnerStaticClass, C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderWithGenerics3.Child, B extends SuperBuilderWithGenerics3.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<Child.SomeInnerStaticClass, C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@@ -72,29 +72,29 @@ public class SuperBuilderWithGenerics3 {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
private static final class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder<SuperBuilderWithGenerics3.Child, SuperBuilderWithGenerics3.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child build() {
return new Child(this);
public SuperBuilderWithGenerics3.Child build() {
return new SuperBuilderWithGenerics3.Child(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderWithGenerics3.Child.ChildBuilder<?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
public static ChildBuilder<?, ?> builder() {
return new ChildBuilderImpl();
public static SuperBuilderWithGenerics3.Child.ChildBuilder<?, ?> builder() {
return new SuperBuilderWithGenerics3.Child.ChildBuilderImpl();
}
}
}
test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
+24 -24
View File
@@ -4,7 +4,7 @@ public class SuperBuilderWithGenericsAndToBuilder {
A field1;
Map<Integer, String> items;
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenericsAndToBuilder.Parent<A>, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private A field1;
@java.lang.SuppressWarnings("all")
@@ -13,11 +13,11 @@ public class SuperBuilderWithGenericsAndToBuilder {
private java.util.ArrayList<String> items$value;
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
private static <A> void $fillValuesFromInstanceIntoBuilder(final Parent<A> instance, final ParentBuilder<A, ?, ?> b) {
private static <A> void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent<A> instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {
b.field1(instance.field1);
b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items);
}
@@ -67,23 +67,23 @@ public class SuperBuilderWithGenericsAndToBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, SuperBuilderWithGenericsAndToBuilder.Parent<A>, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl<A> self() {
protected SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent<A> build() {
return new Parent<A>(this);
public SuperBuilderWithGenericsAndToBuilder.Parent<A> build() {
return new SuperBuilderWithGenericsAndToBuilder.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<A, ?, ?> b) {
protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.Map<Integer, String> items;
switch (b.items$key == null ? 0 : b.items$key.size()) {
@@ -101,29 +101,29 @@ public class SuperBuilderWithGenericsAndToBuilder {
this.items = items;
}
@java.lang.SuppressWarnings("all")
public static <A> ParentBuilder<A, ?, ?> builder() {
return new ParentBuilderImpl<A>();
public static <A> SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> builder() {
return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>();
}
@java.lang.SuppressWarnings("all")
public ParentBuilder<A, ?, ?> toBuilder() {
return new ParentBuilderImpl<A>().$fillValuesFrom(this);
public SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> toBuilder() {
return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>().$fillValuesFrom(this);
}
}
public static class Child<A> extends Parent<A> {
double field3;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
public static abstract class ChildBuilder<A, C extends SuperBuilderWithGenericsAndToBuilder.Child<A>, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
private static <A> void $fillValuesFromInstanceIntoBuilder(final Child<A> instance, final ChildBuilder<A, ?, ?> b) {
private static <A> void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child<A> instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> b) {
b.field3(instance.field3);
}
@java.lang.Override
@@ -144,33 +144,33 @@ public class SuperBuilderWithGenericsAndToBuilder {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
private static final class ChildBuilderImpl<A> extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, SuperBuilderWithGenericsAndToBuilder.Child<A>, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl<A> self() {
protected SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child<A> build() {
return new Child<A>(this);
public SuperBuilderWithGenericsAndToBuilder.Child<A> build() {
return new SuperBuilderWithGenericsAndToBuilder.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<A, ?, ?> b) {
protected Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
public static <A> ChildBuilder<A, ?, ?> builder() {
return new ChildBuilderImpl<A>();
public static <A> SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> builder() {
return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>();
}
@java.lang.SuppressWarnings("all")
public ChildBuilder<A, ?, ?> toBuilder() {
return new ChildBuilderImpl<A>().$fillValuesFrom(this);
public SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> toBuilder() {
return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>().$fillValuesFrom(this);
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
+17 -17
View File
@@ -8,7 +8,7 @@ public class SuperBuilderWithNonNull {
return "default";
}
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
public static abstract class ParentBuilder<C extends SuperBuilderWithNonNull.Parent, B extends SuperBuilderWithNonNull.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private boolean nonNullParentField$set;
@java.lang.SuppressWarnings("all")
@@ -33,39 +33,39 @@ public class SuperBuilderWithNonNull {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
private static final class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder<SuperBuilderWithNonNull.Parent, SuperBuilderWithNonNull.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl self() {
protected SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent build() {
return new Parent(this);
public SuperBuilderWithNonNull.Parent build() {
return new SuperBuilderWithNonNull.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<?, ?> b) {
protected Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder<?, ?> b) {
if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value;
else this.nonNullParentField = Parent.$default$nonNullParentField();
else this.nonNullParentField = SuperBuilderWithNonNull.Parent.$default$nonNullParentField();
if (nonNullParentField == null) {
throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null");
}
}
@java.lang.SuppressWarnings("all")
public static ParentBuilder<?, ?> builder() {
return new ParentBuilderImpl();
public static SuperBuilderWithNonNull.Parent.ParentBuilder<?, ?> builder() {
return new SuperBuilderWithNonNull.Parent.ParentBuilderImpl();
}
}
public static class Child extends Parent {
@lombok.NonNull
String nonNullChildField;
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderWithNonNull.Child, B extends SuperBuilderWithNonNull.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private String nonNullChildField;
@java.lang.Override
@@ -89,23 +89,23 @@ public class SuperBuilderWithNonNull {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
private static final class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder<SuperBuilderWithNonNull.Child, SuperBuilderWithNonNull.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected SuperBuilderWithNonNull.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child build() {
return new Child(this);
public SuperBuilderWithNonNull.Child build() {
return new SuperBuilderWithNonNull.Child(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderWithNonNull.Child.ChildBuilder<?, ?> b) {
super(b);
this.nonNullChildField = b.nonNullChildField;
if (nonNullChildField == null) {
@@ -113,8 +113,8 @@ public class SuperBuilderWithNonNull {
}
}
@java.lang.SuppressWarnings("all")
public static ChildBuilder<?, ?> builder() {
return new ChildBuilderImpl();
public static SuperBuilderWithNonNull.Child.ChildBuilder<?, ?> builder() {
return new SuperBuilderWithNonNull.Child.ChildBuilderImpl();
}
}
public static void test() {
test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java
+6 -6
View File
@@ -3,7 +3,7 @@ class SuperBuilderWithPrefixes {
int xOtherField;
java.util.List<String> mItems;
@java.lang.SuppressWarnings("all")
public static abstract class SuperBuilderWithPrefixesBuilder<C extends SuperBuilderWithPrefixes, B extends SuperBuilderWithPrefixesBuilder<C, B>> {
public static abstract class SuperBuilderWithPrefixesBuilder<C extends SuperBuilderWithPrefixes, B extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int field;
@java.lang.SuppressWarnings("all")
@@ -48,13 +48,13 @@ class SuperBuilderWithPrefixes {
}
}
@java.lang.SuppressWarnings("all")
private static final class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixesBuilder<SuperBuilderWithPrefixes, SuperBuilderWithPrefixesBuilderImpl> {
private static final class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<SuperBuilderWithPrefixes, SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl> {
@java.lang.SuppressWarnings("all")
private SuperBuilderWithPrefixesBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected SuperBuilderWithPrefixesBuilderImpl self() {
protected SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() {
return this;
}
@java.lang.Override
@@ -64,7 +64,7 @@ class SuperBuilderWithPrefixes {
}
}
@java.lang.SuppressWarnings("all")
protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixesBuilder<?, ?> b) {
protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<?, ?> b) {
this.mField = b.field;
this.xOtherField = b.otherField;
java.util.List<String> items;
@@ -81,7 +81,7 @@ class SuperBuilderWithPrefixes {
this.mItems = items;
}
@java.lang.SuppressWarnings("all")
public static SuperBuilderWithPrefixesBuilder<?, ?> builder() {
return new SuperBuilderWithPrefixesBuilderImpl();
public static SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<?, ?> builder() {
return new SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl();
}
}
test/transform/resource/after-ecj/BuilderComplex.java
+6 -6
View File
@@ -9,19 +9,19 @@ class BuilderComplex {
@java.lang.SuppressWarnings("all") TestVoidName() {
super();
}
public @java.lang.SuppressWarnings("all") TestVoidName<T> number(final T number) {
public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> number(final T number) {
this.number = number;
return this;
}
public @java.lang.SuppressWarnings("all") TestVoidName<T> arg2(final int arg2) {
public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> arg2(final int arg2) {
this.arg2 = arg2;
return this;
}
public @java.lang.SuppressWarnings("all") TestVoidName<T> arg3(final String arg3) {
public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> arg3(final String arg3) {
this.arg3 = arg3;
return this;
}
public @java.lang.SuppressWarnings("all") TestVoidName<T> selfRef(final BuilderComplex selfRef) {
public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> selfRef(final BuilderComplex selfRef) {
this.selfRef = selfRef;
return this;
}
@@ -37,7 +37,7 @@ class BuilderComplex {
}
private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
}
public static @java.lang.SuppressWarnings("all") <T extends Number>TestVoidName<T> builder() {
return new TestVoidName<T>();
public static @java.lang.SuppressWarnings("all") <T extends Number>BuilderComplex.TestVoidName<T> builder() {
return new BuilderComplex.TestVoidName<T>();
}
}
test/transform/resource/after-ecj/BuilderCustomName.java
+6 -6
View File
@@ -1,6 +1,6 @@
import java.util.List;
@lombok.experimental.SuperBuilder class BuilderCustomName<T> {
public static abstract @java.lang.SuppressWarnings("all") class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends SimpleTestBuilder<T, C, B>> {
public static abstract @java.lang.SuppressWarnings("all") class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends BuilderCustomName.SimpleTestBuilder<T, C, B>> {
private @java.lang.SuppressWarnings("all") int field;
public SimpleTestBuilder() {
super();
@@ -15,11 +15,11 @@ import java.util.List;
return (("BuilderCustomName.SimpleTestBuilder(field=" + this.field) + ")");
}
}
private static final @java.lang.SuppressWarnings("all") class SimpleTestBuilderImpl<T> extends SimpleTestBuilder<T, BuilderCustomName<T>, SimpleTestBuilderImpl<T>> {
private static final @java.lang.SuppressWarnings("all") class SimpleTestBuilderImpl<T> extends BuilderCustomName.SimpleTestBuilder<T, BuilderCustomName<T>, BuilderCustomName.SimpleTestBuilderImpl<T>> {
private SimpleTestBuilderImpl() {
super();
}
protected @java.lang.Override @java.lang.SuppressWarnings("all") SimpleTestBuilderImpl<T> self() {
protected @java.lang.Override @java.lang.SuppressWarnings("all") BuilderCustomName.SimpleTestBuilderImpl<T> self() {
return this;
}
public @java.lang.Override @java.lang.SuppressWarnings("all") BuilderCustomName<T> build() {
@@ -27,11 +27,11 @@ import java.util.List;
}
}
private final int field;
protected @java.lang.SuppressWarnings("all") BuilderCustomName(final SimpleTestBuilder<T, ?, ?> b) {
protected @java.lang.SuppressWarnings("all") BuilderCustomName(final BuilderCustomName.SimpleTestBuilder<T, ?, ?> b) {
super();
this.field = b.field;
}
public static @java.lang.SuppressWarnings("all") <T>SimpleTestBuilder<T, ?, ?> builder() {
return new SimpleTestBuilderImpl<T>();
public static @java.lang.SuppressWarnings("all") <T>BuilderCustomName.SimpleTestBuilder<T, ?, ?> builder() {
return new BuilderCustomName.SimpleTestBuilderImpl<T>();
}
}
test/transform/resource/after-ecj/BuilderDefaults.java
+5 -5
View File
@@ -10,16 +10,16 @@ public final @Value @Builder class BuilderDefaults {
@java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder x(final int x) {
public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder x(final int x) {
this.x$value = x;
x$set = true;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder name(final String name) {
public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder name(final String name) {
this.name = name;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder z(final long z) {
public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder z(final long z) {
this.z$value = z;
z$set = true;
return this;
@@ -46,8 +46,8 @@ public final @Value @Builder class BuilderDefaults {
this.name = name;
this.z = z;
}
public static @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder builder() {
return new BuilderDefaultsBuilder();
public static @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder builder() {
return new BuilderDefaults.BuilderDefaultsBuilder();
}
public @java.lang.SuppressWarnings("all") int getX() {
return this.x;
test/transform/resource/after-ecj/BuilderDefaultsGenerics.java
+5 -5
View File
@@ -11,17 +11,17 @@ public @Builder class BuilderDefaultsGenerics<N extends Number, T, R extends Lis
@java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
this.callable$value = callable;
callable$set = true;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
this.tee$value = tee;
tee$set = true;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
this.arrr$value = arrr;
arrr$set = true;
return this;
@@ -51,7 +51,7 @@ public @Builder class BuilderDefaultsGenerics<N extends Number, T, R extends Lis
this.tee = tee;
this.arrr = arrr;
}
public static @java.lang.SuppressWarnings("all") <N extends Number, T, R extends List<T>>BuilderDefaultsGenericsBuilder<N, T, R> builder() {
return new BuilderDefaultsGenericsBuilder<N, T, R>();
public static @java.lang.SuppressWarnings("all") <N extends Number, T, R extends List<T>>BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> builder() {
return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R>();
}
}
test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
+9 -9
View File
@@ -8,27 +8,27 @@ public @Builder class BuilderDefaultsWarnings {
@java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder x(final long x) {
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) {
this.x = x;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder z(final int z) {
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) {
this.z = z;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder item(final String item) {
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) {
if ((this.items == null))
this.items = new java.util.ArrayList<String>();
this.items.add(item);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
if ((this.items == null))
this.items = new java.util.ArrayList<String>();
this.items.addAll(items);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder clearItems() {
public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() {
if ((this.items != null))
this.items.clear();
return this;
@@ -61,8 +61,8 @@ public @Builder class BuilderDefaultsWarnings {
this.z = z;
this.items = items;
}
public static @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder builder() {
return new BuilderDefaultsWarningsBuilder();
public static @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() {
return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder();
}
}
class NoBuilderButHasDefaults {
@@ -81,7 +81,7 @@ class NoBuilderButHasDefaults {
public @Builder NoBuilderButHasDefaults() {
super();
}
public static @java.lang.SuppressWarnings("all") NoBuilderButHasDefaultsBuilder builder() {
return new NoBuilderButHasDefaultsBuilder();
public static @java.lang.SuppressWarnings("all") NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() {
return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder();
}
}
test/transform/resource/after-ecj/BuilderGenericMethod.java
+4 -4
View File
@@ -8,11 +8,11 @@ class BuilderGenericMethod<T> {
@java.lang.SuppressWarnings("all") MapBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") MapBuilder<N> a(final int a) {
public @java.lang.SuppressWarnings("all") BuilderGenericMethod<T>.MapBuilder<N> a(final int a) {
this.a = a;
return this;
}
public @java.lang.SuppressWarnings("all") MapBuilder<N> b(final long b) {
public @java.lang.SuppressWarnings("all") BuilderGenericMethod<T>.MapBuilder<N> b(final long b) {
this.b = b;
return this;
}
@@ -29,7 +29,7 @@ class BuilderGenericMethod<T> {
public @Builder <N extends Number>Map<N, T> foo(int a, long b) {
return null;
}
public @java.lang.SuppressWarnings("all") <N extends Number>MapBuilder<N> builder() {
return new MapBuilder<N>();
public @java.lang.SuppressWarnings("all") <N extends Number>BuilderGenericMethod<T>.MapBuilder<N> builder() {
return this.new MapBuilder<N>();
}
}
test/transform/resource/after-ecj/BuilderInstanceMethod.java
+6 -6
View File
@@ -8,19 +8,19 @@ class BuilderInstanceMethod<T> {
@java.lang.SuppressWarnings("all") StringBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") StringBuilder show(final int show) {
public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder show(final int show) {
this.show = show;
return this;
}
public @java.lang.SuppressWarnings("all") StringBuilder yes(final int yes) {
public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder yes(final int yes) {
this.yes = yes;
return this;
}
public @java.lang.SuppressWarnings("all") StringBuilder also(final List<T> also) {
public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder also(final List<T> also) {
this.also = also;
return this;
}
public @java.lang.SuppressWarnings("all") StringBuilder $andMe(final int $andMe) {
public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder $andMe(final int $andMe) {
this.$andMe = $andMe;
return this;
}
@@ -37,7 +37,7 @@ class BuilderInstanceMethod<T> {
public @lombok.Builder String create(int show, final int yes, List<T> also, int $andMe) {
return (((("" + show) + yes) + also) + $andMe);
}
public @java.lang.SuppressWarnings("all") StringBuilder builder() {
return new StringBuilder();
public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder builder() {
return this.new StringBuilder();
}
}
test/transform/resource/after-ecj/BuilderJavadoc.java
+4 -4
View File
@@ -16,11 +16,11 @@ import java.util.List;
@java.lang.SuppressWarnings("all") BuilderJavadocBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderJavadocBuilder<T> basic(final int basic) {
public @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder<T> basic(final int basic) {
this.basic = basic;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderJavadocBuilder<T> getsetwith(final int getsetwith) {
public @java.lang.SuppressWarnings("all") BuilderJavadoc.BuilderJavadocBuilder<T> getsetwith(final int getsetwith) {
this.getsetwith = getsetwith;
return this;
}
@@ -42,8 +42,8 @@ import java.util.List;
this.predef = predef;
this.predefWithJavadoc = predefWithJavadoc;
}
public static @java.lang.SuppressWarnings("all") <T>BuilderJavadocBuilder<T> builder() {
return new BuilderJavadocBuilder<T>();
public static @java.lang.SuppressWarnings("all") <T>BuilderJavadoc.BuilderJavadocBuilder<T> builder() {
return new BuilderJavadoc.BuilderJavadocBuilder<T>();
}
public @java.lang.SuppressWarnings("all") int getGetsetwith() {
return this.getsetwith;
test/transform/resource/after-ecj/BuilderSimple.java
+4 -4
View File
@@ -6,11 +6,11 @@ import java.util.List;
@java.lang.SuppressWarnings("all") BuilderSimpleBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> yes(final int yes) {
public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder<T> yes(final int yes) {
this.yes = yes;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> also(final List<T> also) {
public @java.lang.SuppressWarnings("all") BuilderSimple.BuilderSimpleBuilder<T> also(final List<T> also) {
this.also = also;
return this;
}
@@ -30,7 +30,7 @@ import java.util.List;
this.yes = yes;
this.also = also;
}
protected static @java.lang.SuppressWarnings("all") <T>BuilderSimpleBuilder<T> builder() {
return new BuilderSimpleBuilder<T>();
protected static @java.lang.SuppressWarnings("all") <T>BuilderSimple.BuilderSimpleBuilder<T> builder() {
return new BuilderSimple.BuilderSimpleBuilder<T>();
}
}
test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
+3 -3
View File
@@ -5,7 +5,7 @@ import java.util.List;
@java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
this.unprefixed = unprefixed;
return this;
}
@@ -21,7 +21,7 @@ import java.util.List;
super();
this.unprefixed = unprefixed;
}
protected static @java.lang.SuppressWarnings("all") <T>BuilderSimpleWithSetterPrefixBuilder<T> builder() {
return new BuilderSimpleWithSetterPrefixBuilder<T>();
protected static @java.lang.SuppressWarnings("all") <T>BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> builder() {
return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T>();
}
}
test/transform/resource/after-ecj/BuilderSingularAnnotatedTypes.java
+8 -8
View File
@@ -14,7 +14,7 @@ import lombok.Singular;
@java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder foo(final @MyAnnotation @NonNull String foo) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(final @MyAnnotation @NonNull String foo) {
if ((foo == null))
{
throw new java.lang.NullPointerException("foo is marked non-null but is null");
@@ -24,18 +24,18 @@ import lombok.Singular;
this.foos.add(foo);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
if ((this.foos == null))
this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>();
this.foos.addAll(foos);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder clearFoos() {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() {
if ((this.foos != null))
this.foos.clear();
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) {
if ((barKey == null))
{
throw new java.lang.NullPointerException("barKey is marked non-null but is null");
@@ -53,7 +53,7 @@ import lombok.Singular;
this.bars$value.add(barValue);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
if ((this.bars$key == null))
{
this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>();
@@ -66,7 +66,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder clearBars() {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() {
if ((this.bars$key != null))
{
this.bars$key.clear();
@@ -115,7 +115,7 @@ import lombok.Singular;
this.foos = foos;
this.bars = bars;
}
public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder builder() {
return new BuilderSingularAnnotatedTypesBuilder();
public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() {
return new BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder();
}
}
test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java
+8 -8
View File
@@ -14,7 +14,7 @@ import lombok.Singular;
@java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(final @MyAnnotation @NonNull String foo) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(final @MyAnnotation @NonNull String foo) {
if ((foo == null))
{
throw new java.lang.NullPointerException("foo is marked non-null but is null");
@@ -24,18 +24,18 @@ import lombok.Singular;
this.foos.add(foo);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
if ((this.foos == null))
this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>();
this.foos.addAll(foos);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() {
if ((this.foos != null))
this.foos.clear();
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) {
if ((barKey == null))
{
throw new java.lang.NullPointerException("barKey is marked non-null but is null");
@@ -53,7 +53,7 @@ import lombok.Singular;
this.bars$value.add(barValue);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
if ((this.bars$key == null))
{
this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>();
@@ -66,7 +66,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() {
public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() {
if ((this.bars$key != null))
{
this.bars$key.clear();
@@ -115,7 +115,7 @@ import lombok.Singular;
this.foos = foos;
this.bars = bars;
}
public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() {
return new BuilderSingularAnnotatedTypesWithSetterPrefixBuilder();
public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() {
return new BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder();
}
}
test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
+17 -17
View File
@@ -14,83 +14,83 @@ import lombok.Singular;
@java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
if ((this.cards == null))
this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.add(card);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
if ((this.cards == null))
this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.addAll(cards);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
this.cards = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
if ((this.frogs == null))
this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.add(frog);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
if ((this.frogs == null))
this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.addAll(frogs);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
this.frogs = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
if ((this.rawSet == null))
this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.add(rawSet);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
if ((this.rawSet == null))
this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.addAll(rawSet);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
this.rawSet = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
if ((this.passes == null))
this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.add(pass);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
if ((this.passes == null))
this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.addAll(passes);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
this.passes = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) {
if ((this.users == null))
this.users = com.google.common.collect.ImmutableTable.builder();
this.users.put(rowKey, columnKey, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
if ((this.users == null))
this.users = com.google.common.collect.ImmutableTable.builder();
this.users.putAll(users);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
this.users = null;
return this;
}
@@ -119,7 +119,7 @@ import lombok.Singular;
this.passes = passes;
this.users = users;
}
public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() {
return new BuilderSingularGuavaListsSetsBuilder<T>();
public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> builder() {
return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T>();
}
}
test/transform/resource/after-ecj/BuilderSingularGuavaListsSetsWithSetterPrefix.java
-125
View File
@@ -1,125 +0,0 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.ImmutableTable;
import lombok.Singular;
@lombok.Builder(setterPrefix = "with") class BuilderSingularGuavaListsSetsWithSetterPrefix<T> {
public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> {
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<T> cards;
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<Number> frogs;
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users;
@java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withCard(final T card) {
if ((this.cards == null))
this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.add(card);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withCards(final java.lang.Iterable<? extends T> cards) {
if ((this.cards == null))
this.cards = com.google.common.collect.ImmutableList.builder();
this.cards.addAll(cards);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearCards() {
this.cards = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withFrog(final Number frog) {
if ((this.frogs == null))
this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.add(frog);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withFrogs(final java.lang.Iterable<? extends Number> frogs) {
if ((this.frogs == null))
this.frogs = com.google.common.collect.ImmutableList.builder();
this.frogs.addAll(frogs);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearFrogs() {
this.frogs = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Object rawSet) {
if ((this.rawSet == null))
this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.add(rawSet);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Iterable<?> rawSet) {
if ((this.rawSet == null))
this.rawSet = com.google.common.collect.ImmutableSet.builder();
this.rawSet.addAll(rawSet);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearRawSet() {
this.rawSet = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withPass(final String pass) {
if ((this.passes == null))
this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.add(pass);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withPasses(final java.lang.Iterable<? extends String> passes) {
if ((this.passes == null))
this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
this.passes.addAll(passes);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearPasses() {
this.passes = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withUser(final Number rowKey, final Number columnKey, final String value) {
if ((this.users == null))
this.users = com.google.common.collect.ImmutableTable.builder();
this.users.put(rowKey, columnKey, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withUsers(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
if ((this.users == null))
this.users = com.google.common.collect.ImmutableTable.builder();
this.users.putAll(users);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearUsers() {
this.users = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefix<T> build() {
com.google.common.collect.ImmutableList<T> cards = ((this.cards == null) ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build());
com.google.common.collect.ImmutableCollection<Number> frogs = ((this.frogs == null) ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build());
com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build());
com.google.common.collect.ImmutableSortedSet<String> passes = ((this.passes == null) ? com.google.common.collect.ImmutableSortedSet.<String>of() : this.passes.build());
com.google.common.collect.ImmutableTable<Number, Number, String> users = ((this.users == null) ? com.google.common.collect.ImmutableTable.<Number, Number, String>of() : this.users.build());
return new BuilderSingularGuavaListsSetsWithSetterPrefix<T>(cards, frogs, rawSet, passes, users);
}
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return (((((((((("BuilderSingularGuavaListsSetsWithSetterPrefix.BuilderSingularGuavaListsSetsWithSetterPrefixBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ", users=") + this.users) + ")");
}
}
private @Singular ImmutableList<T> cards;
private @Singular ImmutableCollection<? extends Number> frogs;
private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet;
private @Singular ImmutableSortedSet<String> passes;
private @Singular ImmutableTable<? extends Number, ? extends Number, String> users;
@java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefix(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
super();
this.cards = cards;
this.frogs = frogs;
this.rawSet = rawSet;
this.passes = passes;
this.users = users;
}
public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> builder() {
return new BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T>();
}
}
test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
+11 -11
View File
@@ -10,51 +10,51 @@ import lombok.Singular;
@java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) {
if ((this.battleaxes == null))
this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.put(key, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
if ((this.battleaxes == null))
this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.putAll(battleaxes);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
this.battleaxes = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) {
if ((this.vertices == null))
this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.put(key, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
if ((this.vertices == null))
this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.putAll(vertices);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
this.vertices = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object key, final java.lang.Object value) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object key, final java.lang.Object value) {
if ((this.rawMap == null))
this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.put(key, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
if ((this.rawMap == null))
this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.putAll(rawMap);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
this.rawMap = null;
return this;
}
@@ -77,7 +77,7 @@ import lombok.Singular;
this.vertices = vertices;
this.rawMap = rawMap;
}
public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() {
return new BuilderSingularGuavaMapsBuilder<K, V>();
public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> builder() {
return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V>();
}
}
test/transform/resource/after-ecj/BuilderSingularGuavaMapsWithSetterPrefix.java
-83
View File
@@ -1,83 +0,0 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableSortedMap;
import lombok.Singular;
@lombok.Builder(setterPrefix = "with") class BuilderSingularGuavaMapsWithSetterPrefix<K, V> {
public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> {
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
@java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withBattleaxe(final K key, final V value) {
if ((this.battleaxes == null))
this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.put(key, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withBattleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
if ((this.battleaxes == null))
this.battleaxes = com.google.common.collect.ImmutableMap.builder();
this.battleaxes.putAll(battleaxes);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearBattleaxes() {
this.battleaxes = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withVertex(final Integer key, final V value) {
if ((this.vertices == null))
this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.put(key, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withVertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
if ((this.vertices == null))
this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
this.vertices.putAll(vertices);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearVertices() {
this.vertices = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.lang.Object key, final java.lang.Object value) {
if ((this.rawMap == null))
this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.put(key, value);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.util.Map<?, ?> rawMap) {
if ((this.rawMap == null))
this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
this.rawMap.putAll(rawMap);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearRawMap() {
this.rawMap = null;
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefix<K, V> build() {
com.google.common.collect.ImmutableMap<K, V> battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build());
com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build());
com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build());
return new BuilderSingularGuavaMapsWithSetterPrefix<K, V>(battleaxes, vertices, rawMap);
}
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return (((((("BuilderSingularGuavaMapsWithSetterPrefix.BuilderSingularGuavaMapsWithSetterPrefixBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")");
}
}
private @Singular ImmutableMap<K, V> battleaxes;
private @Singular ImmutableSortedMap<Integer, ? extends V> vertices;
private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap;
@java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefix(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
super();
this.battleaxes = battleaxes;
this.vertices = vertices;
this.rawMap = rawMap;
}
public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> builder() {
return new BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V>();
}
}
test/transform/resource/after-ecj/BuilderSingularLists.java
+11 -11
View File
@@ -10,53 +10,53 @@ import lombok.Singular;
@java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> child(final T child) {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> child(final T child) {
if ((this.children == null))
this.children = new java.util.ArrayList<T>();
this.children.add(child);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
if ((this.children == null))
this.children = new java.util.ArrayList<T>();
this.children.addAll(children);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearChildren() {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> clearChildren() {
if ((this.children != null))
this.children.clear();
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarf(final Number scarf) {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> scarf(final Number scarf) {
if ((this.scarves == null))
this.scarves = new java.util.ArrayList<Number>();
this.scarves.add(scarf);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
if ((this.scarves == null))
this.scarves = new java.util.ArrayList<Number>();
this.scarves.addAll(scarves);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearScarves() {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> clearScarves() {
if ((this.scarves != null))
this.scarves.clear();
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) {
if ((this.rawList == null))
this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.add(rawList);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
if ((this.rawList == null))
this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.addAll(rawList);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearRawList() {
public @java.lang.SuppressWarnings("all") BuilderSingularLists.BuilderSingularListsBuilder<T> clearRawList() {
if ((this.rawList != null))
this.rawList.clear();
return this;
@@ -110,7 +110,7 @@ import lombok.Singular;
this.scarves = scarves;
this.rawList = rawList;
}
public static @java.lang.SuppressWarnings("all") <T>BuilderSingularListsBuilder<T> builder() {
return new BuilderSingularListsBuilder<T>();
public static @java.lang.SuppressWarnings("all") <T>BuilderSingularLists.BuilderSingularListsBuilder<T> builder() {
return new BuilderSingularLists.BuilderSingularListsBuilder<T>();
}
}
test/transform/resource/after-ecj/BuilderSingularListsWithSetterPrefix.java
-116
View File
@@ -1,116 +0,0 @@
import java.util.List;
import java.util.Collection;
import lombok.Singular;
@lombok.Builder(setterPrefix = "with") class BuilderSingularListsWithSetterPrefix<T> {
public static @java.lang.SuppressWarnings("all") class BuilderSingularListsWithSetterPrefixBuilder<T> {
private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> children;
private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> scarves;
private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawList;
@java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withChild(final T child) {
if ((this.children == null))
this.children = new java.util.ArrayList<T>();
this.children.add(child);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withChildren(final java.util.Collection<? extends T> children) {
if ((this.children == null))
this.children = new java.util.ArrayList<T>();
this.children.addAll(children);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> clearChildren() {
if ((this.children != null))
this.children.clear();
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withScarf(final Number scarf) {
if ((this.scarves == null))
this.scarves = new java.util.ArrayList<Number>();
this.scarves.add(scarf);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withScarves(final java.util.Collection<? extends Number> scarves) {
if ((this.scarves == null))
this.scarves = new java.util.ArrayList<Number>();
this.scarves.addAll(scarves);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> clearScarves() {
if ((this.scarves != null))
this.scarves.clear();
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.lang.Object rawList) {
if ((this.rawList == null))
this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.add(rawList);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.util.Collection<?> rawList) {
if ((this.rawList == null))
this.rawList = new java.util.ArrayList<java.lang.Object>();
this.rawList.addAll(rawList);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> clearRawList() {
if ((this.rawList != null))
this.rawList.clear();
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefix<T> build() {
java.util.List<T> children;
switch (((this.children == null) ? 0 : this.children.size())) {
case 0 :
children = java.util.Collections.emptyList();
break;
case 1 :
children = java.util.Collections.singletonList(this.children.get(0));
break;
default :
children = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.children));
}
java.util.Collection<Number> scarves;
switch (((this.scarves == null) ? 0 : this.scarves.size())) {
case 0 :
scarves = java.util.Collections.emptyList();
break;
case 1 :
scarves = java.util.Collections.singletonList(this.scarves.get(0));
break;
default :
scarves = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.scarves));
}
java.util.List<java.lang.Object> rawList;
switch (((this.rawList == null) ? 0 : this.rawList.size())) {
case 0 :
rawList = java.util.Collections.emptyList();
break;
case 1 :
rawList = java.util.Collections.singletonList(this.rawList.get(0));
break;
default :
rawList = java.util.Collections.unmodifiableList(new java.util.ArrayList<java.lang.Object>(this.rawList));
}
return new BuilderSingularListsWithSetterPrefix<T>(children, scarves, rawList);
}
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return (((((("BuilderSingularListsWithSetterPrefix.BuilderSingularListsWithSetterPrefixBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")");
}
}
private @Singular List<T> children;
private @Singular Collection<? extends Number> scarves;
private @SuppressWarnings("all") @Singular("rawList") List rawList;
@java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefix(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
super();
this.children = children;
this.scarves = scarves;
this.rawList = rawList;
}
public static @java.lang.SuppressWarnings("all") <T>BuilderSingularListsWithSetterPrefixBuilder<T> builder() {
return new BuilderSingularListsWithSetterPrefixBuilder<T>();
}
}
test/transform/resource/after-ecj/BuilderSingularMaps.java
+14 -14
View File
@@ -14,7 +14,7 @@ import lombok.Singular;
@java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder() {
super();
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> woman(final K womanKey, final V womanValue) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> woman(final K womanKey, final V womanValue) {
if ((this.women$key == null))
{
this.women$key = new java.util.ArrayList<K>();
@@ -24,7 +24,7 @@ import lombok.Singular;
this.women$value.add(womanValue);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> women(final java.util.Map<? extends K, ? extends V> women) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> women(final java.util.Map<? extends K, ? extends V> women) {
if ((this.women$key == null))
{
this.women$key = new java.util.ArrayList<K>();
@@ -37,7 +37,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearWomen() {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearWomen() {
if ((this.women$key != null))
{
this.women$key.clear();
@@ -45,7 +45,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> man(final K manKey, final Number manValue) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> man(final K manKey, final Number manValue) {
if ((this.men$key == null))
{
this.men$key = new java.util.ArrayList<K>();
@@ -55,7 +55,7 @@ import lombok.Singular;
this.men$value.add(manValue);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> men(final java.util.Map<? extends K, ? extends Number> men) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> men(final java.util.Map<? extends K, ? extends Number> men) {
if ((this.men$key == null))
{
this.men$key = new java.util.ArrayList<K>();
@@ -68,7 +68,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearMen() {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearMen() {
if ((this.men$key != null))
{
this.men$key.clear();
@@ -76,7 +76,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) {
if ((this.rawMap$key == null))
{
this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -86,7 +86,7 @@ import lombok.Singular;
this.rawMap$value.add(rawMapValue);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
if ((this.rawMap$key == null))
{
this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -99,7 +99,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearRawMap() {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearRawMap() {
if ((this.rawMap$key != null))
{
this.rawMap$key.clear();
@@ -107,7 +107,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(final String stringMapKey, final V stringMapValue) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> stringMap(final String stringMapKey, final V stringMapValue) {
if ((this.stringMap$key == null))
{
this.stringMap$key = new java.util.ArrayList<String>();
@@ -117,7 +117,7 @@ import lombok.Singular;
this.stringMap$value.add(stringMapValue);
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> stringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
if ((this.stringMap$key == null))
{
this.stringMap$key = new java.util.ArrayList<String>();
@@ -130,7 +130,7 @@ import lombok.Singular;
}
return this;
}
public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearStringMap() {
public @java.lang.SuppressWarnings("all") BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearStringMap() {
if ((this.stringMap$key != null))
{
this.stringMap$key.clear();
@@ -203,7 +203,7 @@ import lombok.Singular;
this.rawMap = rawMap;
this.stringMap = stringMap;
}
public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularMapsBuilder<K, V> builder() {
return new BuilderSingularMapsBuilder<K, V>();
public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> builder() {
return new BuilderSingularMaps.BuilderSingularMapsBuilder<K, V>();
}
}
Loaded 100 of 166 files, more files were not shown because too many files have changed in this diff. Show more