[maven-release-plugin] prepare release record-builder-21-java15

Closes #36

.github/workflows/maven.yml

@@ -19,6 +19,6 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 16
+        java-version: 16.0.0-ea
     - name: Build with Maven
-      run: ./mvnw -B package --file pom.xml
+      run: mvn -B package --file pom.xml

.github/workflows/maven_java15.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Maven Build - Java 17
+name: Maven Build - Java 15
 
 on:
   push:
@@ -19,6 +19,10 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 15
+    - name: Create Maven Directory
+      run: mkdir -p .mvn/
+    - name: Create Maven JVM file
+      run: echo "--enable-preview" > .mvn/jvm.config
     - name: Build with Maven
-      run: ./mvnw -B package --file pom.xml
+      run: mvn -P java15 -B package --file pom.xml

.gitignore

@@ -1,4 +0,0 @@
-# Default ignored files
-.idea
-**/target/**
-

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
-#
-#   https://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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

README.md

@@ -21,7 +21,8 @@ _Details:_
 - [Record From Interface Details](#RecordInterface-Example)
 - [Generation Via Includes](#generation-via-includes)
 - [Usage](#usage)
-- [Customizing](customizing.md) (e.g. add immutable collections, etc.)
+- [Customizing](customizing.md)
+- [Java 15 Versions](#java-15-versions)
 
 ## RecordBuilder Example
 
@@ -79,18 +80,12 @@ NameAndAge r5 = r4.with(b -> {
        b.name("whatever"));
    }
 });
-
-// or, if you cannot add the "With" interface to your record...
-NameAndAge r6 = NameAndAgeBuilder.from(r5).with(b -> b.age(200).name("whatever"));
-NameAndAge r7 = NameAndAgeBuilder.from(r5).withName("boop");
 ```
 
 _Hat tip to [Benji Weber](https://benjiweber.co.uk/blog/2020/09/19/fun-with-java-records/) for the Withers idea._
 
 ## Builder Class Definition
 
-(Note: you can see a builder class built using `@RecordBuilderFull` here: [FullRecordBuilder.java](https://gist.github.com/Randgalt/8aa487a847ea2acdd76d702f7cf17d6a))
-
 The full builder class is defined as:
 
 ```java
@@ -128,21 +123,6 @@ public class NameAndAgeBuilder {
         return new NameAndAgeBuilder(from.name(), from.age());
     }
 
-    /**
-     * Return a "with"er for an existing record instance
-     */
-    public static NameAndAgeBuilder.With from(NameAndAge from) {
-        return new _FromWith(from);
-    }
-
-    /**
-     * Return a stream of the record components as map entries keyed with the component name and the value as the component value
-     */
-    public static Stream<Map.Entry<String, Object>> stream(NameAndAge record) {
-        return Stream.of(new AbstractMap.SimpleImmutableEntry<>("name", record.name()),
-                 new AbstractMap.SimpleImmutableEntry<>("age", record.age()));
-    }
-
     /**
      * Return a new record instance with all fields set to the current values in this builder
      */
@@ -150,23 +130,6 @@ public class NameAndAgeBuilder {
         return new NameAndAge(name, age);
     }
 
-    @Override
-    public String toString() {
-        return "NameAndAgeBuilder[name=" + name + ", age=" + age + "]";
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, age);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return (this == o) || ((o instanceof NameAndAgeBuilder r)
-                && Objects.equals(name, r.name)
-                && (age == r.age));
-    }
-
     /**
      * Set a new value for the {@code name} record component in the builder
      */
@@ -197,25 +160,53 @@ public class NameAndAgeBuilder {
         return age;
     }
 
+    /**
+     * Return a stream of the record components as map entries keyed with the component name and the value as the component value
+     */
+    public static Stream<Map.Entry<String, Object>> stream(NameAndAge record) {
+        return Stream.of(new AbstractMap.SimpleEntry<>("name", record.name()),
+                 new AbstractMap.SimpleEntry<>("age", record.age()));
+    }
+
+    @Override
+    public String toString() {
+        return "NameAndAgeBuilder[name=" + name + ", age=" + age + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, age);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return (this == o) || ((o instanceof NameAndAgeBuilder b)
+                && Objects.equals(name, b.name)
+                && (age == b.age));
+    }
+
+    /**
+     * Downcast to {@code NameAndAge}
+     */
+    private static NameAndAge _downcast(Object obj) {
+        try {
+            return (NameAndAge)obj;
+        }
+        catch (ClassCastException dummy) {
+            throw new RuntimeException("NameAndAgeBuilder.With can only be implemented for NameAndAge");
+        }
+    }
+
     /**
      * Add withers to {@code NameAndAge}
      */
     public interface With {
-        /**
-         * Return the current value for the {@code name} record component in the builder
-         */
-        String name();
-
-        /**
-         * Return the current value for the {@code age} record component in the builder
-         */
-        int age();
-
         /**
          * Return a new record builder using the current values
          */
         default NameAndAgeBuilder with() {
-            return new NameAndAgeBuilder(name(), age());
+            NameAndAge r = _downcast(this);
+            return NameAndAgeBuilder.builder(r);
         }
 
         /**
@@ -231,32 +222,16 @@ public class NameAndAgeBuilder {
          * Return a new instance of {@code NameAndAge} with a new value for {@code name}
          */
         default NameAndAge withName(String name) {
-            return new NameAndAge(name, age());
+            NameAndAge r = _downcast(this);
+            return new NameAndAge(name, r.age());
         }
 
         /**
          * Return a new instance of {@code NameAndAge} with a new value for {@code age}
          */
         default NameAndAge withAge(int age) {
-            return new NameAndAge(name(), age);
-        }
-    }
-
-    private static final class _FromWith implements NameAndAgeBuilder.With {
-        private final NameAndAge from;
-
-        private _FromWith(NameAndAge from) {
-            this.from = from;
-        }
-
-        @Override
-        public String name() {
-            return from.name();
-        }
-
-        @Override
-        public int age() {
-            return from.age();
+            NameAndAge r = _downcast(this);
+            return new NameAndAge(r.name(), age);
         }
     }
 }
@@ -316,9 +291,6 @@ public void Placeholder {
 }
 ```
 
-`@RecordBuilder.Include` also supports a `packages` attribute that includes all records
-in the listed packages.
-
 The target package for generation is the same as the package that contains the "Include"
 annotation. Use `packagePattern` to change this (see Javadoc for details).  
 
@@ -326,15 +298,41 @@ annotation. Use `packagePattern` to change this (see Javadoc for details).
 
 ### Maven
 
-Add a dependency that contains the discoverable annotation processor:
+1) Add the dependency that contains the `@RecordBuilder` annotation.
 
 ```xml
 <dependency>
     <groupId>io.soabase.record-builder</groupId>
-    <artifactId>record-builder-processor</artifactId>
-    <version>${record.builder.version}</version>
+    <artifactId>record-builder-core</artifactId>
+    <version>set-version-here</version>
     <scope>provided</scope>
 </dependency>
+
+```
+
+2) Enable the annotation processing for the Maven Compiler Plugin:
+
+```xml
+<plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-compiler-plugin</artifactId>
+    <version>set-version-here</version>
+    <configuration>
+        <annotationProcessorPaths>
+            <annotationProcessorPath>
+                <groupId>io.soabase.record-builder</groupId>
+                <artifactId>record-builder-processor</artifactId>
+                <version>set-version-here</version>
+            </annotationProcessorPath>
+        </annotationProcessorPaths>
+        <annotationProcessors>
+            <annotationProcessor>io.soabase.recordbuilder.processor.RecordBuilderProcessor</annotationProcessor>
+        </annotationProcessors>
+
+        
+        ... any other options here ...
+    </configuration>
+</plugin>
 ```
 
 ### Gradle
@@ -357,3 +355,76 @@ Depending on your IDE you are likely to need to enable Annotation Processing in
 RecordBuilder can be customized to your needs and you can even create your
 own custom RecordBuilder annotations. See [Customizing RecordBuilder](customizing.md)
 for details.
+
+## Java 15 Versions
+
+Artifacts compiled wth Java 15 are available. These versions have `-java15` appended.
+
+Note: records are a preview feature only in Java 15. You'll need take a number of steps in order to try RecordBuilder:
+
+- Install and make active Java 15 or later
+- Make sure your development tool is using Java 15 or later and is configured to enable preview features (for Maven I've documented how to do this here: [https://stackoverflow.com/a/59363152/2048051](https://stackoverflow.com/a/59363152/2048051))
+- Bear in mind that this is not yet meant for production and there are numerous bugs in the tools and JDKs.
+
+Note: I've seen some very odd compilation bugs with the current Java 15 and Maven. If you get internal Javac errors I suggest rebuilding with `mvn clean package` and/or `mvn clean install`.
+
+You will need to enable preview in your build tools:
+
+### Maven
+
+```xml
+<dependencies>
+    <dependency>
+        <groupId>io.soabase.record-builder</groupId>
+        <artifactId>record-builder-core</artifactId>
+        <version>record-builder-version-java15</version>
+    </dependency>
+</dependencies>
+
+<plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-compiler-plugin</artifactId>
+    <version>maven-compiler-version</version>
+    <configuration>
+        <annotationProcessorPaths>
+            <annotationProcessorPath>
+                <groupId>io.soabase.record-builder</groupId>
+                <artifactId>record-builder-processor</artifactId>
+                <version>record-builder-version-java15</version>
+            </annotationProcessorPath>
+        </annotationProcessorPaths>
+        <annotationProcessors>
+            <annotationProcessor>io.soabase.recordbuilder.processor.RecordBuilderProcessor</annotationProcessor>
+        </annotationProcessors>
+
+        
+        <!-- "release" and "enable-preview" are required while records are preview features -->
+        <release>15</release>
+        <compilerArgs>
+            <arg>--enable-preview</arg>
+        </compilerArgs>
+
+        ... any other options here ...
+    </configuration>
+</plugin>
+```
+
+Create a file in your project's root named `.mvn/jvm.config`. The file should have 1 line with the value: `--enable-preview`. (see: https://stackoverflow.com/questions/58023240)
+
+### Gradle
+
+```groovy
+dependencies {
+    annotationProcessor 'io.soabase.record-builder:record-builder-processor:$record-builder-version-java15'
+    compileOnly 'io.soabase.record-builder:record-builder-core:$record-builder-version-java15'
+}
+
+tasks.withType(JavaCompile) {
+    options.fork = true
+    options.forkOptions.jvmArgs += '--enable-preview'
+    options.compilerArgs += '--enable-preview'
+}
+tasks.withType(Test) {
+    jvmArgs += "--enable-preview"
+}
+```

customizing.md

@@ -1,17 +1,10 @@
 [◀︎ RecordBuilder](README.md) • Customizing RecordBuilder
 
-# RecordBuilderFull
-
-Note: `@RecordBuilderFull` has most optional features enabled. It's an alternate
-form of `@RecordBuilder` that uses the [templating mechanism](#create-a-custom-annotation) to
-enable optional features.
-
 # Customizing RecordBuilder
 
 RecordBuilder can be customized in a number of ways. The types of customizations will change over time. See
 [@RecordBuilder.Options](record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilder.java)
-for the current set of customizations and their default values. For example, the `useImmutableCollections` option
-adds special handling for record components of type `java.util.List`, `java.util.Set`, `java.util.Map` and `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. `List.copyOf(o)`) or an empty immutable collection if the component is `null`.
+for the current set of customizations and their default values. 
 
 You can:
 
