diff --git a/AUTHORS b/AUTHORS index ebbc5b3765..9e1e4bddc8 100755 --- a/AUTHORS +++ b/AUTHORS @@ -62,5 +62,6 @@ Till Brychcy Victor Williams Stafusa da Silva Yonatan Sherwin Yun Zhi Lin +Mahmoud Khawaja By adding your name to this list, you grant full and irrevocable copyright and patent indemnity to Project Lombok and all use of Project Lombok in relation to all commits you add to Project Lombok, and you certify that you have the right to do so. diff --git a/docker/gradle/files/classpath/.gradle/8.8/checksums/checksums.lock b/docker/gradle/files/classpath/.gradle/8.8/checksums/checksums.lock new file mode 100644 index 0000000000..e2de3a8ae5 Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/8.8/checksums/checksums.lock differ diff --git a/docker/gradle/files/classpath/.gradle/8.8/dependencies-accessors/gc.properties b/docker/gradle/files/classpath/.gradle/8.8/dependencies-accessors/gc.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker/gradle/files/classpath/.gradle/8.8/executionHistory/executionHistory.bin b/docker/gradle/files/classpath/.gradle/8.8/executionHistory/executionHistory.bin new file mode 100644 index 0000000000..d5e17cc22b Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/docker/gradle/files/classpath/.gradle/8.8/executionHistory/executionHistory.lock b/docker/gradle/files/classpath/.gradle/8.8/executionHistory/executionHistory.lock new file mode 100644 index 0000000000..68cad6fdf4 Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/docker/gradle/files/classpath/.gradle/8.8/fileChanges/last-build.bin b/docker/gradle/files/classpath/.gradle/8.8/fileChanges/last-build.bin new file mode 100644 index 0000000000..f76dd238ad Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/8.8/fileChanges/last-build.bin differ diff --git a/docker/gradle/files/classpath/.gradle/8.8/fileHashes/fileHashes.bin b/docker/gradle/files/classpath/.gradle/8.8/fileHashes/fileHashes.bin new file mode 100644 index 0000000000..2365cedbf4 Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/docker/gradle/files/classpath/.gradle/8.8/fileHashes/fileHashes.lock b/docker/gradle/files/classpath/.gradle/8.8/fileHashes/fileHashes.lock new file mode 100644 index 0000000000..83bffd2e03 Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/docker/gradle/files/classpath/.gradle/8.8/gc.properties b/docker/gradle/files/classpath/.gradle/8.8/gc.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker/gradle/files/classpath/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/docker/gradle/files/classpath/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000..aeabc63179 Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/docker/gradle/files/classpath/.gradle/buildOutputCleanup/cache.properties b/docker/gradle/files/classpath/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000000..7d7eb5af72 --- /dev/null +++ b/docker/gradle/files/classpath/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Feb 05 06:32:18 EET 2025 +gradle.version=8.8 diff --git a/docker/gradle/files/classpath/.gradle/buildOutputCleanup/outputFiles.bin b/docker/gradle/files/classpath/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000000..e97c1709dd Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/docker/gradle/files/classpath/.gradle/file-system.probe b/docker/gradle/files/classpath/.gradle/file-system.probe new file mode 100644 index 0000000000..79ed10d8cc Binary files /dev/null and b/docker/gradle/files/classpath/.gradle/file-system.probe differ diff --git a/docker/gradle/files/classpath/.gradle/vcs-1/gc.properties b/docker/gradle/files/classpath/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker/gradle/files/classpath/gradle/wrapper/gradle-wrapper.jar b/docker/gradle/files/classpath/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..e6441136f3 Binary files /dev/null and b/docker/gradle/files/classpath/gradle/wrapper/gradle-wrapper.jar differ diff --git a/docker/gradle/files/classpath/gradle/wrapper/gradle-wrapper.properties b/docker/gradle/files/classpath/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..a4413138c9 --- /dev/null +++ b/docker/gradle/files/classpath/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/docker/gradle/files/classpath/gradlew b/docker/gradle/files/classpath/gradlew new file mode 100644 index 0000000000..b740cf1339 --- /dev/null +++ b/docker/gradle/files/classpath/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# 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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/docker/gradle/files/classpath/gradlew.bat b/docker/gradle/files/classpath/gradlew.bat new file mode 100644 index 0000000000..25da30dbde --- /dev/null +++ b/docker/gradle/files/classpath/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index b19dccfc98..c22b782ddf 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -743,4 +743,12 @@ private ConfigurationKeys() {} * If set, any usage of {@code @StandardException} results in a warning / error. */ public static final ConfigurationKey STANDARD_EXCEPTION_FLAG_USAGE = new ConfigurationKey("lombok.standardException.flagUsage", "Emit a warning or error if @StandardException is used.") {}; + + /** + * lombok configuration: {@code lombok.builder.toBuilder} = {@code true} | {@code false}. + * + * If {@code true}, the {@code toBuilder()} method is generated by default for all {@code @Builder} annotations unless explicitly disabled via {@code @Builder(toBuilder = false)}. + * (Default: {@code false}). + */ + public static final ConfigurationKey BUILDER_TO_BUILDER = new ConfigurationKey("lombok.builder.toBuilder", "Enable toBuilder by default for @Builder annotations.", false) {}; } diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index d814c05a93..b3031e59a3 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -132,7 +132,10 @@ void init(AnnotationValues annValues, Builder ann, JavacNode node) { builderMethodName = ann.builderMethodName(); buildMethodName = ann.buildMethodName(); builderClassName = getBuilderClassNameTemplate(node, ann.builderClassName()); - toBuilder = ann.toBuilder(); + + boolean explicitToBuilder = annValues.isExplicit("toBuilder"); + boolean configToBuilder = Boolean.TRUE.equals(node.getAst().readConfiguration(ConfigurationKeys.BUILDER_TO_BUILDER)); + toBuilder = explicitToBuilder ? ann.toBuilder() : configToBuilder; if (builderMethodName == null) builderMethodName = "builder"; if (buildMethodName == null) buildMethodName = "build";