From 685a31b56bcfa42cbcd66a4b21bd7740cf617005 Mon Sep 17 00:00:00 2001
From: Jordan Zimmerman <jordan@jordanzimmerman.com>
Date: Wed, 29 Mar 2023 08:07:59 +0100
Subject: [PATCH] Various clean ups (#150)

---
 pom.xml                                       |  26 +-
 record-builder-core/pom.xml                   |   2 +-
 .../core/IgnoreDefaultMethod.java             |   2 +-
 .../recordbuilder/core/RecordBuilder.java     | 116 ++-
 .../recordbuilder/core/RecordBuilderFull.java |  13 +-
 .../core/RecordBuilderGenerated.java          |   4 +-
 .../recordbuilder/core/RecordInterface.java   |  16 +-
 record-builder-processor/pom.xml              |   2 +-
 .../recordbuilder/processor/ClassType.java    |   2 +-
 .../processor/CollectionBuilderUtils.java     | 150 ++--
 .../recordbuilder/processor/ElementUtils.java |  88 +--
 .../processor/IncludeHelper.java              |  23 +-
 .../InternalRecordBuilderProcessor.java       | 671 +++++++-----------
 .../InternalRecordInterfaceProcessor.java     | 112 +--
 .../recordbuilder/processor/OptionalType.java |   5 +-
 .../processor/RecordBuilderOptions.java       |  53 +-
 .../processor/RecordBuilderProcessor.java     |  85 ++-
 .../processor/RecordClassType.java            |   6 +-
 record-builder-test/pom.xml                   |   2 +-
 .../soabase/recordbuilder/test/Annotated.java |   2 +-
 .../soabase/recordbuilder/test/BeanStyle.java |   2 +-
 .../soabase/recordbuilder/test/Builder.java   |  10 +-
 .../recordbuilder/test/CollectionCopying.java |  10 +-
 .../test/CollectionInterface.java             |   2 +-
 .../recordbuilder/test/CollectionRecord.java  |   9 +-
 .../test/CollectionRecordConflicts.java       |   5 +-
 .../recordbuilder/test/CustomMethodNames.java |  10 +-
 .../soabase/recordbuilder/test/Customer.java  |   2 +-
 .../io/soabase/recordbuilder/test/Empty.java  |   2 +-
 .../recordbuilder/test/ExceptionDetails.java  |   8 +-
 .../recordbuilder/test/FullRecord.java        |   5 +-
 .../recordbuilder/test/HasDefaults.java       |   2 +-
 .../recordbuilder/test/IgnoreAnnotated.java   |   2 +-
 .../recordbuilder/test/IncludeWithOption.java |   5 +-
 .../test/InterfaceTemplateTest.java           |   2 +-
 .../test/MutableCollectionRecord.java         |   2 +-
 .../test/MyInterfaceTemplate.java             |   8 +-
 .../recordbuilder/test/MyTemplate.java        |  10 +-
 .../io/soabase/recordbuilder/test/Nested.java |   5 +-
 .../soabase/recordbuilder/test/NoBuilder.java |   2 +-
 .../recordbuilder/test/NoStaticBuilder.java   |  15 +-
 .../io/soabase/recordbuilder/test/Pair.java   |   5 +-
 .../io/soabase/recordbuilder/test/Person.java |   2 +-
 .../io/soabase/recordbuilder/test/Point.java  |   5 +-
 .../recordbuilder/test/RecordWithAnR.java     |   5 +-
 .../test/RecordWithOptional.java              |   6 +-
 .../test/RecordWithOptional2.java             |   6 +-
 .../recordbuilder/test/RequestWithValid.java  |   5 +-
 .../recordbuilder/test/RequiredRecord.java    |   5 +-
 .../recordbuilder/test/RequiredRecord2.java   |   2 +-
 .../test/SimpleGenericRecord.java             |   2 +-
 .../recordbuilder/test/SimpleRecord.java      |   2 +-
 .../recordbuilder/test/SingleItems.java       |  12 +-
 .../recordbuilder/test/SpecializedPerson.java |   2 +-
 .../test/StrippedFeaturesRecord.java          |  10 +-
 .../recordbuilder/test/TemplateTest.java      |   5 +-
 .../io/soabase/recordbuilder/test/Thingy.java |   2 +-
 .../io/soabase/recordbuilder/test/Usage.java  |   2 +-
 .../test/WildcardSingleItems.java             |  11 +-
 .../test/includes/IncludeFactory.java         |   7 +-
 .../test/includes/JustATest.java              |   2 +-
 .../test/includes/pack/AlsoIgnoreMe.java      |   2 +-
 .../test/includes/pack/IgnoreMe.java          |   2 +-
 .../test/includes/pack/PackRecord1.java       |   2 +-
 .../test/includes/pack/PackRecord2.java       |   2 +-
 .../test/includes/pack/PackRecord3.java       |   2 +-
 .../test/jacoco/FullRecordForJacoco.java      |   5 +-
 .../recordbuilder/test/package-info.java      |   4 +-
 .../test/visibility/PackagePrivateRecord.java |   2 +-
 ...PackagePrivateRecordWithPublicBuilder.java |   5 +-
 .../test/visibility/Wrapper.java              |   2 +-
 .../recordbuilder/test/TestAnnotated.java     |   2 +-
 .../recordbuilder/test/TestCollections.java   |  24 +-
 .../test/TestCollectionsBuilder.java          |   2 +-
 .../test/TestImmutableCollections.java        |  66 +-
 .../recordbuilder/test/TestIncludes.java      |   2 +-
 .../recordbuilder/test/TestOptional.java      |  22 +-
 .../test/TestRecordBuilderFull.java           |   7 +-
 .../test/TestRecordInterface.java             |  38 +-
 .../recordbuilder/test/TestSingleItems.java   |  41 +-
 .../recordbuilder/test/TestTemplate.java      |   2 +-
 .../recordbuilder/test/TestValidation.java    |  12 +-
 .../test/TestVariousOptions.java              |  72 +-
 .../recordbuilder/test/TestWithers.java       |   2 +-
 .../test/visibility/TestVisibility.java       |   3 +-
 record-builder-validator/pom.xml              |   2 +-
 .../validator/RecordBuilderValidator.java     |   2 +-
 src/etc/header.txt                            |   2 +-
 88 files changed, 857 insertions(+), 1068 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0be3a6..ce5d32f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019 Jordan Zimmerman
+    Copyright 2019 The original author or authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@
         <maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
 
         <jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
+        <formatter-maven-plugin-version>2.22.0</formatter-maven-plugin-version>
 
         <license-file-path>src/etc/header.txt</license-file-path>
 
@@ -353,6 +354,24 @@
                     <artifactId>jacoco-maven-plugin</artifactId>
                     <version>${jacoco-maven-plugin-version}</version>
                 </plugin>
+
+                <plugin>
+                    <groupId>net.revelc.code.formatter</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <version>${formatter-maven-plugin-version}</version>
+                    <executions>
+                        <execution>
+                            <phase>validate</phase>
+                            <goals>
+                                <goal>format</goal>
+                            </goals>
+                            <configuration>
+                                <compilerCompliance>17</compilerCompliance>
+                                <compilerSource>17</compilerSource>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -391,6 +410,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/record-builder-core/pom.xml b/record-builder-core/pom.xml
index 05868b7..e2aee8a 100644
--- a/record-builder-core/pom.xml
+++ b/record-builder-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019 Jordan Zimmerman
+    Copyright 2019 The original author or authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/IgnoreDefaultMethod.java b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/IgnoreDefaultMethod.java
index 14d6f8a..3bceab6 100644
--- a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/IgnoreDefaultMethod.java
+++ b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/IgnoreDefaultMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilder.java b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilder.java
index 1d1fd70..5f525a9 100644
--- a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilder.java
+++ b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 @Inherited
 public @interface RecordBuilder {
-    @Target({ElementType.TYPE, ElementType.PACKAGE})
+    @Target({ ElementType.TYPE, ElementType.PACKAGE })
     @Retention(RetentionPolicy.SOURCE)
     @Inherited
     @interface Include {
@@ -32,27 +32,25 @@ public @interface RecordBuilder {
         Class<?>[] value() default {};
 
         /**
-         * Synonym for {@code value()}. When using the other attributes it maybe clearer to
-         * use {@code classes()} instead of {@code value()}. Note: both attributes are applied
-         * (i.e. a union of classes from both attributes).
+         * Synonym for {@code value()}. When using the other attributes it maybe clearer to use {@code classes()}
+         * instead of {@code value()}. Note: both attributes are applied (i.e. a union of classes from both attributes).
          *
          * @return collection of classes
          */
         Class<?>[] classes() default {};
 
         /**
-         * Optional list of package names. All records in the packages will get processed as
-         * if they were listed as classes to include.
+         * Optional list of package names. All records in the packages will get processed as if they were listed as
+         * classes to include.
          *
          * @return collection of package names
          */
         String[] packages() default {};
 
         /**
-         * Pattern used to generate the package for the generated class. The value
-         * is the literal package name however two replacement values can be used. '@'
-         * is replaced with the package of the {@code Include} annotation. '*' is replaced with
-         * the package of the included class.
+         * Pattern used to generate the package for the generated class. The value is the literal package name however
+         * two replacement values can be used. '@' is replaced with the package of the {@code Include} annotation. '*'
+         * is replaced with the package of the included class.
          *
          * @return package pattern
          */
@@ -64,14 +62,14 @@ public @interface RecordBuilder {
     @Inherited
     @interface Options {
         /**
-         * The builder class name will be the name of the record (prefixed with any enclosing class) plus this suffix. E.g.
-         * if the record name is "Foo", the builder will be named "FooBuilder".
+         * The builder class name will be the name of the record (prefixed with any enclosing class) plus this suffix.
+         * E.g. if the record name is "Foo", the builder will be named "FooBuilder".
          */
         String suffix() default "Builder";
 
         /**
-         * Used by {@code RecordInterface}. The generated record will have the same name as the annotated interface
-         * plus this suffix. E.g. if the interface name is "Foo", the record will be named "FooRecord".
+         * Used by {@code RecordInterface}. The generated record will have the same name as the annotated interface plus
+         * this suffix. E.g. if the interface name is "Foo", the record will be named "FooRecord".
          */
         String interfaceSuffix() default "Record";
 
@@ -126,22 +124,20 @@ public @interface RecordBuilder {
         String fileIndent() default "    ";
 
         /**
-         * If the record is declared inside another class, the outer class's name will
-         * be prefixed to the builder name if this returns true.
+         * If the record is declared inside another class, the outer class's name will be prefixed to the builder name
+         * if this returns true.
          */
         boolean prefixEnclosingClassNames() default true;
 
         /**
-         * If true, any annotations (if applicable) on record components are copied
-         * to the builder methods
+         * If true, any annotations (if applicable) on record components are copied to the builder methods
          *
          * @return true/false
          */
         boolean inheritComponentAnnotations() default true;
 
         /**
-         * Set the default value of {@code Optional} record components to
-         * {@code Optional.empty()}
+         * Set the default value of {@code Optional} record components to {@code Optional.empty()}
          */
         boolean emptyDefaultForOptional() default true;
 
@@ -151,8 +147,8 @@ public @interface RecordBuilder {
         boolean addConcreteSettersForOptional() default false;
 
         /**
-         * Add not-null checks for record components annotated with any annotation named either "NotNull",
-         * "NoNull", or "NonNull" (see {@link #interpretNotNullsPattern()} for the actual regex matching pattern).
+         * Add not-null checks for record components annotated with any annotation named either "NotNull", "NoNull", or
+         * "NonNull" (see {@link #interpretNotNullsPattern()} for the actual regex matching pattern).
          */
         boolean interpretNotNulls() default false;
 
@@ -163,29 +159,33 @@ public @interface RecordBuilder {
         String interpretNotNullsPattern() default "(?i)((notnull)|(nonnull)|(nonull))";
 
         /**
-         * <p>Pass built records through the Java Validation API if it's available in the classpath.</p>
+         * <p>
+         * Pass built records through the Java Validation API if it's available in the classpath.
+         * </p>
          *
-         * <p>IMPORTANT:
-         * if this option is enabled you must include the {@code record-builder-validator} dependency in addition
-         * to {@code record-builder-core}. {@code record-builder-validator} is implemented completely via reflection and
-         * does not require other dependencies. Alternatively, you can define your own class with the package {@code package io.soabase.recordbuilder.validator;}
-         * named {@code RecordBuilderValidator} which has a public static method: {@code public static <T> T validate(T o)}.</p>
+         * <p>
+         * IMPORTANT: if this option is enabled you must include the {@code record-builder-validator} dependency in
+         * addition to {@code record-builder-core}. {@code record-builder-validator} is implemented completely via
+         * reflection and does not require other dependencies. Alternatively, you can define your own class with the
+         * package {@code package io.soabase.recordbuilder.validator;} named {@code RecordBuilderValidator} which has a
+         * public static method: {@code public static <T> T validate(T o)}.
+         * </p>
          */
         boolean useValidationApi() default false;
 
         /**
          * Adds special handling for record components of type {@link java.util.List}, {@link java.util.Set},
-         * {@link java.util.Map} and {@link java.util.Collection}. When the record is built, any components
-         * of these types are passed through an added shim method that uses the corresponding immutable collection
-         * (e.g. {@code List.copyOf(o)}) or an empty immutable collection if the component is {@code null}.
+         * {@link java.util.Map} and {@link java.util.Collection}. When the record is built, any components of these
+         * types are passed through an added shim method that uses the corresponding immutable collection (e.g.
+         * {@code List.copyOf(o)}) or an empty immutable collection if the component is {@code null}.
          */
         boolean useImmutableCollections() default false;
 
         /**
-         * When enabled, collection types ({@code List}, {@code Set} and {@code Map}) are handled specially.
-         * The setters for these types now create an internal collection and items are added to that
-         * collection. Additionally, "adder" methods prefixed with {@link #singleItemBuilderPrefix()} are created
-         * to add single items to these collections.
+         * When enabled, collection types ({@code List}, {@code Set} and {@code Map}) are handled specially. The setters
+         * for these types now create an internal collection and items are added to that collection. Additionally,
+         * "adder" methods prefixed with {@link #singleItemBuilderPrefix()} are created to add single items to these
+         * collections.
          */
         boolean addSingleItemCollectionBuilders() default false;
 
@@ -195,14 +195,14 @@ public @interface RecordBuilder {
         String singleItemBuilderPrefix() default "add";
 
         /**
-         * When enabled, adds functional methods to the nested "With" class (such as {@code map()} and {@code accept()}).
+         * When enabled, adds functional methods to the nested "With" class (such as {@code map()} and
+         * {@code accept()}).
          */
         boolean addFunctionalMethodsToWith() default false;
 
         /**
-         * If set, all builder setter methods will be prefixed with this string. Camel-casing will
-         * still be enforced, so if this option is set to "set" a field named "myField" will get
-         * a corresponding setter named "setMyField".
+         * If set, all builder setter methods will be prefixed with this string. Camel-casing will still be enforced, so
+         * if this option is set to "set" a field named "myField" will get a corresponding setter named "setMyField".
          */
         String setterPrefix() default "";
 
@@ -212,44 +212,41 @@ public @interface RecordBuilder {
         boolean enableGetters() default true;
 
         /**
-         * If set, all builder getter methods will be prefixed with this string. Camel-casing will
-         * still be enforced, so if this option is set to "get", a field named "myField" will get
-         * a corresponding getter named "getMyField".
+         * If set, all builder getter methods will be prefixed with this string. Camel-casing will still be enforced, so
+         * if this option is set to "get", a field named "myField" will get a corresponding getter named "getMyField".
          */
         String getterPrefix() default "";
 
         /**
-         * If set, all boolean builder getter methods will be prefixed with this string.
-         * Camel-casing will still be enforced, so if this option is set to "is", a field named
-         * "myField" will get a corresponding getter named "isMyField".
+         * If set, all boolean builder getter methods will be prefixed with this string. Camel-casing will still be
+         * enforced, so if this option is set to "is", a field named "myField" will get a corresponding getter named
+         * "isMyField".
          */
         String booleanPrefix() default "";
 
         /**
-         * If set, the Builder will contain an internal interface with this name. This interface
-         * contains getters for all the fields in the Record prefixed with the value supplied in
-         * {@link this.getterPrefix} and {@link this.booleanPrefix}. This interface can be
-         * implemented by the original Record to have proper bean-style prefixed getters.
-         * Please note that unless either of the aforementioned prefixes are set,
-         * this option does nothing.
+         * If set, the Builder will contain an internal interface with this name. This interface contains getters for
+         * all the fields in the Record prefixed with the value supplied in {@link this.getterPrefix} and
+         * {@link this.booleanPrefix}. This interface can be implemented by the original Record to have proper
+         * bean-style prefixed getters. Please note that unless either of the aforementioned prefixes are set, this
+         * option does nothing.
          */
         String beanClassName() default "";
 
         /**
-         * If true, generated classes are annotated with {@code RecordBuilderGenerated} which has a retention
-         * policy of {@code CLASS}. This ensures that analyzers such as Jacoco will ignore the generated class.
+         * If true, generated classes are annotated with {@code RecordBuilderGenerated} which has a retention policy of
+         * {@code CLASS}. This ensures that analyzers such as Jacoco will ignore the generated class.
          */
         boolean addClassRetainedGenerated() default false;
 
         /**
-         * The {@link #fromMethodName} method instantiates an internal private class. This is the
-         * name of that class.
+         * The {@link #fromMethodName} method instantiates an internal private class. This is the name of that class.
          */
         String fromWithClassName() default "_FromWith";
 
         /**
-         * If true, a functional-style builder is added so that record instances can be instantiated
-         * without {@code new}.
+         * If true, a functional-style builder is added so that record instances can be instantiated without
+         * {@code new}.
          */
         boolean addStaticBuilder() default true;
 
@@ -271,9 +268,8 @@ public @interface RecordBuilder {
          */
         String mutableMapClassName() default "_MutableMap";
 
-
         /**
-         * Any additional {@link javax.lang.model.element.Modifier} you wish to apply to the builder.  For example to
+         * Any additional {@link javax.lang.model.element.Modifier} you wish to apply to the builder. For example to
          * make the builder public when the record is package protect.
          */
         Modifier[] builderClassModifiers() default {};
diff --git a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderFull.java b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderFull.java
index 3c032cb..b2b7c86 100644
--- a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderFull.java
+++ b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderFull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,9 @@ package io.soabase.recordbuilder.core;
 import java.lang.annotation.*;
 
 /**
- * An alternate form of {@code @RecordBuilder} that has most
- * optional features turned on
+ * An alternate form of {@code @RecordBuilder} that has most optional features turned on
  */
-@RecordBuilder.Template(options = @RecordBuilder.Options(
-        interpretNotNulls = true,
-        useImmutableCollections = true,
-        addSingleItemCollectionBuilders = true,
-        addFunctionalMethodsToWith = true,
-        addClassRetainedGenerated = true
-))
+@RecordBuilder.Template(options = @RecordBuilder.Options(interpretNotNulls = true, useImmutableCollections = true, addSingleItemCollectionBuilders = true, addFunctionalMethodsToWith = true, addClassRetainedGenerated = true))
 @Retention(RetentionPolicy.SOURCE)
 @Target(ElementType.TYPE)
 @Inherited
diff --git a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderGenerated.java b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderGenerated.java
index 1bcc4e4..4584da7 100644
--- a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderGenerated.java
+++ b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderGenerated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.*;
 /**
  * Jacoco ignores classes and methods annotated with `*Generated`
  */
-@Target({PACKAGE, TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER})
+@Target({ PACKAGE, TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER })
 @Retention(RetentionPolicy.CLASS)
 public @interface RecordBuilderGenerated {
 }
diff --git a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordInterface.java b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordInterface.java
index cf7870c..5dec2e0 100644
--- a/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordInterface.java
+++ b/record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import java.lang.annotation.*;
 public @interface RecordInterface {
     boolean addRecordBuilder() default true;
 
-    @Target({ElementType.TYPE, ElementType.PACKAGE})
+    @Target({ ElementType.TYPE, ElementType.PACKAGE })
     @Retention(RetentionPolicy.SOURCE)
     @Inherited
     @interface Include {
@@ -33,9 +33,8 @@ public @interface RecordInterface {
         Class<?>[] value() default {};
 
         /**
-         * Synonym for {@code value()}. When using the other attributes it maybe clearer to
-         * use {@code classes()} instead of {@code value()}. Note: both attributes are applied
-         * (i.e. a union of classes from both attributes).
+         * Synonym for {@code value()}. When using the other attributes it maybe clearer to use {@code classes()}
+         * instead of {@code value()}. Note: both attributes are applied (i.e. a union of classes from both attributes).
          *
          * @return collection of classes
          */
@@ -49,10 +48,9 @@ public @interface RecordInterface {
         boolean addRecordBuilder() default true;
 
         /**
-         * Pattern used to generate the package for the generated class. The value
-         * is the literal package name however two replacement values can be used. '@'
-         * is replaced with the package of the {@code Include} annotation. '*' is replaced with
-         * the package of the included class.
+         * Pattern used to generate the package for the generated class. The value is the literal package name however
+         * two replacement values can be used. '@' is replaced with the package of the {@code Include} annotation. '*'
+         * is replaced with the package of the included class.
          *
          * @return package pattern
          */
diff --git a/record-builder-processor/pom.xml b/record-builder-processor/pom.xml
index 7d5c993..462fa2a 100644
--- a/record-builder-processor/pom.xml
+++ b/record-builder-processor/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019 Jordan Zimmerman
+    Copyright 2019 The original author or authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ClassType.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ClassType.java
index 0ea7c0f..401ef62 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ClassType.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ClassType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/CollectionBuilderUtils.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/CollectionBuilderUtils.java
index 642dcdd..775a53a 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/CollectionBuilderUtils.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/CollectionBuilderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,10 +58,14 @@ class CollectionBuilderUtils {
     private static final TypeVariableName tType = TypeVariableName.get("T");
     private static final TypeVariableName kType = TypeVariableName.get("K");
     private static final TypeVariableName vType = TypeVariableName.get("V");
-    private static final ParameterizedTypeName parameterizedListType = ParameterizedTypeName.get(ClassName.get(List.class), tType);
-    private static final ParameterizedTypeName parameterizedMapType = ParameterizedTypeName.get(ClassName.get(Map.class), kType, vType);
-    private static final ParameterizedTypeName parameterizedSetType = ParameterizedTypeName.get(ClassName.get(Set.class), tType);
-    private static final ParameterizedTypeName parameterizedCollectionType = ParameterizedTypeName.get(ClassName.get(Collection.class), tType);
+    private static final ParameterizedTypeName parameterizedListType = ParameterizedTypeName
+            .get(ClassName.get(List.class), tType);
+    private static final ParameterizedTypeName parameterizedMapType = ParameterizedTypeName
+            .get(ClassName.get(Map.class), kType, vType);
+    private static final ParameterizedTypeName parameterizedSetType = ParameterizedTypeName
+            .get(ClassName.get(Set.class), tType);
+    private static final ParameterizedTypeName parameterizedCollectionType = ParameterizedTypeName
+            .get(ClassName.get(Collection.class), tType);
 
     private static final Class<?> mutableListType = ArrayList.class;
     private static final Class<?> mutableMapType = HashMap.class;
@@ -87,22 +91,24 @@ class CollectionBuilderUtils {
         setMakerMethodName = disambiguateGeneratedMethodName(recordComponents, "__ensureSetMutable", 0);
         mapMakerMethodName = disambiguateGeneratedMethodName(recordComponents, "__ensureMapMutable", 0);
 
-        mutableListSpec = buildMutableCollectionSubType(metaData.mutableListClassName(), mutableListTypeName, parameterizedListType, tType);
-        mutableSetSpec = buildMutableCollectionSubType(metaData.mutableSetClassName(), mutableSetTypeName, parameterizedSetType, tType);
-        mutableMapSpec = buildMutableCollectionSubType(metaData.mutableMapClassName(), mutableMapTypeName, parameterizedMapType, kType, vType);
+        mutableListSpec = buildMutableCollectionSubType(metaData.mutableListClassName(), mutableListTypeName,
+                parameterizedListType, tType);
+        mutableSetSpec = buildMutableCollectionSubType(metaData.mutableSetClassName(), mutableSetTypeName,
+                parameterizedSetType, tType);
+        mutableMapSpec = buildMutableCollectionSubType(metaData.mutableMapClassName(), mutableMapTypeName,
+                parameterizedMapType, kType, vType);
     }
 
     enum SingleItemsMetaDataMode {
-        STANDARD,
-        STANDARD_FOR_SETTER,
-        EXCLUDE_WILDCARD_TYPES
+        STANDARD, STANDARD_FOR_SETTER, EXCLUDE_WILDCARD_TYPES
     }
 
     record SingleItemsMetaData(Class<?> singleItemCollectionClass, List<TypeName> typeArguments, TypeName wildType) {
     }
 
     Optional<SingleItemsMetaData> singleItemsMetaData(RecordClassType component, SingleItemsMetaDataMode mode) {
-        if (addSingleItemCollectionBuilders && (component.typeName() instanceof ParameterizedTypeName parameterizedTypeName)) {
+        if (addSingleItemCollectionBuilders
+                && (component.typeName() instanceof ParameterizedTypeName parameterizedTypeName)) {
             Class<?> collectionClass = null;
             ClassName wildcardClass = null;
             int typeArgumentQty = 0;
@@ -122,21 +128,25 @@ class CollectionBuilderUtils {
             var hasWildcardTypeArguments = hasWildcardTypeArguments(parameterizedTypeName, typeArgumentQty);
             if (collectionClass != null) {
                 return switch (mode) {
-                    case STANDARD -> singleItemsMetaDataWithWildType(parameterizedTypeName, collectionClass, wildcardClass, typeArgumentQty);
+                case STANDARD -> singleItemsMetaDataWithWildType(parameterizedTypeName, collectionClass, wildcardClass,
+                        typeArgumentQty);
 
-                    case STANDARD_FOR_SETTER -> {
-                        if (hasWildcardTypeArguments) {
-                            yield Optional.of(new SingleItemsMetaData(collectionClass, parameterizedTypeName.typeArguments, component.typeName()));
-                        }
-                        yield singleItemsMetaDataWithWildType(parameterizedTypeName, collectionClass, wildcardClass, typeArgumentQty);
+                case STANDARD_FOR_SETTER -> {
+                    if (hasWildcardTypeArguments) {
+                        yield Optional.of(new SingleItemsMetaData(collectionClass, parameterizedTypeName.typeArguments,
+                                component.typeName()));
                     }
+                    yield singleItemsMetaDataWithWildType(parameterizedTypeName, collectionClass, wildcardClass,
+                            typeArgumentQty);
+                }
 
-                    case EXCLUDE_WILDCARD_TYPES -> {
-                        if (hasWildcardTypeArguments) {
-                            yield Optional.empty();
-                        }
-                        yield singleItemsMetaDataWithWildType(parameterizedTypeName, collectionClass, wildcardClass, typeArgumentQty);
+                case EXCLUDE_WILDCARD_TYPES -> {
+                    if (hasWildcardTypeArguments) {
+                        yield Optional.empty();
                     }
+                    yield singleItemsMetaDataWithWildType(parameterizedTypeName, collectionClass, wildcardClass,
+                            typeArgumentQty);
+                }
                 };
             }
         }
@@ -144,7 +154,8 @@ class CollectionBuilderUtils {
     }
 
     boolean isImmutableCollection(RecordClassType component) {
-        return useImmutableCollections && (isList(component) || isMap(component) || isSet(component) || component.rawTypeName().equals(collectionTypeName));
+        return useImmutableCollections && (isList(component) || isMap(component) || isSet(component)
+                || component.rawTypeName().equals(collectionTypeName));
     }
 
     boolean isList(RecordClassType component) {
@@ -216,7 +227,8 @@ class CollectionBuilderUtils {
         }
 
         if (needsListShim) {
-            builder.addMethod(buildShimMethod(listShimName, listTypeName, collectionType, parameterizedListType, tType));
+            builder.addMethod(
+                    buildShimMethod(listShimName, listTypeName, collectionType, parameterizedListType, tType));
         }
         if (needsSetShim) {
             builder.addMethod(buildShimMethod(setShimName, setTypeName, collectionType, parameterizedSetType, tType));
@@ -235,25 +247,32 @@ class CollectionBuilderUtils {
         }
 
         if (needsListMutableMaker) {
-            builder.addMethod(buildMutableMakerMethod(listMakerMethodName, mutableListSpec.name, parameterizedListType, tType));
+            builder.addMethod(
+                    buildMutableMakerMethod(listMakerMethodName, mutableListSpec.name, parameterizedListType, tType));
             builder.addType(mutableListSpec);
         }
         if (needsSetMutableMaker) {
-            builder.addMethod(buildMutableMakerMethod(setMakerMethodName, mutableSetSpec.name, parameterizedSetType, tType));
+            builder.addMethod(
+                    buildMutableMakerMethod(setMakerMethodName, mutableSetSpec.name, parameterizedSetType, tType));
             builder.addType(mutableSetSpec);
         }
         if (needsMapMutableMaker) {
-            builder.addMethod(buildMutableMakerMethod(mapMakerMethodName, mutableMapSpec.name, parameterizedMapType, kType, vType));
+            builder.addMethod(buildMutableMakerMethod(mapMakerMethodName, mutableMapSpec.name, parameterizedMapType,
+                    kType, vType));
             builder.addType(mutableMapSpec);
         }
     }
 
-    private Optional<SingleItemsMetaData> singleItemsMetaDataWithWildType(ParameterizedTypeName parameterizedTypeName, Class<?> collectionClass, ClassName wildcardClass, int typeArgumentQty) {
+    private Optional<SingleItemsMetaData> singleItemsMetaDataWithWildType(ParameterizedTypeName parameterizedTypeName,
+            Class<?> collectionClass, ClassName wildcardClass, int typeArgumentQty) {
         TypeName wildType;
         if (typeArgumentQty == 1) {
-            wildType = ParameterizedTypeName.get(wildcardClass, WildcardTypeName.subtypeOf(parameterizedTypeName.typeArguments.get(0)));
+            wildType = ParameterizedTypeName.get(wildcardClass,
+                    WildcardTypeName.subtypeOf(parameterizedTypeName.typeArguments.get(0)));
         } else { // if (typeArgumentQty == 2)
-            wildType = ParameterizedTypeName.get(wildcardClass, WildcardTypeName.subtypeOf(parameterizedTypeName.typeArguments.get(0)), WildcardTypeName.subtypeOf(parameterizedTypeName.typeArguments.get(1)));
+            wildType = ParameterizedTypeName.get(wildcardClass,
+                    WildcardTypeName.subtypeOf(parameterizedTypeName.typeArguments.get(0)),
+                    WildcardTypeName.subtypeOf(parameterizedTypeName.typeArguments.get(1)));
         }
         return Optional.of(new SingleItemsMetaData(collectionClass, parameterizedTypeName.typeArguments, wildType));
     }
@@ -277,47 +296,41 @@ class CollectionBuilderUtils {
         return name;
     }
 
-    private MethodSpec buildShimMethod(String name, TypeName mainType, Class<?> abstractType, ParameterizedTypeName parameterizedType, TypeVariableName... typeVariables) {
+    private MethodSpec buildShimMethod(String name, TypeName mainType, Class<?> abstractType,
+            ParameterizedTypeName parameterizedType, TypeVariableName... typeVariables) {
         var code = CodeBlock.of("return (o != null) ? $T.copyOf(o) : $T.of()", mainType, mainType);
-        TypeName[] wildCardTypeArguments = parameterizedType.typeArguments.stream().map(WildcardTypeName::subtypeOf).toList().toArray(new TypeName[0]);
+        TypeName[] wildCardTypeArguments = parameterizedType.typeArguments.stream().map(WildcardTypeName::subtypeOf)
+                .toList().toArray(new TypeName[0]);
         var extendedParameterizedType = ParameterizedTypeName.get(ClassName.get(abstractType), wildCardTypeArguments);
-        return MethodSpec.methodBuilder(name)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
-                .addTypeVariables(Arrays.asList(typeVariables))
-                .returns(parameterizedType)
-                .addParameter(extendedParameterizedType, "o")
-                .addStatement(code)
-                .build();
+        return MethodSpec.methodBuilder(name).addAnnotation(generatedRecordBuilderAnnotation)
+                .addModifiers(Modifier.PRIVATE, Modifier.STATIC).addTypeVariables(Arrays.asList(typeVariables))
+                .returns(parameterizedType).addParameter(extendedParameterizedType, "o").addStatement(code).build();
     }
 
-    private MethodSpec buildMutableMakerMethod(String name, String mutableCollectionType, ParameterizedTypeName parameterizedType, TypeVariableName... typeVariables) {
+    private MethodSpec buildMutableMakerMethod(String name, String mutableCollectionType,
+            ParameterizedTypeName parameterizedType, TypeVariableName... typeVariables) {
         var nullCase = CodeBlock.of("if (o == null) return new $L<>()", mutableCollectionType);
         var isMutableCase = CodeBlock.of("if (o instanceof $L) return o", mutableCollectionType);
         var defaultCase = CodeBlock.of("return new $L<>(o)", mutableCollectionType);
-        return MethodSpec.methodBuilder(name)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
-                .addTypeVariables(Arrays.asList(typeVariables))
-                .returns(parameterizedType)
-                .addParameter(parameterizedType, "o")
-                .addStatement(nullCase)
-                .addStatement(isMutableCase)
-                .addStatement(defaultCase)
-                .build();
+        return MethodSpec.methodBuilder(name).addAnnotation(generatedRecordBuilderAnnotation)
+                .addModifiers(Modifier.PRIVATE, Modifier.STATIC).addTypeVariables(Arrays.asList(typeVariables))
+                .returns(parameterizedType).addParameter(parameterizedType, "o").addStatement(nullCase)
+                .addStatement(isMutableCase).addStatement(defaultCase).build();
     }
 
-    private TypeSpec buildMutableCollectionSubType(String className, ClassName mutableCollectionType, ParameterizedTypeName parameterizedType, TypeVariableName... typeVariables) {
-        TypeName[] typeArguments = new TypeName[]{};
+    private TypeSpec buildMutableCollectionSubType(String className, ClassName mutableCollectionType,
+            ParameterizedTypeName parameterizedType, TypeVariableName... typeVariables) {
+        TypeName[] typeArguments = new TypeName[] {};
         typeArguments = Arrays.stream(typeVariables).toList().toArray(typeArguments);
 
-        TypeSpec.Builder builder = TypeSpec.classBuilder(className)
-                .addAnnotation(generatedRecordBuilderAnnotation)
+        TypeSpec.Builder builder = TypeSpec.classBuilder(className).addAnnotation(generatedRecordBuilderAnnotation)
                 .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
                 .superclass(ParameterizedTypeName.get(mutableCollectionType, typeArguments))
                 .addTypeVariables(Arrays.asList(typeVariables))
-                .addMethod(MethodSpec.constructorBuilder().addAnnotation(generatedRecordBuilderAnnotation).addStatement("super()").build())
-                .addMethod(MethodSpec.constructorBuilder().addAnnotation(generatedRecordBuilderAnnotation).addParameter(parameterizedType, "o").addStatement("super(o)").build());
+                .addMethod(MethodSpec.constructorBuilder().addAnnotation(generatedRecordBuilderAnnotation)
+                        .addStatement("super()").build())
+                .addMethod(MethodSpec.constructorBuilder().addAnnotation(generatedRecordBuilderAnnotation)
+                        .addParameter(parameterizedType, "o").addStatement("super(o)").build());
 
         if (addClassRetainedGenerated) {
             builder.addAnnotation(recordBuilderGeneratedAnnotation);
@@ -327,21 +340,12 @@ class CollectionBuilderUtils {
     }
 
     private MethodSpec buildCollectionsShimMethod() {
-        var code = CodeBlock.builder()
-                .add("if (o instanceof Set) {\n")
-                .indent()
-                .addStatement("return $T.copyOf(o)", setTypeName)
-                .unindent()
-                .addStatement("}")
-                .addStatement("return (o != null) ? $T.copyOf(o) : $T.of()", listTypeName, listTypeName)
-                .build();
-        return MethodSpec.methodBuilder(collectionShimName)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
-                .addTypeVariable(tType)
-                .returns(parameterizedCollectionType)
-                .addParameter(parameterizedCollectionType, "o")
-                .addCode(code)
+        var code = CodeBlock.builder().add("if (o instanceof Set) {\n").indent()
+                .addStatement("return $T.copyOf(o)", setTypeName).unindent().addStatement("}")
+                .addStatement("return (o != null) ? $T.copyOf(o) : $T.of()", listTypeName, listTypeName).build();
+        return MethodSpec.methodBuilder(collectionShimName).addAnnotation(generatedRecordBuilderAnnotation)
+                .addModifiers(Modifier.PRIVATE, Modifier.STATIC).addTypeVariable(tType)
+                .returns(parameterizedCollectionType).addParameter(parameterizedCollectionType, "o").addCode(code)
                 .build();
     }
 }
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ElementUtils.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ElementUtils.java
index 09c75b7..0aec3c8 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ElementUtils.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ElementUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,49 +37,43 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class ElementUtils {
-    public static Optional<? extends AnnotationMirror> findAnnotationMirror(ProcessingEnvironment processingEnv, Element element, String annotationClass) {
+    public static Optional<? extends AnnotationMirror> findAnnotationMirror(ProcessingEnvironment processingEnv,
+            Element element, String annotationClass) {
         return processingEnv.getElementUtils().getAllAnnotationMirrors(element).stream()
-            .filter(e -> e.getAnnotationType().toString().equals(annotationClass))
-            .findFirst();
+                .filter(e -> e.getAnnotationType().toString().equals(annotationClass)).findFirst();
     }
 
-    public static Optional<? extends AnnotationValue> getAnnotationValue(Map<? extends ExecutableElement, ? extends AnnotationValue> values, String name) {
-        return values.entrySet()
-            .stream()
-            .filter(e -> e.getKey().getSimpleName().toString().equals(name))
-            .map(Map.Entry::getValue)
-            .findFirst();
+    public static Optional<? extends AnnotationValue> getAnnotationValue(
+            Map<? extends ExecutableElement, ? extends AnnotationValue> values, String name) {
+        return values.entrySet().stream().filter(e -> e.getKey().getSimpleName().toString().equals(name))
+                .map(Map.Entry::getValue).findFirst();
     }
 
     @SuppressWarnings("unchecked")
-    public static List<TypeMirror> getAttributeTypeMirrorList(AnnotationValue attribute)
-    {
-        List<? extends AnnotationValue> values = (attribute != null) ? (List<? extends AnnotationValue>)attribute.getValue() : Collections.emptyList();
-        return values.stream().map(v -> (TypeMirror)v.getValue()).collect(Collectors.toList());
+    public static List<TypeMirror> getAttributeTypeMirrorList(AnnotationValue attribute) {
+        List<? extends AnnotationValue> values = (attribute != null)
+                ? (List<? extends AnnotationValue>) attribute.getValue() : Collections.emptyList();
+        return values.stream().map(v -> (TypeMirror) v.getValue()).collect(Collectors.toList());
     }
 
     @SuppressWarnings("unchecked")
-    public static List<String> getAttributeStringList(AnnotationValue attribute)
-    {
-        List<? extends AnnotationValue> values = (attribute != null) ? (List<? extends AnnotationValue>)attribute.getValue() : Collections.emptyList();
-        return values.stream().map(v -> (String)v.getValue()).collect(Collectors.toList());
+    public static List<String> getAttributeStringList(AnnotationValue attribute) {
+        List<? extends AnnotationValue> values = (attribute != null)
+                ? (List<? extends AnnotationValue>) attribute.getValue() : Collections.emptyList();
+        return values.stream().map(v -> (String) v.getValue()).collect(Collectors.toList());
     }
 
-    public static boolean getBooleanAttribute(AnnotationValue attribute)
-    {
+    public static boolean getBooleanAttribute(AnnotationValue attribute) {
         Object value = (attribute != null) ? attribute.getValue() : null;
-        if ( value != null )
-        {
+        if (value != null) {
             return Boolean.parseBoolean(String.valueOf(value));
         }
         return false;
     }
 
-    public static String getStringAttribute(AnnotationValue attribute, String defaultValue)
-    {
+    public static String getStringAttribute(AnnotationValue attribute, String defaultValue) {
         Object value = (attribute != null) ? attribute.getValue() : null;
-        if ( value != null )
-        {
+        if (value != null) {
             return String.valueOf(value);
         }
         return defaultValue;
@@ -99,7 +93,8 @@ public class ElementUtils {
         return (index > -1) ? name.substring(0, index) : "";
     }
 
-    public static ClassType getClassType(String packageName, String simpleName, List<? extends TypeParameterElement> typeParameters) {
+    public static ClassType getClassType(String packageName, String simpleName,
+            List<? extends TypeParameterElement> typeParameters) {
         return getClassType(ClassName.get(packageName, simpleName), typeParameters);
     }
 
@@ -107,7 +102,8 @@ public class ElementUtils {
         return getClassType(ClassName.get(typeElement), typeParameters);
     }
 
-    public static ClassType getClassType(ClassName builderClassName, List<? extends TypeParameterElement> typeParameters) {
+    public static ClassType getClassType(ClassName builderClassName,
+            List<? extends TypeParameterElement> typeParameters) {
         if (typeParameters.isEmpty()) {
             return new ClassType(builderClassName, builderClassName.simpleName());
         }
@@ -115,10 +111,13 @@ public class ElementUtils {
         return new ClassType(ParameterizedTypeName.get(builderClassName, typeNames), builderClassName.simpleName());
     }
 
-    public static RecordClassType getRecordClassType(ProcessingEnvironment processingEnv, RecordComponentElement recordComponent, List<? extends AnnotationMirror> accessorAnnotations, List<? extends AnnotationMirror> canonicalConstructorAnnotations) {
+    public static RecordClassType getRecordClassType(ProcessingEnvironment processingEnv,
+            RecordComponentElement recordComponent, List<? extends AnnotationMirror> accessorAnnotations,
+            List<? extends AnnotationMirror> canonicalConstructorAnnotations) {
         var typeName = TypeName.get(recordComponent.asType());
         var rawTypeName = TypeName.get(processingEnv.getTypeUtils().erasure(recordComponent.asType()));
-        return new RecordClassType(typeName, rawTypeName, recordComponent.getSimpleName().toString(), accessorAnnotations, canonicalConstructorAnnotations);
+        return new RecordClassType(typeName, rawTypeName, recordComponent.getSimpleName().toString(),
+                accessorAnnotations, canonicalConstructorAnnotations);
     }
 
     public static String getWithMethodName(ClassType component, String prefix) {
@@ -129,27 +128,30 @@ public class ElementUtils {
         return prefix + Character.toUpperCase(name.charAt(0)) + name.substring(1);
     }
 
-    public static String getBuilderName(TypeElement element, RecordBuilder.Options metaData, ClassType classType, String suffix) {
+    public static String getBuilderName(TypeElement element, RecordBuilder.Options metaData, ClassType classType,
+            String suffix) {
         // generate the class name
         var baseName = classType.name() + suffix;
-        return metaData.prefixEnclosingClassNames() ? (getBuilderNamePrefix(element.getEnclosingElement()) + baseName) : baseName;
+        return metaData.prefixEnclosingClassNames() ? (getBuilderNamePrefix(element.getEnclosingElement()) + baseName)
+                : baseName;
     }
 
     public static Optional<? extends Element> findCanonicalConstructor(TypeElement record) {
-        if ( record.getKind() != ElementKind.RECORD ) {
+        if (record.getKind() != ElementKind.RECORD) {
             return Optional.empty();
         }
 
-        // based on https://github.com/openjdk/jdk/pull/3556/files#diff-a6270f4b50989abe733607c69038b2036306d13f77276af005d023b7fc57f1a2R2368
-        var componentList = record.getRecordComponents().stream().map(e -> e.asType().toString()).collect(Collectors.toList());
-        return record.getEnclosedElements().stream()
-            .filter(element -> element.getKind() == ElementKind.CONSTRUCTOR)
-            .filter(element -> {
-                var parameters = ((ExecutableElement)element).getParameters();
-                var parametersList = parameters.stream().map(e -> e.asType().toString()).collect(Collectors.toList());
-                return componentList.equals(parametersList);
-            })
-            .findFirst();
+        // based on
+        // https://github.com/openjdk/jdk/pull/3556/files#diff-a6270f4b50989abe733607c69038b2036306d13f77276af005d023b7fc57f1a2R2368
+        var componentList = record.getRecordComponents().stream().map(e -> e.asType().toString())
+                .collect(Collectors.toList());
+        return record.getEnclosedElements().stream().filter(element -> element.getKind() == ElementKind.CONSTRUCTOR)
+                .filter(element -> {
+                    var parameters = ((ExecutableElement) element).getParameters();
+                    var parametersList = parameters.stream().map(e -> e.asType().toString())
+                            .collect(Collectors.toList());
+                    return componentList.equals(parametersList);
+                }).findFirst();
     }
 
     private static String getBuilderNamePrefix(Element element) {
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/IncludeHelper.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/IncludeHelper.java
index 8bb6418..ca883be 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/IncludeHelper.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/IncludeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@ class IncludeHelper {
     private final List<TypeElement> classTypeElements;
     private final Map<? extends ExecutableElement, ? extends AnnotationValue> annotationValues;
 
-    IncludeHelper(ProcessingEnvironment processingEnv, Element element, AnnotationMirror annotationMirror, boolean packagesSupported) {
+    IncludeHelper(ProcessingEnvironment processingEnv, Element element, AnnotationMirror annotationMirror,
+            boolean packagesSupported) {
         annotationValues = processingEnv.getElementUtils().getElementValuesWithDefaults(annotationMirror);
         var value = ElementUtils.getAnnotationValue(annotationValues, "value");
         var classes = ElementUtils.getAnnotationValue(annotationValues, "classes");
@@ -41,9 +42,11 @@ class IncludeHelper {
             var packagesList = packages.map(ElementUtils::getAttributeStringList).orElseGet(List::of);
             if (valueList.isEmpty() && classesList.isEmpty() && packagesList.isEmpty()) {
                 if (packagesSupported) {
-                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "At least one of \"value\", \"classes\" or \"packages\" required", element);
+                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+                            "At least one of \"value\", \"classes\" or \"packages\" required", element);
                 } else {
-                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "At least one of \"value\" or \"classes\" required", element);
+                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+                            "At least one of \"value\" or \"classes\" required", element);
                 }
                 isValid = false;
             }
@@ -51,7 +54,8 @@ class IncludeHelper {
             isValid = processList(processingEnv, isValid, element, classesList, classTypeElements);
             packages.ifPresent(annotationValue -> processPackages(processingEnv, classTypeElements, packagesList));
         } else {
-            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Could not read attribute for annotation", element);
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Could not read attribute for annotation",
+                    element);
             isValid = false;
         }
         this.isValid = isValid;
@@ -70,11 +74,13 @@ class IncludeHelper {
         return classTypeElements;
     }
 
-    private boolean processList(ProcessingEnvironment processingEnv, boolean isValid, Element element, List<TypeMirror> list, ArrayList<TypeElement> classTypeElements) {
+    private boolean processList(ProcessingEnvironment processingEnv, boolean isValid, Element element,
+            List<TypeMirror> list, ArrayList<TypeElement> classTypeElements) {
         for (var typeMirror : list) {
             TypeElement typeElement = (TypeElement) processingEnv.getTypeUtils().asElement(typeMirror);
             if (typeElement == null) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Could not get element for: " + typeMirror, element);
+                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+                        "Could not get element for: " + typeMirror, element);
                 isValid = false;
             } else {
                 classTypeElements.add(typeElement);
@@ -83,7 +89,8 @@ class IncludeHelper {
         return isValid;
     }
 
-    private void processPackages(ProcessingEnvironment processingEnv, List<TypeElement> classTypeElements, List<String> packagesList) {
+    private void processPackages(ProcessingEnvironment processingEnv, List<TypeElement> classTypeElements,
+            List<String> packagesList) {
         for (var packageName : packagesList) {
             var packageElement = processingEnv.getElementUtils().getPackageElement(packageName);
             for (var child : packageElement.getEnclosedElements()) {
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java
index e2c902e..c2b7f4e 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,27 +51,28 @@ class InternalRecordBuilderProcessor {
 
     private static final TypeName overrideType = TypeName.get(Override.class);
     private static final TypeName validType = ClassName.get("javax.validation", "Valid");
-    private static final TypeName validatorTypeName = ClassName.get("io.soabase.recordbuilder.validator", "RecordBuilderValidator");
+    private static final TypeName validatorTypeName = ClassName.get("io.soabase.recordbuilder.validator",
+            "RecordBuilderValidator");
     private static final TypeVariableName rType = TypeVariableName.get("R");
     private final ProcessingEnvironment processingEnv;
 
-    InternalRecordBuilderProcessor(ProcessingEnvironment processingEnv, TypeElement record, RecordBuilder.Options metaData, Optional<String> packageNameOpt) {
+    InternalRecordBuilderProcessor(ProcessingEnvironment processingEnv, TypeElement record,
+            RecordBuilder.Options metaData, Optional<String> packageNameOpt) {
         this.processingEnv = processingEnv;
         var recordActualPackage = ElementUtils.getPackageName(record);
         this.metaData = metaData;
         recordClassType = ElementUtils.getClassType(record, record.getTypeParameters());
         packageName = packageNameOpt.orElse(recordActualPackage);
-        builderClassType = ElementUtils.getClassType(packageName, getBuilderName(record, metaData, recordClassType, metaData.suffix()), record.getTypeParameters());
+        builderClassType = ElementUtils.getClassType(packageName,
+                getBuilderName(record, metaData, recordClassType, metaData.suffix()), record.getTypeParameters());
         typeVariables = record.getTypeParameters().stream().map(TypeVariableName::get).collect(Collectors.toList());
         recordComponents = buildRecordComponents(record);
         uniqueVarName = getUniqueVarName();
         notNullPattern = Pattern.compile(metaData.interpretNotNullsPattern());
         collectionBuilderUtils = new CollectionBuilderUtils(recordComponents, this.metaData);
 
-        builder = TypeSpec.classBuilder(builderClassType.name())
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addModifiers(metaData.builderClassModifiers())
-                .addTypeVariables(typeVariables);
+        builder = TypeSpec.classBuilder(builderClassType.name()).addAnnotation(generatedRecordBuilderAnnotation)
+                .addModifiers(metaData.builderClassModifiers()).addTypeVariables(typeVariables);
         if (metaData.addClassRetainedGenerated()) {
             builder.addAnnotation(recordBuilderGeneratedAnnotation);
         }
@@ -130,8 +131,10 @@ class InternalRecordBuilderProcessor {
 
     private void addVisibility(boolean builderIsInRecordPackage, Set<Modifier> modifiers) {
         if (builderIsInRecordPackage) {
-            if (modifiers.contains(Modifier.PUBLIC) || modifiers.contains(Modifier.PRIVATE) || modifiers.contains(Modifier.PROTECTED)) {
-                builder.addModifiers(Modifier.PUBLIC);  // builders are top level classes - can only be public or package-private
+            if (modifiers.contains(Modifier.PUBLIC) || modifiers.contains(Modifier.PRIVATE)
+                    || modifiers.contains(Modifier.PROTECTED)) {
+                builder.addModifiers(Modifier.PUBLIC); // builders are top level classes - can only be public or
+                                                       // package-private
             }
             // is package-private
         } else {
@@ -140,40 +143,42 @@ class InternalRecordBuilderProcessor {
     }
 
     private List<RecordClassType> buildRecordComponents(TypeElement record) {
-        var accessorAnnotations = record.getRecordComponents().stream().map(e -> e.getAccessor().getAnnotationMirrors()).collect(Collectors.toList());
-        var canonicalConstructorAnnotations = ElementUtils.findCanonicalConstructor(record).map(constructor -> ((ExecutableElement) constructor).getParameters().stream().map(Element::getAnnotationMirrors).collect(Collectors.toList())).orElse(List.of());
-        var recordComponents = record.getRecordComponents();
-        return IntStream.range(0, recordComponents.size())
-                .mapToObj(index -> {
-                    var thisAccessorAnnotations = (accessorAnnotations.size() > index) ? accessorAnnotations.get(index) : List.<AnnotationMirror>of();
-                    var thisCanonicalConstructorAnnotations = (canonicalConstructorAnnotations.size() > index) ? canonicalConstructorAnnotations.get(index) : List.<AnnotationMirror>of();
-                    return ElementUtils.getRecordClassType(processingEnv, recordComponents.get(index), thisAccessorAnnotations, thisCanonicalConstructorAnnotations);
-                })
+        var accessorAnnotations = record.getRecordComponents().stream().map(e -> e.getAccessor().getAnnotationMirrors())
                 .collect(Collectors.toList());
+        var canonicalConstructorAnnotations = ElementUtils.findCanonicalConstructor(record)
+                .map(constructor -> ((ExecutableElement) constructor).getParameters().stream()
+                        .map(Element::getAnnotationMirrors).collect(Collectors.toList()))
+                .orElse(List.of());
+        var recordComponents = record.getRecordComponents();
+        return IntStream.range(0, recordComponents.size()).mapToObj(index -> {
+            var thisAccessorAnnotations = (accessorAnnotations.size() > index) ? accessorAnnotations.get(index)
+                    : List.<AnnotationMirror> of();
+            var thisCanonicalConstructorAnnotations = (canonicalConstructorAnnotations.size() > index)
+                    ? canonicalConstructorAnnotations.get(index) : List.<AnnotationMirror> of();
+            return ElementUtils.getRecordClassType(processingEnv, recordComponents.get(index), thisAccessorAnnotations,
+                    thisCanonicalConstructorAnnotations);
+        }).collect(Collectors.toList());
     }
 
     private void addWithNestedClass() {
         /*
-            Adds a nested interface that adds withers similar to:
-
-            public class MyRecordBuilder {
-                public interface With {
-                    // with methods
-                }
-            }
+         * Adds a nested interface that adds withers similar to:
+         *
+         * public class MyRecordBuilder { public interface With { // with methods } }
          */
         var classBuilder = TypeSpec.interfaceBuilder(metaData.withClassName())
                 .addAnnotation(generatedRecordBuilderAnnotation)
-                .addJavadoc("Add withers to {@code $L}\n", recordClassType.name())
-                .addModifiers(Modifier.PUBLIC)
+                .addJavadoc("Add withers to {@code $L}\n", recordClassType.name()).addModifiers(Modifier.PUBLIC)
                 .addTypeVariables(typeVariables);
         if (metaData.addClassRetainedGenerated()) {
             classBuilder.addAnnotation(recordBuilderGeneratedAnnotation);
         }
-        recordComponents.forEach(component -> addNestedGetterMethod(classBuilder, component, prefixedName(component, true)));
+        recordComponents
+                .forEach(component -> addNestedGetterMethod(classBuilder, component, prefixedName(component, true)));
         addWithBuilderMethod(classBuilder);
         addWithSuppliedBuilderMethod(classBuilder);
-        IntStream.range(0, recordComponents.size()).forEach(index -> add1WithMethod(classBuilder, recordComponents.get(index), index));
+        IntStream.range(0, recordComponents.size())
+                .forEach(index -> add1WithMethod(classBuilder, recordComponents.get(index), index));
         if (metaData.addFunctionalMethodsToWith()) {
             classBuilder.addType(buildFunctionalInterface("Function", true))
                     .addType(buildFunctionalInterface("Consumer", false))
@@ -185,18 +190,13 @@ class InternalRecordBuilderProcessor {
 
     private void addBeanNestedClass() {
         /*
-            Adds a nested interface that adds getters similar to:
-
-            public class MyRecordBuilder {
-                public interface Bean {
-                    // getter methods
-                }
-            }
+         * Adds a nested interface that adds getters similar to:
+         *
+         * public class MyRecordBuilder { public interface Bean { // getter methods } }
          */
         var classBuilder = TypeSpec.interfaceBuilder(metaData.beanClassName())
                 .addAnnotation(generatedRecordBuilderAnnotation)
-                .addJavadoc("Add getters to {@code $L}\n", recordClassType.name())
-                .addModifiers(Modifier.PUBLIC)
+                .addJavadoc("Add getters to {@code $L}\n", recordClassType.name()).addModifiers(Modifier.PUBLIC)
                 .addTypeVariables(typeVariables);
         recordComponents.forEach(component -> {
             if (prefixedName(component, true).equals(component.name())) {
@@ -210,50 +210,38 @@ class InternalRecordBuilderProcessor {
 
     private void addWithSuppliedBuilderMethod(TypeSpec.Builder classBuilder) {
         /*
-            Adds a method that returns a pre-filled copy builder similar to:
-
-            default MyRecord with(Consumer<MyRecordBuilder> consumer) {
-                MyRecordBuilder builder = with();
-                consumer.accept(builder);
-                return builder.build();
-            }
+         * Adds a method that returns a pre-filled copy builder similar to:
+         *
+         * default MyRecord with(Consumer<MyRecordBuilder> consumer) { MyRecordBuilder builder = with();
+         * consumer.accept(builder); return builder.build(); }
          */
-        var codeBlockBuilder = CodeBlock.builder()
-                .add("$T builder = with();\n", builderClassType.typeName())
-                .add("consumer.accept(builder);\n")
-                .add("return builder.$L();\n", metaData.buildMethodName());
+        var codeBlockBuilder = CodeBlock.builder().add("$T builder = with();\n", builderClassType.typeName())
+                .add("consumer.accept(builder);\n").add("return builder.$L();\n", metaData.buildMethodName());
         var consumerType = ParameterizedTypeName.get(ClassName.get(Consumer.class), builderClassType.typeName());
         var parameter = ParameterSpec.builder(consumerType, "consumer").build();
         var methodSpec = MethodSpec.methodBuilder(metaData.withClassMethodPrefix())
                 .addAnnotation(generatedRecordBuilderAnnotation)
                 .addJavadoc("Return a new record built from the builder passed to the given consumer")
-                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
-                .addParameter(parameter)
-                .returns(recordClassType.typeName())
-                .addCode(codeBlockBuilder.build())
-                .build();
+                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT).addParameter(parameter)
+                .returns(recordClassType.typeName()).addCode(codeBlockBuilder.build()).build();
         classBuilder.addMethod(methodSpec);
     }
 
     private void addWithBuilderMethod(TypeSpec.Builder classBuilder) {
         /*
-            Adds a method that returns a pre-filled copy builder similar to:
-
-            default MyRecordBuilder with() {
-                return MyRecordBuilder.builder(r);
-            }
+         * Adds a method that returns a pre-filled copy builder similar to:
+         *
+         * default MyRecordBuilder with() { return MyRecordBuilder.builder(r); }
          */
-        var codeBlockBuilder = CodeBlock.builder()
-                .add("return new $L$L(", builderClassType.name(), typeVariables.isEmpty() ? "" : "<>");
+        var codeBlockBuilder = CodeBlock.builder().add("return new $L$L(", builderClassType.name(),
+                typeVariables.isEmpty() ? "" : "<>");
         addComponentCallsAsArguments(-1, codeBlockBuilder);
         codeBlockBuilder.add(");");
         var methodSpec = MethodSpec.methodBuilder(metaData.withClassMethodPrefix())
                 .addAnnotation(generatedRecordBuilderAnnotation)
                 .addJavadoc("Return a new record builder using the current values")
-                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
-                .returns(builderClassType.typeName())
-                .addCode(codeBlockBuilder.build())
-                .build();
+                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT).returns(builderClassType.typeName())
+                .addCode(codeBlockBuilder.build()).build();
         classBuilder.addMethod(methodSpec);
     }
 
@@ -263,19 +251,15 @@ class InternalRecordBuilderProcessor {
 
     private String getUniqueVarName(String prefix) {
         var name = prefix + "r";
-        var alreadyExists = recordComponents.stream()
-                .map(ClassType::name)
-                .anyMatch(n -> n.equals(name));
+        var alreadyExists = recordComponents.stream().map(ClassType::name).anyMatch(n -> n.equals(name));
         return alreadyExists ? getUniqueVarName(prefix + "_") : name;
     }
 
     private void add1WithMethod(TypeSpec.Builder classBuilder, RecordClassType component, int index) {
         /*
-            Adds a with method for the component similar to:
-
-            default MyRecord withName(String name) {
-                return new MyRecord(name, r.age());
-            }
+         * Adds a with method for the component similar to:
+         *
+         * default MyRecord withName(String name) { return new MyRecord(name, r.age()); }
          */
         var codeBlockBuilder = CodeBlock.builder();
         addNullCheckCodeBlock(codeBlockBuilder, index);
@@ -294,36 +278,28 @@ class InternalRecordBuilderProcessor {
         var methodName = getWithMethodName(component, metaData.withClassMethodPrefix());
         var parameterSpecBuilder = ParameterSpec.builder(component.typeName(), component.name());
         addConstructorAnnotations(component, parameterSpecBuilder);
-        var methodSpec = MethodSpec.methodBuilder(methodName)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addJavadoc("Return a new instance of {@code $L} with a new value for {@code $L}\n", recordClassType.name(), component.name())
-                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
-                .addParameter(parameterSpecBuilder.build())
-                .addCode(codeBlockBuilder.build())
-                .returns(recordClassType.typeName())
-                .build();
+        var methodSpec = MethodSpec.methodBuilder(methodName).addAnnotation(generatedRecordBuilderAnnotation)
+                .addJavadoc("Return a new instance of {@code $L} with a new value for {@code $L}\n",
+                        recordClassType.name(), component.name())
+                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT).addParameter(parameterSpecBuilder.build())
+                .addCode(codeBlockBuilder.build()).returns(recordClassType.typeName()).build();
         classBuilder.addMethod(methodSpec);
     }
 
     private void add1PrefixedGetterMethod(TypeSpec.Builder classBuilder, RecordClassType component) {
         /*
-            Adds a get method for the component similar to:
-
-            default MyRecord getName() {
-                return name();
-            }
+         * Adds a get method for the component similar to:
+         *
+         * default MyRecord getName() { return name(); }
          */
         var codeBlockBuilder = CodeBlock.builder();
         codeBlockBuilder.add("$[return $L()$];", component.name());
 
         var methodName = prefixedName(component, true);
-        var methodSpec = MethodSpec.methodBuilder(methodName)
-                .addAnnotation(generatedRecordBuilderAnnotation)
+        var methodSpec = MethodSpec.methodBuilder(methodName).addAnnotation(generatedRecordBuilderAnnotation)
                 .addJavadoc("Returns the value of {@code $L}\n", component.name())
-                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
-                .addCode(codeBlockBuilder.build())
-                .returns(component.typeName())
-                .build();
+                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT).addCode(codeBlockBuilder.build())
+                .returns(component.typeName()).build();
         classBuilder.addMethod(methodSpec);
     }
 
@@ -343,34 +319,26 @@ class InternalRecordBuilderProcessor {
 
     private void addDefaultConstructor() {
         /*
-            Adds a default constructor similar to:
-
-            private MyRecordBuilder() {
-            }
+         * Adds a default constructor similar to:
+         *
+         * private MyRecordBuilder() { }
          */
-        var constructor = MethodSpec.constructorBuilder()
-                .addModifiers(Modifier.PRIVATE)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .build();
+        var constructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE)
+                .addAnnotation(generatedRecordBuilderAnnotation).build();
         builder.addMethod(constructor);
     }
 
     private void addStaticBuilder() {
         /*
-            Adds an static builder similar to:
-
-            public static MyRecord(int p1, T p2, ...) {
-                return new MyRecord(p1, p2, ...);
-            }
+         * Adds an static builder similar to:
+         *
+         * public static MyRecord(int p1, T p2, ...) { return new MyRecord(p1, p2, ...); }
          */
         CodeBlock codeBlock = buildCodeBlock();
         var builder = MethodSpec.methodBuilder(recordClassType.name())
                 .addJavadoc("Static constructor/builder. Can be used instead of new $L(...)\n", recordClassType.name())
-                .addTypeVariables(typeVariables)
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .returns(recordClassType.typeName())
-                .addCode(codeBlock);
+                .addTypeVariables(typeVariables).addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .addAnnotation(generatedRecordBuilderAnnotation).returns(recordClassType.typeName()).addCode(codeBlock);
         recordComponents.forEach(component -> {
             var parameterSpecBuilder = ParameterSpec.builder(component.typeName(), component.name());
             addConstructorAnnotations(component, parameterSpecBuilder);
@@ -392,29 +360,25 @@ class InternalRecordBuilderProcessor {
             var component = recordComponents.get(index);
             if (!collectionBuilderUtils.isImmutableCollection(component)) {
                 if (!component.typeName().isPrimitive() && isNullAnnotated(component)) {
-                    builder.addStatement("$T.requireNonNull($L, $S)", Objects.class, component.name(), component.name() + " is required");
+                    builder.addStatement("$T.requireNonNull($L, $S)", Objects.class, component.name(),
+                            component.name() + " is required");
                 }
             }
         }
     }
 
     private boolean isNullAnnotated(RecordClassType component) {
-        return component.getCanonicalConstructorAnnotations().stream()
-                .anyMatch(annotation -> notNullPattern.matcher(annotation.getAnnotationType().asElement().getSimpleName().toString()).matches());
+        return component.getCanonicalConstructorAnnotations().stream().anyMatch(annotation -> notNullPattern
+                .matcher(annotation.getAnnotationType().asElement().getSimpleName().toString()).matches());
     }
 
     private void addAllArgsConstructor() {
         /*
-            Adds an all-args constructor similar to:
-
-            private MyRecordBuilder(int p1, T p2, ...) {
-                this.p1 = p1;
-                this.p2 = p2;
-                ...
-            }
+         * Adds an all-args constructor similar to:
+         *
+         * private MyRecordBuilder(int p1, T p2, ...) { this.p1 = p1; this.p2 = p2; ... }
          */
-        var constructorBuilder = MethodSpec.constructorBuilder()
-                .addModifiers(Modifier.PRIVATE)
+        var constructorBuilder = MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE)
                 .addAnnotation(generatedRecordBuilderAnnotation);
         recordComponents.forEach(component -> {
             constructorBuilder.addParameter(component.typeName(), component.name());
@@ -425,12 +389,9 @@ class InternalRecordBuilderProcessor {
 
     private void addToStringMethod() {
         /*
-            add a toString() method similar to:
-
-            @Override
-            public String toString() {
-                return "MyRecord[p1=blah, p2=blah]";
-            }
+         * add a toString() method similar to:
+         *
+         * @Override public String toString() { return "MyRecord[p1=blah, p2=blah]"; }
          */
         var codeBuilder = CodeBlock.builder().add("return \"$L[", builderClassType.name());
         IntStream.range(0, recordComponents.size()).forEach(index -> {
@@ -442,24 +403,17 @@ class InternalRecordBuilderProcessor {
         });
         codeBuilder.add("]\"");
 
-        var methodSpec = MethodSpec.methodBuilder("toString")
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addAnnotation(Override.class)
-                .returns(String.class)
-                .addStatement(codeBuilder.build())
-                .build();
+        var methodSpec = MethodSpec.methodBuilder("toString").addModifiers(Modifier.PUBLIC)
+                .addAnnotation(generatedRecordBuilderAnnotation).addAnnotation(Override.class).returns(String.class)
+                .addStatement(codeBuilder.build()).build();
         builder.addMethod(methodSpec);
     }
 
     private void addHashCodeMethod() {
         /*
-            add a hashCode() method similar to:
-
-            @Override
-            public int hashCode() {
-                return Objects.hash(p1, p2);
-            }
+         * add a hashCode() method similar to:
+         *
+         * @Override public int hashCode() { return Objects.hash(p1, p2); }
          */
         var codeBuilder = CodeBlock.builder().add("return $T.hash(", Objects.class);
         IntStream.range(0, recordComponents.size()).forEach(index -> {
@@ -470,26 +424,18 @@ class InternalRecordBuilderProcessor {
         });
         codeBuilder.add(")");
 
-        var methodSpec = MethodSpec.methodBuilder("hashCode")
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addAnnotation(Override.class)
-                .returns(TypeName.INT)
-                .addStatement(codeBuilder.build())
-                .build();
+        var methodSpec = MethodSpec.methodBuilder("hashCode").addModifiers(Modifier.PUBLIC)
+                .addAnnotation(generatedRecordBuilderAnnotation).addAnnotation(Override.class).returns(TypeName.INT)
+                .addStatement(codeBuilder.build()).build();
         builder.addMethod(methodSpec);
     }
 
     private void addEqualsMethod() {
         /*
-            add an equals() method similar to:
-
-            @Override
-            public boolean equals(Object o) {
-                if (this == o) || ((o instanceof MyRecordBuilder b)
-                    && Objects.equals(p1, b.p1)
-                    && Objects.equals(p2, b.p2));
-            }
+         * add an equals() method similar to:
+         *
+         * @Override public boolean equals(Object o) { if (this == o) || ((o instanceof MyRecordBuilder b) &&
+         * Objects.equals(p1, b.p1) && Objects.equals(p2, b.p2)); }
          */
         var codeBuilder = CodeBlock.builder();
         codeBuilder.add("return (this == o) || (");
@@ -509,40 +455,30 @@ class InternalRecordBuilderProcessor {
         });
         codeBuilder.add(")");
 
-        var methodSpec = MethodSpec.methodBuilder("equals")
-                .addParameter(Object.class, "o")
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addAnnotation(Override.class)
-                .returns(TypeName.BOOLEAN)
-                .addStatement(codeBuilder.build())
-                .build();
+        var methodSpec = MethodSpec.methodBuilder("equals").addParameter(Object.class, "o")
+                .addModifiers(Modifier.PUBLIC).addAnnotation(generatedRecordBuilderAnnotation)
+                .addAnnotation(Override.class).returns(TypeName.BOOLEAN).addStatement(codeBuilder.build()).build();
         builder.addMethod(methodSpec);
     }
 
     private void addBuildMethod() {
         /*
-            Adds the build method that generates the record similar to:
-
-            public MyRecord build() {
-                return new MyRecord(p1, p2, ...);
-            }
+         * Adds the build method that generates the record similar to:
+         *
+         * public MyRecord build() { return new MyRecord(p1, p2, ...); }
          */
         CodeBlock codeBlock = buildCodeBlock();
         var methodSpec = MethodSpec.methodBuilder(metaData.buildMethodName())
                 .addJavadoc("Return a new record instance with all fields set to the current values in this builder\n")
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .returns(recordClassType.typeName())
-                .addCode(codeBlock)
-                .build();
+                .addModifiers(Modifier.PUBLIC).addAnnotation(generatedRecordBuilderAnnotation)
+                .returns(recordClassType.typeName()).addCode(codeBlock).build();
         builder.addMethod(methodSpec);
     }
 
     private CodeBlock buildCodeBlock() {
         /*
-            Builds the code block for allocating the record from its parts
-        */
+         * Builds the code block for allocating the record from its parts
+         */
 
         var codeBuilder = CodeBlock.builder();
 
@@ -575,60 +511,44 @@ class InternalRecordBuilderProcessor {
         return codeBuilder.build();
     }
 
-    private TypeName buildWithTypeName()
-    {
+    private TypeName buildWithTypeName() {
         ClassName rawTypeName = ClassName.get(packageName, builderClassType.name() + "." + metaData.withClassName());
         if (typeVariables.isEmpty()) {
             return rawTypeName;
         }
-        return ParameterizedTypeName.get(rawTypeName, typeVariables.toArray(new TypeName[]{}));
+        return ParameterizedTypeName.get(rawTypeName, typeVariables.toArray(new TypeName[] {}));
     }
 
     private void addFromWithClass() {
         /*
-            Adds static private class that implements/proxies the Wither
-
-            private static final class _FromWith implements MyRecordBuilder.With {
-                private final MyRecord from;
-
-                @Override
-                public String p1() {
-                    return from.p1();
-                }
-
-                @Override
-                public String p2() {
-                    return from.p2();
-                }
-            }
+         * Adds static private class that implements/proxies the Wither
+         *
+         * private static final class _FromWith implements MyRecordBuilder.With { private final MyRecord from;
+         *
+         * @Override public String p1() { return from.p1(); }
+         *
+         * @Override public String p2() { return from.p2(); } }
          */
 
         var fromWithClassBuilder = TypeSpec.classBuilder(metaData.fromWithClassName())
                 .addModifiers(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addTypeVariables(typeVariables)
+                .addAnnotation(generatedRecordBuilderAnnotation).addTypeVariables(typeVariables)
                 .addSuperinterface(buildWithTypeName());
         if (metaData.addClassRetainedGenerated()) {
             fromWithClassBuilder.addAnnotation(recordBuilderGeneratedAnnotation);
         }
 
         fromWithClassBuilder.addField(recordClassType.typeName(), "from", Modifier.PRIVATE, Modifier.FINAL);
-        MethodSpec constructorSpec = MethodSpec.constructorBuilder()
-                .addParameter(recordClassType.typeName(), "from")
-                .addStatement("this.from = from")
-                .addModifiers(Modifier.PRIVATE)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .build();
+        MethodSpec constructorSpec = MethodSpec.constructorBuilder().addParameter(recordClassType.typeName(), "from")
+                .addStatement("this.from = from").addModifiers(Modifier.PRIVATE)
+                .addAnnotation(generatedRecordBuilderAnnotation).build();
         fromWithClassBuilder.addMethod(constructorSpec);
 
         IntStream.range(0, recordComponents.size()).forEach(index -> {
             var component = recordComponents.get(index);
             MethodSpec methodSpec = MethodSpec.methodBuilder(prefixedName(component, true))
-                    .returns(component.typeName())
-                    .addAnnotation(Override.class)
-                    .addModifiers(Modifier.PUBLIC)
-                    .addStatement("return from.$L()", component.name())
-                    .addAnnotation(generatedRecordBuilderAnnotation)
+                    .returns(component.typeName()).addAnnotation(Override.class).addModifiers(Modifier.PUBLIC)
+                    .addStatement("return from.$L()", component.name()).addAnnotation(generatedRecordBuilderAnnotation)
                     .build();
             fromWithClassBuilder.addMethod(methodSpec);
         });
@@ -637,34 +557,29 @@ class InternalRecordBuilderProcessor {
 
     private void addStaticFromWithMethod() {
         /*
-            Adds static method that returns a "with"er view of an existing record.
-
-            public static With from(MyRecord from) {
-                return new _FromWith(from);
-            }
+         * Adds static method that returns a "with"er view of an existing record.
+         *
+         * public static With from(MyRecord from) { return new _FromWith(from); }
          */
 
         addFromWithClass();
 
         var methodSpec = MethodSpec.methodBuilder(metaData.fromMethodName())
                 .addJavadoc("Return a \"with\"er for an existing record instance\n")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addTypeVariables(typeVariables)
-                .addParameter(recordClassType.typeName(), metaData.fromMethodName())
-                .returns(buildWithTypeName())
-                .addStatement("return new $L$L(from)", metaData.fromWithClassName(), typeVariables.isEmpty() ? "" : "<>")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC).addAnnotation(generatedRecordBuilderAnnotation)
+                .addTypeVariables(typeVariables).addParameter(recordClassType.typeName(), metaData.fromMethodName())
+                .returns(buildWithTypeName()).addStatement("return new $L$L(from)", metaData.fromWithClassName(),
+                        typeVariables.isEmpty() ? "" : "<>")
                 .build();
         builder.addMethod(methodSpec);
     }
 
     private void addStaticCopyBuilderMethod() {
         /*
-            Adds a copy builder method that pre-fills the builder with existing values similar to:
-
-            public static MyRecordBuilder builder(MyRecord from) {
-                return new MyRecordBuilder(from.p1(), from.p2(), ...);
-            }
+         * Adds a copy builder method that pre-fills the builder with existing values similar to:
+         *
+         * public static MyRecordBuilder builder(MyRecord from) { return new MyRecordBuilder(from.p1(), from.p2(), ...);
+         * }
          */
         var codeBuilder = CodeBlock.builder().add("return new $T(", builderClassType.typeName());
         IntStream.range(0, recordComponents.size()).forEach(index -> {
@@ -676,44 +591,35 @@ class InternalRecordBuilderProcessor {
         codeBuilder.add(")");
 
         var methodSpec = MethodSpec.methodBuilder(metaData.copyMethodName())
-                .addJavadoc("Return a new builder with all fields set to the values taken from the given record instance\n")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addTypeVariables(typeVariables)
-                .addParameter(recordClassType.typeName(), "from")
-                .returns(builderClassType.typeName())
-                .addStatement(codeBuilder.build())
-                .build();
+                .addJavadoc(
+                        "Return a new builder with all fields set to the values taken from the given record instance\n")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC).addAnnotation(generatedRecordBuilderAnnotation)
+                .addTypeVariables(typeVariables).addParameter(recordClassType.typeName(), "from")
+                .returns(builderClassType.typeName()).addStatement(codeBuilder.build()).build();
         builder.addMethod(methodSpec);
     }
 
     private void addStaticDefaultBuilderMethod() {
         /*
-            Adds a the default builder method similar to:
-
-            public static MyRecordBuilder builder() {
-                return new MyRecordBuilder();
-            }
+         * Adds a the default builder method similar to:
+         *
+         * public static MyRecordBuilder builder() { return new MyRecordBuilder(); }
          */
         var methodSpec = MethodSpec.methodBuilder(metaData.builderMethodName())
                 .addJavadoc("Return a new builder with all fields set to default Java values\n")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addTypeVariables(typeVariables)
-                .returns(builderClassType.typeName())
-                .addStatement("return new $T()", builderClassType.typeName())
-                .build();
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC).addAnnotation(generatedRecordBuilderAnnotation)
+                .addTypeVariables(typeVariables).returns(builderClassType.typeName())
+                .addStatement("return new $T()", builderClassType.typeName()).build();
         builder.addMethod(methodSpec);
     }
 
     private void addStaticComponentsMethod() {
         /*
-            Adds a static method that converts a record instance into a stream of its component parts
-
-            public static Stream<Map.Entry<String, Object>> stream(MyRecord record) {
-                return Stream.of(new AbstractMap.SimpleImmutableEntry<>("p1", record.p1()),
-                         new AbstractMap.SimpleImmutableEntry<>("p2", record.p2()));
-            }
+         * Adds a static method that converts a record instance into a stream of its component parts
+         *
+         * public static Stream<Map.Entry<String, Object>> stream(MyRecord record) { return Stream.of(new
+         * AbstractMap.SimpleImmutableEntry<>("p1", record.p1()), new AbstractMap.SimpleImmutableEntry<>("p2",
+         * record.p2())); }
          */
         var codeBuilder = CodeBlock.builder().add("return $T.of(", Stream.class);
         IntStream.range(0, recordComponents.size()).forEach(index -> {
@@ -726,31 +632,25 @@ class InternalRecordBuilderProcessor {
         codeBuilder.add(")");
         var mapEntryTypeVariables = ParameterizedTypeName.get(Map.Entry.class, String.class, Object.class);
         var mapEntryType = ParameterizedTypeName.get(ClassName.get(Stream.class), mapEntryTypeVariables);
-        var methodSpec = MethodSpec.methodBuilder(metaData.componentsMethodName())
-                .addJavadoc("Return a stream of the record components as map entries keyed with the component name and the value as the component value\n")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addParameter(recordClassType.typeName(), "record")
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addTypeVariables(typeVariables)
-                .returns(mapEntryType)
-                .addStatement(codeBuilder.build())
-                .build();
+        var methodSpec = MethodSpec.methodBuilder(metaData.componentsMethodName()).addJavadoc(
+                "Return a stream of the record components as map entries keyed with the component name and the value as the component value\n")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC).addParameter(recordClassType.typeName(), "record")
+                .addAnnotation(generatedRecordBuilderAnnotation).addTypeVariables(typeVariables).returns(mapEntryType)
+                .addStatement(codeBuilder.build()).build();
         builder.addMethod(methodSpec);
     }
 
     private void add1Field(ClassType component) {
         /*
-            For a single record component, add a field similar to:
-
-            private T p;
+         * For a single record component, add a field similar to:
+         *
+         * private T p;
          */
         var fieldSpecBuilder = FieldSpec.builder(component.typeName(), component.name(), Modifier.PRIVATE);
         if (metaData.emptyDefaultForOptional()) {
             Optional<OptionalType> thisOptionalType = OptionalType.fromClassType(component);
             if (thisOptionalType.isPresent()) {
-                var codeBlock = CodeBlock.builder()
-                        .add("$T.empty()", thisOptionalType.get().typeName())
-                        .build();
+                var codeBlock = CodeBlock.builder().add("$T.empty()", thisOptionalType.get().typeName()).build();
                 fieldSpecBuilder.initializer(codeBlock);
             }
         }
@@ -759,14 +659,14 @@ class InternalRecordBuilderProcessor {
 
     private void addNestedGetterMethod(TypeSpec.Builder classBuilder, RecordClassType component, String methodName) {
         /*
-            For a single record component, add a getter similar to:
-
-            T p();
+         * For a single record component, add a getter similar to:
+         *
+         * T p();
          */
         var methodSpecBuilder = MethodSpec.methodBuilder(methodName)
-                .addJavadoc("Return the current value for the {@code $L} record component in the builder\n", component.name())
-                .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
+                .addJavadoc("Return the current value for the {@code $L} record component in the builder\n",
+                        component.name())
+                .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).addAnnotation(generatedRecordBuilderAnnotation)
                 .returns(component.typeName());
         addAccessorAnnotations(component, methodSpecBuilder, this::filterOutValid);
         classBuilder.addMethod(methodSpecBuilder.build());
@@ -782,22 +682,16 @@ class InternalRecordBuilderProcessor {
 
     private void addConstructorAnnotations(RecordClassType component, ParameterSpec.Builder parameterSpecBuilder) {
         if (metaData.inheritComponentAnnotations()) {
-            component.getCanonicalConstructorAnnotations()
-                    .stream()
-                    .map(AnnotationSpec::get)
-                    .filter(this::filterOutOverride)
-                    .forEach(parameterSpecBuilder::addAnnotation);
+            component.getCanonicalConstructorAnnotations().stream().map(AnnotationSpec::get)
+                    .filter(this::filterOutOverride).forEach(parameterSpecBuilder::addAnnotation);
         }
     }
 
-    private void addAccessorAnnotations(RecordClassType component, MethodSpec.Builder methodSpecBuilder, Predicate<AnnotationSpec> additionalFilter) {
+    private void addAccessorAnnotations(RecordClassType component, MethodSpec.Builder methodSpecBuilder,
+            Predicate<AnnotationSpec> additionalFilter) {
         if (metaData.inheritComponentAnnotations()) {
-            component.getAccessorAnnotations()
-                    .stream()
-                    .map(AnnotationSpec::get)
-                    .filter(this::filterOutOverride)
-                    .filter(additionalFilter)
-                    .forEach(methodSpecBuilder::addAnnotation);
+            component.getAccessorAnnotations().stream().map(AnnotationSpec::get).filter(this::filterOutOverride)
+                    .filter(additionalFilter).forEach(methodSpecBuilder::addAnnotation);
         }
     }
 
@@ -815,41 +709,30 @@ class InternalRecordBuilderProcessor {
 
     private void add1MapBuilder(CollectionBuilderUtils.SingleItemsMetaData meta, RecordClassType component) {
         /*
-            For a single map record component, add a methods similar to:
-
-            public T addP(K key, V value) {
-                this.p = __ensureMapMutable(p);
-                this.p.put(key, value);
-                return this;
-            }
-
-            public T addP(Stream<? extends Map.Entry<K, V> i) {
-                this.p = __ensureMapMutable(p);
-                i.forEach(this.p::put);
-                return this;
-            }
-
-            public T addP(Iterable<? extends Map.Entry<K, V> i) {
-                this.p = __ensureMapMutable(p);
-                i.forEach(this.p::put);
-                return this;
-            }
+         * For a single map record component, add a methods similar to:
+         *
+         * public T addP(K key, V value) { this.p = __ensureMapMutable(p); this.p.put(key, value); return this; }
+         *
+         * public T addP(Stream<? extends Map.Entry<K, V> i) { this.p = __ensureMapMutable(p); i.forEach(this.p::put);
+         * return this; }
+         *
+         * public T addP(Iterable<? extends Map.Entry<K, V> i) { this.p = __ensureMapMutable(p); i.forEach(this.p::put);
+         * return this; }
          */
         for (var i = 0; i < 3; ++i) {
             var codeBlockBuilder = CodeBlock.builder();
             if (collectionBuilderUtils.isImmutableCollection(component)) {
-                codeBlockBuilder
-                        .addStatement("this.$L = $L($L)", component.name(), collectionBuilderUtils.mutableMakerName(component), component.name());
+                codeBlockBuilder.addStatement("this.$L = $L($L)", component.name(),
+                        collectionBuilderUtils.mutableMakerName(component), component.name());
             } else {
-                codeBlockBuilder
-                        .beginControlFlow("if (this.$L == null)", component.name())
+                codeBlockBuilder.beginControlFlow("if (this.$L == null)", component.name())
                         .addStatement("this.$L = new $T<>()", component.name(), meta.singleItemCollectionClass())
                         .endControlFlow();
             }
-            var methodSpecBuilder = MethodSpec.methodBuilder(metaData.singleItemBuilderPrefix() + capitalize(component.name()))
+            var methodSpecBuilder = MethodSpec
+                    .methodBuilder(metaData.singleItemBuilderPrefix() + capitalize(component.name()))
                     .addJavadoc("Add to the internally allocated {@code HashMap} for {@code $L}\n", component.name())
-                    .addModifiers(Modifier.PUBLIC)
-                    .addAnnotation(generatedRecordBuilderAnnotation)
+                    .addModifiers(Modifier.PUBLIC).addAnnotation(generatedRecordBuilderAnnotation)
                     .returns(builderClassType.typeName());
             if (i == 0) {
                 methodSpecBuilder.addParameter(meta.typeArguments().get(0), "key");
@@ -857,10 +740,14 @@ class InternalRecordBuilderProcessor {
                 codeBlockBuilder.addStatement("this.$L.put(key, value)", component.name());
             } else {
                 var parameterClass = ClassName.get((i == 1) ? Stream.class : Iterable.class);
-                var entryType = ParameterizedTypeName.get(ClassName.get(Map.Entry.class), WildcardTypeName.subtypeOf(meta.typeArguments().get(0)), WildcardTypeName.subtypeOf(meta.typeArguments().get(1)));
-                ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(parameterClass, WildcardTypeName.subtypeOf(entryType));
+                var entryType = ParameterizedTypeName.get(ClassName.get(Map.Entry.class),
+                        WildcardTypeName.subtypeOf(meta.typeArguments().get(0)),
+                        WildcardTypeName.subtypeOf(meta.typeArguments().get(1)));
+                ParameterizedTypeName parameterizedTypeName = ParameterizedTypeName.get(parameterClass,
+                        WildcardTypeName.subtypeOf(entryType));
                 methodSpecBuilder.addParameter(parameterizedTypeName, "i");
-                codeBlockBuilder.addStatement("i.forEach(entry -> this.$L.put(entry.getKey(), entry.getValue()))", component.name());
+                codeBlockBuilder.addStatement("i.forEach(entry -> this.$L.put(entry.getKey(), entry.getValue()))",
+                        component.name());
             }
             codeBlockBuilder.addStatement("return this");
             methodSpecBuilder.addCode(codeBlockBuilder.build());
@@ -870,25 +757,15 @@ class InternalRecordBuilderProcessor {
 
     private void add1ListBuilder(CollectionBuilderUtils.SingleItemsMetaData meta, RecordClassType component) {
         /*
-            For a single list or set record component, add methods similar to:
-
-            public T addP(I i) {
-                this.list = __ensureListMutable(list);
-                this.p.add(i);
-                return this;
-            }
-
-            public T addP(Stream<? extends I> i) {
-                this.list = __ensureListMutable(list);
-                this.p.addAll(i);
-                return this;
-            }
-
-            public T addP(Iterable<? extends I> i) {
-                this.list = __ensureListMutable(list);
-                this.p.addAll(i);
-                return this;
-            }
+         * For a single list or set record component, add methods similar to:
+         *
+         * public T addP(I i) { this.list = __ensureListMutable(list); this.p.add(i); return this; }
+         *
+         * public T addP(Stream<? extends I> i) { this.list = __ensureListMutable(list); this.p.addAll(i); return this;
+         * }
+         *
+         * public T addP(Iterable<? extends I> i) { this.list = __ensureListMutable(list); this.p.addAll(i); return
+         * this; }
          */
         for (var i = 0; i < 3; ++i) {
             var addClockBlock = CodeBlock.builder();
@@ -899,27 +776,25 @@ class InternalRecordBuilderProcessor {
             } else {
                 addClockBlock.addStatement("i.forEach(this.$L::add)", component.name());
                 var parameterClass = ClassName.get((i == 1) ? Stream.class : Iterable.class);
-                parameter = ParameterizedTypeName.get(parameterClass, WildcardTypeName.subtypeOf(meta.typeArguments().get(0)));
+                parameter = ParameterizedTypeName.get(parameterClass,
+                        WildcardTypeName.subtypeOf(meta.typeArguments().get(0)));
             }
             var codeBlockBuilder = CodeBlock.builder();
             if (collectionBuilderUtils.isImmutableCollection(component)) {
-                codeBlockBuilder
-                        .addStatement("this.$L = $L($L)", component.name(), collectionBuilderUtils.mutableMakerName(component), component.name());
+                codeBlockBuilder.addStatement("this.$L = $L($L)", component.name(),
+                        collectionBuilderUtils.mutableMakerName(component), component.name());
             } else {
-                codeBlockBuilder
-                        .beginControlFlow("if (this.$L == null)", component.name())
+                codeBlockBuilder.beginControlFlow("if (this.$L == null)", component.name())
                         .addStatement("this.$L = new $T<>()", component.name(), meta.singleItemCollectionClass())
                         .endControlFlow();
             }
-            codeBlockBuilder
-                    .add(addClockBlock.build())
-                    .addStatement("return this");
-            var methodSpecBuilder = MethodSpec.methodBuilder(metaData.singleItemBuilderPrefix() + capitalize(component.name()))
-                    .addJavadoc("Add to the internally allocated {@code $L} for {@code $L}\n", meta.singleItemCollectionClass().getSimpleName(), component.name())
-                    .addModifiers(Modifier.PUBLIC)
-                    .addAnnotation(generatedRecordBuilderAnnotation)
-                    .returns(builderClassType.typeName())
-                    .addParameter(parameter, "i")
+            codeBlockBuilder.add(addClockBlock.build()).addStatement("return this");
+            var methodSpecBuilder = MethodSpec
+                    .methodBuilder(metaData.singleItemBuilderPrefix() + capitalize(component.name()))
+                    .addJavadoc("Add to the internally allocated {@code $L} for {@code $L}\n",
+                            meta.singleItemCollectionClass().getSimpleName(), component.name())
+                    .addModifiers(Modifier.PUBLIC).addAnnotation(generatedRecordBuilderAnnotation)
+                    .returns(builderClassType.typeName()).addParameter(parameter, "i")
                     .addCode(codeBlockBuilder.build());
             builder.addMethod(methodSpecBuilder.build());
         }
@@ -927,18 +802,15 @@ class InternalRecordBuilderProcessor {
 
     private void add1GetterMethod(RecordClassType component) {
         /*
-            For a single record component, add a getter similar to:
-
-            public T p() {
-                return p;
-            }
+         * For a single record component, add a getter similar to:
+         *
+         * public T p() { return p; }
          */
         var methodSpecBuilder = MethodSpec.methodBuilder(prefixedName(component, true))
-                .addJavadoc("Return the current value for the {@code $L} record component in the builder\n", component.name())
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .returns(component.typeName())
-                .addCode(checkReturnShim(component));
+                .addJavadoc("Return the current value for the {@code $L} record component in the builder\n",
+                        component.name())
+                .addModifiers(Modifier.PUBLIC).addAnnotation(generatedRecordBuilderAnnotation)
+                .returns(component.typeName()).addCode(checkReturnShim(component));
         addAccessorAnnotations(component, methodSpecBuilder, __ -> true);
         builder.addMethod(methodSpecBuilder.build());
     }
@@ -957,28 +829,25 @@ class InternalRecordBuilderProcessor {
 
     private void add1SetterMethod(RecordClassType component) {
         /*
-            For a single record component, add a setter similar to:
-
-            public MyRecordBuilder p(T p) {
-                this.p = p;
-                return this;
-            }
+         * For a single record component, add a setter similar to:
+         *
+         * public MyRecordBuilder p(T p) { this.p = p; return this; }
          */
-        var methodSpec = MethodSpec.methodBuilder(prefixedName(component, false))
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .returns(builderClassType.typeName());
+        var methodSpec = MethodSpec.methodBuilder(prefixedName(component, false)).addModifiers(Modifier.PUBLIC)
+                .addAnnotation(generatedRecordBuilderAnnotation).returns(builderClassType.typeName());
 
         var collectionMetaData = collectionBuilderUtils.singleItemsMetaData(component, STANDARD_FOR_SETTER);
         var parameterSpecBuilder = collectionMetaData.map(meta -> {
             CodeBlock.Builder codeSpec = CodeBlock.builder();
-            codeSpec.addStatement("this.$L = $L($L)", component.name(), collectionBuilderUtils.shimName(component), component.name());
-            methodSpec.addJavadoc("Re-create the internally allocated {@code $T} for {@code $L} by copying the argument\n", component.typeName(), component.name())
-                    .addCode(codeSpec.build());
+            codeSpec.addStatement("this.$L = $L($L)", component.name(), collectionBuilderUtils.shimName(component),
+                    component.name());
+            methodSpec.addJavadoc(
+                    "Re-create the internally allocated {@code $T} for {@code $L} by copying the argument\n",
+                    component.typeName(), component.name()).addCode(codeSpec.build());
             return ParameterSpec.builder(meta.wildType(), component.name());
         }).orElseGet(() -> {
-            methodSpec.addJavadoc("Set a new value for the {@code $L} record component in the builder\n", component.name())
-                    .addStatement("this.$L = $L", component.name(), component.name());
+            methodSpec.addJavadoc("Set a new value for the {@code $L} record component in the builder\n",
+                    component.name()).addStatement("this.$L = $L", component.name(), component.name());
             return ParameterSpec.builder(component.typeName(), component.name());
         });
         addConstructorAnnotations(component, parameterSpecBuilder);
@@ -987,23 +856,18 @@ class InternalRecordBuilderProcessor {
     }
 
     private void add1ConcreteOptionalSetterMethod(RecordClassType component) {
-         /*
-            For a single optional record component, add a concrete setter similar to:
-
-            public MyRecordBuilder p(T p) {
-                this.p = p;
-                return this;
-            }
+        /*
+         * For a single optional record component, add a concrete setter similar to:
+         *
+         * public MyRecordBuilder p(T p) { this.p = p; return this; }
          */
         var optionalType = OptionalType.fromClassType(component);
         if (optionalType.isEmpty()) {
             return;
         }
         var type = optionalType.get();
-        var methodSpec = MethodSpec.methodBuilder(prefixedName(component, false))
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .returns(builderClassType.typeName());
+        var methodSpec = MethodSpec.methodBuilder(prefixedName(component, false)).addModifiers(Modifier.PUBLIC)
+                .addAnnotation(generatedRecordBuilderAnnotation).returns(builderClassType.typeName());
 
         var parameterSpecBuilder = ParameterSpec.builder(type.valueType(), component.name());
         methodSpec.addJavadoc("Set a new value for the {@code $L} record component in the builder\n", component.name())
@@ -1015,7 +879,7 @@ class InternalRecordBuilderProcessor {
 
     private String getOptionalStatement(OptionalType type) {
 
-        if(type.isOptional()) {
+        if (type.isOptional()) {
             return "this.$L = $T.ofNullable($L)";
         }
 
@@ -1031,18 +895,15 @@ class InternalRecordBuilderProcessor {
 
     private MethodSpec buildFunctionalHandler(String className, String methodName, boolean isMap) {
         /*
-            Build a Functional handler ala:
-
-            default <R> R map(Function<R, T> proc) {
-                return proc.apply(p());
-            }
-        */
+         * Build a Functional handler ala:
+         *
+         * default <R> R map(Function<R, T> proc) { return proc.apply(p()); }
+         */
         var localTypeVariables = isMap ? typeVariablesWithReturn() : typeVariables;
-        var typeName = localTypeVariables.isEmpty() ? ClassName.get("", className) : ParameterizedTypeName.get(ClassName.get("", className), localTypeVariables.toArray(TypeName[]::new));
-        var methodBuilder = MethodSpec.methodBuilder(methodName)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
-                .addParameter(typeName, "proc");
+        var typeName = localTypeVariables.isEmpty() ? ClassName.get("", className)
+                : ParameterizedTypeName.get(ClassName.get("", className), localTypeVariables.toArray(TypeName[]::new));
+        var methodBuilder = MethodSpec.methodBuilder(methodName).addAnnotation(generatedRecordBuilderAnnotation)
+                .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT).addParameter(typeName, "proc");
         var codeBlockBuilder = CodeBlock.builder();
         if (isMap) {
             methodBuilder.addJavadoc("Map record components into a new object");
@@ -1061,13 +922,10 @@ class InternalRecordBuilderProcessor {
 
     private TypeSpec buildFunctionalInterface(String className, boolean isMap) {
         /*
-            Build a Functional interface ala:
-
-            @FunctionalInterface
-            interface Function<R, T> {
-                R apply(T a);
-            }
-        */
+         * Build a Functional interface ala:
+         *
+         * @FunctionalInterface interface Function<R, T> { R apply(T a); }
+         */
         var localTypeVariables = isMap ? typeVariablesWithReturn() : typeVariables;
         var methodBuilder = MethodSpec.methodBuilder("apply").addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT);
         recordComponents.forEach(component -> {
@@ -1078,18 +936,14 @@ class InternalRecordBuilderProcessor {
         if (isMap) {
             methodBuilder.returns(rType);
         }
-        return TypeSpec.interfaceBuilder(className)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addAnnotation(FunctionalInterface.class)
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addTypeVariables(localTypeVariables)
-                .addMethod(methodBuilder.build())
-                .build();
+        return TypeSpec.interfaceBuilder(className).addAnnotation(generatedRecordBuilderAnnotation)
+                .addAnnotation(FunctionalInterface.class).addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .addTypeVariables(localTypeVariables).addMethod(methodBuilder.build()).build();
     }
 
     private String prefixedName(RecordClassType component, boolean isGetter) {
-        BiFunction<String, String, String> prefixer = (p, s) -> p.isEmpty()
-                ? s : p + Character.toUpperCase(s.charAt(0)) + s.substring(1);
+        BiFunction<String, String, String> prefixer = (p, s) -> p.isEmpty() ? s
+                : p + Character.toUpperCase(s.charAt(0)) + s.substring(1);
         boolean isBool = component.typeName().toString().toLowerCase(Locale.ROOT).equals("boolean");
         if (isGetter) {
             if (isBool) {
@@ -1100,4 +954,3 @@ class InternalRecordBuilderProcessor {
         return prefixer.apply(metaData.setterPrefix(), component.name());
     }
 }
-
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordInterfaceProcessor.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordInterfaceProcessor.java
index 8f30f5f..b050c5c 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordInterfaceProcessor.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordInterfaceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,30 +51,33 @@ class InternalRecordInterfaceProcessor {
     private record Component(ExecutableElement element, Optional<String> alternateName) {
     }
 
-    InternalRecordInterfaceProcessor(ProcessingEnvironment processingEnv, TypeElement iface, boolean addRecordBuilder, RecordBuilder.Options metaData, Optional<String> packageNameOpt, boolean fromTemplate) {
+    InternalRecordInterfaceProcessor(ProcessingEnvironment processingEnv, TypeElement iface, boolean addRecordBuilder,
+            RecordBuilder.Options metaData, Optional<String> packageNameOpt, boolean fromTemplate) {
         this.processingEnv = processingEnv;
         packageName = packageNameOpt.orElseGet(() -> ElementUtils.getPackageName(iface));
         recordComponents = getRecordComponents(iface);
         this.iface = iface;
 
         ClassType ifaceClassType = ElementUtils.getClassType(iface, iface.getTypeParameters());
-        recordClassType = ElementUtils.getClassType(packageName, getBuilderName(iface, metaData, ifaceClassType, metaData.interfaceSuffix()), iface.getTypeParameters());
-        List<TypeVariableName> typeVariables = iface.getTypeParameters().stream().map(TypeVariableName::get).collect(Collectors.toList());
+        recordClassType = ElementUtils.getClassType(packageName,
+                getBuilderName(iface, metaData, ifaceClassType, metaData.interfaceSuffix()), iface.getTypeParameters());
+        List<TypeVariableName> typeVariables = iface.getTypeParameters().stream().map(TypeVariableName::get)
+                .collect(Collectors.toList());
 
         MethodSpec methodSpec = generateArgumentList();
 
-        TypeSpec.Builder builder = TypeSpec.classBuilder(recordClassType.name())
-                .addSuperinterface(iface.asType())
-                .addMethod(methodSpec)
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(generatedRecordInterfaceAnnotation)
+        TypeSpec.Builder builder = TypeSpec.classBuilder(recordClassType.name()).addSuperinterface(iface.asType())
+                .addMethod(methodSpec).addModifiers(Modifier.PUBLIC).addAnnotation(generatedRecordInterfaceAnnotation)
                 .addTypeVariables(typeVariables);
         if (metaData.addClassRetainedGenerated()) {
             builder.addAnnotation(recordBuilderGeneratedAnnotation);
         }
 
         if (addRecordBuilder) {
-            ClassType builderClassType = ElementUtils.getClassType(packageName, getBuilderName(iface, metaData, recordClassType, metaData.suffix()) + "." + metaData.withClassName(), iface.getTypeParameters());
+            ClassType builderClassType = ElementUtils.getClassType(packageName,
+                    getBuilderName(iface, metaData, recordClassType, metaData.suffix()) + "."
+                            + metaData.withClassName(),
+                    iface.getTypeParameters());
             builder.addAnnotation(RecordBuilder.class);
             builder.addSuperinterface(builderClassType.typeName());
             if (fromTemplate) {
@@ -112,30 +115,29 @@ class InternalRecordInterfaceProcessor {
         // javapoet does yet support records - so a class was created and we can reshape it
         // The class will look something like this:
         /*
-            // Auto generated by io.soabase.recordbuilder.core.RecordBuilder: https://github.com/Randgalt/record-builder
-            package io.soabase.recordbuilder.test;
-
-            import io.soabase.recordbuilder.core.RecordBuilder;
-            import javax.annotation.processing.Generated;
-
-            @Generated("io.soabase.recordbuilder.core.RecordInterface")
-            @RecordBuilder
-            public class MyRecord implements MyInterface {
-                void __FAKE__(String name, int age) {
-                }
-            }
-        */
-        Pattern pattern = Pattern.compile("(.*)(implements.*)(\\{)(.*" + FAKE_METHOD_NAME + ")(\\(.*\\))(.*)", Pattern.MULTILINE | Pattern.DOTALL);
+         * // Auto generated by io.soabase.recordbuilder.core.RecordBuilder: https://github.com/Randgalt/record-builder
+         * package io.soabase.recordbuilder.test;
+         *
+         * import io.soabase.recordbuilder.core.RecordBuilder; import javax.annotation.processing.Generated;
+         *
+         * @Generated("io.soabase.recordbuilder.core.RecordInterface")
+         *
+         * @RecordBuilder public class MyRecord implements MyInterface { void __FAKE__(String name, int age) { } }
+         */
+        Pattern pattern = Pattern.compile("(.*)(implements.*)(\\{)(.*" + FAKE_METHOD_NAME + ")(\\(.*\\))(.*)",
+                Pattern.MULTILINE | Pattern.DOTALL);
         Matcher matcher = pattern.matcher(classSource);
         if (!matcher.find() || matcher.groupCount() != 6) {
-            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Internal error generating record. Group count: " + matcher.groupCount(), iface);
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+                    "Internal error generating record. Group count: " + matcher.groupCount(), iface);
         }
 
         String declaration = matcher.group(1).trim().replace("class", "record");
         String implementsSection = matcher.group(2).trim();
         String argumentList = matcher.group(5).trim();
 
-        StringBuilder fixedRecord = new StringBuilder(declaration).append(argumentList).append(' ').append(implementsSection).append(" {");
+        StringBuilder fixedRecord = new StringBuilder(declaration).append(argumentList).append(' ')
+                .append(implementsSection).append(" {");
         alternateMethods.forEach(method -> fixedRecord.append('\n').append(method));
         fixedRecord.append('}');
         return fixedRecord.toString();
@@ -145,27 +147,23 @@ class InternalRecordInterfaceProcessor {
         MethodSpec.Builder builder = MethodSpec.methodBuilder(FAKE_METHOD_NAME);
         recordComponents.forEach(component -> {
             String name = component.alternateName.orElseGet(() -> component.element.getSimpleName().toString());
-            ParameterSpec parameterSpec = ParameterSpec.builder(ClassName.get(component.element.getReturnType()), name).build();
-            builder.addTypeVariables(component.element.getTypeParameters().stream().map(TypeVariableName::get).collect(Collectors.toList()));
+            ParameterSpec parameterSpec = ParameterSpec.builder(ClassName.get(component.element.getReturnType()), name)
+                    .build();
+            builder.addTypeVariables(component.element.getTypeParameters().stream().map(TypeVariableName::get)
+                    .collect(Collectors.toList()));
             builder.addParameter(parameterSpec);
         });
         return builder.build();
     }
 
     private List<String> buildAlternateMethods(List<Component> recordComponents) {
-        return recordComponents.stream()
-                .filter(component -> component.alternateName.isPresent())
-                .map(component -> {
-                    var method = MethodSpec.methodBuilder(component.element.getSimpleName().toString())
-                            .addAnnotation(Override.class)
-                            .addAnnotation(generatedRecordInterfaceAnnotation)
-                            .returns(ClassName.get(component.element.getReturnType()))
-                            .addModifiers(Modifier.PUBLIC)
-                            .addCode("return $L();", component.alternateName.get())
-                            .build();
-                    return method.toString();
-                })
-                .collect(Collectors.toList());
+        return recordComponents.stream().filter(component -> component.alternateName.isPresent()).map(component -> {
+            var method = MethodSpec.methodBuilder(component.element.getSimpleName().toString())
+                    .addAnnotation(Override.class).addAnnotation(generatedRecordInterfaceAnnotation)
+                    .returns(ClassName.get(component.element.getReturnType())).addModifiers(Modifier.PUBLIC)
+                    .addCode("return $L();", component.alternateName.get()).build();
+            return method.toString();
+        }).collect(Collectors.toList());
     }
 
     private List<Component> getRecordComponents(TypeElement iface) {
@@ -173,7 +171,8 @@ class InternalRecordInterfaceProcessor {
         try {
             getRecordComponents(iface, components, new HashSet<>(), new HashSet<>());
             if (components.isEmpty()) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Annotated interface has no component methods", iface);
+                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+                        "Annotated interface has no component methods", iface);
             }
         } catch (IllegalInterface e) {
             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, e.getMessage(), iface);
@@ -189,29 +188,32 @@ class InternalRecordInterfaceProcessor {
 
     }
 
-    private void getRecordComponents(TypeElement iface, Collection<Component> components, Set<String> visitedSet, Set<String> usedNames) {
+    private void getRecordComponents(TypeElement iface, Collection<Component> components, Set<String> visitedSet,
+            Set<String> usedNames) {
         if (!visitedSet.add(iface.getQualifiedName().toString())) {
             return;
         }
 
         iface.getEnclosedElements().stream()
-                .filter(element -> (element.getKind() == ElementKind.METHOD) && !(element.getModifiers().contains(Modifier.STATIC)))
-                .map(element -> ((ExecutableElement) element))
-                .filter(element -> {
+                .filter(element -> (element.getKind() == ElementKind.METHOD)
+                        && !(element.getModifiers().contains(Modifier.STATIC)))
+                .map(element -> ((ExecutableElement) element)).filter(element -> {
                     if (element.isDefault()) {
                         return element.getAnnotation(IgnoreDefaultMethod.class) == null;
                     }
                     return true;
-                })
-                .peek(element -> {
+                }).peek(element -> {
                     if (!element.getParameters().isEmpty() || element.getReturnType().getKind() == TypeKind.VOID) {
-                        throw new IllegalInterface(String.format("Non-static, non-default methods must take no arguments and must return a value. Bad method: %s.%s()", iface.getSimpleName(), element.getSimpleName()));
+                        throw new IllegalInterface(String.format(
+                                "Non-static, non-default methods must take no arguments and must return a value. Bad method: %s.%s()",
+                                iface.getSimpleName(), element.getSimpleName()));
                     }
                     if (!element.getTypeParameters().isEmpty()) {
-                        throw new IllegalInterface(String.format("Interface methods cannot have type parameters. Bad method: %s.%s()", iface.getSimpleName(), element.getSimpleName()));
+                        throw new IllegalInterface(
+                                String.format("Interface methods cannot have type parameters. Bad method: %s.%s()",
+                                        iface.getSimpleName(), element.getSimpleName()));
                     }
-                })
-                .filter(element -> usedNames.add(element.getSimpleName().toString()))
+                }).filter(element -> usedNames.add(element.getSimpleName().toString()))
                 .map(element -> new Component(element, stripBeanPrefix(element.getSimpleName().toString())))
                 .collect(Collectors.toCollection(() -> components));
         iface.getInterfaces().forEach(parentIface -> {
@@ -221,10 +223,8 @@ class InternalRecordInterfaceProcessor {
     }
 
     private Optional<String> stripBeanPrefix(String name) {
-        return javaBeanPrefixes.stream()
-                .filter(prefix -> name.startsWith(prefix) && (name.length() > prefix.length()))
-                .findFirst()
-                .map(prefix -> {
+        return javaBeanPrefixes.stream().filter(prefix -> name.startsWith(prefix) && (name.length() > prefix.length()))
+                .findFirst().map(prefix -> {
                     var stripped = name.substring(prefix.length());
                     return Character.toLowerCase(stripped.charAt(0)) + stripped.substring(1);
                 });
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/OptionalType.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/OptionalType.java
index 59647e2..3c0f6d4 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/OptionalType.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/OptionalType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,8 +43,7 @@ public record OptionalType(TypeName typeName, TypeName valueType) {
             if (!(component.typeName() instanceof ParameterizedTypeName parameterizedType)) {
                 return Optional.of(new OptionalType(optionalType, TypeName.get(Object.class)));
             }
-            final TypeName containingType = parameterizedType.typeArguments.isEmpty()
-                    ? TypeName.get(Object.class)
+            final TypeName containingType = parameterizedType.typeArguments.isEmpty() ? TypeName.get(Object.class)
                     : parameterizedType.typeArguments.get(0);
             return Optional.of(new OptionalType(optionalType, containingType));
         }
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderOptions.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderOptions.java
index 3e0b156..f81de86 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderOptions.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,35 +25,36 @@ class RecordBuilderOptions {
     private static final Map<String, Object> defaultValues = buildDefaultValues();
 
     static RecordBuilder.Options build(Map<String, String> options) {
-        return (RecordBuilder.Options)Proxy.newProxyInstance(RecordBuilderOptions.class.getClassLoader(), new Class[]{RecordBuilder.Options.class}, (proxy, method, args) -> {
-            var name = method.getName();
-            var defaultValue = defaultValues.get(name);
-            var option = options.get(name);
-            if (option != null) {
-                if (defaultValue instanceof String) {
-                    return option;
-                }
-                if (defaultValue instanceof Boolean) {
-                    return Boolean.parseBoolean(option);
-                }
-                if (defaultValue instanceof Integer) {
-                    return Integer.parseInt(option);
-                }
-                if (defaultValue instanceof Long) {
-                    return Long.parseLong(option);
-                }
-                if (defaultValue instanceof Double) {
-                    return Double.parseDouble(option);
-                }
-                throw new IllegalArgumentException("Unhandled option type: " + defaultValue.getClass());
-            }
-            return defaultValue;
-        });
+        return (RecordBuilder.Options) Proxy.newProxyInstance(RecordBuilderOptions.class.getClassLoader(),
+                new Class[] { RecordBuilder.Options.class }, (proxy, method, args) -> {
+                    var name = method.getName();
+                    var defaultValue = defaultValues.get(name);
+                    var option = options.get(name);
+                    if (option != null) {
+                        if (defaultValue instanceof String) {
+                            return option;
+                        }
+                        if (defaultValue instanceof Boolean) {
+                            return Boolean.parseBoolean(option);
+                        }
+                        if (defaultValue instanceof Integer) {
+                            return Integer.parseInt(option);
+                        }
+                        if (defaultValue instanceof Long) {
+                            return Long.parseLong(option);
+                        }
+                        if (defaultValue instanceof Double) {
+                            return Double.parseDouble(option);
+                        }
+                        throw new IllegalArgumentException("Unhandled option type: " + defaultValue.getClass());
+                    }
+                    return defaultValue;
+                });
     }
 
     private static Map<String, Object> buildDefaultValues() {
         var workMap = new HashMap<String, Object>();
-        for ( Method method : RecordBuilder.Options.class.getDeclaredMethods()) {
+        for (Method method : RecordBuilder.Options.class.getDeclaredMethods()) {
             workMap.put(method.getName(), method.getDefaultValue());
         }
         workMap.put("toString", "Generated RecordBuilder.Options");
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderProcessor.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderProcessor.java
index 4d50aea..322867c 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderProcessor.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,20 +38,23 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 
-public class RecordBuilderProcessor
-        extends AbstractProcessor {
+public class RecordBuilderProcessor extends AbstractProcessor {
     private static final String RECORD_BUILDER = RecordBuilder.class.getName();
     private static final String RECORD_BUILDER_INCLUDE = RecordBuilder.Include.class.getName().replace('$', '.');
     private static final String RECORD_INTERFACE = RecordInterface.class.getName();
     private static final String RECORD_INTERFACE_INCLUDE = RecordInterface.Include.class.getName().replace('$', '.');
 
-    static final AnnotationSpec generatedRecordBuilderAnnotation = AnnotationSpec.builder(Generated.class).addMember("value", "$S", RecordBuilder.class.getName()).build();
-    static final AnnotationSpec generatedRecordInterfaceAnnotation = AnnotationSpec.builder(Generated.class).addMember("value", "$S", RecordInterface.class.getName()).build();
-    static final AnnotationSpec recordBuilderGeneratedAnnotation = AnnotationSpec.builder(RecordBuilderGenerated.class).build();
+    static final AnnotationSpec generatedRecordBuilderAnnotation = AnnotationSpec.builder(Generated.class)
+            .addMember("value", "$S", RecordBuilder.class.getName()).build();
+    static final AnnotationSpec generatedRecordInterfaceAnnotation = AnnotationSpec.builder(Generated.class)
+            .addMember("value", "$S", RecordInterface.class.getName()).build();
+    static final AnnotationSpec recordBuilderGeneratedAnnotation = AnnotationSpec.builder(RecordBuilderGenerated.class)
+            .build();
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        annotations.forEach(annotation -> roundEnv.getElementsAnnotatedWith(annotation).forEach(element -> process(annotation, element)));
+        annotations.forEach(annotation -> roundEnv.getElementsAnnotatedWith(annotation)
+                .forEach(element -> process(annotation, element)));
         return false;
     }
 
@@ -62,7 +65,7 @@ public class RecordBuilderProcessor
 
     @Override
     public SourceVersion getSupportedSourceVersion() {
-        // we don't directly return RELEASE_14 as that may 
+        // we don't directly return RELEASE_14 as that may
         // not exist in prior releases
         // if we're running on an older release, returning latest()
         // is fine as we won't encounter any records anyway
@@ -76,14 +79,16 @@ public class RecordBuilderProcessor
             processRecordBuilder(typeElement, getMetaData(typeElement), Optional.empty());
         } else if (annotationClass.equals(RECORD_INTERFACE)) {
             var typeElement = (TypeElement) element;
-            processRecordInterface(typeElement, element.getAnnotation(RecordInterface.class).addRecordBuilder(), getMetaData(typeElement), Optional.empty(), false);
+            processRecordInterface(typeElement, element.getAnnotation(RecordInterface.class).addRecordBuilder(),
+                    getMetaData(typeElement), Optional.empty(), false);
         } else if (annotationClass.equals(RECORD_BUILDER_INCLUDE) || annotationClass.equals(RECORD_INTERFACE_INCLUDE)) {
             processIncludes(element, getMetaData(element), annotationClass);
         } else {
             var recordBuilderTemplate = annotation.getAnnotation(RecordBuilder.Template.class);
             if (recordBuilderTemplate != null) {
                 if (recordBuilderTemplate.asRecordInterface()) {
-                    processRecordInterface((TypeElement) element, true, recordBuilderTemplate.options(), Optional.empty(), true);
+                    processRecordInterface((TypeElement) element, true, recordBuilderTemplate.options(),
+                            Optional.empty(), true);
                 } else {
                     processRecordBuilder((TypeElement) element, recordBuilderTemplate.options(), Optional.empty());
                 }
@@ -93,27 +98,34 @@ public class RecordBuilderProcessor
 
     private RecordBuilder.Options getMetaData(Element element) {
         var recordSpecificMetaData = element.getAnnotation(RecordBuilder.Options.class);
-        return (recordSpecificMetaData != null) ? recordSpecificMetaData : RecordBuilderOptions.build(processingEnv.getOptions());
+        return (recordSpecificMetaData != null) ? recordSpecificMetaData
+                : RecordBuilderOptions.build(processingEnv.getOptions());
     }
 
     private void processIncludes(Element element, RecordBuilder.Options metaData, String annotationClass) {
         var isRecordBuilderInclude = annotationClass.equals(RECORD_BUILDER_INCLUDE);
         var annotationMirrorOpt = ElementUtils.findAnnotationMirror(processingEnv, element, annotationClass);
         if (annotationMirrorOpt.isEmpty()) {
-            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Could not get annotation mirror for: " + annotationClass, element);
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+                    "Could not get annotation mirror for: " + annotationClass, element);
         } else {
-            var includeHelper = new IncludeHelper(processingEnv, element, annotationMirrorOpt.get(), isRecordBuilderInclude);
+            var includeHelper = new IncludeHelper(processingEnv, element, annotationMirrorOpt.get(),
+                    isRecordBuilderInclude);
             if (includeHelper.isValid()) {
-                var packagePattern = ElementUtils.getStringAttribute(ElementUtils.getAnnotationValue(includeHelper.getAnnotationValues(), "packagePattern").orElse(null), "*");
+                var packagePattern = ElementUtils.getStringAttribute(ElementUtils
+                        .getAnnotationValue(includeHelper.getAnnotationValues(), "packagePattern").orElse(null), "*");
                 for (var typeElement : includeHelper.getClassTypeElements()) {
                     var packageName = buildPackageName(packagePattern, element, typeElement);
                     if (packageName != null) {
                         if (isRecordBuilderInclude) {
                             processRecordBuilder(typeElement, metaData, Optional.of(packageName));
                         } else {
-                            var addRecordBuilderOpt = ElementUtils.getAnnotationValue(includeHelper.getAnnotationValues(), "addRecordBuilder");
-                            var addRecordBuilder = addRecordBuilderOpt.map(ElementUtils::getBooleanAttribute).orElse(true);
-                            processRecordInterface(typeElement, addRecordBuilder, metaData, Optional.of(packageName), false);
+                            var addRecordBuilderOpt = ElementUtils
+                                    .getAnnotationValue(includeHelper.getAnnotationValues(), "addRecordBuilder");
+                            var addRecordBuilder = addRecordBuilderOpt.map(ElementUtils::getBooleanAttribute)
+                                    .orElse(true);
+                            processRecordInterface(typeElement, addRecordBuilder, metaData, Optional.of(packageName),
+                                    false);
                         }
                     }
                 }
@@ -130,7 +142,8 @@ public class RecordBuilderProcessor
         if (builderElement instanceof PackageElement) {
             return replaced.replace("@", ((PackageElement) builderElement).getQualifiedName().toString());
         }
-        return replaced.replace("@", ((PackageElement) builderElement.getEnclosingElement()).getQualifiedName().toString());
+        return replaced.replace("@",
+                ((PackageElement) builderElement.getEnclosingElement()).getQualifiedName().toString());
     }
 
     private PackageElement findPackageElement(Element actualElement, Element includedClass) {
@@ -144,37 +157,46 @@ public class RecordBuilderProcessor
         return findPackageElement(actualElement, includedClass.getEnclosingElement());
     }
 
-    private void processRecordInterface(TypeElement element, boolean addRecordBuilder, RecordBuilder.Options metaData, Optional<String> packageName, boolean fromTemplate) {
+    private void processRecordInterface(TypeElement element, boolean addRecordBuilder, RecordBuilder.Options metaData,
+            Optional<String> packageName, boolean fromTemplate) {
         if (!element.getKind().isInterface()) {
-            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "RecordInterface only valid for interfaces.", element);
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+                    "RecordInterface only valid for interfaces.", element);
             return;
         }
-        var internalProcessor = new InternalRecordInterfaceProcessor(processingEnv, element, addRecordBuilder, metaData, packageName, fromTemplate);
+        var internalProcessor = new InternalRecordInterfaceProcessor(processingEnv, element, addRecordBuilder, metaData,
+                packageName, fromTemplate);
         if (!internalProcessor.isValid()) {
             return;
         }
-        writeRecordInterfaceJavaFile(element, internalProcessor.packageName(), internalProcessor.recordClassType(), internalProcessor.recordType(), metaData, internalProcessor::toRecord);
+        writeRecordInterfaceJavaFile(element, internalProcessor.packageName(), internalProcessor.recordClassType(),
+                internalProcessor.recordType(), metaData, internalProcessor::toRecord);
     }
 
-    private void processRecordBuilder(TypeElement record, RecordBuilder.Options metaData, Optional<String> packageName) {
+    private void processRecordBuilder(TypeElement record, RecordBuilder.Options metaData,
+            Optional<String> packageName) {
         // we use string based name comparison for the element kind,
         // as the ElementKind.RECORD enum doesn't exist on JRE releases
         // older than Java 14, and we don't want to throw unexpected
         // NoSuchFieldErrors
         if (!"RECORD".equals(record.getKind().name())) {
-            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "RecordBuilder only valid for records.", record);
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "RecordBuilder only valid for records.",
+                    record);
             return;
         }
         var internalProcessor = new InternalRecordBuilderProcessor(processingEnv, record, metaData, packageName);
-        writeRecordBuilderJavaFile(record, internalProcessor.packageName(), internalProcessor.builderClassType(), internalProcessor.builderType(), metaData);
+        writeRecordBuilderJavaFile(record, internalProcessor.packageName(), internalProcessor.builderClassType(),
+                internalProcessor.builderType(), metaData);
     }
 
-    private void writeRecordBuilderJavaFile(TypeElement record, String packageName, ClassType builderClassType, TypeSpec builderType, RecordBuilder.Options metaData) {
+    private void writeRecordBuilderJavaFile(TypeElement record, String packageName, ClassType builderClassType,
+            TypeSpec builderType, RecordBuilder.Options metaData) {
         // produces the Java file
         JavaFile javaFile = javaFileBuilder(packageName, builderType, metaData);
         Filer filer = processingEnv.getFiler();
         try {
-            String fullyQualifiedName = packageName.isEmpty() ? builderClassType.name() : (packageName + "." + builderClassType.name());
+            String fullyQualifiedName = packageName.isEmpty() ? builderClassType.name()
+                    : (packageName + "." + builderClassType.name());
             JavaFileObject sourceFile = filer.createSourceFile(fullyQualifiedName);
             try (Writer writer = sourceFile.openWriter()) {
                 javaFile.writeTo(writer);
@@ -184,7 +206,8 @@ public class RecordBuilderProcessor
         }
     }
 
-    private void writeRecordInterfaceJavaFile(TypeElement element, String packageName, ClassType classType, TypeSpec type, RecordBuilder.Options metaData, Function<String, String> toRecordProc) {
+    private void writeRecordInterfaceJavaFile(TypeElement element, String packageName, ClassType classType,
+            TypeSpec type, RecordBuilder.Options metaData, Function<String, String> toRecordProc) {
         JavaFile javaFile = javaFileBuilder(packageName, type, metaData);
 
         String classSourceCode = javaFile.toString();
@@ -193,7 +216,8 @@ public class RecordBuilderProcessor
 
         Filer filer = processingEnv.getFiler();
         try {
-            String fullyQualifiedName = packageName.isEmpty() ? classType.name() : (packageName + "." + classType.name());
+            String fullyQualifiedName = packageName.isEmpty() ? classType.name()
+                    : (packageName + "." + classType.name());
             JavaFileObject sourceFile = filer.createSourceFile(fullyQualifiedName);
             try (Writer writer = sourceFile.openWriter()) {
                 writer.write(recordSourceCode);
@@ -204,7 +228,8 @@ public class RecordBuilderProcessor
     }
 
     private JavaFile javaFileBuilder(String packageName, TypeSpec type, RecordBuilder.Options metaData) {
-        var javaFileBuilder = JavaFile.builder(packageName, type).skipJavaLangImports(true).indent(metaData.fileIndent());
+        var javaFileBuilder = JavaFile.builder(packageName, type).skipJavaLangImports(true)
+                .indent(metaData.fileIndent());
         var comment = metaData.fileComment();
         if ((comment != null) && !comment.isEmpty()) {
             javaFileBuilder.addFileComment(comment);
diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordClassType.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordClassType.java
index 9858329..a321cf1 100644
--- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordClassType.java
+++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordClassType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@ public class RecordClassType extends ClassType {
     private final List<? extends AnnotationMirror> accessorAnnotations;
     private final List<? extends AnnotationMirror> canonicalConstructorAnnotations;
 
-    public RecordClassType(TypeName typeName, TypeName rawTypeName, String name, List<? extends AnnotationMirror> accessorAnnotations, List<? extends AnnotationMirror> canonicalConstructorAnnotations) {
+    public RecordClassType(TypeName typeName, TypeName rawTypeName, String name,
+            List<? extends AnnotationMirror> accessorAnnotations,
+            List<? extends AnnotationMirror> canonicalConstructorAnnotations) {
         super(typeName, name);
         this.rawTypeName = rawTypeName;
         this.accessorAnnotations = accessorAnnotations;
diff --git a/record-builder-test/pom.xml b/record-builder-test/pom.xml
index 0ac4eaa..2a59949 100644
--- a/record-builder-test/pom.xml
+++ b/record-builder-test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019 Jordan Zimmerman
+    Copyright 2019 The original author or authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Annotated.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Annotated.java
index e282657..b3a0b96 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Annotated.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Annotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/BeanStyle.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/BeanStyle.java
index 967cc90..2b1ebe3 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/BeanStyle.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/BeanStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Builder.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Builder.java
index 0b90ac6..f4bd3a0 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Builder.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Builder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,7 @@ package io.soabase.recordbuilder.test;
 import io.soabase.recordbuilder.core.RecordBuilder;
 import io.soabase.recordbuilder.core.RecordInterface;
 
-@RecordInterface.Include({
-    Thingy.class
-})
-@RecordBuilder.Include({
-    Nested.NestedRecord.class
-})
+@RecordInterface.Include({ Thingy.class })
+@RecordBuilder.Include({ Nested.NestedRecord.class })
 public class Builder {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionCopying.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionCopying.java
index 99850bc..05e0ab5 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionCopying.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionCopying.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,7 @@ import java.util.Map;
 import java.util.Set;
 
 @RecordBuilder
-@RecordBuilder.Options(
-        addSingleItemCollectionBuilders = true,
-        useImmutableCollections = true,
-        mutableListClassName = "PersonalizedMutableList"
-)
+@RecordBuilder.Options(addSingleItemCollectionBuilders = true, useImmutableCollections = true, mutableListClassName = "PersonalizedMutableList")
 public record CollectionCopying<T>(List<String> list, Set<T> set, Map<Instant, T> map, Collection<T> collection,
-                                   int count) implements CollectionCopyingBuilder.With<T> {
+        int count) implements CollectionCopyingBuilder.With<T> {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionInterface.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionInterface.java
index 66998ae..ef23b35 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionInterface.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecord.java
index e6572c6..85eea44 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,11 @@ import java.util.Set;
 
 @RecordBuilder
 @RecordBuilder.Options(useImmutableCollections = true, addFunctionalMethodsToWith = true)
-public record CollectionRecord<T, X extends Point>(List<T> l, Set<T> s, Map<T, X> m,
-                                                   Collection<X> c) implements CollectionRecordBuilder.With<T, X> {
+public record CollectionRecord<T, X extends Point>(List<T> l, Set<T> s, Map<T, X> m, Collection<X> c)
+        implements CollectionRecordBuilder.With<T, X> {
     public static void main(String[] args) {
-        var r = new CollectionRecord<>(List.of("hey"), Set.of("there"), Map.of("one", new Point(10, 20)), Set.of(new Point(30, 40)));
+        var r = new CollectionRecord<>(List.of("hey"), Set.of("there"), Map.of("one", new Point(10, 20)),
+                Set.of(new Point(30, 40)));
         Instant now = r.map((l1, s1, m1, c1) -> Instant.now());
         r.accept((l1, s1, m1, c1) -> {
         });
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecordConflicts.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecordConflicts.java
index 61de975..4af95fd 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecordConflicts.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecordConflicts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,5 +24,6 @@ import java.util.Set;
 
 @RecordBuilder
 @RecordBuilder.Options(useImmutableCollections = true)
-public record CollectionRecordConflicts(List<String> __list, Set<String> __set, Map<String, String> __map, Collection<String> __collection) implements CollectionRecordConflictsBuilder.With {
+public record CollectionRecordConflicts(List<String> __list, Set<String> __set, Map<String, String> __map,
+        Collection<String> __collection) implements CollectionRecordConflictsBuilder.With {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CustomMethodNames.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CustomMethodNames.java
index aa81e02..2390505 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CustomMethodNames.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/CustomMethodNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,6 @@ import io.soabase.recordbuilder.core.RecordBuilder;
 import io.soabase.recordbuilder.test.CustomMethodNamesBuilder.Bean;
 
 @RecordBuilder
-@RecordBuilder.Options(
-    setterPrefix = "set", getterPrefix = "get", booleanPrefix = "is", beanClassName = "Bean")
-public record CustomMethodNames(
-    int theValue,
-    List<Integer> theList,
-    boolean theBoolean) implements Bean {
+@RecordBuilder.Options(setterPrefix = "set", getterPrefix = "get", booleanPrefix = "is", beanClassName = "Bean")
+public record CustomMethodNames(int theValue, List<Integer> theList, boolean theBoolean) implements Bean {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Customer.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Customer.java
index 0cbcd00..b722f99 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Customer.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Customer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Empty.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Empty.java
index 7d721ed..5a28135 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Empty.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Empty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/ExceptionDetails.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/ExceptionDetails.java
index 99c44a9..4d2e01b 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/ExceptionDetails.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/ExceptionDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,8 @@ import javax.lang.model.type.ErrorType;
 import java.util.List;
 
 @RecordBuilder
-public record ExceptionDetails(
-        String internalMessage, String endUserMessage, String httpStatus,
-        ErrorType errorType, List<String> jsonProblems, Throwable cause
-) {
+public record ExceptionDetails(String internalMessage, String endUserMessage, String httpStatus, ErrorType errorType,
+        List<String> jsonProblems, Throwable cause) {
     @Override
     public List<String> jsonProblems() {
         if (jsonProblems == null) {
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/FullRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/FullRecord.java
index bd7f374..a251020 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/FullRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/FullRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,5 +22,6 @@ import java.util.List;
 import java.util.Map;
 
 @RecordBuilderFull
-public record FullRecord(@NotNull List<Number> numbers, @NotNull Map<Number, FullRecord> fullRecords, @NotNull String justAString) {
+public record FullRecord(@NotNull List<Number> numbers, @NotNull Map<Number, FullRecord> fullRecords,
+        @NotNull String justAString) {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/HasDefaults.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/HasDefaults.java
index 9328d49..44cf582 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/HasDefaults.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/HasDefaults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IgnoreAnnotated.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IgnoreAnnotated.java
index 9a38577..49c7024 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IgnoreAnnotated.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IgnoreAnnotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IncludeWithOption.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IncludeWithOption.java
index 9e57100..d59d027 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IncludeWithOption.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/IncludeWithOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,5 +20,6 @@ import io.soabase.recordbuilder.core.RecordBuilder;
 @RecordBuilder.Options(prefixEnclosingClassNames = false)
 @RecordBuilder.Include(IncludeWithOption.Hey.class)
 public class IncludeWithOption {
-    public static record Hey(String s){}
+    public static record Hey(String s) {
+    }
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/InterfaceTemplateTest.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/InterfaceTemplateTest.java
index f2aeb3e..ba12244 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/InterfaceTemplateTest.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/InterfaceTemplateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MutableCollectionRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MutableCollectionRecord.java
index 4808708..1136182 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MutableCollectionRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MutableCollectionRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyInterfaceTemplate.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyInterfaceTemplate.java
index 47827b5..56a9c47 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyInterfaceTemplate.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyInterfaceTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,6 @@ package io.soabase.recordbuilder.test;
 
 import io.soabase.recordbuilder.core.RecordBuilder;
 
-@RecordBuilder.Template(options = @RecordBuilder.Options(
-        fileComment = "This is a test",
-        withClassName = "Com"),
-        asRecordInterface = true
-)
+@RecordBuilder.Template(options = @RecordBuilder.Options(fileComment = "This is a test", withClassName = "Com"), asRecordInterface = true)
 public @interface MyInterfaceTemplate {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyTemplate.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyTemplate.java
index 516958c..82db93e 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyTemplate.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,6 @@ package io.soabase.recordbuilder.test;
 
 import io.soabase.recordbuilder.core.RecordBuilder;
 
-@RecordBuilder.Template(options = @RecordBuilder.Options(
-        fileComment = "This is a test",
-        withClassName = "Com"
-))
-public @interface MyTemplate
-{
+@RecordBuilder.Template(options = @RecordBuilder.Options(fileComment = "This is a test", withClassName = "Com"))
+public @interface MyTemplate {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Nested.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Nested.java
index 28dc2e5..6c9041e 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Nested.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Nested.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,5 +16,6 @@
 package io.soabase.recordbuilder.test;
 
 public class Nested {
-    record NestedRecord(int x, int y){}
+    record NestedRecord(int x, int y) {
+    }
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoBuilder.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoBuilder.java
index 2f9c113..d04a909 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoBuilder.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoStaticBuilder.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoStaticBuilder.java
index 90d3379..5a45674 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoStaticBuilder.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoStaticBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,17 +20,14 @@ import io.soabase.recordbuilder.core.RecordBuilder;
 /**
  * Copyright 2019 Jordan Zimmerman
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
  */
 @RecordBuilder.Options(addStaticBuilder = false)
 @RecordBuilder
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Pair.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Pair.java
index 211ed25..099d4f6 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Pair.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Pair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,4 +15,5 @@
  */
 package io.soabase.recordbuilder.test;
 
-public record Pair<T, U>(T t, U u) {}
+public record Pair<T, U>(T t, U u) {
+}
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Person.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Person.java
index 02190b1..3828427 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Person.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Point.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Point.java
index ac93402..e1b88a7 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Point.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Point.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,4 +15,5 @@
  */
 package io.soabase.recordbuilder.test;
 
-public record Point(int x, int y) {}
+public record Point(int x, int y) {
+}
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithAnR.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithAnR.java
index 145abf7..b2e42b5 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithAnR.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithAnR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,4 +18,5 @@ package io.soabase.recordbuilder.test;
 import io.soabase.recordbuilder.core.RecordBuilder;
 
 @RecordBuilder
-public record RecordWithAnR(int r, String b) {}
+public record RecordWithAnR(int r, String b) {
+}
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional.java
index 86d717b..b828a78 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,4 +26,6 @@ import java.util.OptionalLong;
 
 @RecordBuilder.Options(emptyDefaultForOptional = true, addConcreteSettersForOptional = true)
 @RecordBuilder
-public record RecordWithOptional(@NotNull Optional<String> value, Optional raw, OptionalInt i, OptionalLong l, OptionalDouble d) {}
+public record RecordWithOptional(@NotNull Optional<String> value, Optional raw, OptionalInt i, OptionalLong l,
+        OptionalDouble d) {
+}
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional2.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional2.java
index 9f10dbc..af22cb8 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional2.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,4 +23,6 @@ import io.soabase.recordbuilder.core.RecordBuilder;
 
 @RecordBuilder.Options(emptyDefaultForOptional = true)
 @RecordBuilder
-public record RecordWithOptional2(Optional<String> value, Optional raw, OptionalInt i, OptionalLong l, OptionalDouble d) {}
+public record RecordWithOptional2(Optional<String> value, Optional raw, OptionalInt i, OptionalLong l,
+        OptionalDouble d) {
+}
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java
index 913585d..42f839b 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,5 +24,6 @@ import javax.validation.constraints.NotNull;
 @RecordBuilder
 @RecordBuilder.Options(useValidationApi = true)
 public record RequestWithValid(@NotNull @Valid Part part) implements RequestWithValidBuilder.With {
-  public record Part(@NotBlank String name) {}
+    public record Part(@NotBlank String name) {
+    }
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord.java
index 1a92b5c..3244840 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,5 +22,6 @@ import java.util.List;
 
 @RecordBuilder.Options(interpretNotNulls = true)
 @RecordBuilder
-public record RequiredRecord(@NotNull String hey, @NotNull int i, @NotNull List<String> l) implements RequiredRecordBuilder.With {
+public record RequiredRecord(@NotNull String hey, @NotNull int i, @NotNull List<String> l)
+        implements RequiredRecordBuilder.With {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord2.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord2.java
index b212e1d..b2bebef 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord2.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleGenericRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleGenericRecord.java
index cb03dbe..41cb10f 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleGenericRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleGenericRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleRecord.java
index 8cbb8bf..f727f42 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SimpleRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SingleItems.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SingleItems.java
index a8cac74..7c651b4 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SingleItems.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SingleItems.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,7 @@ import java.util.Map;
 import java.util.Set;
 
 @RecordBuilder
-@RecordBuilder.Options(
-        addSingleItemCollectionBuilders = true,
-        singleItemBuilderPrefix = "add1",
-        useImmutableCollections = true,
-        addFunctionalMethodsToWith = true
-)
-public record SingleItems<T>(List<String> strings, Set<List<T>> sets, Map<Instant, T> map, Collection<T> collection) implements SingleItemsBuilder.With<T> {
+@RecordBuilder.Options(addSingleItemCollectionBuilders = true, singleItemBuilderPrefix = "add1", useImmutableCollections = true, addFunctionalMethodsToWith = true)
+public record SingleItems<T>(List<String> strings, Set<List<T>> sets, Map<Instant, T> map, Collection<T> collection)
+        implements SingleItemsBuilder.With<T> {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SpecializedPerson.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SpecializedPerson.java
index 7e10fdb..06670ae 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SpecializedPerson.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/SpecializedPerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/StrippedFeaturesRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/StrippedFeaturesRecord.java
index 287376f..7216ab8 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/StrippedFeaturesRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/StrippedFeaturesRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@ package io.soabase.recordbuilder.test;
 import io.soabase.recordbuilder.core.RecordBuilder;
 
 @RecordBuilder
-@RecordBuilder.Options(
-    enableGetters = false,
-    enableWither = false
-)
-public record StrippedFeaturesRecord(int aField) {}
+@RecordBuilder.Options(enableGetters = false, enableWither = false)
+public record StrippedFeaturesRecord(int aField) {
+}
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/TemplateTest.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/TemplateTest.java
index 885fb30..84da39b 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/TemplateTest.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/TemplateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,5 @@ package io.soabase.recordbuilder.test;
 import java.time.Instant;
 
 @MyTemplate
-public record TemplateTest(String text, Instant date) implements TemplateTestBuilder.Com
-{
+public record TemplateTest(String text, Instant date) implements TemplateTestBuilder.Com {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Thingy.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Thingy.java
index d64a006..e703f0d 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Thingy.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Thingy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Usage.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Usage.java
index 6a9ebcf..8134300 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Usage.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/Usage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/WildcardSingleItems.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/WildcardSingleItems.java
index 6a7f9f4..8c9d301 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/WildcardSingleItems.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/WildcardSingleItems.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,8 @@ import java.util.Map;
 import java.util.Set;
 
 @RecordBuilder
-@RecordBuilder.Options(
-        addSingleItemCollectionBuilders = true,
-        useImmutableCollections = true
-)
-public record WildcardSingleItems<T>(List<? extends String> strings, Set<? extends List<? extends T>> sets, Map<? extends Instant, ? extends T> map, Collection<? extends T> collection) implements WildcardSingleItemsBuilder.With<T> {
+@RecordBuilder.Options(addSingleItemCollectionBuilders = true, useImmutableCollections = true)
+public record WildcardSingleItems<T>(List<? extends String> strings, Set<? extends List<? extends T>> sets,
+        Map<? extends Instant, ? extends T> map, Collection<? extends T> collection)
+        implements WildcardSingleItemsBuilder.With<T> {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/IncludeFactory.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/IncludeFactory.java
index 6166df4..a10891a 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/IncludeFactory.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/IncludeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,6 @@ package io.soabase.recordbuilder.test.includes;
 
 import io.soabase.recordbuilder.core.RecordBuilder;
 
-@RecordBuilder.Include(
-        packages = "io.soabase.recordbuilder.test.includes.pack",
-        classes = JustATest.class
-)
+@RecordBuilder.Include(packages = "io.soabase.recordbuilder.test.includes.pack", classes = JustATest.class)
 public class IncludeFactory {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/JustATest.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/JustATest.java
index c3908c1..3643aa3 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/JustATest.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/JustATest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/AlsoIgnoreMe.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/AlsoIgnoreMe.java
index 6878480..c638c38 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/AlsoIgnoreMe.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/AlsoIgnoreMe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/IgnoreMe.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/IgnoreMe.java
index e1b8f38..a2fbf5c 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/IgnoreMe.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/IgnoreMe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord1.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord1.java
index 21f2746..f4508da 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord1.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord2.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord2.java
index d291908..5292353 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord2.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord3.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord3.java
index 48c45a0..0f25a0a 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord3.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/jacoco/FullRecordForJacoco.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/jacoco/FullRecordForJacoco.java
index 027bd49..acef838 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/jacoco/FullRecordForJacoco.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/jacoco/FullRecordForJacoco.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,5 +24,6 @@ import java.util.Map;
 
 @RecordBuilderFull
 @RecordBuilderGenerated
-public record FullRecordForJacoco(@NotNull List<Number> numbers, @NotNull Map<Number, FullRecordForJacoco> fullRecords, @NotNull String justAString) {
+public record FullRecordForJacoco(@NotNull List<Number> numbers, @NotNull Map<Number, FullRecordForJacoco> fullRecords,
+        @NotNull String justAString) {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/package-info.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/package-info.java
index 0beaac6..388fd81 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/package-info.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@RecordBuilder.Include(value = {Point.class, Pair.class}, packagePattern = "*.foo")
+@RecordBuilder.Include(value = { Point.class, Pair.class }, packagePattern = "*.foo")
 @RecordInterface.Include(value = Customer.class, addRecordBuilder = false, packagePattern = "*.bar")
 package io.soabase.recordbuilder.test;
 
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecord.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecord.java
index 7eda529..6cb9d9f 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecord.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecordWithPublicBuilder.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecordWithPublicBuilder.java
index c774575..a5ad777 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecordWithPublicBuilder.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecordWithPublicBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,7 @@ import io.soabase.recordbuilder.core.RecordBuilder;
 
 import javax.lang.model.element.Modifier;
 
-
-@RecordBuilder.Options(builderClassModifiers = {Modifier.PUBLIC})
+@RecordBuilder.Options(builderClassModifiers = { Modifier.PUBLIC })
 @RecordBuilder
 record PackagePrivateRecordWithPublicBuilder(String value) {
 }
diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/Wrapper.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/Wrapper.java
index bb2936c..90afa9b 100644
--- a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/Wrapper.java
+++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/Wrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestAnnotated.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestAnnotated.java
index 5802217..3c262c2 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestAnnotated.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestAnnotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollections.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollections.java
index af5fa8e..decbc49 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollections.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,30 +52,20 @@ class TestCollections {
         map.put("one", Point(10, 20));
         var collectionAsSet = new HashSet<Point>();
         collectionAsSet.add(Point(30, 40));
-        var r = CollectionRecordBuilder.<String, Point>builder()
-                .l(list)
-                .s(set)
-                .m(map)
-                .c(collectionAsSet)
-                .build();
+        var r = CollectionRecordBuilder.<String, Point> builder().l(list).s(set).m(map).c(collectionAsSet).build();
 
         assertValues(r, list, set, map, collectionAsSet);
         assertValueChanges(r, list, set, map, collectionAsSet);
         assertImmutable(r);
 
         var collectionAsList = new ArrayList<Point>();
-        var x = CollectionRecordBuilder.<String, Point>builder()
-                .l(list)
-                .s(set)
-                .m(map)
-                .c(collectionAsList)
-                .build();
+        var x = CollectionRecordBuilder.<String, Point> builder().l(list).s(set).m(map).c(collectionAsList).build();
         assertTrue(x.c() instanceof List);
     }
 
     @Test
     void testCollectionRecordImmutableWithers() {
-        var r = CollectionRecordBuilder.<String, Point>builder().build();
+        var r = CollectionRecordBuilder.<String, Point> builder().build();
 
         var list = new ArrayList<String>();
         list.add("one");
@@ -113,7 +103,8 @@ class TestCollections {
         assertThrows(UnsupportedOperationException.class, () -> r.c().add(Point(1, 2)));
     }
 
-    private void assertValueChanges(CollectionRecord<String, Point> r, ArrayList<String> list, HashSet<String> set, HashMap<String, Point> map, HashSet<Point> collectionAsSet) {
+    private void assertValueChanges(CollectionRecord<String, Point> r, ArrayList<String> list, HashSet<String> set,
+            HashMap<String, Point> map, HashSet<Point> collectionAsSet) {
         list.add("two");
         set.add("two");
         map.put("two", Point(50, 60));
@@ -125,7 +116,8 @@ class TestCollections {
         assertNotEquals(r.c(), collectionAsSet);
     }
 
-    private void assertValues(CollectionRecord<String, Point> r, ArrayList<String> list, HashSet<String> set, HashMap<String, Point> map, HashSet<Point> collectionAsSet) {
+    private void assertValues(CollectionRecord<String, Point> r, ArrayList<String> list, HashSet<String> set,
+            HashMap<String, Point> map, HashSet<Point> collectionAsSet) {
         assertEquals(r.l(), list);
         assertEquals(r.s(), set);
         assertEquals(r.m(), map);
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollectionsBuilder.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollectionsBuilder.java
index 236f39d..66b9205 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollectionsBuilder.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollectionsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestImmutableCollections.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestImmutableCollections.java
index b47f405..33161e4 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestImmutableCollections.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestImmutableCollections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,91 +24,65 @@ import java.util.*;
 public class TestImmutableCollections {
     @Test
     public void testImmutableListNotCopiedWhenNotChanged() {
-        var item = CollectionCopyingBuilder.<String>builder()
-                .addList("a")
-                .addList("b")
-                .addList("c")
-                .build();
+        var item = CollectionCopyingBuilder.<String> builder().addList("a").addList("b").addList("c").build();
         Assertions.assertEquals(item.list(), List.of("a", "b", "c"));
 
         var oldList = item.list();
 
-        var copy = item.with()
-                .count(1)
-                .build();
+        var copy = item.with().count(1).build();
 
         Assertions.assertSame(oldList, copy.list());
 
-        var otherCopy = item.with()
-                .count(2)
-                .build();
+        var otherCopy = item.with().count(2).build();
 
         Assertions.assertSame(oldList, otherCopy.list());
     }
 
     @Test
     public void testImmutableSetNotCopiedWhenNotChanged() {
-        var item = CollectionCopyingBuilder.<String>builder()
-                .addSet(Arrays.asList("1", "2", "3"))
-                .build();
+        var item = CollectionCopyingBuilder.<String> builder().addSet(Arrays.asList("1", "2", "3")).build();
         Assertions.assertEquals(item.set(), Set.of("1", "2", "3"));
 
         var oldSet = item.set();
 
-        var copy = item.with()
-                .count(1)
-                .build();
+        var copy = item.with().count(1).build();
 
         Assertions.assertSame(oldSet, copy.set());
 
-        var otherCopy = item.with()
-                .count(2)
-                .build();
+        var otherCopy = item.with().count(2).build();
 
         Assertions.assertSame(oldSet, otherCopy.set());
     }
 
     @Test
     public void testImmutableCollectionNotCopiedWhenNotChanged() {
-        var item = CollectionCopyingBuilder.<String>builder()
-                .collection(List.of("foo", "bar", "baz"))
-                .build();
+        var item = CollectionCopyingBuilder.<String> builder().collection(List.of("foo", "bar", "baz")).build();
         Assertions.assertEquals(item.collection(), List.of("foo", "bar", "baz"));
 
         var oldCollection = item.collection();
 
-        var copy = item.with()
-                .count(1)
-                .build();
+        var copy = item.with().count(1).build();
 
         Assertions.assertSame(oldCollection, copy.collection());
 
-        var otherCopy = item.with()
-                .count(2)
-                .build();
+        var otherCopy = item.with().count(2).build();
 
         Assertions.assertSame(oldCollection, otherCopy.collection());
     }
 
     @Test
     public void testImmutableMapNotCopiedWhenNotChanged() {
-        var item = CollectionCopyingBuilder.<String>builder()
-                .addMap(Instant.MAX, "future")
-                .addMap(Instant.MIN, "before")
-                .build();
+        var item = CollectionCopyingBuilder.<String> builder().addMap(Instant.MAX, "future")
+                .addMap(Instant.MIN, "before").build();
         Assertions.assertEquals(item.map(), Map.of(Instant.MAX, "future", Instant.MIN, "before"));
 
         var oldMap = item.map();
 
-        var copy = item.with()
-                .count(1)
-                .build();
+        var copy = item.with().count(1).build();
 
         Assertions.assertSame(oldMap, copy.map());
 
-        var otherCopy = item.with()
-                .count(2)
-                .build();
+        var otherCopy = item.with().count(2).build();
 
         Assertions.assertSame(oldMap, otherCopy.map());
     }
@@ -116,9 +90,7 @@ public class TestImmutableCollections {
     @Test
     void testSourceListNotModified() {
         var item = new CollectionCopying<>(new ArrayList<>(), null, null, null, 0);
-        var modifiedItem = CollectionCopyingBuilder.builder(item)
-                .addList("a")
-                .build();
+        var modifiedItem = CollectionCopyingBuilder.builder(item).addList("a").build();
 
         Assertions.assertEquals(modifiedItem.list(), List.of("a"));
         Assertions.assertTrue(item.list().isEmpty());
@@ -127,9 +99,7 @@ public class TestImmutableCollections {
     @Test
     void testSourceSetNotModified() {
         var item = new CollectionCopying<>(null, new HashSet<>(), null, null, 0);
-        var modifiedItem = CollectionCopyingBuilder.builder(item)
-                .addSet("a")
-                .build();
+        var modifiedItem = CollectionCopyingBuilder.builder(item).addSet("a").build();
 
         Assertions.assertEquals(modifiedItem.set(), Set.of("a"));
         Assertions.assertTrue(item.set().isEmpty());
@@ -138,9 +108,7 @@ public class TestImmutableCollections {
     @Test
     void testSourceMapNotModified() {
         var item = new CollectionCopying<>(null, null, new HashMap<>(), null, 0);
-        var modifiedItem = CollectionCopyingBuilder.builder(item)
-                .addMap(Instant.MIN, "a")
-                .build();
+        var modifiedItem = CollectionCopyingBuilder.builder(item).addMap(Instant.MIN, "a").build();
 
         Assertions.assertEquals(modifiedItem.map(), Map.of(Instant.MIN, "a"));
         Assertions.assertTrue(item.map().isEmpty());
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestIncludes.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestIncludes.java
index c457bd8..e54645c 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestIncludes.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestIncludes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestOptional.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestOptional.java
index 626e76d..4dfc779 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestOptional.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestOptional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,12 +36,7 @@ class TestOptional {
 
     @Test
     void testRawSetters() {
-        var record = RecordWithOptionalBuilder.builder()
-                .value("value")
-                .raw("rawValue")
-                .i(42)
-                .l(424242L)
-                .d(42.42)
+        var record = RecordWithOptionalBuilder.builder().value("value").raw("rawValue").i(42).l(424242L).d(42.42)
                 .build();
         Assertions.assertEquals(Optional.of("value"), record.value());
         Assertions.assertEquals(Optional.of("rawValue"), record.raw());
@@ -52,13 +47,8 @@ class TestOptional {
 
     @Test
     void testOptionalSetters() {
-        var record = RecordWithOptional2Builder.builder()
-            .value(Optional.of("value"))
-            .raw(Optional.of("rawValue"))
-            .i(OptionalInt.of(42))
-            .l(OptionalLong.of(424242L))
-            .d(OptionalDouble.of(42.42))
-            .build();
+        var record = RecordWithOptional2Builder.builder().value(Optional.of("value")).raw(Optional.of("rawValue"))
+                .i(OptionalInt.of(42)).l(OptionalLong.of(424242L)).d(OptionalDouble.of(42.42)).build();
         Assertions.assertEquals(Optional.of("value"), record.value());
         Assertions.assertEquals(Optional.of("rawValue"), record.raw());
         Assertions.assertEquals(OptionalInt.of(42), record.i());
@@ -72,9 +62,7 @@ class TestOptional {
         String value = null;
 
         // when
-        var record = RecordWithOptionalBuilder.builder()
-                                              .value(value)
-                                              .build();
+        var record = RecordWithOptionalBuilder.builder().value(value).build();
 
         // then
         Assertions.assertEquals(Optional.empty(), record.value());
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordBuilderFull.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordBuilderFull.java
index 4f6eebd..518440e 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordBuilderFull.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordBuilderFull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,10 +33,7 @@ class TestRecordBuilderFull {
 
     @Test
     void testImmutable() {
-        var record = FullRecordBuilder.builder()
-                .fullRecords(new HashMap<>())
-                .numbers(new ArrayList<>())
-                .justAString("")
+        var record = FullRecordBuilder.builder().fullRecords(new HashMap<>()).numbers(new ArrayList<>()).justAString("")
                 .build();
         Assertions.assertThrows(UnsupportedOperationException.class, () -> record.fullRecords().put(1, record));
         Assertions.assertThrows(UnsupportedOperationException.class, () -> record.numbers().add(1));
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordInterface.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordInterface.java
index d002367..70c1546 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordInterface.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,9 @@ import java.time.Instant;
 import static io.soabase.recordbuilder.test.SimpleGenericRecordBuilder.SimpleGenericRecord;
 import static io.soabase.recordbuilder.test.SimpleRecordBuilder.SimpleRecord;
 
-public class TestRecordInterface
-{
+public class TestRecordInterface {
     @Test
-    public void testHasDefaults()
-    {
+    public void testHasDefaults() {
         var r1 = new HasDefaultsRecord(Instant.MIN, Instant.MAX);
         var r2 = r1.with(b -> b.tomorrow(Instant.MIN));
         Assertions.assertEquals(Instant.MIN, r1.time());
@@ -40,9 +38,8 @@ public class TestRecordInterface
     }
 
     @Test
-    public void testStaticConstructor()
-    {
-        var simple = SimpleRecord(10,"hey");
+    public void testStaticConstructor() {
+        var simple = SimpleRecord(10, "hey");
         Assertions.assertEquals(simple.i(), 10);
         Assertions.assertEquals(simple.s(), "hey");
 
@@ -53,26 +50,15 @@ public class TestRecordInterface
     }
 
     @Test
-    public void testBuilderStreamWithValues()
-    {
-        var stream = SimpleRecordBuilder.stream(SimpleRecordBuilder.builder()
-                .i(19)
-                .s("value")
-                .build())
-            .toList();
-        Assertions.assertEquals(stream, List.of(
-            Map.entry("i", 19),
-            Map.entry("s", "value")));
+    public void testBuilderStreamWithValues() {
+        var stream = SimpleRecordBuilder.stream(SimpleRecordBuilder.builder().i(19).s("value").build()).toList();
+        Assertions.assertEquals(stream, List.of(Map.entry("i", 19), Map.entry("s", "value")));
     }
 
     @Test
-    public void testBuilderStreamWithNulls()
-    {
-        var stream = SimpleRecordBuilder.stream(SimpleRecordBuilder.builder()
-                .build())
-            .toList();
-        Assertions.assertEquals(stream, List.of(
-            new SimpleImmutableEntry<>("i", 0),
-            new SimpleImmutableEntry<>("s", null)));
+    public void testBuilderStreamWithNulls() {
+        var stream = SimpleRecordBuilder.stream(SimpleRecordBuilder.builder().build()).toList();
+        Assertions.assertEquals(stream,
+                List.of(new SimpleImmutableEntry<>("i", 0), new SimpleImmutableEntry<>("s", null)));
     }
 }
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestSingleItems.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestSingleItems.java
index e0421e9..cb9ef58 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestSingleItems.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestSingleItems.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,26 +26,16 @@ import java.util.Set;
 
 public class TestSingleItems {
     @Test
-    public void testInternalCollections()
-    {
+    public void testInternalCollections() {
         var now = Instant.now();
-        var item = SingleItemsBuilder.<String>builder()
-                .add1Map(now, "now")
-                .add1Map(Instant.MIN, "before")
-                .add1Sets(Arrays.asList("1", "2"))
-                .add1Sets(List.of("3"))
-                .add1Strings("a")
-                .add1Strings("b")
-                .add1Strings("c")
-                .build();
+        var item = SingleItemsBuilder.<String> builder().add1Map(now, "now").add1Map(Instant.MIN, "before")
+                .add1Sets(Arrays.asList("1", "2")).add1Sets(List.of("3")).add1Strings("a").add1Strings("b")
+                .add1Strings("c").build();
         Assertions.assertEquals(item.map(), Map.of(now, "now", Instant.MIN, "before"));
         Assertions.assertEquals(item.sets(), Set.of(List.of("1", "2"), List.of("3")));
         Assertions.assertEquals(item.strings(), List.of("a", "b", "c"));
 
-        var copy = item.with()
-                .add1Strings("new")
-                .add1Map(Instant.MAX, "after")
-                .add1Sets(List.of("10", "20", "30"))
+        var copy = item.with().add1Strings("new").add1Map(Instant.MAX, "after").add1Sets(List.of("10", "20", "30"))
                 .build();
         Assertions.assertNotEquals(item, copy);
         Assertions.assertEquals(copy.map(), Map.of(now, "now", Instant.MIN, "before", Instant.MAX, "after"));
@@ -55,20 +45,15 @@ public class TestSingleItems {
         var stringsToAdd = Arrays.asList("x", "y", "z");
         var listToAdd = Arrays.asList(List.of("aa", "bb"), List.of("cc"));
         var mapToAdd = Map.of(now.plusMillis(1), "now+1", now.plusMillis(2), "now+2");
-        var streamed = SingleItemsBuilder.builder(item)
-                .add1Strings(stringsToAdd.stream())
-                .add1Sets(listToAdd.stream())
-                .add1Map(mapToAdd.entrySet().stream())
-                .build();
-        Assertions.assertEquals(streamed.map(), Map.of(now, "now", Instant.MIN, "before", now.plusMillis(1), "now+1", now.plusMillis(2), "now+2"));
-        Assertions.assertEquals(streamed.sets(), Set.of(List.of("1", "2"), List.of("3"), List.of("aa", "bb"), List.of("cc")));
+        var streamed = SingleItemsBuilder.builder(item).add1Strings(stringsToAdd.stream()).add1Sets(listToAdd.stream())
+                .add1Map(mapToAdd.entrySet().stream()).build();
+        Assertions.assertEquals(streamed.map(),
+                Map.of(now, "now", Instant.MIN, "before", now.plusMillis(1), "now+1", now.plusMillis(2), "now+2"));
+        Assertions.assertEquals(streamed.sets(),
+                Set.of(List.of("1", "2"), List.of("3"), List.of("aa", "bb"), List.of("cc")));
         Assertions.assertEquals(streamed.strings(), Arrays.asList("a", "b", "c", "x", "y", "z"));
 
-        var nulls = SingleItemsBuilder.builder(item)
-                .strings(null)
-                .sets(null)
-                .map(null)
-                .build();
+        var nulls = SingleItemsBuilder.builder(item).strings(null).sets(null).map(null).build();
         Assertions.assertEquals(nulls.map(), Map.of());
         Assertions.assertEquals(nulls.sets(), Set.of());
         Assertions.assertEquals(nulls.strings(), List.of());
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestTemplate.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestTemplate.java
index 7bccfb4..945a353 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestTemplate.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java
index 0426492..913c256 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,11 +46,9 @@ class TestValidation {
 
     @Test
     void testRequestWithValid() {
-        Assertions.assertDoesNotThrow(() -> RequestWithValidBuilder.builder()
-                .part(new RequestWithValid.Part("jsfjsf"))
-                .build());
-        Assertions.assertThrows(ValidationException.class, () -> RequestWithValidBuilder.builder()
-                .part(new RequestWithValid.Part(""))
-                .build());
+        Assertions.assertDoesNotThrow(
+                () -> RequestWithValidBuilder.builder().part(new RequestWithValid.Part("jsfjsf")).build());
+        Assertions.assertThrows(ValidationException.class,
+                () -> RequestWithValidBuilder.builder().part(new RequestWithValid.Part("")).build());
     }
 }
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestVariousOptions.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestVariousOptions.java
index a2ac0e4..21102e0 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestVariousOptions.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestVariousOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,46 +24,40 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class TestVariousOptions {
 
-  @Test
-  public void builderGetsCustomSetterAndGetterNames() {
-    var obj = CustomMethodNamesBuilder.builder()
-        .setTheValue(1)
-        .setTheList(List.of(2))
-        .setTheBoolean(true);
-    assertEquals(1, obj.getTheValue());
-    assertEquals(List.of(2), obj.getTheList());
-    assertTrue(obj.isTheBoolean());
-    assertEquals(new CustomMethodNames(1, List.of(2), true), obj.build());
-  }
+    @Test
+    public void builderGetsCustomSetterAndGetterNames() {
+        var obj = CustomMethodNamesBuilder.builder().setTheValue(1).setTheList(List.of(2)).setTheBoolean(true);
+        assertEquals(1, obj.getTheValue());
+        assertEquals(List.of(2), obj.getTheList());
+        assertTrue(obj.isTheBoolean());
+        assertEquals(new CustomMethodNames(1, List.of(2), true), obj.build());
+    }
 
-  @Test
-  public void withBuilderGetsCustomSetterAndGetterNames() {
-    var obj = CustomMethodNamesBuilder.from(CustomMethodNamesBuilder.builder()
-            .setTheValue(1)
-            .setTheList(List.of(2))
-            .setTheBoolean(true)
-            .build());
-    assertEquals(1, obj.getTheValue());
-    assertEquals(List.of(2), obj.getTheList());
-    assertTrue(obj.isTheBoolean());
-  }
+    @Test
+    public void withBuilderGetsCustomSetterAndGetterNames() {
+        var obj = CustomMethodNamesBuilder.from(
+                CustomMethodNamesBuilder.builder().setTheValue(1).setTheList(List.of(2)).setTheBoolean(true).build());
+        assertEquals(1, obj.getTheValue());
+        assertEquals(List.of(2), obj.getTheList());
+        assertTrue(obj.isTheBoolean());
+    }
 
-  @Test
-  public void recordHasPrefixedGetters() {
-    var obj = new CustomMethodNames(1, List.of(2), true);
-    assertEquals(1, obj.getTheValue());
-    assertEquals(List.of(2), obj.getTheList());
-    assertTrue(obj.isTheBoolean());
-  }
+    @Test
+    public void recordHasPrefixedGetters() {
+        var obj = new CustomMethodNames(1, List.of(2), true);
+        assertEquals(1, obj.getTheValue());
+        assertEquals(List.of(2), obj.getTheList());
+        assertTrue(obj.isTheBoolean());
+    }
 
-  @Test
-  public void noStaticBuilder() {
-    boolean hasStaticBuilder = Stream.of(NoStaticBuilderBuilder.class.getDeclaredMethods())
-            .anyMatch(method -> method.getName().equals("NoStaticBuilder"));
-    assertFalse(hasStaticBuilder);
+    @Test
+    public void noStaticBuilder() {
+        boolean hasStaticBuilder = Stream.of(NoStaticBuilderBuilder.class.getDeclaredMethods())
+                .anyMatch(method -> method.getName().equals("NoStaticBuilder"));
+        assertFalse(hasStaticBuilder);
 
-    hasStaticBuilder = Stream.of(SimpleRecordBuilder.class.getDeclaredMethods())
-            .anyMatch(method -> method.getName().equals("SimpleRecord"));
-    assertTrue(hasStaticBuilder);
-  }
+        hasStaticBuilder = Stream.of(SimpleRecordBuilder.class.getDeclaredMethods())
+                .anyMatch(method -> method.getName().equals("SimpleRecord"));
+        assertTrue(hasStaticBuilder);
+    }
 }
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestWithers.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestWithers.java
index 379bcfe..947991c 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestWithers.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestWithers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/visibility/TestVisibility.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/visibility/TestVisibility.java
index 4a1ce19..b48ea0d 100644
--- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/visibility/TestVisibility.java
+++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/visibility/TestVisibility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ class TestVisibility {
         Assertions.assertTrue(Modifier.isPublic(WrapperProtectedRecordBuilder.class.getModifiers()));
     }
 
-
     @Test
     void testMatchesWithModifers() {
         Assertions.assertFalse(Modifier.isPublic(PackagePrivateRecordWithPublicBuilder.class.getModifiers()));
diff --git a/record-builder-validator/pom.xml b/record-builder-validator/pom.xml
index 42557d8..d2bb8c6 100644
--- a/record-builder-validator/pom.xml
+++ b/record-builder-validator/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2019 Jordan Zimmerman
+    Copyright 2019 The original author or authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/record-builder-validator/src/main/java/io/soabase/recordbuilder/validator/RecordBuilderValidator.java b/record-builder-validator/src/main/java/io/soabase/recordbuilder/validator/RecordBuilderValidator.java
index 8c296e9..f198ba8 100644
--- a/record-builder-validator/src/main/java/io/soabase/recordbuilder/validator/RecordBuilderValidator.java
+++ b/record-builder-validator/src/main/java/io/soabase/recordbuilder/validator/RecordBuilderValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Jordan Zimmerman
+ * Copyright 2019 The original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/etc/header.txt b/src/etc/header.txt
index 67a9dae..44f0d8e 100644
--- a/src/etc/header.txt
+++ b/src/etc/header.txt
@@ -1,4 +1,4 @@
-Copyright 2019 Jordan Zimmerman
+Copyright ${year} The original author or authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.