@@ -90,6 +83,3 @@ public @interface MyCoRecordBuilder {
 
 Now, you can use `@MyCoRecordBuilder` instead of `@RecordBuilder` and the record
 will be built with options as specified.
-
-Note: the template mechanism also supports `@RecordInterface` templates via the `asRecordInterface` attribute.
-When it is set a `@RecordInterface` template is created instead.

java15.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# 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
+#
+# 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.
+#
+
+
+jenv local 15
+javahome
+mkdir -p .mvn/
+echo "--enable-preview" > .mvn/jvm.config

java16.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# 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
+#
+# 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.
+#
+
+
+jenv local 16
+javahome
+rm -fr .mvn

mvnw

@@ -1,287 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.1.1
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME
-      else
-        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`\\unset -f command; \\command -v java`"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
-  done
-  printf '%s' "$(cd "$basedir"; pwd)"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=$(find_maven_basedir "$(dirname $0)")
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    if [ -n "$MVNW_REPOURL" ]; then
-      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
-    else
-      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
-    fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $wrapperUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
-
-    if command -v wget > /dev/null; then
-        QUIET="--quiet"
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-          QUIET=""
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
-        else
-            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
-        fi
-        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
-    elif command -v curl > /dev/null; then
-        QUIET="--silent"
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-          QUIET=""
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
-        else
-            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L
-        fi
-        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaSource=`cygpath --path --windows "$javaSource"`
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
-        if [ -e "$javaSource" ]; then
-            if [ ! -e "$javaClass" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaSource")
-            fi
-            if [ -e "$javaClass" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -1,187 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.1.1
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %WRAPPER_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% ^
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
-
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-
-cmd /C exit /B %ERROR_CODE%

pom.xml

@@ -5,7 +5,7 @@
     <groupId>io.soabase.record-builder</groupId>
     <artifactId>record-builder</artifactId>
     <packaging>pom</packaging>
-    <version>35</version>
+    <version>21-java15</version>
 
     <modules>
         <module>record-builder-core</module>
@@ -19,6 +19,8 @@
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+        <enable-preview />
+
         <jdk-version>16</jdk-version>
 
         <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
@@ -31,10 +33,8 @@
         <maven-clean-plugin-version>3.1.0</maven-clean-plugin-version>
         <maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
         <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
-        <maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
         <maven-surefire-plugin-version>3.0.0-M5</maven-surefire-plugin-version>
-
-        <jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
+        <maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
 
         <license-file-path>src/etc/header.txt</license-file-path>
 
@@ -80,7 +80,7 @@
         <url>https://github.com/randgalt/record-builder</url>
         <connection>scm:git:https://github.com/randgalt/record-builder.git</connection>
         <developerConnection>scm:git:git@github.com:randgalt/record-builder.git</developerConnection>
-        <tag>record-builder-35</tag>
+        <tag>record-builder-21-java15</tag>
     </scm>
 
     <issueManagement>
@@ -115,12 +115,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.soabase.record-builder</groupId>
-                <artifactId>record-builder-processor</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>io.soabase.record-builder</groupId>
                 <artifactId>record-builder-validator</artifactId>
@@ -156,18 +150,15 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin-version}</version>
-                </plugin>
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven-compiler-plugin-version}</version>
                     <configuration>
                         <release>${jdk-version}</release>
+                        <compilerArgs>
+                            <arg>${enable-preview}</arg>
+                        </compilerArgs>
                     </configuration>
                 </plugin>
 
@@ -227,8 +218,6 @@
                             <exclude>**/.travis.yml</exclude>
                             <exclude>**/gradlew</exclude>
                             <exclude>**/.github/**</exclude>
-                            <exclude>**/.mvn/**</exclude>
-                            <exclude>**/mvnw*</exclude>
                         </excludes>
                         <strictCheck>true</strictCheck>
                     </configuration>
@@ -319,6 +308,15 @@
                     </configuration>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin-version}</version>
+                    <configuration>
+                        <argLine>${enable-preview}</argLine>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -330,12 +328,6 @@
                     <artifactId>maven-gpg-plugin</artifactId>
                     <version>${maven-gpg-plugin-version}</version>
                 </plugin>
-
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${jacoco-maven-plugin-version}</version>
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -369,11 +361,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
@@ -401,5 +388,13 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>java15</id>
+            <properties>
+                <jdk-version>15</jdk-version>
+                <enable-preview>--enable-preview</enable-preview>
+            </properties>
+        </profile>
     </profiles>
 </project>

record-builder-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.soabase.record-builder</groupId>
         <artifactId>record-builder</artifactId>
-        <version>35</version>
+        <version>21-java15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilder.java

@@ -15,7 +15,6 @@
  */
 package io.soabase.recordbuilder.core;
 
-import javax.lang.model.element.Modifier;
 import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.SOURCE)
@@ -26,32 +25,12 @@ public @interface RecordBuilder {
     @Retention(RetentionPolicy.SOURCE)
     @Inherited
     @interface Include {
-        /**
-         * @return list of classes to include
-         */
-        Class<?>[] value() default {};
-
-        /**
-         * Synonym for {@code value()}. When using the other attributes it maybe more clear to
-         * use {@code classes()} instead of {@code value()}. Note: both attributes are applied
-         * (i.e. a union of classes from both attributes).
-         *
-         * @return list 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.
-         *
-         * @return list of package names
-         */
-        String[] packages() default {};
+        Class<?>[] value();
 
         /**
          * 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
+         * is replaced with the package of the Include annotation. '*' is replaced with
          * the package of the included class.
          *
          * @return package pattern
@@ -91,20 +70,15 @@ public @interface RecordBuilder {
         String buildMethodName() default "build";
 
         /**
-         * The name to use for the from-to-wither method
+         * The name to use for the downcast method
          */
-        String fromMethodName() default "from";
+        String downCastMethodName() default "_downcast";
 
         /**
          * The name to use for the method that returns the record components as a stream
          */
         String componentsMethodName() default "stream";
 
-        /**
-         * If true, a "With" interface is generated and an associated static factory
-         */
-        boolean enableWither() default true;
-
         /**
          * The name to use for the nested With class
          */
@@ -145,11 +119,6 @@ public @interface RecordBuilder {
          */
         boolean emptyDefaultForOptional() default true;
 
-        /**
-         * Add non-optional setter methods for optional record components.
-         */
-        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).
@@ -172,120 +141,12 @@ public @interface RecordBuilder {
          * 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}.
-         */
-        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.
-         */
-        boolean addSingleItemCollectionBuilders() default false;
-
-        /**
-         * The prefix for adder methods when {@link #addSingleItemCollectionBuilders()} is enabled
-         */
-        String singleItemBuilderPrefix() default "add";
-
-        /**
-         * 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".
-         */
-        String setterPrefix() default "";
-
-        /**
-         * If true, getters will be generated for the Builder class.
-         */
-        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".
-         */
-        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".
-         */
-        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.
-         */
-        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.
-         */
-        boolean addClassRetainedGenerated() default false;
-
-        /**
-         * 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}.
-         */
-        boolean addStaticBuilder() default true;
-
-        /**
-         * If {@link #addSingleItemCollectionBuilders()} and {@link #useImmutableCollections()} are enabled the builder
-         * uses an internal class to track changes to lists. This is the name of that class.
-         */
-        String mutableListClassName() default "_MutableList";
-
-        /**
-         * If {@link #addSingleItemCollectionBuilders()} and {@link #useImmutableCollections()} are enabled the builder
-         * uses an internal class to track changes to sets. This is the name of that class.
-         */
-        String mutableSetClassName() default "_MutableSet";
-
-        /**
-         * If {@link #addSingleItemCollectionBuilders()} and {@link #useImmutableCollections()} are enabled the builder
-         * uses an internal class to track changes to maps. This is the name of that class.
-         */
-        String mutableMapClassName() default "_MutableMap";
-
-
-        /**
-         * 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 {};
     }
 
-    @Retention(RetentionPolicy.CLASS)
+    @Retention(RetentionPolicy.SOURCE)
     @Target(ElementType.ANNOTATION_TYPE)
     @Inherited
     @interface Template {
         RecordBuilder.Options options();
-
-        boolean asRecordInterface() default false;
     }
 }

record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderFull.java

@@ -1,35 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.core;
-
-import java.lang.annotation.*;
-
-@RecordBuilder.Template(options = @RecordBuilder.Options(
-        interpretNotNulls = true,
-        useImmutableCollections = true,
-        addSingleItemCollectionBuilders = true,
-        addFunctionalMethodsToWith = true,
-        addClassRetainedGenerated = true
-))
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.TYPE)
-@Inherited
-/**
- * An alternate form of {@code @RecordBuilder} that has most
- * optional features turned on
- */
-public @interface RecordBuilderFull {
-}

record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordBuilderGenerated.java

@@ -1,30 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.core;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-
-/**
- * Jacoco ignores classes and methods annotated with `*Generated`
- */
-@Target({PACKAGE, TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER})
-@Retention(RetentionPolicy.CLASS)
-public @interface RecordBuilderGenerated {
-}

record-builder-core/src/main/java/io/soabase/recordbuilder/core/RecordInterface.java

@@ -15,7 +15,11 @@
  */
 package io.soabase.recordbuilder.core;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.SOURCE)
 @Target(ElementType.TYPE)
@@ -27,31 +31,14 @@ public @interface RecordInterface {
     @Retention(RetentionPolicy.SOURCE)
     @Inherited
     @interface Include {
-        /**
-         * @return list of classes to include
-         */
-        Class<?>[] value() default {};
+        Class<?>[] value();
 
-        /**
-         * Synonym for {@code value()}. When using the other attributes it maybe more clear to
-         * use {@code classes()} instead of {@code value()}. Note: both attributes are applied
-         * (i.e. a union of classes from both attributes).
-         *
-         * @return list of classes
-         */
-        Class<?>[] classes() default {};
-
-        /**
-         * If true the generated record is annotated with {@code @RecordBuilder}
-         *
-         * @return true/false
-         */
         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
+         * is replaced with the package of the Include annotation. '*' is replaced with
          * the package of the included class.
          *
          * @return package pattern

record-builder-processor/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.soabase.record-builder</groupId>
         <artifactId>record-builder</artifactId>
-        <version>35</version>
+        <version>21-java15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/CollectionBuilderUtils.java

@@ -1,347 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.processor;
-
-import com.squareup.javapoet.*;
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import javax.lang.model.element.Modifier;
-import java.util.*;
-
-import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.generatedRecordBuilderAnnotation;
-import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.recordBuilderGeneratedAnnotation;
-
-class CollectionBuilderUtils {
-    private final boolean useImmutableCollections;
-    private final boolean addSingleItemCollectionBuilders;
-    private final boolean addClassRetainedGenerated;
-    private final String listShimName;
-    private final String mapShimName;
-    private final String setShimName;
-    private final String collectionShimName;
-
-    private final String listMakerMethodName;
-    private final String mapMakerMethodName;
-    private final String setMakerMethodName;
-
-    private boolean needsListShim;
-    private boolean needsMapShim;
-    private boolean needsSetShim;
-    private boolean needsCollectionShim;
-
-    private boolean needsListMutableMaker;
-    private boolean needsMapMutableMaker;
-    private boolean needsSetMutableMaker;
-
-    private static final Class<?> listType = List.class;
-    private static final Class<?> mapType = Map.class;
-    private static final Class<?> setType = Set.class;
-    private static final Class<?> collectionType = Collection.class;
-    private static final TypeName listTypeName = TypeName.get(listType);
-    private static final TypeName mapTypeName = TypeName.get(mapType);
-    private static final TypeName setTypeName = TypeName.get(setType);
-    private static final TypeName collectionTypeName = TypeName.get(collectionType);
-
-    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 Class<?> mutableListType = ArrayList.class;
-    private static final Class<?> mutableMapType = HashMap.class;
-    private static final Class<?> mutableSetType = HashSet.class;
-    private static final ClassName mutableListTypeName = ClassName.get(mutableListType);
-    private static final ClassName mutableMapTypeName = ClassName.get(mutableMapType);
-    private static final ClassName mutableSetTypeName = ClassName.get(mutableSetType);
-    private final TypeSpec mutableListSpec;
-    private final TypeSpec mutableSetSpec;
-    private final TypeSpec mutableMapSpec;
-
-    CollectionBuilderUtils(List<RecordClassType> recordComponents, RecordBuilder.Options metaData) {
-        useImmutableCollections = metaData.useImmutableCollections();
-        addSingleItemCollectionBuilders = metaData.addSingleItemCollectionBuilders();
-        addClassRetainedGenerated = metaData.addClassRetainedGenerated();
-
-        listShimName = disambiguateGeneratedMethodName(recordComponents, "__list", 0);
-        mapShimName = disambiguateGeneratedMethodName(recordComponents, "__map", 0);
-        setShimName = disambiguateGeneratedMethodName(recordComponents, "__set", 0);
-        collectionShimName = disambiguateGeneratedMethodName(recordComponents, "__collection", 0);
-
-        listMakerMethodName = disambiguateGeneratedMethodName(recordComponents, "__ensureListMutable", 0);
-        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);
-    }
-
-    enum SingleItemsMetaDataMode {
-        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)) {
-            Class<?> collectionClass = null;
-            ClassName wildcardClass = null;
-            int typeArgumentQty = 0;
-            if (isList(component)) {
-                collectionClass = mutableListType;
-                wildcardClass = ClassName.get(Collection.class);
-                typeArgumentQty = 1;
-            } else if (isSet(component)) {
-                collectionClass = mutableSetType;
-                wildcardClass = ClassName.get(Collection.class);
-                typeArgumentQty = 1;
-            } else if (isMap(component)) {
-                collectionClass = mutableMapType;
-                wildcardClass = (ClassName) component.rawTypeName();
-                typeArgumentQty = 2;
-            }
-            var hasWildcardTypeArguments = hasWildcardTypeArguments(parameterizedTypeName, typeArgumentQty);
-            if (collectionClass != null) {
-                return switch (mode) {
-                    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 EXCLUDE_WILDCARD_TYPES -> {
-                        if (hasWildcardTypeArguments) {
-                            yield Optional.empty();
-                        }
-                        yield singleItemsMetaDataWithWildType(parameterizedTypeName, collectionClass, wildcardClass, typeArgumentQty);
-                    }
-                };
-            }
-        }
-        return Optional.empty();
-    }
-
-    boolean isImmutableCollection(RecordClassType component) {
-        return useImmutableCollections && (isList(component) || isMap(component) || isSet(component) || component.rawTypeName().equals(collectionTypeName));
-    }
-
-    boolean isList(RecordClassType component) {
-        return component.rawTypeName().equals(listTypeName);
-    }
-
-    boolean isMap(RecordClassType component) {
-        return component.rawTypeName().equals(mapTypeName);
-    }
-
-    boolean isSet(RecordClassType component) {
-        return component.rawTypeName().equals(setTypeName);
-    }
-
-    void addShimCall(CodeBlock.Builder builder, RecordClassType component) {
-        if (useImmutableCollections) {
-            if (isList(component)) {
-                needsListShim = true;
-                needsListMutableMaker = true;
-                builder.add("$L($L)", listShimName, component.name());
-            } else if (isMap(component)) {
-                needsMapShim = true;
-                needsMapMutableMaker = true;
-                builder.add("$L($L)", mapShimName, component.name());
-            } else if (isSet(component)) {
-                needsSetShim = true;
-                needsSetMutableMaker = true;
-                builder.add("$L($L)", setShimName, component.name());
-            } else if (component.rawTypeName().equals(collectionTypeName)) {
-                needsCollectionShim = true;
-                builder.add("$L($L)", collectionShimName, component.name());
-            } else {
-                builder.add("$L", component.name());
-            }
-        } else {
-            builder.add("$L", component.name());
-        }
-    }
-
-    String shimName(RecordClassType component) {
-        if (isList(component)) {
-            return listShimName;
-        } else if (isMap(component)) {
-            return mapShimName;
-        } else if (isSet(component)) {
-            return setShimName;
-        } else if (component.rawTypeName().equals(collectionTypeName)) {
-            return collectionShimName;
-        } else {
-            throw new IllegalArgumentException(component + " is not a supported collection type");
-        }
-    }
-
-    String mutableMakerName(RecordClassType component) {
-        if (isList(component)) {
-            return listMakerMethodName;
-        } else if (isMap(component)) {
-            return mapMakerMethodName;
-        } else if (isSet(component)) {
-            return setMakerMethodName;
-        } else {
-            throw new IllegalArgumentException(component + " is not a supported collection type");
-        }
-    }
-
-    void addShims(TypeSpec.Builder builder) {
-        if (!useImmutableCollections) {
-            return;
-        }
-
-        if (needsListShim) {
-            builder.addMethod(buildShimMethod(listShimName, listTypeName, collectionType, parameterizedListType, tType));
-        }
-        if (needsSetShim) {
-            builder.addMethod(buildShimMethod(setShimName, setTypeName, collectionType, parameterizedSetType, tType));
-        }
-        if (needsMapShim) {
-            builder.addMethod(buildShimMethod(mapShimName, mapTypeName, mapType, parameterizedMapType, kType, vType));
-        }
-        if (needsCollectionShim) {
-            builder.addMethod(buildCollectionsShimMethod());
-        }
-    }
-
-    void addMutableMakers(TypeSpec.Builder builder) {
-        if (!useImmutableCollections) {
-            return;
-        }
-
-        if (needsListMutableMaker) {
-            builder.addMethod(buildMutableMakerMethod(listMakerMethodName, mutableListSpec.name, parameterizedListType, tType));
-            builder.addType(mutableListSpec);
-        }
-        if (needsSetMutableMaker) {
-            builder.addMethod(buildMutableMakerMethod(setMakerMethodName, mutableSetSpec.name, parameterizedSetType, tType));
-            builder.addType(mutableSetSpec);
-        }
-        if (needsMapMutableMaker) {
-            builder.addMethod(buildMutableMakerMethod(mapMakerMethodName, mutableMapSpec.name, parameterizedMapType, kType, vType));
-            builder.addType(mutableMapSpec);
-        }
-    }
-
-    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)));
-        } else { // if (typeArgumentQty == 2)
-            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));
-    }
-
-    private boolean hasWildcardTypeArguments(ParameterizedTypeName parameterizedTypeName, int argumentCount) {
-        for (int i = 0; i < argumentCount; ++i) {
-            if (parameterizedTypeName.typeArguments.size() > i) {
-                if (parameterizedTypeName.typeArguments.get(i) instanceof WildcardTypeName) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private String disambiguateGeneratedMethodName(List<RecordClassType> recordComponents, String baseName, int index) {
-        var name = (index == 0) ? baseName : (baseName + index);
-        if (recordComponents.stream().anyMatch(component -> component.name().equals(name))) {
-            return disambiguateGeneratedMethodName(recordComponents, baseName, index + 1);
-        }
-        return name;
-    }
-
-    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]);
-        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();
-    }
-
-    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();
-    }
-
-    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)
-                .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());
-
-        if (addClassRetainedGenerated) {
-            builder.addAnnotation(recordBuilderGeneratedAnnotation);
-        }
-
-        return builder.build();
-    }
-
-    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)
-                .build();
-    }
-}

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/ElementUtils.java

