names = new ArrayList
for (type : types) {
- names.add(type.fullyQualifiedName)
+ names.add(type.importedName)
}
return names
}
@@ -321,7 +342,7 @@ class BuilderTemplate extends AbstractBuilderTemplate {
def private generateSetter(GeneratedProperty field) {
val returnType = field.returnType
if (returnType instanceof ParameterizedType) {
- if (Types.isListType(returnType)) {
+ if (Types.isListType(returnType) || Types.isSetType(returnType)) {
val arguments = returnType.actualTypeArguments
if (arguments.isEmpty) {
return generateListSetter(field, Types.objectType)
@@ -353,18 +374,15 @@ class BuilderTemplate extends AbstractBuilderTemplate {
'''
- // FIXME: MDSAL-540: remove the migration setter
def private generateMapSetter(GeneratedProperty field, Type actualType) '''
«val restrictions = restrictionsForSetter(actualType)»
- «val actualTypeRef = actualType.importedName»
- «val setterName = "set" + field.name.toFirstUpper»
«IF restrictions !== null»
«generateCheckers(field, restrictions, actualType)»
«ENDIF»
- public «type.getName» «setterName»(final «field.returnType.importedName» values) {
+ public «type.getName» set«field.name.toFirstUpper»(final «field.returnType.importedName» values) {
«IF restrictions !== null»
if (values != null) {
- for («actualTypeRef» value : values.values()) {
+ for («actualType.importedName» value : values.values()) {
«checkArgument(field, restrictions, actualType, "value")»
}
}
@@ -372,24 +390,6 @@ class BuilderTemplate extends AbstractBuilderTemplate {
this.«field.fieldName» = values;
return this;
}
-
- /**
- * Utility migration setter.
- *
- * IMPORTANT NOTE: This method does not completely match previous mechanics, as the list is processed as
- * during this method's execution. Any future modifications of the list are NOT
- * reflected in this builder nor its products.
- *
- * @param values Legacy List of values
- * @return this builder
- * @throws IllegalArgumentException if the list contains entries with the same key
- * @throws NullPointerException if the list contains a null entry
- * @deprecated Use {#link #«setterName»(«JU_MAP.importedName»)} instead.
- */
- @«DEPRECATED.importedName»(forRemoval = true)
- public «type.getName» «setterName»(final «JU_LIST.importedName»<«actualTypeRef»> values) {
- return «setterName»(«CODEHELPERS.importedName».compatMap(values));
- }
'''
def private generateSimpleSetter(GeneratedProperty field, Type actualType) '''
@@ -409,21 +409,6 @@ class BuilderTemplate extends AbstractBuilderTemplate {
this.«field.fieldName» = value;
return this;
}
- «val uintType = UINT_TYPES.get(field.returnType)»
- «IF uintType !== null»
-
- /**
- * Utility migration setter.
- *
- * @param value field value in legacy type
- * @return this builder
- * @deprecated Use {#link «setterName»(«field.returnType.importedJavadocName»)} instead.
- */
- @Deprecated(forRemoval = true)
- public «type.getName» «setterName»(final «uintType.importedName» value) {
- return «setterName»(«CODEHELPERS.importedName».compatUint(value));
- }
- «ENDIF»
'''
/**
@@ -444,7 +429,6 @@ class BuilderTemplate extends AbstractBuilderTemplate {
«IF augmentType !== null»
«val augmentTypeRef = augmentType.importedName»
- «val jlClassRef = CLASS.importedName»
«val hashMapRef = JU_HASHMAP.importedName»
/**
* Add an augmentation to this builder's product.
@@ -454,12 +438,11 @@ class BuilderTemplate extends AbstractBuilderTemplate {
* @throws NullPointerException if {@code augmentation} is null
*/
public «type.name» addAugmentation(«augmentTypeRef» augmentation) {
- «jlClassRef» augmentationType = augmentation.«DATA_CONTAINER_IMPLEMENTED_INTERFACE_NAME»();
if (!(this.«AUGMENTATION_FIELD» instanceof «hashMapRef»)) {
this.«AUGMENTATION_FIELD» = new «hashMapRef»<>();
}
- this.«AUGMENTATION_FIELD».put(augmentationType, augmentation);
+ this.«AUGMENTATION_FIELD».put(augmentation.«BINDING_CONTRACT_IMPLEMENTED_INTERFACE_NAME»(), augmentation);
return this;
}
@@ -470,7 +453,7 @@ class BuilderTemplate extends AbstractBuilderTemplate {
* @param augmentationType augmentation type to be removed
* @return this builder
*/
- public «type.name» removeAugmentation(«jlClassRef» augmentationType) {
+ public «type.name» removeAugmentation(«CLASS.importedName» augmentationType) {
if (this.«AUGMENTATION_FIELD» instanceof «hashMapRef») {
this.«AUGMENTATION_FIELD».remove(augmentationType);
}
@@ -480,7 +463,7 @@ class BuilderTemplate extends AbstractBuilderTemplate {
'''
private def createDescription(GeneratedType targetType) {
- val target = type.importedName
+ val target = targetType.importedName
return '''
Class that builds {@link «target»} instances. Overall design of the class is that of a
fluent interface, where method chaining is used.
@@ -489,7 +472,7 @@ class BuilderTemplate extends AbstractBuilderTemplate {
In general, this class is supposed to be used like this template:
- «target» createTarget(int fooXyzzy, int barBaz) {
+ «target» create«target»(int fooXyzzy, int barBaz) {
return new «target»Builder()
.setFoo(new FooBuilder().setXyzzy(fooXyzzy).build())
.setBar(new BarBuilder().setBaz(barBaz).build())
@@ -510,14 +493,13 @@ class BuilderTemplate extends AbstractBuilderTemplate {
invocation, which is terminated by {@link #build()}, which is then returned from the method
better understanding by humans, as the scope of mutable state (the builder) is kept to a minimum and is
very localized
- better optimization oportunities, as the object scope is minimized in terms of invocation (rather than
+ better optimization opportunities, as the object scope is minimized in terms of invocation (rather than
method) stack, making escape analysis a lot
easier. Given enough compiler (JIT/AOT) prowess, the cost of th builder object can be completely
eliminated
@see «target»
- @see «BUILDER.importedName»
'''
}
@@ -532,6 +514,14 @@ class BuilderTemplate extends AbstractBuilderTemplate {
}
private def generateAugmentation() '''
+ /**
+ * Return the specified augmentation, if it is present in this builder.
+ *
+ * @param augmentation type
+ * @param augmentationType augmentation type class
+ * @return Augmentation object from this builder, or {@code null} if not present
+ * @throws «NPE.importedName» if {@code augmentType} is {@code null}
+ */
@«SUPPRESS_WARNINGS.importedName»({ "unchecked", "checkstyle:methodTypeParameterName"})
public E$$ «AUGMENTABLE_AUGMENTATION_NAME»(«CLASS.importedName» augmentationType) {
return (E$$) «AUGMENTATION_FIELD».get(«JU_OBJECTS.importedName».requireNonNull(augmentationType));