@@ -52,19 +52,12 @@ public class ElementUtils {
     }
 
     @SuppressWarnings("unchecked")
-    public static List<TypeMirror> getAttributeTypeMirrorList(AnnotationValue attribute)
+    public static List<TypeMirror> getClassesAttribute(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 boolean getBooleanAttribute(AnnotationValue attribute)
     {
         Object value = (attribute != null) ? attribute.getValue() : null;
@@ -115,10 +108,8 @@ 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) {
-        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);
+    public static RecordClassType getRecordClassType(RecordComponentElement recordComponent, List<? extends AnnotationMirror> accessorAnnotations, List<? extends AnnotationMirror> canonicalConstructorAnnotations) {
+        return new RecordClassType(TypeName.get(recordComponent.asType()), recordComponent.getSimpleName().toString(), accessorAnnotations, canonicalConstructorAnnotations);
     }
 
     public static String getWithMethodName(ClassType component, String prefix) {

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/IncludeHelper.java

@@ -1,96 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.processor;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.*;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.Diagnostic;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-class IncludeHelper {
-    private final boolean isValid;
-    private final List<TypeElement> classTypeElements;
-    private final Map<? extends ExecutableElement, ? extends AnnotationValue> annotationValues;
-
-    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");
-        var packages = ElementUtils.getAnnotationValue(annotationValues, "packages");
-        var isValid = true;
-        var classTypeElements = new ArrayList<TypeElement>();
-        if (value.isPresent() || classes.isPresent() || packages.isPresent()) {
-            var valueList = value.map(ElementUtils::getAttributeTypeMirrorList).orElseGet(List::of);
-            var classesList = classes.map(ElementUtils::getAttributeTypeMirrorList).orElseGet(List::of);
-            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);
-                } else {
-                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "At least one of \"value\" or \"classes\" required", element);
-                }
-                isValid = false;
-            }
-            isValid = processList(processingEnv, isValid, element, valueList, classTypeElements);
-            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);
-            isValid = false;
-        }
-        this.isValid = isValid;
-        this.classTypeElements = List.copyOf(classTypeElements);
-    }
-
-    Map<? extends ExecutableElement, ? extends AnnotationValue> getAnnotationValues() {
-        return annotationValues;
-    }
-
-    boolean isValid() {
-        return isValid;
-    }
-
-    List<TypeElement> getClassTypeElements() {
-        return 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);
-                isValid = false;
-            } else {
-                classTypeElements.add(typeElement);
-            }
-        }
-        return isValid;
-    }
-
-    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()) {
-                if (child.getKind() == ElementKind.RECORD) {
-                    classTypeElements.add((TypeElement) child);
-                }
-            }
-        }
-    }
-}

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java

@@ -15,26 +15,20 @@
  */
 package io.soabase.recordbuilder.processor;
 
-import static io.soabase.recordbuilder.processor.CollectionBuilderUtils.SingleItemsMetaDataMode.EXCLUDE_WILDCARD_TYPES;
-import static io.soabase.recordbuilder.processor.CollectionBuilderUtils.SingleItemsMetaDataMode.STANDARD_FOR_SETTER;
-import static io.soabase.recordbuilder.processor.ElementUtils.getBuilderName;
-import static io.soabase.recordbuilder.processor.ElementUtils.getWithMethodName;
-import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.generatedRecordBuilderAnnotation;
-import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.recordBuilderGeneratedAnnotation;
+import com.squareup.javapoet.*;
+import io.soabase.recordbuilder.core.RecordBuilder;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.*;
 import java.util.*;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.squareup.javapoet.*;
-import io.soabase.recordbuilder.core.RecordBuilder;
+import static io.soabase.recordbuilder.processor.ElementUtils.getBuilderName;
+import static io.soabase.recordbuilder.processor.ElementUtils.getWithMethodName;
+import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.generatedRecordBuilderAnnotation;
 
 class InternalRecordBuilderProcessor {
     private final RecordBuilder.Options metaData;
@@ -47,53 +41,35 @@ class InternalRecordBuilderProcessor {
     private final TypeSpec.Builder builder;
     private final String uniqueVarName;
     private final Pattern notNullPattern;
-    private final CollectionBuilderUtils collectionBuilderUtils;
 
-    private static final TypeName overrideType = TypeName.get(Override.class);
-    private static final TypeName validType = ClassName.get("javax.validation", "Valid");
+    private static final TypeName optionalType = TypeName.get(Optional.class);
+    private static final TypeName optionalIntType = TypeName.get(OptionalInt.class);
+    private static final TypeName optionalLongType = TypeName.get(OptionalLong.class);
+    private static final TypeName optionalDoubleType = TypeName.get(OptionalDouble.class);
     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) {
-        this.processingEnv = processingEnv;
-        var recordActualPackage = ElementUtils.getPackageName(record);
-        this.metaData = metaData;
+    InternalRecordBuilderProcessor(TypeElement record, RecordBuilder.Options metaData, Optional<String> packageNameOpt) {
+        this.metaData = getMetaData(record, metaData);
         recordClassType = ElementUtils.getClassType(record, record.getTypeParameters());
-        packageName = packageNameOpt.orElse(recordActualPackage);
+        packageName = packageNameOpt.orElseGet(() -> ElementUtils.getPackageName(record));
         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())
+                .addModifiers(Modifier.PUBLIC)
                 .addAnnotation(generatedRecordBuilderAnnotation)
-                .addModifiers(metaData.builderClassModifiers())
                 .addTypeVariables(typeVariables);
-        if (metaData.addClassRetainedGenerated()) {
-            builder.addAnnotation(recordBuilderGeneratedAnnotation);
-        }
-        addVisibility(recordActualPackage.equals(packageName), record.getModifiers());
-        if (metaData.enableWither()) {
-            addWithNestedClass();
-        }
-        if (!metaData.beanClassName().isEmpty()) {
-            addBeanNestedClass();
-        }
+        addWithNestedClass();
         addDefaultConstructor();
-        if (metaData.addStaticBuilder()) {
-            addStaticBuilder();
-        }
+        addStaticBuilder();
         if (recordComponents.size() > 0) {
             addAllArgsConstructor();
         }
         addStaticDefaultBuilderMethod();
         addStaticCopyBuilderMethod();
-        if (metaData.enableWither()) {
-            addStaticFromWithMethod();
-        }
         addStaticComponentsMethod();
         addBuildMethod();
         addToStringMethod();
@@ -102,17 +78,9 @@ class InternalRecordBuilderProcessor {
         recordComponents.forEach(component -> {
             add1Field(component);
             add1SetterMethod(component);
-            if (metaData.enableGetters()) {
-                add1GetterMethod(component);
-            }
-            if (metaData.addConcreteSettersForOptional()) {
-                add1ConcreteOptionalSetterMethod(component);
-            }
-            var collectionMetaData = collectionBuilderUtils.singleItemsMetaData(component, EXCLUDE_WILDCARD_TYPES);
-            collectionMetaData.ifPresent(meta -> add1CollectionBuilders(meta, component));
+            add1GetterMethod(component);
         });
-        collectionBuilderUtils.addShims(builder);
-        collectionBuilderUtils.addMutableMakers(builder);
+        addStaticDowncastMethod();
         builderType = builder.build();
     }
 
@@ -128,17 +96,6 @@ class InternalRecordBuilderProcessor {
         return builderType;
     }
 
-    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
-            }
-            // is package-private
-        } else {
-            builder.addModifiers(Modifier.PUBLIC);
-        }
-    }
-
     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());
@@ -147,11 +104,16 @@ class InternalRecordBuilderProcessor {
                 .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);
+                    return ElementUtils.getRecordClassType(recordComponents.get(index), thisAccessorAnnotations, thisCanonicalConstructorAnnotations);
                 })
                 .collect(Collectors.toList());
     }
 
+    private RecordBuilder.Options getMetaData(TypeElement record, RecordBuilder.Options metaData) {
+        var recordSpecificMetaData = record.getAnnotation(RecordBuilder.Options.class);
+        return (recordSpecificMetaData != null) ? recordSpecificMetaData : metaData;
+    }
+
     private void addWithNestedClass() {
         /*
             Adds a nested interface that adds withers similar to:
@@ -167,44 +129,9 @@ class InternalRecordBuilderProcessor {
                 .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)));
         addWithBuilderMethod(classBuilder);
         addWithSuppliedBuilderMethod(classBuilder);
         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))
-                    .addMethod(buildFunctionalHandler("Function", "map", true))
-                    .addMethod(buildFunctionalHandler("Consumer", "accept", false));
-        }
-        builder.addType(classBuilder.build());
-    }
-
-    private void addBeanNestedClass() {
-        /*
-            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)
-                .addTypeVariables(typeVariables);
-        recordComponents.forEach(component -> {
-            if (prefixedName(component, true).equals(component.name())) {
-                return;
-            }
-            addNestedGetterMethod(classBuilder, component, component.name());
-            add1PrefixedGetterMethod(classBuilder, component);
-        });
         builder.addType(classBuilder.build());
     }
 
@@ -221,7 +148,7 @@ class InternalRecordBuilderProcessor {
         var codeBlockBuilder = CodeBlock.builder()
                 .add("$T builder = with();\n", builderClassType.typeName())
                 .add("consumer.accept(builder);\n")
-                .add("return builder.$L();\n", metaData.buildMethodName());
+                .add("return builder.build();\n");
         var consumerType = ParameterizedTypeName.get(ClassName.get(Consumer.class), builderClassType.typeName());
         var parameter = ParameterSpec.builder(consumerType, "consumer").build();
         var methodSpec = MethodSpec.methodBuilder(metaData.withClassMethodPrefix())
@@ -240,13 +167,13 @@ class InternalRecordBuilderProcessor {
             Adds a method that returns a pre-filled copy builder similar to:
 
             default MyRecordBuilder with() {
+                MyRecord r = _downcast(this);
                 return MyRecordBuilder.builder(r);
             }
          */
         var codeBlockBuilder = CodeBlock.builder()
-                .add("return new $L$L(", builderClassType.name(), typeVariables.isEmpty() ? "" : "<>");
-        addComponentCallsAsArguments(-1, codeBlockBuilder);
-        codeBlockBuilder.add(");");
+                .add("$T $L = $L(this);\n", recordClassType.typeName(), uniqueVarName, metaData.downCastMethodName())
+                .add("return $L.$L($L);", builderClassType.name(), metaData.copyMethodName(), uniqueVarName);
         var methodSpec = MethodSpec.methodBuilder(metaData.withClassMethodPrefix())
                 .addAnnotation(generatedRecordBuilderAnnotation)
                 .addJavadoc("Return a new record builder using the current values")
@@ -274,26 +201,31 @@ class InternalRecordBuilderProcessor {
             Adds a with method for the component similar to:
 
             default MyRecord withName(String name) {
+                MyRecord r = _downcast(this);
                 return new MyRecord(name, r.age());
             }
          */
         var codeBlockBuilder = CodeBlock.builder();
-        addNullCheckCodeBlock(codeBlockBuilder, index);
-        codeBlockBuilder.add("$[return ");
-        if (metaData.useValidationApi()) {
-            codeBlockBuilder.add("$T.validate(", validatorTypeName);
+        if (recordComponents.size() > 1) {
+            codeBlockBuilder.add("$T $L = $L(this);\n", recordClassType.typeName(), uniqueVarName, metaData.downCastMethodName());
         }
-        codeBlockBuilder.add("new $T(", recordClassType.typeName());
-        addComponentCallsAsArguments(index, codeBlockBuilder);
-        codeBlockBuilder.add(")");
-        if (metaData.useValidationApi()) {
-            codeBlockBuilder.add(")");
-        }
-        codeBlockBuilder.add(";$]");
+        codeBlockBuilder.add("return new $T(", recordClassType.typeName());
+        IntStream.range(0, recordComponents.size()).forEach(parameterIndex -> {
+            if (parameterIndex > 0) {
+                codeBlockBuilder.add(", ");
+            }
+            ClassType parameterComponent = recordComponents.get(parameterIndex);
+            if (parameterIndex == index) {
+                codeBlockBuilder.add(parameterComponent.name());
+            } else {
+                codeBlockBuilder.add("$L.$L()", uniqueVarName, parameterComponent.name());
+            }
+        });
+        codeBlockBuilder.add(");");
 
         var methodName = getWithMethodName(component, metaData.withClassMethodPrefix());
         var parameterSpecBuilder = ParameterSpec.builder(component.typeName(), component.name());
-        addConstructorAnnotations(component, parameterSpecBuilder);
+        component.getCanonicalConstructorAnnotations().forEach(annotationMirror -> parameterSpecBuilder.addAnnotation(AnnotationSpec.get(annotationMirror)));
         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())
@@ -305,42 +237,6 @@ class InternalRecordBuilderProcessor {
         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();
-            }
-         */
-        var codeBlockBuilder = CodeBlock.builder();
-        codeBlockBuilder.add("$[return $L()$];", component.name());
-
-        var methodName = prefixedName(component, true);
-        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();
-        classBuilder.addMethod(methodSpec);
-    }
-
-    private void addComponentCallsAsArguments(int index, CodeBlock.Builder codeBlockBuilder) {
-        IntStream.range(0, recordComponents.size()).forEach(parameterIndex -> {
-            if (parameterIndex > 0) {
-                codeBlockBuilder.add(", ");
-            }
-            RecordClassType parameterComponent = recordComponents.get(parameterIndex);
-            if (parameterIndex == index) {
-                collectionBuilderUtils.addShimCall(codeBlockBuilder, parameterComponent);
-            } else {
-                codeBlockBuilder.add("$L()", prefixedName(parameterComponent, true));
-            }
-        });
-    }
-
     private void addDefaultConstructor() {
         /*
             Adds a default constructor similar to:
@@ -373,7 +269,7 @@ class InternalRecordBuilderProcessor {
                 .addCode(codeBlock);
         recordComponents.forEach(component -> {
             var parameterSpecBuilder = ParameterSpec.builder(component.typeName(), component.name());
-            addConstructorAnnotations(component, parameterSpecBuilder);
+            component.getCanonicalConstructorAnnotations().forEach(annotationMirror -> parameterSpecBuilder.addAnnotation(AnnotationSpec.get(annotationMirror)));
             builder.addParameter(parameterSpecBuilder.build());
         });
         this.builder.addMethod(builder.build());
@@ -381,20 +277,10 @@ class InternalRecordBuilderProcessor {
 
     private void addNullCheckCodeBlock(CodeBlock.Builder builder) {
         if (metaData.interpretNotNulls()) {
-            for (int i = 0; i < recordComponents.size(); ++i) {
-                addNullCheckCodeBlock(builder, i);
-            }
-        }
-    }
-
-    private void addNullCheckCodeBlock(CodeBlock.Builder builder, int index) {
-        if (metaData.interpretNotNulls()) {
-            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");
-                }
-            }
+            recordComponents.stream()
+                    .filter(component -> !component.typeName().isPrimitive())
+                    .filter(this::isNullAnnotated)
+                    .forEach(component -> builder.addStatement("$T.requireNonNull($L, $S)", Objects.class, component.name(), component.name() + " is required"));
         }
     }
 
@@ -418,7 +304,8 @@ class InternalRecordBuilderProcessor {
                 .addAnnotation(generatedRecordBuilderAnnotation);
         recordComponents.forEach(component -> {
             constructorBuilder.addParameter(component.typeName(), component.name());
-            constructorBuilder.addStatement("this.$L = $L", component.name(), component.name());
+            var codeBuilder = CodeBlock.builder().add("this.$L = $L", component.name(), component.name());
+            constructorBuilder.addStatement(codeBuilder.build());
         });
         builder.addMethod(constructorBuilder.build());
     }
@@ -493,12 +380,7 @@ class InternalRecordBuilderProcessor {
          */
         var codeBuilder = CodeBlock.builder();
         codeBuilder.add("return (this == o) || (");
-        if (typeVariables.isEmpty()) {
-            codeBuilder.add("(o instanceof $L $L)", builderClassType.name(), uniqueVarName);
-        } else {
-            String wildcardList = typeVariables.stream().map(__ -> "?").collect(Collectors.joining(","));
-            codeBuilder.add("(o instanceof $L<$L> $L)", builderClassType.name(), wildcardList, uniqueVarName);
-        }
+        codeBuilder.add("(o instanceof $L $L)", builderClassType.name(), uniqueVarName);
         recordComponents.forEach(recordComponent -> {
             String name = recordComponent.name();
             if (recordComponent.typeName().isPrimitive()) {
@@ -545,16 +427,6 @@ class InternalRecordBuilderProcessor {
         */
 
         var codeBuilder = CodeBlock.builder();
-
-        IntStream.range(0, recordComponents.size()).forEach(index -> {
-            var recordComponent = recordComponents.get(index);
-            if (collectionBuilderUtils.isImmutableCollection(recordComponent)) {
-                codeBuilder.add("$[$L = ", recordComponent.name());
-                collectionBuilderUtils.addShimCall(codeBuilder, recordComponents.get(index));
-                codeBuilder.add(";\n$]");
-            }
-        });
-
         addNullCheckCodeBlock(codeBuilder);
         codeBuilder.add("$[return ");
         if (metaData.useValidationApi()) {
@@ -575,89 +447,6 @@ class InternalRecordBuilderProcessor {
         return codeBuilder.build();
     }
 
-    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[]{}));
-    }
-
-    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();
-                }
-            }
-         */
-
-        var fromWithClassBuilder = TypeSpec.classBuilder(metaData.fromWithClassName())
-                .addModifiers(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
-                .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();
-        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)
-                    .build();
-            fromWithClassBuilder.addMethod(methodSpec);
-        });
-        this.builder.addType(fromWithClassBuilder.build());
-    }
-
-    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);
-            }
-         */
-
-        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() ? "" : "<>")
-                .build();
-        builder.addMethod(methodSpec);
-    }
-
     private void addStaticCopyBuilderMethod() {
         /*
             Adds a copy builder method that pre-fills the builder with existing values similar to:
@@ -711,8 +500,10 @@ class InternalRecordBuilderProcessor {
             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()));
+                return Stream.of(
+                    new AbstractMap.SimpleEntry<>("p1", record.p1()),
+                    new AbstractMap.SimpleEntry<>("p2", record.p2())
+                );
             }
          */
         var codeBuilder = CodeBlock.builder().add("return $T.of(", Stream.class);
@@ -721,7 +512,7 @@ class InternalRecordBuilderProcessor {
                 codeBuilder.add(",\n ");
             }
             var name = recordComponents.get(index).name();
-            codeBuilder.add("new $T<>($S, record.$L())", AbstractMap.SimpleImmutableEntry.class, name, name);
+            codeBuilder.add("new $T<>($S, record.$L())", AbstractMap.SimpleEntry.class, name, name);
         });
         codeBuilder.add(")");
         var mapEntryTypeVariables = ParameterizedTypeName.get(Map.Entry.class, String.class, Object.class);
@@ -738,6 +529,37 @@ class InternalRecordBuilderProcessor {
         builder.addMethod(methodSpec);
     }
 
+    private void addStaticDowncastMethod() {
+        /*
+            Adds a method that downcasts to the record type
+
+            private static MyRecord _downcast(Object this) {
+                return (MyRecord)this;
+            }
+         */
+        var codeBlockBuilder = CodeBlock.builder()
+                .add("try {\n")
+                .indent()
+                .add("return ($T)obj;\n", recordClassType.typeName())
+                .unindent()
+                .add("}\n")
+                .add("catch (ClassCastException dummy) {\n")
+                .indent()
+                .add("throw new RuntimeException($S);\n", builderClassType.name() + "." + metaData.withClassName() + " can only be implemented by " + recordClassType.name())
+                .unindent()
+                .add("}");
+        var methodSpec = MethodSpec.methodBuilder(metaData.downCastMethodName())
+                .addAnnotation(generatedRecordBuilderAnnotation)
+                .addJavadoc("Downcast to {@code $L}\n", recordClassType.name())
+                .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
+                .addParameter(Object.class, "obj")
+                .addTypeVariables(typeVariables)
+                .returns(recordClassType.typeName())
+                .addCode(codeBlockBuilder.build())
+                .build();
+        builder.addMethod(methodSpec);
+    }
+
     private void add1Field(ClassType component) {
         /*
             For a single record component, add a field similar to:
@@ -746,183 +568,29 @@ class InternalRecordBuilderProcessor {
          */
         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();
+            TypeName thisOptionalType = null;
+            if (isOptional(component)) {
+                thisOptionalType = optionalType;
+            } else if (component.typeName().equals(optionalIntType)) {
+                thisOptionalType = optionalIntType;
+            } else if (component.typeName().equals(optionalLongType)) {
+                thisOptionalType = optionalLongType;
+            } else if (component.typeName().equals(optionalDoubleType)) {
+                thisOptionalType = optionalDoubleType;
+            }
+            if (thisOptionalType != null) {
+                var codeBlock = CodeBlock.builder().add("$T.empty()", thisOptionalType).build();
                 fieldSpecBuilder.initializer(codeBlock);
             }
         }
         builder.addField(fieldSpecBuilder.build());
     }
 
-    private void addNestedGetterMethod(TypeSpec.Builder classBuilder, RecordClassType component, String methodName) {
-        /*
-            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)
-                .returns(component.typeName());
-        addAccessorAnnotations(component, methodSpecBuilder, this::filterOutValid);
-        classBuilder.addMethod(methodSpecBuilder.build());
-    }
-
-    private boolean filterOutOverride(AnnotationSpec annotationSpec) {
-        return !annotationSpec.type.equals(overrideType);
-    }
-
-    private boolean filterOutValid(AnnotationSpec annotationSpec) {
-        return !annotationSpec.type.equals(validType);
-    }
-
-    private void addConstructorAnnotations(RecordClassType component, ParameterSpec.Builder parameterSpecBuilder) {
-        if (metaData.inheritComponentAnnotations()) {
-            component.getCanonicalConstructorAnnotations()
-                    .stream()
-                    .map(AnnotationSpec::get)
-                    .filter(this::filterOutOverride)
-                    .forEach(parameterSpecBuilder::addAnnotation);
-        }
-    }
-
-    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);
-        }
-    }
-
-    private String capitalize(String s) {
-        return (s.length() < 2) ? s.toUpperCase(Locale.ROOT) : (Character.toUpperCase(s.charAt(0)) + s.substring(1));
-    }
-
-    private void add1CollectionBuilders(CollectionBuilderUtils.SingleItemsMetaData meta, RecordClassType component) {
-        if (collectionBuilderUtils.isList(component) || collectionBuilderUtils.isSet(component)) {
-            add1ListBuilder(meta, component);
-        } else if (collectionBuilderUtils.isMap(component)) {
-            add1MapBuilder(meta, component);
-        }
-    }
-
-    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 (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());
-            } else {
-                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()))
-                    .addJavadoc("Add to the internally allocated {@code HashMap} for {@code $L}\n", component.name())
-                    .addModifiers(Modifier.PUBLIC)
-                    .addAnnotation(generatedRecordBuilderAnnotation)
-                    .returns(builderClassType.typeName());
-            if (i == 0) {
-                methodSpecBuilder.addParameter(meta.typeArguments().get(0), "key");
-                methodSpecBuilder.addParameter(meta.typeArguments().get(1), "value");
-                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));
-                methodSpecBuilder.addParameter(parameterizedTypeName, "i");
-                codeBlockBuilder.addStatement("i.forEach(entry -> this.$L.put(entry.getKey(), entry.getValue()))", component.name());
-            }
-            codeBlockBuilder.addStatement("return this");
-            methodSpecBuilder.addCode(codeBlockBuilder.build());
-            builder.addMethod(methodSpecBuilder.build());
-        }
-    }
-
-    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 (var i = 0; i < 3; ++i) {
-            var addClockBlock = CodeBlock.builder();
-            TypeName parameter;
-            if (i == 0) {
-                addClockBlock.addStatement("this.$L.add(i)", component.name());
-                parameter = meta.typeArguments().get(0);
-            } 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)));
-            }
-            var codeBlockBuilder = CodeBlock.builder();
-            if (collectionBuilderUtils.isImmutableCollection(component)) {
-                codeBlockBuilder
-                        .addStatement("this.$L = $L($L)", component.name(), collectionBuilderUtils.mutableMakerName(component), component.name());
-            } else {
-                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")
-                    .addCode(codeBlockBuilder.build());
-            builder.addMethod(methodSpecBuilder.build());
+    private boolean isOptional(ClassType component) {
+        if (component.typeName().equals(optionalType)) {
+            return true;
         }
+        return (component.typeName() instanceof ParameterizedTypeName) && ((ParameterizedTypeName) component.typeName()).rawType.equals(optionalType);
     }
 
     private void add1GetterMethod(RecordClassType component) {
@@ -933,13 +601,13 @@ class InternalRecordBuilderProcessor {
                 return p;
             }
          */
-        var methodSpecBuilder = MethodSpec.methodBuilder(prefixedName(component, true))
+        var methodSpecBuilder = MethodSpec.methodBuilder(component.name())
                 .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())
                 .addStatement("return $L", component.name());
-        addAccessorAnnotations(component, methodSpecBuilder, __ -> true);
+        component.getAccessorAnnotations().forEach(annotationMirror -> methodSpecBuilder.addAnnotation(AnnotationSpec.get(annotationMirror)));
         builder.addMethod(methodSpecBuilder.build());
     }
 
@@ -952,140 +620,19 @@ class InternalRecordBuilderProcessor {
                 return this;
             }
          */
-        var methodSpec = MethodSpec.methodBuilder(prefixedName(component, false))
+        var parameterSpecBuilder = ParameterSpec.builder(component.typeName(), component.name());
+        component.getCanonicalConstructorAnnotations().forEach(annotationMirror -> parameterSpecBuilder.addAnnotation(AnnotationSpec.get(annotationMirror)));
+
+        var methodSpec = MethodSpec.methodBuilder(component.name())
+                .addJavadoc("Set a new value for the {@code $L} record component in the builder\n", component.name())
                 .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());
-            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());
-            return ParameterSpec.builder(component.typeName(), component.name());
-        });
-        addConstructorAnnotations(component, parameterSpecBuilder);
-        methodSpec.addStatement("return this").addParameter(parameterSpecBuilder.build());
-        builder.addMethod(methodSpec.build());
-    }
-
-    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;
-            }
-         */
-        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 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())
-                .addStatement(getOptionalStatement(type), component.name(), type.typeName(), component.name());
-        addConstructorAnnotations(component, parameterSpecBuilder);
-        methodSpec.addStatement("return this").addParameter(parameterSpecBuilder.build());
-        builder.addMethod(methodSpec.build());
-    }
-
-    private String getOptionalStatement(OptionalType type) {
-
-        if(type.isOptional()) {
-            return "this.$L = $T.ofNullable($L)";
-        }
-
-        return "this.$L = $T.of($L)";
-    }
-
-    private List<TypeVariableName> typeVariablesWithReturn() {
-        var variables = new ArrayList<TypeVariableName>();
-        variables.add(rType);
-        variables.addAll(typeVariables);
-        return variables;
-    }
-
-    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());
-            }
-        */
-        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 codeBlockBuilder = CodeBlock.builder();
-        if (isMap) {
-            methodBuilder.addJavadoc("Map record components into a new object");
-            methodBuilder.addTypeVariable(rType);
-            methodBuilder.returns(rType);
-            codeBlockBuilder.add("return ");
-        } else {
-            methodBuilder.addJavadoc("Perform an operation on record components");
-        }
-        codeBlockBuilder.add("proc.apply(");
-        addComponentCallsAsArguments(-1, codeBlockBuilder);
-        codeBlockBuilder.add(");");
-        methodBuilder.addCode(codeBlockBuilder.build());
-        return methodBuilder.build();
-    }
-
-    private TypeSpec buildFunctionalInterface(String className, boolean isMap) {
-        /*
-            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 -> {
-            var parameterSpecBuilder = ParameterSpec.builder(component.typeName(), component.name());
-            addConstructorAnnotations(component, parameterSpecBuilder);
-            methodBuilder.addParameter(parameterSpecBuilder.build());
-        });
-        if (isMap) {
-            methodBuilder.returns(rType);
-        }
-        return TypeSpec.interfaceBuilder(className)
-                .addAnnotation(generatedRecordBuilderAnnotation)
-                .addAnnotation(FunctionalInterface.class)
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .addTypeVariables(localTypeVariables)
-                .addMethod(methodBuilder.build())
+                .addParameter(parameterSpecBuilder.build())
+                .returns(builderClassType.typeName())
+                .addStatement("this.$L = $L", component.name(), component.name())
+                .addStatement("return this")
                 .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);
-        boolean isBool = component.typeName().toString().toLowerCase(Locale.ROOT).equals("boolean");
-        if (isGetter) {
-            if (isBool) {
-                return prefixer.apply(metaData.booleanPrefix(), component.name());
-            }
-            return prefixer.apply(metaData.getterPrefix(), component.name());
-        }
-        return prefixer.apply(metaData.setterPrefix(), component.name());
+        builder.addMethod(methodSpec);
     }
 }
 

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordInterfaceProcessor.java

@@ -15,10 +15,13 @@
  */
 package io.soabase.recordbuilder.processor;
 
-import com.squareup.javapoet.*;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
+import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.TypeVariableName;
 import io.soabase.recordbuilder.core.IgnoreDefaultMethod;
 import io.soabase.recordbuilder.core.RecordBuilder;
-
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -26,14 +29,19 @@ import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
 import javax.tools.Diagnostic;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static io.soabase.recordbuilder.processor.ElementUtils.getBuilderName;
 import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.generatedRecordInterfaceAnnotation;
-import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.recordBuilderGeneratedAnnotation;
 
 class InternalRecordInterfaceProcessor {
     private final ProcessingEnvironment processingEnv;
@@ -48,10 +56,9 @@ class InternalRecordInterfaceProcessor {
 
     private static final Set<String> javaBeanPrefixes = Set.of("get", "is");
 
-    private record Component(ExecutableElement element, Optional<String> alternateName) {
-    }
+    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) {
         this.processingEnv = processingEnv;
         packageName = packageNameOpt.orElseGet(() -> ElementUtils.getPackageName(iface));
         recordComponents = getRecordComponents(iface);
@@ -69,22 +76,11 @@ class InternalRecordInterfaceProcessor {
                 .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());
             builder.addAnnotation(RecordBuilder.class);
             builder.addSuperinterface(builderClassType.typeName());
-            if (fromTemplate) {
-                builder.addAnnotation(AnnotationSpec.get(metaData));
-            } else {
-                var options = iface.getAnnotation(RecordBuilder.Options.class);
-                if (options != null) {
-                    builder.addAnnotation(AnnotationSpec.get(options));
-                }
-            }
         }
 
         alternateMethods = buildAlternateMethods(recordComponents);
@@ -92,7 +88,8 @@ class InternalRecordInterfaceProcessor {
         recordType = builder.build();
     }
 
-    boolean isValid() {
+    boolean isValid()
+    {
         return !recordComponents.isEmpty();
     }
 
@@ -108,7 +105,8 @@ class InternalRecordInterfaceProcessor {
         return recordClassType;
     }
 
-    String toRecord(String classSource) {
+    String toRecord(String classSource)
+    {
         // javapoet does yet support records - so a class was created and we can reshape it
         // The class will look something like this:
         /*
@@ -141,7 +139,8 @@ class InternalRecordInterfaceProcessor {
         return fixedRecord.toString();
     }
 
-    private MethodSpec generateArgumentList() {
+    private MethodSpec generateArgumentList()
+    {
         MethodSpec.Builder builder = MethodSpec.methodBuilder(FAKE_METHOD_NAME);
         recordComponents.forEach(component -> {
             String name = component.alternateName.orElseGet(() -> component.element.getSimpleName().toString());
@@ -154,18 +153,18 @@ class InternalRecordInterfaceProcessor {
 
     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());
+            .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) {
@@ -181,8 +180,8 @@ class InternalRecordInterfaceProcessor {
         }
         return components;
     }
-
-    private static class IllegalInterface extends RuntimeException {
+    private static class IllegalInterface extends RuntimeException
+    {
         public IllegalInterface(String message) {
             super(message);
         }
@@ -220,13 +219,14 @@ class InternalRecordInterfaceProcessor {
         });
     }
 
-    private Optional<String> stripBeanPrefix(String name) {
+    private Optional<String> stripBeanPrefix(String name)
+    {
         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);
-                });
+            .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);
+            });
     }
 }

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/OptionalType.java

@@ -1,66 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.processor;
-
-import java.util.Optional;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
-
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-
-public record OptionalType(TypeName typeName, TypeName valueType) {
-
-    private static final TypeName optionalType = TypeName.get(Optional.class);
-    private static final TypeName optionalIntType = TypeName.get(OptionalInt.class);
-    private static final TypeName optionalLongType = TypeName.get(OptionalLong.class);
-    private static final TypeName optionalDoubleType = TypeName.get(OptionalDouble.class);
-
-    private static boolean isOptional(ClassType component) {
-        if (component.typeName().equals(optionalType)) {
-            return true;
-        }
-        return (component.typeName() instanceof ParameterizedTypeName parameterizedTypeName)
-                && parameterizedTypeName.rawType.equals(optionalType);
-    }
-
-    static Optional<OptionalType> fromClassType(final ClassType component) {
-        if (isOptional(component)) {
-            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)
-                    : parameterizedType.typeArguments.get(0);
-            return Optional.of(new OptionalType(optionalType, containingType));
-        }
-        if (component.typeName().equals(optionalIntType)) {
-            return Optional.of(new OptionalType(optionalIntType, TypeName.get(int.class)));
-        }
-        if (component.typeName().equals(optionalLongType)) {
-            return Optional.of(new OptionalType(optionalLongType, TypeName.get(long.class)));
-        }
-        if (component.typeName().equals(optionalDoubleType)) {
-            return Optional.of(new OptionalType(optionalDoubleType, TypeName.get(double.class)));
-        }
-        return Optional.empty();
-    }
-
-    public boolean isOptional() {
-        return typeName.equals(optionalType);
-    }
-}

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderProcessor.java

@@ -19,7 +19,6 @@ import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.TypeSpec;
 import io.soabase.recordbuilder.core.RecordBuilder;
-import io.soabase.recordbuilder.core.RecordBuilderGenerated;
 import io.soabase.recordbuilder.core.RecordInterface;
 
 import javax.annotation.processing.AbstractProcessor;
@@ -30,8 +29,10 @@ import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Optional;
@@ -39,7 +40,8 @@ import java.util.Set;
 import java.util.function.Function;
 
 public class RecordBuilderProcessor
-        extends AbstractProcessor {
+        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();
@@ -47,21 +49,23 @@ public class RecordBuilderProcessor
 
     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) {
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv)
+    {
         annotations.forEach(annotation -> roundEnv.getElementsAnnotatedWith(annotation).forEach(element -> process(annotation, element)));
         return false;
     }
 
     @Override
-    public Set<String> getSupportedAnnotationTypes() {
+    public Set<String> getSupportedAnnotationTypes()
+    {
         return Set.of("*");
     }
 
     @Override
-    public SourceVersion getSupportedSourceVersion() {
+    public SourceVersion getSupportedSourceVersion()
+    {
         // 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()
@@ -69,51 +73,59 @@ public class RecordBuilderProcessor
         return SourceVersion.latest();
     }
 
-    private void process(TypeElement annotation, Element element) {
+    private void process(TypeElement annotation, Element element)
+    {
         String annotationClass = annotation.getQualifiedName().toString();
         if (annotationClass.equals(RECORD_BUILDER)) {
-            var typeElement = (TypeElement) element;
-            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);
-        } else if (annotationClass.equals(RECORD_BUILDER_INCLUDE) || annotationClass.equals(RECORD_INTERFACE_INCLUDE)) {
-            processIncludes(element, getMetaData(element), annotationClass);
+            var metaData = RecordBuilderOptions.build(processingEnv.getOptions());
+            processRecordBuilder((TypeElement) element, metaData, Optional.empty());
+        }
+        else if (annotationClass.equals(RECORD_INTERFACE)) {
+            var metaData = RecordBuilderOptions.build(processingEnv.getOptions());
+            processRecordInterface((TypeElement) element, element.getAnnotation(RecordInterface.class).addRecordBuilder(), metaData, Optional.empty());
+        }
+        else if (annotationClass.equals(RECORD_BUILDER_INCLUDE) || annotationClass.equals(RECORD_INTERFACE_INCLUDE)) {
+            var metaData = RecordBuilderOptions.build(processingEnv.getOptions());
+            processIncludes(element, metaData, annotationClass);
         } else {
             var recordBuilderTemplate = annotation.getAnnotation(RecordBuilder.Template.class);
             if (recordBuilderTemplate != null) {
-                if (recordBuilderTemplate.asRecordInterface()) {
-                    processRecordInterface((TypeElement) element, true, recordBuilderTemplate.options(), Optional.empty(), true);
-                } else {
-                    processRecordBuilder((TypeElement) element, recordBuilderTemplate.options(), Optional.empty());
-                }
+                processRecordBuilder((TypeElement) element, recordBuilderTemplate.options(), Optional.empty());
             }
         }
     }
 
-    private RecordBuilder.Options getMetaData(Element element) {
-        var recordSpecificMetaData = element.getAnnotation(RecordBuilder.Options.class);
-        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);
+    private void processIncludes(Element element, RecordBuilder.Options metaData, String annotationClass)
+    {
         var annotationMirrorOpt = ElementUtils.findAnnotationMirror(processingEnv, element, annotationClass);
         if (annotationMirrorOpt.isEmpty()) {
             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Could not get annotation mirror for: " + annotationClass, element);
-        } else {
-            var includeHelper = new IncludeHelper(processingEnv, element, annotationMirrorOpt.get(), isRecordBuilderInclude);
-            if (includeHelper.isValid()) {
-                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);
+        }
+        else {
+            var values = processingEnv.getElementUtils().getElementValuesWithDefaults(annotationMirrorOpt.get());
+            var classes = ElementUtils.getAnnotationValue(values, "value");
+            if (classes.isEmpty()) {
+                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Could not get annotation value for: " + annotationClass, element);
+            }
+            else {
+                var packagePattern = ElementUtils.getStringAttribute(ElementUtils.getAnnotationValue(values, "packagePattern").orElse(null), "*");
+                var classesMirrors = ElementUtils.getClassesAttribute(classes.get());
+                for (TypeMirror mirror : classesMirrors) {
+                    TypeElement typeElement = (TypeElement) processingEnv.getTypeUtils().asElement(mirror);
+                    if (typeElement == null) {
+                        processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Could not get element for: " + mirror, element);
+                    }
+                    else {
+                        var packageName = buildPackageName(packagePattern, element, typeElement);
+                        if (packageName != null) {
+                            if (annotationClass.equals(RECORD_INTERFACE_INCLUDE)) {
+                                var addRecordBuilderOpt = ElementUtils.getAnnotationValue(values, "addRecordBuilder");
+                                var addRecordBuilder = addRecordBuilderOpt.map(ElementUtils::getBooleanAttribute).orElse(true);
+                                processRecordInterface(typeElement, addRecordBuilder, metaData, Optional.of(packageName));
+                            }
+                            else {
+                                processRecordBuilder(typeElement, metaData, Optional.of(packageName));
+                            }
                         }
                     }
                 }
@@ -121,7 +133,8 @@ public class RecordBuilderProcessor
         }
     }
 
-    private String buildPackageName(String packagePattern, Element builderElement, TypeElement includedClass) {
+    private String buildPackageName(String packagePattern, Element builderElement, TypeElement includedClass)
+    {
         PackageElement includedClassPackage = findPackageElement(includedClass, includedClass);
         if (includedClassPackage == null) {
             return null;
@@ -133,7 +146,8 @@ public class RecordBuilderProcessor
         return replaced.replace("@", ((PackageElement) builderElement.getEnclosingElement()).getQualifiedName().toString());
     }
 
-    private PackageElement findPackageElement(Element actualElement, Element includedClass) {
+    private PackageElement findPackageElement(Element actualElement, Element includedClass)
+    {
         if (includedClass == null) {
             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Element has not package", actualElement);
             return null;
@@ -144,19 +158,21 @@ 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)
+    {
         if (!element.getKind().isInterface()) {
             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);
         if (!internalProcessor.isValid()) {
             return;
         }
         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
@@ -165,11 +181,12 @@ public class RecordBuilderProcessor
             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "RecordBuilder only valid for records.", record);
             return;
         }
-        var internalProcessor = new InternalRecordBuilderProcessor(processingEnv, record, metaData, packageName);
+        var internalProcessor = new InternalRecordBuilderProcessor(record, metaData, packageName);
         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();
@@ -179,12 +196,14 @@ public class RecordBuilderProcessor
             try (Writer writer = sourceFile.openWriter()) {
                 javaFile.writeTo(writer);
             }
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             handleWriteError(record, e);
         }
     }
 
-    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();
@@ -198,12 +217,14 @@ public class RecordBuilderProcessor
             try (Writer writer = sourceFile.openWriter()) {
                 writer.write(recordSourceCode);
             }
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             handleWriteError(element, e);
         }
     }
 
-    private JavaFile javaFileBuilder(String packageName, TypeSpec type, RecordBuilder.Options metaData) {
+    private JavaFile javaFileBuilder(String packageName, TypeSpec type, RecordBuilder.Options metaData)
+    {
         var javaFileBuilder = JavaFile.builder(packageName, type).skipJavaLangImports(true).indent(metaData.fileIndent());
         var comment = metaData.fileComment();
         if ((comment != null) && !comment.isEmpty()) {
@@ -212,7 +233,8 @@ public class RecordBuilderProcessor
         return javaFileBuilder.build();
     }
 
-    private void handleWriteError(TypeElement element, IOException e) {
+    private void handleWriteError(TypeElement element, IOException e)
+    {
         String message = "Could not create source file";
         if (e.getMessage() != null) {
             message = message + ": " + e.getMessage();

record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordClassType.java

@@ -21,21 +21,15 @@ import javax.lang.model.element.AnnotationMirror;
 import java.util.List;
 
 public class RecordClassType extends ClassType {
-    private final TypeName rawTypeName;
     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, String name, List<? extends AnnotationMirror> accessorAnnotations, List<? extends AnnotationMirror> canonicalConstructorAnnotations) {
         super(typeName, name);
-        this.rawTypeName = rawTypeName;
         this.accessorAnnotations = accessorAnnotations;
         this.canonicalConstructorAnnotations = canonicalConstructorAnnotations;
     }
 
-    public TypeName rawTypeName() {
-        return rawTypeName;
-    }
-
     public List<? extends AnnotationMirror> getAccessorAnnotations() {
         return accessorAnnotations;
     }

record-builder-test/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.soabase.record-builder</groupId>
         <artifactId>record-builder</artifactId>
-        <version>35</version>
+        <version>21-java15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
 
         <dependency>
             <groupId>io.soabase.record-builder</groupId>
-            <artifactId>record-builder-processor</artifactId>
+            <artifactId>record-builder-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -51,6 +51,31 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>io.soabase.record-builder</groupId>
+                            <artifactId>record-builder-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                    <annotationProcessors>
+                        <annotationProcessor>io.soabase.recordbuilder.processor.RecordBuilderProcessor</annotationProcessor>
+                    </annotationProcessors>
+                    <release>${jdk-version}</release>
+                    <compilerArgs>
+                        <arg>${enable-preview}</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -66,48 +91,6 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>io/soabase/recordbuilder/test/jacoco/*</include>
-                            </includes>
-                            <rules>
-                                <rule>
-                                    <element>BUNDLE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.60</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionCopying.java

@@ -1,34 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import java.time.Instant;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@RecordBuilder
-@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> {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionInterface.java

@@ -1,36 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-import io.soabase.recordbuilder.core.RecordInterface;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@RecordInterface
-@RecordBuilder.Options(useImmutableCollections = true)
-public interface CollectionInterface<T, X extends Point> {
-    List<T> l();
-
-    Set<T> s();
-
-    Map<T, X> m();
-
-    Collection<X> c();
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecord.java

@@ -1,36 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import java.time.Instant;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-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 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)));
-        Instant now = r.map((l1, s1, m1, c1) -> Instant.now());
-        r.accept((l1, s1, m1, c1) -> {
-        });
-    }
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/CollectionRecordConflicts.java

@@ -1,28 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-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 {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/CustomMethodNames.java

@@ -1,29 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import java.util.List;
-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 {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/ExceptionDetails.java

@@ -1,35 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-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
-) {
-    @Override
-    public List<String> jsonProblems() {
-        if (jsonProblems == null) {
-            return List.of();
-        }
-        return jsonProblems;
-    }
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/FullRecord.java

@@ -1,26 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilderFull;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-import java.util.Map;
-
-@RecordBuilderFull
-public record FullRecord(@NotNull List<Number> numbers, @NotNull Map<Number, FullRecord> fullRecords, @NotNull String justAString) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/IgnoreAnnotated.java

@@ -1,25 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import javax.validation.constraints.NotNull;
-
-@RecordBuilder()
-@RecordBuilder.Options(inheritComponentAnnotations = false)
-public record IgnoreAnnotated(@NotNull String s) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/IncludeWithOption.java

@@ -1,24 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-@RecordBuilder.Options(prefixEnclosingClassNames = false)
-@RecordBuilder.Include(IncludeWithOption.Hey.class)
-public class IncludeWithOption {
-    public static record Hey(String s){}
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/InterfaceTemplateTest.java

@@ -1,23 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-@MyInterfaceTemplate
-public interface InterfaceTemplateTest {
-    String name();
-
-    int age();
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/MutableCollectionRecord.java

@@ -1,24 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import java.util.List;
-
-@RecordBuilder
-public record MutableCollectionRecord(List<String> l) implements MutableCollectionRecordBuilder.With {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/MyInterfaceTemplate.java

@@ -1,26 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-@RecordBuilder.Template(options = @RecordBuilder.Options(
-        fileComment = "This is a test",
-        withClassName = "Com"),
-        asRecordInterface = true
-)
-public @interface MyInterfaceTemplate {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/NoStaticBuilder.java

@@ -1,23 +0,0 @@
-package io.soabase.recordbuilder.test;
-
-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
- *
- * 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.
- */
-@RecordBuilder.Options(addStaticBuilder = false)
-@RecordBuilder
-public record NoStaticBuilder(String foo) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional.java

@@ -15,8 +15,6 @@
  */
 package io.soabase.recordbuilder.test;
 
-import javax.validation.constraints.NotNull;
-
 import io.soabase.recordbuilder.core.RecordBuilder;
 
 import java.util.Optional;
@@ -24,6 +22,6 @@ import java.util.OptionalDouble;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 
-@RecordBuilder.Options(emptyDefaultForOptional = true, addConcreteSettersForOptional = true)
+@RecordBuilder.Options(emptyDefaultForOptional = true)
 @RecordBuilder
-public record RecordWithOptional(@NotNull Optional<String> value, Optional raw, OptionalInt i, OptionalLong l, OptionalDouble d) {}
+public record RecordWithOptional(Optional<String> value, Optional raw, OptionalInt i, OptionalLong l, OptionalDouble d) {}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/RecordWithOptional2.java

@@ -1,26 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import java.util.Optional;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
-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) {}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java

@@ -1,28 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-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) {}
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord.java

@@ -18,9 +18,8 @@ package io.soabase.recordbuilder.test;
 import io.soabase.recordbuilder.core.RecordBuilder;
 
 import javax.validation.constraints.NotNull;
-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) {
 }

record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequiredRecord2.java

@@ -21,5 +21,5 @@ import javax.validation.constraints.NotNull;
 
 @RecordBuilder.Options(useValidationApi = true)
 @RecordBuilder
-public record RequiredRecord2(@NotNull String hey, @NotNull int i) implements RequiredRecord2Builder.With {
+public record RequiredRecord2(@NotNull String hey, @NotNull int i) {
 }

record-builder-test/src/main/java/io/soabase/recordbuilder/test/SingleItems.java

@@ -1,34 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import java.time.Instant;
-import java.util.Collection;
-import java.util.List;
-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> {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/StrippedFeaturesRecord.java

@@ -1,25 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-@RecordBuilder
-@RecordBuilder.Options(
-    enableGetters = false,
-    enableWither = false
-)
-public record StrippedFeaturesRecord(int aField) {}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/WildcardSingleItems.java

@@ -1,32 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import java.time.Instant;
-import java.util.Collection;
-import java.util.List;
-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> {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/IncludeFactory.java

@@ -1,25 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.includes;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-@RecordBuilder.Include(
-        packages = "io.soabase.recordbuilder.test.includes.pack",
-        classes = JustATest.class
-)
-public class IncludeFactory {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/JustATest.java

@@ -1,19 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.includes;
-
-public record JustATest(int i) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/AlsoIgnoreMe.java

@@ -1,19 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.includes.pack;
-
-public interface AlsoIgnoreMe {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/IgnoreMe.java

@@ -1,19 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.includes.pack;
-
-public class IgnoreMe {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord1.java

@@ -1,19 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.includes.pack;
-
-public record PackRecord1(String name) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord2.java

@@ -1,19 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.includes.pack;
-
-public record PackRecord2(String name, int age) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/includes/pack/PackRecord3.java

@@ -1,21 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.includes.pack;
-
-import java.time.Instant;
-
-public record PackRecord3(Instant time, int age) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/jacoco/FullRecordForJacoco.java

@@ -1,28 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.jacoco;
-
-import io.soabase.recordbuilder.core.RecordBuilderFull;
-import io.soabase.recordbuilder.core.RecordBuilderGenerated;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-import java.util.Map;
-
-@RecordBuilderFull
-@RecordBuilderGenerated
-public record FullRecordForJacoco(@NotNull List<Number> numbers, @NotNull Map<Number, FullRecordForJacoco> fullRecords, @NotNull String justAString) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecord.java

@@ -1,22 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.visibility;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-@RecordBuilder
-record PackagePrivateRecord(int i) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/PackagePrivateRecordWithPublicBuilder.java

@@ -1,26 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.visibility;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-import javax.lang.model.element.Modifier;
-
-
-@RecordBuilder.Options(builderClassModifiers = {Modifier.PUBLIC})
-@RecordBuilder
-record PackagePrivateRecordWithPublicBuilder(String value) {
-}

record-builder-test/src/main/java/io/soabase/recordbuilder/test/visibility/Wrapper.java

@@ -1,28 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.visibility;
-
-import io.soabase.recordbuilder.core.RecordBuilder;
-
-class Wrapper {
-    @RecordBuilder
-    protected record ProtectedRecord(int i) {
-    }
-
-    @RecordBuilder
-    record PackagePrivateRecord(int i) {
-    }
-}

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestAnnotated.java

@@ -25,12 +25,6 @@ import javax.validation.constraints.Null;
 import java.lang.reflect.AnnotatedElement;
 
 class TestAnnotated {
-    @Test
-    void testInheritComponentAnnotationsFalse() throws NoSuchMethodException {
-        var method = IgnoreAnnotatedBuilder.class.getMethod("s");
-        Assertions.assertNull(method.getAnnotation(NotNull.class));
-    }
-
     @Test
     void testStaticConstructor() throws NoSuchMethodException {
         var method = AnnotatedBuilder.class.getMethod("Annotated", String.class, Integer.TYPE, Double.TYPE);

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestCollections.java

@@ -1,135 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.*;
-
-import static io.soabase.recordbuilder.test.foo.PointBuilder.Point;
-import static org.junit.jupiter.api.Assertions.*;
-
-class TestCollections {
-    @Test
-    void testRecordBuilderOptionsCopied() {
-        try {
-            assertNotNull(CollectionInterfaceRecordBuilder.class.getDeclaredMethod("__list", Collection.class));
-        } catch (NoSuchMethodException e) {
-            Assertions.fail(e);
-        }
-    }
-
-    @Test
-    void testCollectionRecordDefaultValues() {
-        var defaultValues = CollectionRecordBuilder.builder().build();
-        assertNotNull(defaultValues.l());
-        assertNotNull(defaultValues.s());
-        assertNotNull(defaultValues.m());
-        assertNotNull(defaultValues.c());
-    }
-
-    @Test
-    void testCollectionRecordImmutable() {
-        var list = new ArrayList<String>();
-        list.add("one");
-        var set = new HashSet<String>();
-        set.add("one");
-        var map = new HashMap<String, Point>();
-        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();
-
-        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();
-        assertTrue(x.c() instanceof List);
-    }
-
-    @Test
-    void testCollectionRecordImmutableWithers() {
-        var r = CollectionRecordBuilder.<String, Point>builder().build();
-
-        var list = new ArrayList<String>();
-        list.add("one");
-        var set = new HashSet<String>();
-        set.add("one");
-        var map = new HashMap<String, Point>();
-        map.put("one", Point(10, 20));
-        var collectionAsSet = new HashSet<Point>();
-        collectionAsSet.add(Point(30, 40));
-        var x = r.withL(list).withS(set).withM(map).withC(collectionAsSet);
-
-        assertValues(x, list, set, map, collectionAsSet);
-        assertValueChanges(x, list, set, map, collectionAsSet);
-        assertImmutable(x);
-    }
-
-    @Test
-    public void testMutableCollectionRecord() {
-        var r = MutableCollectionRecordBuilder.builder().build();
-        assertNull(r.l());
-
-        var list = new ArrayList<String>();
-        list.add("one");
-        r = MutableCollectionRecordBuilder.builder().l(list).build();
-
-        assertEquals(r.l(), list);
-        list.add("two");
-        assertEquals(r.l(), list);
-    }
-
-    private void assertImmutable(CollectionRecord<String, Point> r) {
-        assertThrows(UnsupportedOperationException.class, () -> r.l().add("hey"));
-        assertThrows(UnsupportedOperationException.class, () -> r.s().add("hey"));
-        assertThrows(UnsupportedOperationException.class, () -> r.m().put("hey", Point(1, 2)));
-        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) {
-        list.add("two");
-        set.add("two");
-        map.put("two", Point(50, 60));
-        collectionAsSet.add(Point(70, 80));
-
-        assertNotEquals(r.l(), list);
-        assertNotEquals(r.s(), set);
-        assertNotEquals(r.m(), map);
-        assertNotEquals(r.c(), 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);
-        assertEquals(r.c(), collectionAsSet);
-        assertTrue(r.c() instanceof Set);
-    }
-}

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestImmutableCollections.java

@@ -1,148 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.Instant;
-import java.util.*;
-
-public class TestImmutableCollections {
-    @Test
-    public void testImmutableListNotCopiedWhenNotChanged() {
-        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();
-
-        Assertions.assertSame(oldList, copy.list());
-
-        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();
-        Assertions.assertEquals(item.set(), Set.of("1", "2", "3"));
-
-        var oldSet = item.set();
-
-        var copy = item.with()
-                .count(1)
-                .build();
-
-        Assertions.assertSame(oldSet, copy.set());
-
-        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();
-        Assertions.assertEquals(item.collection(), List.of("foo", "bar", "baz"));
-
-        var oldCollection = item.collection();
-
-        var copy = item.with()
-                .count(1)
-                .build();
-
-        Assertions.assertSame(oldCollection, copy.collection());
-
-        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();
-        Assertions.assertEquals(item.map(), Map.of(Instant.MAX, "future", Instant.MIN, "before"));
-
-        var oldMap = item.map();
-
-        var copy = item.with()
-                .count(1)
-                .build();
-
-        Assertions.assertSame(oldMap, copy.map());
-
-        var otherCopy = item.with()
-                .count(2)
-                .build();
-
-        Assertions.assertSame(oldMap, otherCopy.map());
-    }
-
-    @Test
-    void testSourceListNotModified() {
-        var item = new CollectionCopying<>(new ArrayList<>(), null, null, null, 0);
-        var modifiedItem = CollectionCopyingBuilder.builder(item)
-                .addList("a")
-                .build();
-
-        Assertions.assertEquals(modifiedItem.list(), List.of("a"));
-        Assertions.assertTrue(item.list().isEmpty());
-    }
-
-    @Test
-    void testSourceSetNotModified() {
-        var item = new CollectionCopying<>(null, new HashSet<>(), null, null, 0);
-        var modifiedItem = CollectionCopyingBuilder.builder(item)
-                .addSet("a")
-                .build();
-
-        Assertions.assertEquals(modifiedItem.set(), Set.of("a"));
-        Assertions.assertTrue(item.set().isEmpty());
-    }
-
-    @Test
-    void testSourceMapNotModified() {
-        var item = new CollectionCopying<>(null, null, new HashMap<>(), null, 0);
-        var modifiedItem = CollectionCopyingBuilder.builder(item)
-                .addMap(Instant.MIN, "a")
-                .build();
-
-        Assertions.assertEquals(modifiedItem.map(), Map.of(Instant.MIN, "a"));
-        Assertions.assertTrue(item.map().isEmpty());
-    }
-}

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestIncludes.java

@@ -1,28 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class TestIncludes {
-    @Test
-    void testOptionsOnInclude() {
-        // assert it's not prefixed with the enclosing class name
-        IncludeWithOption.Hey hey = io.soabase.recordbuilder.test.HeyBuilder.builder().s("this is s").build();
-        Assertions.assertEquals("this is s", hey.s());
-    }
-}

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestOptional.java

@@ -15,14 +15,14 @@
  */
 package io.soabase.recordbuilder.test;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 class TestOptional {
     @Test
     void testDefaultEmpty() {
@@ -33,51 +33,4 @@ class TestOptional {
         Assertions.assertEquals(OptionalLong.empty(), record.l());
         Assertions.assertEquals(OptionalDouble.empty(), record.d());
     }
-
-    @Test
-    void testRawSetters() {
-        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());
-        Assertions.assertEquals(OptionalInt.of(42), record.i());
-        Assertions.assertEquals(OptionalLong.of(424242L), record.l());
-        Assertions.assertEquals(OptionalDouble.of(42.42), record.d());
-    }
-
-    @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();
-        Assertions.assertEquals(Optional.of("value"), record.value());
-        Assertions.assertEquals(Optional.of("rawValue"), record.raw());
-        Assertions.assertEquals(OptionalInt.of(42), record.i());
-        Assertions.assertEquals(OptionalLong.of(424242L), record.l());
-        Assertions.assertEquals(OptionalDouble.of(42.42), record.d());
-    }
-
-    @Test
-    void shouldAcceptNullForOptionalRawSetter() {
-        // given
-        String value = null;
-
-        // when
-        var record = RecordWithOptionalBuilder.builder()
-                                              .value(value)
-                                              .build();
-
-        // then
-        Assertions.assertEquals(Optional.empty(), record.value());
-    }
-
 }

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordBuilderFull.java

@@ -1,44 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-class TestRecordBuilderFull {
-    @Test
-    void testNonNull() {
-        var record = FullRecordBuilder.builder().justAString("").build();
-        Assertions.assertEquals(List.of(), record.numbers());
-        Assertions.assertEquals(Map.of(), record.fullRecords());
-    }
-
-    @Test
-    void testImmutable() {
-        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));
-    }
-}

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestRecordInterface.java

@@ -15,9 +15,6 @@
  */
 package io.soabase.recordbuilder.test;
 
-import java.util.AbstractMap.SimpleImmutableEntry;
-import java.util.List;
-import java.util.Map;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -51,28 +48,4 @@ public class TestRecordInterface
         Assertions.assertEquals(generic.i(), 101);
         Assertions.assertEquals(generic.s(), now);
     }
-
-    @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")));
-    }
-
-    @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)));
-    }
 }

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestSingleItems.java

@@ -1,76 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class TestSingleItems {
-    @Test
-    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();
-        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"))
-                .build();
-        Assertions.assertNotEquals(item, copy);
-        Assertions.assertEquals(copy.map(), Map.of(now, "now", Instant.MIN, "before", Instant.MAX, "after"));
-        Assertions.assertEquals(copy.sets(), Set.of(List.of("1", "2"), List.of("3"), List.of("10", "20", "30")));
-        Assertions.assertEquals(copy.strings(), List.of("a", "b", "c", "new"));
-
-        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")));
-        Assertions.assertEquals(streamed.strings(), Arrays.asList("a", "b", "c", "x", "y", "z"));
-
-        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());
-    }
-}

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java

@@ -19,7 +19,6 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import javax.validation.ValidationException;
-import java.util.List;
 
 class TestValidation {
     @Test
@@ -31,26 +30,4 @@ class TestValidation {
     void testValidation() {
         Assertions.assertThrows(ValidationException.class, () -> RequiredRecord2Builder.builder().build());
     }
-
-    @Test
-    void testNotNullsWithNewProperty() {
-        var valid = RequiredRecordBuilder.builder().hey("hey").i(1).l(List.of()).build();
-        Assertions.assertThrows(NullPointerException.class, () -> valid.withHey(null));
-    }
-
-    @Test
-    void testValidationWithNewProperty() {
-        var valid = RequiredRecord2Builder.builder().hey("hey").i(1).build();
-        Assertions.assertThrows(ValidationException.class, () -> valid.withHey(null));
-    }
-
-    @Test
-    void testRequestWithValid() {
-        Assertions.assertDoesNotThrow(() -> RequestWithValidBuilder.builder()
-                .part(new RequestWithValid.Part("jsfjsf"))
-                .build());
-        Assertions.assertThrows(ValidationException.class, () -> RequestWithValidBuilder.builder()
-                .part(new RequestWithValid.Part(""))
-                .build());
-    }
 }

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestVariousOptions.java

@@ -1,69 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-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 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 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);
-  }
-}

record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestWithers.java

@@ -21,17 +21,6 @@ import org.junit.jupiter.api.Test;
 import java.util.List;
 
 class TestWithers {
-    @Test
-    void testFromWithers() {
-        var r1 = new SimpleGenericRecord<>(10, List.of("1", "2", "3"));
-        var r2 = SimpleGenericRecordBuilder.from(r1).withS(List.of("4", "5"));
-        var r3 = SimpleGenericRecordBuilder.from(r1).with(b -> b.i(20).s(List.of("6", "7")));
-        Assertions.assertEquals(List.of("1", "2", "3"), r1.s());
-        Assertions.assertEquals(List.of("4", "5"), r2.s());
-        Assertions.assertEquals(List.of("6", "7"), r3.s());
-        Assertions.assertEquals(20, r3.i());
-    }
-
     @Test
     void testWithers() {
         var r1 = new SimpleGenericRecord<>(10, List.of("1", "2", "3"));
@@ -70,4 +59,11 @@ class TestWithers {
         Assertions.assertEquals(20, r3.i());
         Assertions.assertEquals("twenty", r3.s());
     }
+
+    private static class BadSubclass implements PersonRecordBuilder.With {}
+
+    @Test
+    void testBadWithSubclass() {
+        Assertions.assertThrows(RuntimeException.class, () -> new BadSubclass().withAge(10));
+    }
 }

record-builder-test/src/test/java/io/soabase/recordbuilder/test/visibility/TestVisibility.java

@@ -1,43 +0,0 @@
-/**
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.soabase.recordbuilder.test.visibility;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.lang.reflect.Modifier;
-
-class TestVisibility {
-    @Test
-    void testMatches() {
-        Assertions.assertFalse(Modifier.isPublic(PackagePrivateRecordBuilder.class.getModifiers()));
-        Assertions.assertFalse(Modifier.isPrivate(PackagePrivateRecordBuilder.class.getModifiers()));
-        Assertions.assertFalse(Modifier.isProtected(PackagePrivateRecordBuilder.class.getModifiers()));
-
-        Assertions.assertTrue(Modifier.isPublic(WrapperProtectedRecordBuilder.class.getModifiers()));
-    }
-
-
-    @Test
-    void testMatchesWithModifers() {
-        Assertions.assertFalse(Modifier.isPublic(PackagePrivateRecordWithPublicBuilder.class.getModifiers()));
-        Assertions.assertFalse(Modifier.isPrivate(PackagePrivateRecordWithPublicBuilder.class.getModifiers()));
-        Assertions.assertFalse(Modifier.isProtected(PackagePrivateRecordWithPublicBuilder.class.getModifiers()));
-
-        Assertions.assertTrue(Modifier.isPublic(PackagePrivateRecordWithPublicBuilderBuilder.class.getModifiers()));
-    }
-
-}

record-builder-validator/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.soabase.record-builder</groupId>
         <artifactId>record-builder</artifactId>
-        <version>35</version>
+        <version>21-java15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>