From 236260e28bc3715ac03f401d83cd9c65943ea91b Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Fri, 14 Feb 2025 20:11:52 +0100 Subject: [PATCH 001/141] chore: execute gradle init --- .gitattributes | 12 + .gitignore | 173 ++++++++++++ .idea/.gitignore | 8 + .idea/compiler.xml | 6 + .idea/ktfmt.xml | 6 + .idea/misc.xml | 5 + .idea/palantir-java-format.xml | 6 + .idea/vcs.xml | 6 + app/build.gradle | 19 ++ app/src/main/java/org/example/app/App.java | 21 ++ .../java/org/example/app/MessageUtils.java | 10 + .../org/example/app/MessageUtilsTest.java | 14 + build-logic/build.gradle | 15 ++ build-logic/settings.gradle | 15 ++ ...dlogic.java-application-conventions.gradle | 13 + .../buildlogic.java-common-conventions.gradle | 39 +++ ...buildlogic.java-library-conventions.gradle | 13 + gradle.properties | 7 + gradle/libs.versions.toml | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ list/build.gradle | 9 + .../java/org/example/list/LinkedList.java | 81 ++++++ .../java/org/example/list/LinkedListTest.java | 50 ++++ settings.gradle | 20 ++ utilities/build.gradle | 13 + .../java/org/example/utilities/JoinUtils.java | 20 ++ .../org/example/utilities/SplitUtils.java | 39 +++ .../org/example/utilities/StringUtils.java | 16 ++ 31 files changed, 990 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/ktfmt.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/palantir-java-format.xml create mode 100644 .idea/vcs.xml create mode 100644 app/build.gradle create mode 100644 app/src/main/java/org/example/app/App.java create mode 100644 app/src/main/java/org/example/app/MessageUtils.java create mode 100644 app/src/test/java/org/example/app/MessageUtilsTest.java create mode 100644 build-logic/build.gradle create mode 100644 build-logic/settings.gradle create mode 100644 build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle create mode 100644 build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle create mode 100644 build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 list/build.gradle create mode 100644 list/src/main/java/org/example/list/LinkedList.java create mode 100644 list/src/test/java/org/example/list/LinkedListTest.java create mode 100644 settings.gradle create mode 100644 utilities/build.gradle create mode 100644 utilities/src/main/java/org/example/utilities/JoinUtils.java create mode 100644 utilities/src/main/java/org/example/utilities/SplitUtils.java create mode 100644 utilities/src/main/java/org/example/utilities/StringUtils.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f91f646 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f8cb77f --- /dev/null +++ b/.gitignore @@ -0,0 +1,173 @@ +# Created by https://www.toptal.com/developers/gitignore/api/java,gradle,intellij +# Edit at https://www.toptal.com/developers/gitignore?templates=java,gradle,intellij + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + +### Gradle ### +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +### Gradle Patch ### +# Java heap dump +*.hprof + +# End of https://www.toptal.com/developers/gitignore/api/java,gradle,intellij + +####### Custom stuff below here ####### + diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/ktfmt.xml b/.idea/ktfmt.xml new file mode 100644 index 0000000..228bfae --- /dev/null +++ b/.idea/ktfmt.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..ed6ca53 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/palantir-java-format.xml b/.idea/palantir-java-format.xml new file mode 100644 index 0000000..cbcc1cb --- /dev/null +++ b/.idea/palantir-java-format.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..789da74 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,19 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + id 'buildlogic.java-application-conventions' +} + +dependencies { + implementation 'org.apache.commons:commons-text' + implementation project(':utilities') +} + +application { + // Define the main class for the application. + mainClass = 'org.example.app.App' +} diff --git a/app/src/main/java/org/example/app/App.java b/app/src/main/java/org/example/app/App.java new file mode 100644 index 0000000..b67b469 --- /dev/null +++ b/app/src/main/java/org/example/app/App.java @@ -0,0 +1,21 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.app; + +import org.example.list.LinkedList; + +import static org.example.utilities.StringUtils.join; +import static org.example.utilities.StringUtils.split; +import static org.example.app.MessageUtils.getMessage; + +import org.apache.commons.text.WordUtils; + +public class App { + public static void main(String[] args) { + LinkedList tokens; + tokens = split(getMessage()); + String result = join(tokens); + System.out.println(WordUtils.capitalize(result)); + } +} diff --git a/app/src/main/java/org/example/app/MessageUtils.java b/app/src/main/java/org/example/app/MessageUtils.java new file mode 100644 index 0000000..cd181be --- /dev/null +++ b/app/src/main/java/org/example/app/MessageUtils.java @@ -0,0 +1,10 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.app; + +class MessageUtils { + public static String getMessage() { + return "Hello World!"; + } +} diff --git a/app/src/test/java/org/example/app/MessageUtilsTest.java b/app/src/test/java/org/example/app/MessageUtilsTest.java new file mode 100644 index 0000000..02ac0af --- /dev/null +++ b/app/src/test/java/org/example/app/MessageUtilsTest.java @@ -0,0 +1,14 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.app; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class MessageUtilsTest { + @Test void testGetMessage() { + assertEquals("Hello World!", MessageUtils.getMessage()); + } +} diff --git a/build-logic/build.gradle b/build-logic/build.gradle new file mode 100644 index 0000000..16fbc6f --- /dev/null +++ b/build-logic/build.gradle @@ -0,0 +1,15 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + id 'groovy-gradle-plugin' +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle new file mode 100644 index 0000000..58fbfd5 --- /dev/null +++ b/build-logic/settings.gradle @@ -0,0 +1,15 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This settings file is used to specify which projects to include in your build-logic build. + * This project uses @Incubating APIs which are subject to change. + */ + +dependencyResolutionManagement { + // Reuse version catalog from the main build. + versionCatalogs { + create('libs', { from(files("../gradle/libs.versions.toml")) }) + } +} + +rootProject.name = 'build-logic' diff --git a/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle new file mode 100644 index 0000000..1006b9b --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the common convention plugin for shared build configuration between library and application projects. + id 'buildlogic.java-common-conventions' + + // Apply the application plugin to add support for building a CLI application in Java. + id 'application' +} diff --git a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle new file mode 100644 index 0000000..3a22656 --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle @@ -0,0 +1,39 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the java Plugin to add support for Java. + id 'java' +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + constraints { + // Define dependency versions as constraints + implementation 'org.apache.commons:commons-text:1.12.0' + } +} + +testing { + suites { + // Configure the built-in test suite + test { + // Use JUnit Jupiter test framework + useJUnitJupiter('5.11.1') + } + } +} + +// Apply a specific Java toolchain to ease working on different environments. +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} diff --git a/build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle new file mode 100644 index 0000000..526803e --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the common convention plugin for shared build configuration between library and application projects. + id 'buildlogic.java-common-conventions' + + // Apply the java-library plugin for API and implementation separation. + id 'java-library' +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5154008 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,7 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..4ac3234 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,2 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e18bc25 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f3b75f3 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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/list/build.gradle b/list/build.gradle new file mode 100644 index 0000000..1329c31 --- /dev/null +++ b/list/build.gradle @@ -0,0 +1,9 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + id 'buildlogic.java-library-conventions' +} diff --git a/list/src/main/java/org/example/list/LinkedList.java b/list/src/main/java/org/example/list/LinkedList.java new file mode 100644 index 0000000..b7fd121 --- /dev/null +++ b/list/src/main/java/org/example/list/LinkedList.java @@ -0,0 +1,81 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.list; + +public class LinkedList { + private Node head; + + public void add(String element) { + Node newNode = new Node(element); + + Node it = tail(head); + if (it == null) { + head = newNode; + } else { + it.next = newNode; + } + } + + private static Node tail(Node head) { + Node it; + + for (it = head; it != null && it.next != null; it = it.next) {} + + return it; + } + + public boolean remove(String element) { + boolean result = false; + Node previousIt = null; + Node it = null; + for (it = head; !result && it != null; previousIt = it, it = it.next) { + if (0 == element.compareTo(it.data)) { + result = true; + unlink(previousIt, it); + break; + } + } + + return result; + } + + private void unlink(Node previousIt, Node currentIt) { + if (currentIt == head) { + head = currentIt.next; + } else { + previousIt.next = currentIt.next; + } + } + + public int size() { + int size = 0; + + for (Node it = head; it != null; ++size, it = it.next) {} + + return size; + } + + public String get(int index) { + Node it = head; + while (index > 0 && it != null) { + it = it.next; + index--; + } + + if (it == null) { + throw new IndexOutOfBoundsException("Index is out of range"); + } + + return it.data; + } + + private static class Node { + final String data; + Node next; + + Node(String data) { + this.data = data; + } + } +} diff --git a/list/src/test/java/org/example/list/LinkedListTest.java b/list/src/test/java/org/example/list/LinkedListTest.java new file mode 100644 index 0000000..84a5fb9 --- /dev/null +++ b/list/src/test/java/org/example/list/LinkedListTest.java @@ -0,0 +1,50 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.list; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class LinkedListTest { + @Test void testConstructor() { + LinkedList list = new LinkedList(); + assertEquals(0, list.size()); + } + + @Test void testAdd() { + LinkedList list = new LinkedList(); + + list.add("one"); + assertEquals(1, list.size()); + assertEquals("one", list.get(0)); + + list.add("two"); + assertEquals(2, list.size()); + assertEquals("two", list.get(1)); + } + + @Test void testRemove() { + LinkedList list = new LinkedList(); + + list.add("one"); + list.add("two"); + assertTrue(list.remove("one")); + + assertEquals(1, list.size()); + assertEquals("two", list.get(0)); + + assertTrue(list.remove("two")); + assertEquals(0, list.size()); + } + + @Test public void testRemoveMissing() { + LinkedList list = new LinkedList(); + + list.add("one"); + list.add("two"); + assertFalse(list.remove("three")); + assertEquals(2, list.size()); + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ebe062d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,20 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.12.1/userguide/multi_project_builds.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +pluginManagement { + // Include 'plugins build' to define convention plugins. + includeBuild('build-logic') +} + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + +rootProject.name = 'spotless-cli' +include('app', 'list', 'utilities') diff --git a/utilities/build.gradle b/utilities/build.gradle new file mode 100644 index 0000000..14486dc --- /dev/null +++ b/utilities/build.gradle @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + id 'buildlogic.java-library-conventions' +} + +dependencies { + api project(':list') +} diff --git a/utilities/src/main/java/org/example/utilities/JoinUtils.java b/utilities/src/main/java/org/example/utilities/JoinUtils.java new file mode 100644 index 0000000..93e0ae1 --- /dev/null +++ b/utilities/src/main/java/org/example/utilities/JoinUtils.java @@ -0,0 +1,20 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.utilities; + +import org.example.list.LinkedList; + +class JoinUtils { + public static String join(LinkedList source) { + StringBuilder result = new StringBuilder(); + for (int i = 0; i < source.size(); ++i) { + if (result.length() > 0) { + result.append(" "); + } + result.append(source.get(i)); + } + + return result.toString(); + } +} diff --git a/utilities/src/main/java/org/example/utilities/SplitUtils.java b/utilities/src/main/java/org/example/utilities/SplitUtils.java new file mode 100644 index 0000000..5e7a748 --- /dev/null +++ b/utilities/src/main/java/org/example/utilities/SplitUtils.java @@ -0,0 +1,39 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.utilities; + +import org.example.list.LinkedList; + +class SplitUtils { + public static LinkedList split(String source) { + int lastFind = 0; + int currentFind = 0; + LinkedList result = new LinkedList(); + + while ((currentFind = source.indexOf(" ", lastFind)) != -1) { + String token = source.substring(lastFind); + if (currentFind != -1) { + token = token.substring(0, currentFind - lastFind); + } + + addIfValid(token, result); + lastFind = currentFind + 1; + } + + String token = source.substring(lastFind); + addIfValid(token, result); + + return result; + } + + private static void addIfValid(String token, LinkedList list) { + if (isTokenValid(token)) { + list.add(token); + } + } + + private static boolean isTokenValid(String token) { + return !token.isEmpty(); + } +} diff --git a/utilities/src/main/java/org/example/utilities/StringUtils.java b/utilities/src/main/java/org/example/utilities/StringUtils.java new file mode 100644 index 0000000..235b88e --- /dev/null +++ b/utilities/src/main/java/org/example/utilities/StringUtils.java @@ -0,0 +1,16 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example.utilities; + +import org.example.list.LinkedList; + +public class StringUtils { + public static String join(LinkedList source) { + return JoinUtils.join(source); + } + + public static LinkedList split(String source) { + return SplitUtils.split(source); + } +} From 98fc3506b4da58facff1115ea2c1f0bdb908ceee Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Fri, 14 Feb 2025 20:38:45 +0100 Subject: [PATCH 002/141] feat: introduce spotless formatting for java --- .idea/misc.xml | 5 ++++- .idea/palantir-java-format.xml | 2 +- .../groovy/buildlogic.java-common-conventions.gradle | 1 + .../buildlogic.spotless-common-conventions.gradle | 8 ++++++++ .../buildlogic.spotless-java-conventions.gradle | 12 ++++++++++++ settings.gradle | 3 +++ 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle create mode 100644 build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle diff --git a/.idea/misc.xml b/.idea/misc.xml index ed6ca53..7c47dd4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ - + + + + \ No newline at end of file diff --git a/.idea/palantir-java-format.xml b/.idea/palantir-java-format.xml index cbcc1cb..3815718 100644 --- a/.idea/palantir-java-format.xml +++ b/.idea/palantir-java-format.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle index 3a22656..a307d51 100644 --- a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle @@ -7,6 +7,7 @@ plugins { // Apply the java Plugin to add support for Java. id 'java' + id 'buildlogic.spotless-java-conventions' } repositories { diff --git a/build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle new file mode 100644 index 0000000..80682e7 --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle @@ -0,0 +1,8 @@ +plugins { + id 'com.diffplug.spotless' +} + +spotless { +// ratchetFrom 'origin/main' + encoding 'UTF-8' +} diff --git a/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle new file mode 100644 index 0000000..32cb28b --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle @@ -0,0 +1,12 @@ +plugins { + id 'buildlogic.spotless-common-conventions' +} + +spotless { + java { + palantirJavaFormat() + formatAnnotations() + removeUnusedImports() + importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index ebe062d..efb0948 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,9 @@ pluginManagement { plugins { // Apply the foojay-resolver plugin to allow automatic download of JDKs id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + + // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md + id 'com.diffplug.spotless' version '7.0.2' apply false } rootProject.name = 'spotless-cli' From 7d686b433851a0ea50eb0b0b7a56826b268df8b6 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Fri, 14 Feb 2025 20:43:44 +0100 Subject: [PATCH 003/141] style: apply spotless to java code --- app/src/main/java/org/example/app/App.java | 5 ++--- .../test/java/org/example/app/MessageUtilsTest.java | 3 ++- .../test/java/org/example/list/LinkedListTest.java | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/example/app/App.java b/app/src/main/java/org/example/app/App.java index b67b469..ba59fd5 100644 --- a/app/src/main/java/org/example/app/App.java +++ b/app/src/main/java/org/example/app/App.java @@ -3,13 +3,12 @@ */ package org.example.app; +import org.apache.commons.text.WordUtils; import org.example.list.LinkedList; +import static org.example.app.MessageUtils.getMessage; import static org.example.utilities.StringUtils.join; import static org.example.utilities.StringUtils.split; -import static org.example.app.MessageUtils.getMessage; - -import org.apache.commons.text.WordUtils; public class App { public static void main(String[] args) { diff --git a/app/src/test/java/org/example/app/MessageUtilsTest.java b/app/src/test/java/org/example/app/MessageUtilsTest.java index 02ac0af..93a5fc0 100644 --- a/app/src/test/java/org/example/app/MessageUtilsTest.java +++ b/app/src/test/java/org/example/app/MessageUtilsTest.java @@ -8,7 +8,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class MessageUtilsTest { - @Test void testGetMessage() { + @Test + void testGetMessage() { assertEquals("Hello World!", MessageUtils.getMessage()); } } diff --git a/list/src/test/java/org/example/list/LinkedListTest.java b/list/src/test/java/org/example/list/LinkedListTest.java index 84a5fb9..e2dc72f 100644 --- a/list/src/test/java/org/example/list/LinkedListTest.java +++ b/list/src/test/java/org/example/list/LinkedListTest.java @@ -8,12 +8,14 @@ import static org.junit.jupiter.api.Assertions.*; class LinkedListTest { - @Test void testConstructor() { + @Test + void testConstructor() { LinkedList list = new LinkedList(); assertEquals(0, list.size()); } - @Test void testAdd() { + @Test + void testAdd() { LinkedList list = new LinkedList(); list.add("one"); @@ -25,7 +27,8 @@ class LinkedListTest { assertEquals("two", list.get(1)); } - @Test void testRemove() { + @Test + void testRemove() { LinkedList list = new LinkedList(); list.add("one"); @@ -39,7 +42,8 @@ class LinkedListTest { assertEquals(0, list.size()); } - @Test public void testRemoveMissing() { + @Test + public void testRemoveMissing() { LinkedList list = new LinkedList(); list.add("one"); From e76e9de6ee6fa6efa64b96091df2c19f94ae2723 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Fri, 14 Feb 2025 22:33:40 +0100 Subject: [PATCH 004/141] chore(build): add spotless for build files --- build-logic/build.gradle | 15 +++++++++++++++ build-logic/settings.gradle | 5 +++++ .../buildlogic.spotless-gradle-conventions.gradle | 9 +++++++++ build.gradle | 13 +++++++++++++ settings.gradle | 9 +++++++-- 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle create mode 100644 build.gradle diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 16fbc6f..4b2217a 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -7,9 +7,24 @@ plugins { // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. id 'groovy-gradle-plugin' + id 'com.diffplug.spotless' } repositories { // Use the plugin portal to apply community plugins in convention plugins. gradlePluginPortal() } + +spotless { + encoding 'UTF-8' + + groovy { + importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') + removeSemicolons() + greclipse() + excludeJava() + } + groovyGradle { + greclipse() + } +} \ No newline at end of file diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle index 58fbfd5..94adc56 100644 --- a/build-logic/settings.gradle +++ b/build-logic/settings.gradle @@ -4,6 +4,10 @@ * This settings file is used to specify which projects to include in your build-logic build. * This project uses @Incubating APIs which are subject to change. */ +plugins { + // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md + id 'com.diffplug.spotless' version '7.0.2' apply false +} dependencyResolutionManagement { // Reuse version catalog from the main build. @@ -13,3 +17,4 @@ dependencyResolutionManagement { } rootProject.name = 'build-logic' + diff --git a/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle new file mode 100644 index 0000000..a4243af --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle @@ -0,0 +1,9 @@ +plugins { + id 'buildlogic.spotless-common-conventions' +} + +spotless { + groovyGradle { + greclipse() + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4ea5207 --- /dev/null +++ b/build.gradle @@ -0,0 +1,13 @@ +plugins { + id 'buildlogic.spotless-gradle-conventions' +} + +subprojects { + apply plugin: 'buildlogic.spotless-gradle-conventions' +} + +allprojects { + repositories { + mavenCentral() + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index efb0948..216b1ee 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,8 +7,13 @@ */ pluginManagement { - // Include 'plugins build' to define convention plugins. - includeBuild('build-logic') + // Include 'plugins build' to define convention plugins. + includeBuild('build-logic') + + repositories { + mavenCentral() + gradlePluginPortal() + } } plugins { From e2b0c9339af4caf2f66073e0d13006e9016527e7 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Fri, 14 Feb 2025 22:43:08 +0100 Subject: [PATCH 005/141] style: apply spotless to build files --- app/build.gradle | 10 +++++----- build-logic/build.gradle | 31 ++++++++++++++++--------------- build-logic/settings.gradle | 13 +++++++------ list/build.gradle | 2 +- settings.gradle | 10 +++++----- utilities/build.gradle | 4 ++-- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 789da74..ec38350 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,15 +5,15 @@ */ plugins { - id 'buildlogic.java-application-conventions' + id 'buildlogic.java-application-conventions' } dependencies { - implementation 'org.apache.commons:commons-text' - implementation project(':utilities') + implementation 'org.apache.commons:commons-text' + implementation project(':utilities') } application { - // Define the main class for the application. - mainClass = 'org.example.app.App' + // Define the main class for the application. + mainClass = 'org.example.app.App' } diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 4b2217a..9cf0507 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -5,26 +5,27 @@ */ plugins { - // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. - id 'groovy-gradle-plugin' - id 'com.diffplug.spotless' + // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + id 'groovy-gradle-plugin' + id 'com.diffplug.spotless' } repositories { - // Use the plugin portal to apply community plugins in convention plugins. - gradlePluginPortal() + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() + mavenCentral() } spotless { - encoding 'UTF-8' + encoding 'UTF-8' - groovy { - importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') - removeSemicolons() - greclipse() - excludeJava() - } - groovyGradle { - greclipse() - } + groovy { + importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') + removeSemicolons() + greclipse() + excludeJava() + } + groovyGradle { + greclipse() + } } \ No newline at end of file diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle index 94adc56..254183e 100644 --- a/build-logic/settings.gradle +++ b/build-logic/settings.gradle @@ -5,15 +5,16 @@ * This project uses @Incubating APIs which are subject to change. */ plugins { - // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md - id 'com.diffplug.spotless' version '7.0.2' apply false + // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md + id 'com.diffplug.spotless' version '7.0.2' apply false } + dependencyResolutionManagement { - // Reuse version catalog from the main build. - versionCatalogs { - create('libs', { from(files("../gradle/libs.versions.toml")) }) - } + // Reuse version catalog from the main build. + versionCatalogs { + create('libs', { from(files("../gradle/libs.versions.toml")) }) + } } rootProject.name = 'build-logic' diff --git a/list/build.gradle b/list/build.gradle index 1329c31..0335185 100644 --- a/list/build.gradle +++ b/list/build.gradle @@ -5,5 +5,5 @@ */ plugins { - id 'buildlogic.java-library-conventions' + id 'buildlogic.java-library-conventions' } diff --git a/settings.gradle b/settings.gradle index 216b1ee..181f428 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,11 +17,11 @@ pluginManagement { } plugins { - // Apply the foojay-resolver plugin to allow automatic download of JDKs - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' - - // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md - id 'com.diffplug.spotless' version '7.0.2' apply false + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + + // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md + id 'com.diffplug.spotless' version '7.0.2' apply false } rootProject.name = 'spotless-cli' diff --git a/utilities/build.gradle b/utilities/build.gradle index 14486dc..dbf245c 100644 --- a/utilities/build.gradle +++ b/utilities/build.gradle @@ -5,9 +5,9 @@ */ plugins { - id 'buildlogic.java-library-conventions' + id 'buildlogic.java-library-conventions' } dependencies { - api project(':list') + api project(':list') } From dc0281edd4d969d89aa58efbd80baf5c15a6e199 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Sat, 15 Feb 2025 08:38:41 +0100 Subject: [PATCH 006/141] chore: configure license to java files --- .../buildlogic.spotless-java-conventions.gradle | 1 + gradle/spotless.license | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 gradle/spotless.license diff --git a/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle index 32cb28b..c564de8 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle @@ -8,5 +8,6 @@ spotless { formatAnnotations() removeUnusedImports() importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') + licenseHeaderFile rootProject.file('gradle/spotless.license') } } \ No newline at end of file diff --git a/gradle/spotless.license b/gradle/spotless.license new file mode 100644 index 0000000..4064a53 --- /dev/null +++ b/gradle/spotless.license @@ -0,0 +1,15 @@ +/* + * Copyright $YEAR DiffPlug + * + * 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. + */ \ No newline at end of file From b883ac4fdf8382bf9207a7ce3c7367b3e5568921 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Sat, 15 Feb 2025 08:39:34 +0100 Subject: [PATCH 007/141] style: apply copyright --- app/src/main/java/org/example/app/App.java | 14 +++++++++++++- .../main/java/org/example/app/MessageUtils.java | 14 +++++++++++++- .../java/org/example/app/MessageUtilsTest.java | 14 +++++++++++++- .../src/main/java/org/example/list/LinkedList.java | 14 +++++++++++++- .../test/java/org/example/list/LinkedListTest.java | 14 +++++++++++++- .../main/java/org/example/utilities/JoinUtils.java | 14 +++++++++++++- .../java/org/example/utilities/SplitUtils.java | 14 +++++++++++++- .../java/org/example/utilities/StringUtils.java | 14 +++++++++++++- 8 files changed, 104 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/example/app/App.java b/app/src/main/java/org/example/app/App.java index ba59fd5..0d8c384 100644 --- a/app/src/main/java/org/example/app/App.java +++ b/app/src/main/java/org/example/app/App.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.app; diff --git a/app/src/main/java/org/example/app/MessageUtils.java b/app/src/main/java/org/example/app/MessageUtils.java index cd181be..d5ed800 100644 --- a/app/src/main/java/org/example/app/MessageUtils.java +++ b/app/src/main/java/org/example/app/MessageUtils.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.app; diff --git a/app/src/test/java/org/example/app/MessageUtilsTest.java b/app/src/test/java/org/example/app/MessageUtilsTest.java index 93a5fc0..8e0d0ba 100644 --- a/app/src/test/java/org/example/app/MessageUtilsTest.java +++ b/app/src/test/java/org/example/app/MessageUtilsTest.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.app; diff --git a/list/src/main/java/org/example/list/LinkedList.java b/list/src/main/java/org/example/list/LinkedList.java index b7fd121..68df4cb 100644 --- a/list/src/main/java/org/example/list/LinkedList.java +++ b/list/src/main/java/org/example/list/LinkedList.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.list; diff --git a/list/src/test/java/org/example/list/LinkedListTest.java b/list/src/test/java/org/example/list/LinkedListTest.java index e2dc72f..0f76923 100644 --- a/list/src/test/java/org/example/list/LinkedListTest.java +++ b/list/src/test/java/org/example/list/LinkedListTest.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.list; diff --git a/utilities/src/main/java/org/example/utilities/JoinUtils.java b/utilities/src/main/java/org/example/utilities/JoinUtils.java index 93e0ae1..ad904c0 100644 --- a/utilities/src/main/java/org/example/utilities/JoinUtils.java +++ b/utilities/src/main/java/org/example/utilities/JoinUtils.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.utilities; diff --git a/utilities/src/main/java/org/example/utilities/SplitUtils.java b/utilities/src/main/java/org/example/utilities/SplitUtils.java index 5e7a748..1d2d794 100644 --- a/utilities/src/main/java/org/example/utilities/SplitUtils.java +++ b/utilities/src/main/java/org/example/utilities/SplitUtils.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.utilities; diff --git a/utilities/src/main/java/org/example/utilities/StringUtils.java b/utilities/src/main/java/org/example/utilities/StringUtils.java index 235b88e..53ba955 100644 --- a/utilities/src/main/java/org/example/utilities/StringUtils.java +++ b/utilities/src/main/java/org/example/utilities/StringUtils.java @@ -1,5 +1,17 @@ /* - * This source file was generated by the Gradle 'init' task + * Copyright 2025 DiffPlug + * + * 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 org.example.utilities; From 4fdfe2ef0e10ddc7121374d05d6280751237a991 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Sat, 15 Feb 2025 08:40:20 +0100 Subject: [PATCH 008/141] chore: add LICENSE to repo --- LICENSE.txt | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..dff5599 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,195 @@ + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, "control" means (i) the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "{}" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same "printed page" as the copyright notice for easier identification within +third-party archives. + + Copyright {yyyy} {name of copyright owner} + + 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. + + + \ No newline at end of file From d682d2c843f7ae59482399212fb8b2af06a57701 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Sun, 16 Feb 2025 20:14:52 +0100 Subject: [PATCH 009/141] chore: add markdown formatting and README.md --- README.md | 29 +++++++++++++++++++ ...logic.spotless-markdown-conventions.gradle | 11 +++++++ build.gradle | 1 + 3 files changed, 41 insertions(+) create mode 100644 README.md create mode 100644 build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle diff --git a/README.md b/README.md new file mode 100644 index 0000000..e8e8a98 --- /dev/null +++ b/README.md @@ -0,0 +1,29 @@ +# Spotless Command Line Interface CLI + +_Keep your code Spotless with Gradle_ + + + +[![Changelog](https://img.shields.io/badge/changelog-versionLast%3DUNKNOWN-blue.svg)](CHANGES.md) + +[![OS Win](https://img.shields.io/badge/OS-Windows-blueviolet.svg)](README.md) +[![OS Linux](https://img.shields.io/badge/OS-Linux-blueviolet.svg)](README.md) +[![OS macOS](https://img.shields.io/badge/OS-macOS-blueviolet.svg)](README.md) + + + +`spotless` is a command line interface (CLI) for the [spotless code formatter](../README.md). +It intends to be a simple alternative to its siblings: the plugins for [gradle](../plugin-gradle/README.md), [maven](../plugin-maven/README.md) +and others. + +- TODO: add usage and examples +- TBD: can usage be generated automatically e.g. via freshmark? +- diff --git a/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle new file mode 100644 index 0000000..6ae6fcb --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle @@ -0,0 +1,11 @@ +plugins { + id 'buildlogic.spotless-common-conventions' +} + +spotless { + freshmark { // freshmark for keeping markdown files up to date + target '*.md' + prettier() // prettier for markdown formatting + } + +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4ea5207..ce703d7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'buildlogic.spotless-gradle-conventions' + id 'buildlogic.spotless-markdown-conventions' } subprojects { From 10875ea8dbe7c349d98fce0715192025e4450320 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Sun, 16 Feb 2025 20:30:29 +0100 Subject: [PATCH 010/141] chore: add spotless-changelog + introduce changelog --- CHANGELOG.md | 12 ++++++++++++ .../groovy/buildlogic.changelog-conventions.gradle | 3 +++ build.gradle | 1 + settings.gradle | 3 +++ 4 files changed, 19 insertions(+) create mode 100644 CHANGELOG.md create mode 100644 build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..2c53ea2 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,12 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added + +- Initial version of the CLI diff --git a/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle new file mode 100644 index 0000000..d3c2285 --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle @@ -0,0 +1,3 @@ +plugins { + id 'com.diffplug.spotless-changelog' +} diff --git a/build.gradle b/build.gradle index ce703d7..e6a6f03 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'buildlogic.spotless-gradle-conventions' id 'buildlogic.spotless-markdown-conventions' + id 'buildlogic.changelog-conventions' } subprojects { diff --git a/settings.gradle b/settings.gradle index 181f428..b4820e2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,6 +22,9 @@ plugins { // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md id 'com.diffplug.spotless' version '7.0.2' apply false + + // https://github.com/diffplug/spotless-changelog/blob/main/README.md + id 'com.diffplug.spotless-changelog' version '3.1.2' apply false } rootProject.name = 'spotless-cli' From efbf715126327173759658f81a8d0ddeb51fdf78 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Sun, 16 Feb 2025 20:44:30 +0100 Subject: [PATCH 011/141] chore: stricter changelog, formattings end with newline --- build-logic/build.gradle | 4 +++- build-logic/settings.gradle | 1 - .../src/main/groovy/buildlogic.changelog-conventions.gradle | 5 +++++ .../groovy/buildlogic.spotless-gradle-conventions.gradle | 1 + .../main/groovy/buildlogic.spotless-java-conventions.gradle | 1 + .../groovy/buildlogic.spotless-markdown-conventions.gradle | 1 + build.gradle | 2 +- 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 9cf0507..6d5a995 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -24,8 +24,10 @@ spotless { removeSemicolons() greclipse() excludeJava() + endWithNewline() } groovyGradle { greclipse() + endWithNewline() } -} \ No newline at end of file +} diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle index 254183e..ff10d06 100644 --- a/build-logic/settings.gradle +++ b/build-logic/settings.gradle @@ -18,4 +18,3 @@ dependencyResolutionManagement { } rootProject.name = 'build-logic' - diff --git a/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle index d3c2285..d652ece 100644 --- a/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle @@ -1,3 +1,8 @@ plugins { id 'com.diffplug.spotless-changelog' } + + +spotlessChangelog { + appendDashSnapshotUnless_dashPrelease=true +} \ No newline at end of file diff --git a/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle index a4243af..b3e4c8f 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle @@ -5,5 +5,6 @@ plugins { spotless { groovyGradle { greclipse() + endWithNewline() } } \ No newline at end of file diff --git a/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle index c564de8..f793ba2 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle @@ -9,5 +9,6 @@ spotless { removeUnusedImports() importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') licenseHeaderFile rootProject.file('gradle/spotless.license') + endWithNewline() } } \ No newline at end of file diff --git a/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle index 6ae6fcb..141b720 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle @@ -6,6 +6,7 @@ spotless { freshmark { // freshmark for keeping markdown files up to date target '*.md' prettier() // prettier for markdown formatting + endWithNewline() } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index e6a6f03..5a04e70 100644 --- a/build.gradle +++ b/build.gradle @@ -12,4 +12,4 @@ allprojects { repositories { mavenCentral() } -} \ No newline at end of file +} From 2c4ff07edf2f91cb49f26f7d03d5a1b4d9e801e0 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Sun, 16 Feb 2025 20:47:19 +0100 Subject: [PATCH 012/141] chore: make sure to format convention gradle files --- build-logic/build.gradle | 1 + .../buildlogic.changelog-conventions.gradle | 6 +-- ...dlogic.java-application-conventions.gradle | 8 ++-- .../buildlogic.java-common-conventions.gradle | 38 +++++++++---------- ...buildlogic.java-library-conventions.gradle | 8 ++-- ...ldlogic.spotless-common-conventions.gradle | 6 +-- ...ldlogic.spotless-gradle-conventions.gradle | 12 +++--- ...uildlogic.spotless-java-conventions.gradle | 20 +++++----- ...logic.spotless-markdown-conventions.gradle | 16 ++++---- 9 files changed, 58 insertions(+), 57 deletions(-) diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 6d5a995..4cafb01 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -27,6 +27,7 @@ spotless { endWithNewline() } groovyGradle { + target '*.gradle', 'src/main/groovy/**/*.gradle' greclipse() endWithNewline() } diff --git a/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle index d652ece..3774b6f 100644 --- a/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle @@ -1,8 +1,8 @@ plugins { - id 'com.diffplug.spotless-changelog' + id 'com.diffplug.spotless-changelog' } spotlessChangelog { - appendDashSnapshotUnless_dashPrelease=true -} \ No newline at end of file + appendDashSnapshotUnless_dashPrelease=true +} diff --git a/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle index 1006b9b..81a8085 100644 --- a/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle @@ -5,9 +5,9 @@ */ plugins { - // Apply the common convention plugin for shared build configuration between library and application projects. - id 'buildlogic.java-common-conventions' + // Apply the common convention plugin for shared build configuration between library and application projects. + id 'buildlogic.java-common-conventions' - // Apply the application plugin to add support for building a CLI application in Java. - id 'application' + // Apply the application plugin to add support for building a CLI application in Java. + id 'application' } diff --git a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle index a307d51..9941af9 100644 --- a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle @@ -5,36 +5,36 @@ */ plugins { - // Apply the java Plugin to add support for Java. - id 'java' - id 'buildlogic.spotless-java-conventions' + // Apply the java Plugin to add support for Java. + id 'java' + id 'buildlogic.spotless-java-conventions' } repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() + // Use Maven Central for resolving dependencies. + mavenCentral() } dependencies { - constraints { - // Define dependency versions as constraints - implementation 'org.apache.commons:commons-text:1.12.0' - } + constraints { + // Define dependency versions as constraints + implementation 'org.apache.commons:commons-text:1.12.0' + } } testing { - suites { - // Configure the built-in test suite - test { - // Use JUnit Jupiter test framework - useJUnitJupiter('5.11.1') - } - } + suites { + // Configure the built-in test suite + test { + // Use JUnit Jupiter test framework + useJUnitJupiter('5.11.1') + } + } } // Apply a specific Java toolchain to ease working on different environments. java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } diff --git a/build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle index 526803e..3c8b5b6 100644 --- a/build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle @@ -5,9 +5,9 @@ */ plugins { - // Apply the common convention plugin for shared build configuration between library and application projects. - id 'buildlogic.java-common-conventions' + // Apply the common convention plugin for shared build configuration between library and application projects. + id 'buildlogic.java-common-conventions' - // Apply the java-library plugin for API and implementation separation. - id 'java-library' + // Apply the java-library plugin for API and implementation separation. + id 'java-library' } diff --git a/build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle index 80682e7..954c67f 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-common-conventions.gradle @@ -1,8 +1,8 @@ plugins { - id 'com.diffplug.spotless' + id 'com.diffplug.spotless' } spotless { -// ratchetFrom 'origin/main' - encoding 'UTF-8' + // ratchetFrom 'origin/main' + encoding 'UTF-8' } diff --git a/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle index b3e4c8f..bb3e999 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-gradle-conventions.gradle @@ -1,10 +1,10 @@ plugins { - id 'buildlogic.spotless-common-conventions' + id 'buildlogic.spotless-common-conventions' } spotless { - groovyGradle { - greclipse() - endWithNewline() - } -} \ No newline at end of file + groovyGradle { + greclipse() + endWithNewline() + } +} diff --git a/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle index f793ba2..ea84d7f 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-java-conventions.gradle @@ -1,14 +1,14 @@ plugins { - id 'buildlogic.spotless-common-conventions' + id 'buildlogic.spotless-common-conventions' } spotless { - java { - palantirJavaFormat() - formatAnnotations() - removeUnusedImports() - importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') - licenseHeaderFile rootProject.file('gradle/spotless.license') - endWithNewline() - } -} \ No newline at end of file + java { + palantirJavaFormat() + formatAnnotations() + removeUnusedImports() + importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#') + licenseHeaderFile rootProject.file('gradle/spotless.license') + endWithNewline() + } +} diff --git a/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle b/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle index 141b720..dd18e6f 100644 --- a/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.spotless-markdown-conventions.gradle @@ -1,12 +1,12 @@ plugins { - id 'buildlogic.spotless-common-conventions' + id 'buildlogic.spotless-common-conventions' } spotless { - freshmark { // freshmark for keeping markdown files up to date - target '*.md' - prettier() // prettier for markdown formatting - endWithNewline() - } - -} \ No newline at end of file + freshmark { + // freshmark for keeping markdown files up to date + target '*.md' + prettier() // prettier for markdown formatting + endWithNewline() + } +} From 9613da533a8858b8d41802715b5f1dc7c09a0a22 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Mon, 17 Feb 2025 21:12:32 +0100 Subject: [PATCH 013/141] feat: add poc implementation Refs: https://github.com/diffplug/spotless/pull/2419 --- .idea/compiler.xml | 10 + .idea/modules.xml | 8 + .../testlib/spotless-cli.testlib.main.iml | 8 + app/build.gradle | 5 + .../diffplug/spotless/cli/SpotlessAction.java | 26 ++ .../cli/SpotlessActionContextProvider.java | 24 ++ .../diffplug/spotless/cli/SpotlessCLI.java | 269 ++++++++++++++++++ .../spotless/cli/SpotlessCommand.java | 18 ++ .../spotless/cli/core/ChecksumCalculator.java | 130 +++++++++ .../spotless/cli/core/CliJarProvisioner.java | 58 ++++ .../spotless/cli/core/ExecutionLayout.java | 110 +++++++ .../spotless/cli/core/FilePathUtil.java | 45 +++ .../spotless/cli/core/FileResolver.java | 45 +++ .../cli/core/SpotlessActionContext.java | 89 ++++++ .../cli/core/SpotlessCommandLineStream.java | 70 +++++ .../cli/core/TargetFileTypeInferer.java | 127 +++++++++ .../spotless/cli/core/TargetResolver.java | 127 +++++++++ .../execution/SpotlessExecutionStrategy.java | 73 +++++ .../spotless/cli/help/OptionConstants.java | 31 ++ .../cli/steps/BuildDirGloballyReusable.java | 18 ++ .../spotless/cli/steps/GoogleJavaFormat.java | 75 +++++ .../spotless/cli/steps/LicenseHeader.java | 141 +++++++++ .../spotless/cli/steps/OptionDefaultUse.java | 43 +++ .../diffplug/spotless/cli/steps/Prettier.java | 236 +++++++++++++++ .../cli/steps/SpotlessCLIFormatterStep.java | 29 ++ .../cli/steps/SpotlessFormatterStep.java | 38 +++ .../version/SpotlessCLIVersionProvider.java | 32 +++ app/src/main/resources/application.properties | 1 + .../spotless/cli/CLIIntegrationHarness.java | 66 +++++ .../cli/SpotlessCLIHelpAndVersionTest.java | 35 +++ .../spotless/cli/SpotlessCLIRunner.java | 169 +++++++++++ ...potlessCLIRunnerInExternalJavaProcess.java | 62 ++++ ...tlessCLIRunnerInNativeExternalProcess.java | 60 ++++ .../cli/SpotlessCLIRunnerInSameThread.java | 60 ++++ .../cli/core/ChecksumCalculatorTest.java | 241 ++++++++++++++++ .../GoogleJavaFormatJavaProcessTest.java} | 16 +- .../GoogleJavaFormatNativeProcessTest.java | 24 ++ .../cli/steps/GoogleJavaFormatTest.java | 41 +++ .../steps/LicenseHeaderJavaProcessTest.java | 21 ++ .../steps/LicenseHeaderNativeProcessTest.java | 21 ++ .../spotless/cli/steps/LicenseHeaderTest.java | 167 +++++++++++ .../spotless/cli/steps/PrettierTest.java | 58 ++++ ...dlogic.java-application-conventions.gradle | 6 + .../buildlogic.java-common-conventions.gradle | 3 + ...dlogic.java-testlibrary-conventions.gradle | 18 ++ gradle/libs.versions.toml | 25 ++ settings.gradle | 2 +- testlib/build.gradle | 8 + .../diffplug/spotless/ResourceHarness.java | 253 ++++++++++++++++ .../spotless/tag/CliNativeNpmTest.java | 30 ++ .../diffplug/spotless/tag/CliNativeTest.java | 30 ++ .../spotless/tag/CliProcessNpmTest.java | 30 ++ .../diffplug/spotless/tag/CliProcessTest.java | 30 ++ 53 files changed, 3350 insertions(+), 12 deletions(-) create mode 100644 .idea/modules.xml create mode 100644 .idea/modules/testlib/spotless-cli.testlib.main.iml create mode 100644 app/src/main/java/com/diffplug/spotless/cli/SpotlessAction.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/SpotlessActionContextProvider.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/SpotlessCommand.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/ChecksumCalculator.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/CliJarProvisioner.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/ExecutionLayout.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/FilePathUtil.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/FileResolver.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/SpotlessActionContext.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/SpotlessCommandLineStream.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/TargetFileTypeInferer.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/core/TargetResolver.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/execution/SpotlessExecutionStrategy.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/help/OptionConstants.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/BuildDirGloballyReusable.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/GoogleJavaFormat.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/LicenseHeader.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/OptionDefaultUse.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/Prettier.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessCLIFormatterStep.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessFormatterStep.java create mode 100644 app/src/main/java/com/diffplug/spotless/cli/version/SpotlessCLIVersionProvider.java create mode 100644 app/src/main/resources/application.properties create mode 100644 app/src/test/java/com/diffplug/spotless/cli/CLIIntegrationHarness.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIHelpAndVersionTest.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunner.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInExternalJavaProcess.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInNativeExternalProcess.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInSameThread.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/core/ChecksumCalculatorTest.java rename app/src/test/java/{org/example/app/MessageUtilsTest.java => com/diffplug/spotless/cli/steps/GoogleJavaFormatJavaProcessTest.java} (66%) create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatNativeProcessTest.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatTest.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderJavaProcessTest.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderNativeProcessTest.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderTest.java create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/PrettierTest.java create mode 100644 build-logic/src/main/groovy/buildlogic.java-testlibrary-conventions.gradle create mode 100644 testlib/build.gradle create mode 100644 testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/CliNativeNpmTest.java create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/CliNativeTest.java create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/CliProcessNpmTest.java create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/CliProcessTest.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b86273d..0bd692e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a44c414 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/testlib/spotless-cli.testlib.main.iml b/.idea/modules/testlib/spotless-cli.testlib.main.iml new file mode 100644 index 0000000..76ece22 --- /dev/null +++ b/.idea/modules/testlib/spotless-cli.testlib.main.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ec38350..0fe080d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,6 +11,11 @@ plugins { dependencies { implementation 'org.apache.commons:commons-text' implementation project(':utilities') + testImplementation project(':testlib') + implementation libs.bundles.spotless.libs + + implementation libs.picocli + annotationProcessor libs.picocli.codegen } application { diff --git a/app/src/main/java/com/diffplug/spotless/cli/SpotlessAction.java b/app/src/main/java/com/diffplug/spotless/cli/SpotlessAction.java new file mode 100644 index 0000000..2ece295 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/SpotlessAction.java @@ -0,0 +1,26 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.FormatterStep; + +public interface SpotlessAction extends SpotlessCommand { + Integer executeSpotlessAction(@NotNull List formatterSteps); +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/SpotlessActionContextProvider.java b/app/src/main/java/com/diffplug/spotless/cli/SpotlessActionContextProvider.java new file mode 100644 index 0000000..b8d81cc --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/SpotlessActionContextProvider.java @@ -0,0 +1,24 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import com.diffplug.spotless.cli.core.SpotlessActionContext; +import com.diffplug.spotless.cli.core.SpotlessCommandLineStream; + +public interface SpotlessActionContextProvider { + + SpotlessActionContext spotlessActionContext(SpotlessCommandLineStream commandLineStream); +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java new file mode 100644 index 0000000..c05fea1 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java @@ -0,0 +1,269 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import java.nio.charset.Charset; +import java.nio.file.Path; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.Formatter; +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.LineEnding; +import com.diffplug.spotless.LintState; +import com.diffplug.spotless.ThrowingEx; +import com.diffplug.spotless.cli.core.FileResolver; +import com.diffplug.spotless.cli.core.SpotlessActionContext; +import com.diffplug.spotless.cli.core.SpotlessCommandLineStream; +import com.diffplug.spotless.cli.core.TargetFileTypeInferer; +import com.diffplug.spotless.cli.core.TargetResolver; +import com.diffplug.spotless.cli.execution.SpotlessExecutionStrategy; +import com.diffplug.spotless.cli.help.OptionConstants; +import com.diffplug.spotless.cli.steps.GoogleJavaFormat; +import com.diffplug.spotless.cli.steps.LicenseHeader; +import com.diffplug.spotless.cli.steps.Prettier; +import com.diffplug.spotless.cli.version.SpotlessCLIVersionProvider; + +import picocli.CommandLine; +import picocli.CommandLine.Command; + +@Command( + name = "spotless", + mixinStandardHelpOptions = true, + versionProvider = SpotlessCLIVersionProvider.class, + description = "Runs spotless", + synopsisSubcommandLabel = "[FORMATTING_STEPS]", + commandListHeading = "%nAvailable formatting steps:%n", + subcommandsRepeatable = true, + subcommands = {LicenseHeader.class, GoogleJavaFormat.class, Prettier.class}) +public class SpotlessCLI implements SpotlessAction, SpotlessCommand, SpotlessActionContextProvider { + + @CommandLine.Spec + CommandLine.Model.CommandSpec spec; // injected by picocli + + @CommandLine.Option( + names = {"--mode", "-m"}, + defaultValue = "APPLY", + description = "The mode to run spotless in." + OptionConstants.VALID_AND_DEFAULT_VALUES_SUFFIX) + SpotlessMode spotlessMode; + + @CommandLine.Option( + names = {"--basedir"}, + hidden = true, + description = "The base directory to run spotless in. Intended for testing purposes only.") + Path baseDir; + + @CommandLine.Option( + names = {"--target", "-t"}, + description = "The target files to format.") + public List targets; + + @CommandLine.Option( + names = {"--encoding", "-e"}, + defaultValue = "UTF-8", + description = "The encoding of the files to format." + OptionConstants.DEFAULT_VALUE_SUFFIX) + public Charset encoding; + + @CommandLine.Option( + names = {"--line-ending", "-l"}, + defaultValue = "UNIX", + description = "The line ending of the files to format." + OptionConstants.VALID_AND_DEFAULT_VALUES_SUFFIX) + public LineEnding lineEnding; + + @Override + public Integer executeSpotlessAction(@NotNull List formatterSteps) { + validateTargets(); + TargetResolver targetResolver = targetResolver(); + + try (Formatter formatter = Formatter.builder() + .lineEndingsPolicy(lineEnding.createPolicy()) + .encoding(encoding) + .steps(formatterSteps) + .build()) { + + ResultType resultType = targetResolver + .resolveTargets() + .parallel() + .peek(path -> System.out.printf( + "%s: formatting %s%n", Thread.currentThread().getName(), path)) + .map(path -> ThrowingEx.get(() -> new Result( + path, + LintState.of(formatter, path.toFile())))) // TODO handle suppressions, see SpotlessTaskImpl + .map(result -> this.handleResult(formatter, result)) + .reduce(ResultType.CLEAN, ResultType::combineWith); + return spotlessMode.translateResultTypeToExitCode(resultType); + } + } + + private void validateTargets() { + if (targets == null || targets.isEmpty()) { // cannot use `required = true` because of the subcommands + throw new CommandLine.ParameterException( + spec.commandLine(), + "Error: Missing required argument (specify one of these): (--target= | -t)"); + } + } + + private ResultType handleResult(Formatter formatter, Result result) { + if (result.lintState.isClean()) { + // System.out.println("File is clean: " + result.target.toFile().getName()); + return ResultType.CLEAN; + } + if (result.lintState.getDirtyState().didNotConverge()) { + System.err.println("File did not converge: " + + result.target.toFile().getName()); // TODO: where to print the output to? + return ResultType.DID_NOT_CONVERGE; + } + return this.spotlessMode.handleResult(formatter, result); + } + + private TargetResolver targetResolver() { + return new TargetResolver(baseDir(), targets); + } + + private Path baseDir() { + return baseDir == null ? Path.of(System.getProperty("user.dir")) : baseDir; + } + + @Override + public SpotlessActionContext spotlessActionContext(SpotlessCommandLineStream commandLineStream) { + validateTargets(); + TargetResolver targetResolver = targetResolver(); + TargetFileTypeInferer targetFileTypeInferer = new TargetFileTypeInferer(targetResolver); + return SpotlessActionContext.builder() + .targetFileType(targetFileTypeInferer.inferTargetFileType()) + .fileResolver(new FileResolver(baseDir())) + .commandLineStream(commandLineStream) + .build(); + } + + public static void main(String... args) { + if (args.length == 0) { + // args = new String[]{"--version"}; + // args = new String[]{"license-header", "--header-file", "CHANGES.md", "--delimiter-for", "java", + // "license-header", "--header", "abc"}; + + // args = new String[]{"--mode=CHECK", "--target", "src/poc/java/**/*.java", "--encoding=UTF-8", + // "license-header", "--header", "abc", "license-header", "--header-file", "TestHeader.txt"}; + args = new String[] { + "--basedir", "cli", "--target", "src/poc/java/**/*.java", "--encoding=UTF-8", "google-java-format" + }; + // args = new String[]{"--version"}; + } + int exitCode = createCommandLine(createInstance()).execute(args); + System.exit(exitCode); + } + + static SpotlessCLI createInstance() { + return new SpotlessCLI(); + } + + static CommandLine createCommandLine(SpotlessCLI spotlessCLI) { + return new CommandLine(spotlessCLI) + .setExecutionStrategy(new SpotlessExecutionStrategy()) + .setCaseInsensitiveEnumValuesAllowed(true); + } + + private enum SpotlessMode { + CHECK { + @Override + ResultType handleResult(Formatter formatter, Result result) { + if (result.lintState.isHasLints()) { + result.lintState.asStringOneLine(result.target.toFile(), formatter); + } else { + System.out.println(String.format("%s is violating formatting rules.", result.target)); + } + return ResultType.DIRTY; + } + + @Override + Integer translateResultTypeToExitCode(ResultType resultType) { + if (resultType == ResultType.CLEAN) { + return 0; + } + if (resultType == ResultType.DIRTY) { + return 1; + } + if (resultType == ResultType.DID_NOT_CONVERGE) { + return -1; + } + throw new IllegalStateException("Unexpected result type: " + resultType); + } + }, + APPLY { + @Override + ResultType handleResult(Formatter formatter, Result result) { + if (result.lintState.isHasLints()) { + // something went wrong, we should not apply the changes + System.err.println( + "File has lints: " + result.target.toFile().getName()); + System.err.println( + "lint:\n" + result.lintState.asStringDetailed(result.target.toFile(), formatter)); + return ResultType.DIRTY; + } + ThrowingEx.run(() -> result.lintState.getDirtyState().writeCanonicalTo(result.target.toFile())); + return ResultType.CLEAN; + } + + @Override + Integer translateResultTypeToExitCode(ResultType resultType) { + if (resultType == ResultType.CLEAN) { + return 0; + } + if (resultType == ResultType.DIRTY) { + return 0; + } + if (resultType == ResultType.DID_NOT_CONVERGE) { + return -1; + } + throw new IllegalStateException("Unexpected result type: " + resultType); + } + }; + + abstract ResultType handleResult(Formatter formatter, Result result); + + abstract Integer translateResultTypeToExitCode(ResultType resultType); + } + + private enum ResultType { + CLEAN, + DIRTY, + DID_NOT_CONVERGE; + + ResultType combineWith(ResultType other) { + if (this == other) { + return this; + } + if (this == DID_NOT_CONVERGE || other == DID_NOT_CONVERGE) { + return DID_NOT_CONVERGE; + } + if (this == DIRTY || other == DIRTY) { + return DIRTY; + } + throw new IllegalStateException("Unexpected combination of result types: " + this + " and " + other); + } + } + + private static final class Result { + private final Path target; + private final LintState lintState; + + public Result(Path target, LintState lintState) { + this.target = target; + this.lintState = lintState; + } + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/SpotlessCommand.java b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCommand.java new file mode 100644 index 0000000..603bdb0 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCommand.java @@ -0,0 +1,18 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +public interface SpotlessCommand {} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/ChecksumCalculator.java b/app/src/main/java/com/diffplug/spotless/cli/core/ChecksumCalculator.java new file mode 100644 index 0000000..22c648f --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/ChecksumCalculator.java @@ -0,0 +1,130 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; + +import com.diffplug.common.hash.Hashing; +import com.diffplug.spotless.ThrowingEx; +import com.diffplug.spotless.cli.SpotlessAction; +import com.diffplug.spotless.cli.steps.SpotlessCLIFormatterStep; + +import picocli.CommandLine; + +public class ChecksumCalculator { + + public String calculateChecksum(SpotlessCLIFormatterStep step) { + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + writeObjectDataTo(step, out); + return toHashedHexBytes(out.toByteArray()); + } catch (Exception e) { + throw ThrowingEx.asRuntime(e); + } + } + + private void writeObjectDataTo(Object object, OutputStream outputStream) { + ThrowingEx.run(() -> outputStream.write(object.getClass().getName().getBytes(StandardCharsets.UTF_8))); + options(object) + .map(Object::toString) + .map(str -> str.getBytes(StandardCharsets.UTF_8)) + .forEachOrdered(bytes -> ThrowingEx.run(() -> outputStream.write(bytes))); + } + + public String calculateChecksum(SpotlessCommandLineStream commandLineStream) { + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + + calculateChecksumOfActions(commandLineStream.actions(), out); + + calculateChecksumOfSteps(commandLineStream.formatterSteps(), out); + return toHashedHexBytes(out.toByteArray()); + } catch (Exception e) { + throw ThrowingEx.asRuntime(e); + } + } + + private void calculateChecksumOfSteps( + Stream spotlessCLIFormatterStepStream, ByteArrayOutputStream out) { + spotlessCLIFormatterStepStream.forEachOrdered(step -> writeObjectDataTo(step, out)); + } + + private void calculateChecksumOfActions(Stream actions, ByteArrayOutputStream out) { + actions.forEachOrdered(action -> writeObjectDataTo(action, out)); + } + + private static Stream options(Object step) { + List> classHierarchy = classHierarchy(step); + return classHierarchy.stream() + .flatMap(clazz -> Arrays.stream(clazz.getDeclaredFields())) + .flatMap(field -> expandOptionField(field, step)) + .map(FieldOnObject::getValue) + .filter(Objects::nonNull); + } + + private static List> classHierarchy(Object obj) { + List> hierarchy = new ArrayList<>(); + Class clazz = obj.getClass(); + while (clazz != null) { + hierarchy.add(clazz); + clazz = clazz.getSuperclass(); + } + return hierarchy; + } + + private static Stream expandOptionField(Field field, Object obj) { + if (field.isAnnotationPresent(CommandLine.Option.class) + || field.isAnnotationPresent(CommandLine.Parameters.class)) { + return Stream.of(new FieldOnObject(field, obj)); + } + if (field.isAnnotationPresent(CommandLine.ArgGroup.class)) { + Object fieldValue = new FieldOnObject(field, obj).getValue(); + return Arrays.stream(fieldValue.getClass().getDeclaredFields()) + .flatMap(subField -> expandOptionField(subField, fieldValue)); + } + return Stream.empty(); // nothing to expand + } + + private static String toHashedHexBytes(byte[] bytes) { + byte[] hash = Hashing.murmur3_128().hashBytes(bytes).asBytes(); + StringBuilder builder = new StringBuilder(); + for (byte b : hash) { + builder.append(String.format("%02x", b)); + } + return builder.toString(); + } + + private static class FieldOnObject { + private final Field field; + private final Object obj; + + FieldOnObject(Field field, Object obj) { + this.field = field; + this.obj = obj; + } + + Object getValue() { + ThrowingEx.run(() -> field.setAccessible(true)); + return ThrowingEx.get(() -> field.get(obj)); + } + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/CliJarProvisioner.java b/app/src/main/java/com/diffplug/spotless/cli/core/CliJarProvisioner.java new file mode 100644 index 0000000..a308585 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/CliJarProvisioner.java @@ -0,0 +1,58 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +import com.diffplug.spotless.JarState; +import com.diffplug.spotless.Provisioner; + +public class CliJarProvisioner implements Provisioner { + + public static final CliJarProvisioner INSTANCE = new CliJarProvisioner(); + + public static final File OWN_JAR = createSentinelFile(); + + public CliJarProvisioner() { + JarState.setOverrideClassLoader(getClass().getClassLoader()); // use the classloader of this class + // TODO (simschla, 11.11.2024): THIS IS A HACK, replace with proper solution + } + + private static File createSentinelFile() { + try { + File file = File.createTempFile("spotless-cli", ".jar"); + Files.write( + file.toPath(), + List.of("@@@@PLACEHOLDER_FOR_OWN_JAR@@@@"), + StandardCharsets.UTF_8, + java.nio.file.StandardOpenOption.TRUNCATE_EXISTING); + file.deleteOnExit(); + return file; + } catch (Exception e) { + throw new RuntimeException("Could not create sentinel file", e); + } + } + + @Override + public Set provisionWithTransitives(boolean withTransitives, Collection mavenCoordinates) { + return Set.of(OWN_JAR); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/ExecutionLayout.java b/app/src/main/java/com/diffplug/spotless/cli/core/ExecutionLayout.java new file mode 100644 index 0000000..45eca38 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/ExecutionLayout.java @@ -0,0 +1,110 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import com.diffplug.spotless.cli.steps.BuildDirGloballyReusable; +import com.diffplug.spotless.cli.steps.SpotlessCLIFormatterStep; + +public class ExecutionLayout { + + private final FileResolver fileResolver; + private final SpotlessCommandLineStream commandLineStream; + private final ChecksumCalculator checksumCalculator; + + private ExecutionLayout(@NotNull FileResolver fileResolver, @NotNull SpotlessCommandLineStream commandLineStream) { + this.fileResolver = Objects.requireNonNull(fileResolver); + this.commandLineStream = Objects.requireNonNull(commandLineStream); + this.checksumCalculator = new ChecksumCalculator(); + } + + public static ExecutionLayout create( + @NotNull FileResolver fileResolver, @NotNull SpotlessCommandLineStream commandLineStream) { + return new ExecutionLayout(fileResolver, commandLineStream); + } + + public Optional find(@Nullable Path searchPath) { + if (searchPath == null) { + return Optional.empty(); + } + Path found = fileResolver.resolvePath(searchPath); + if (found.toFile().canRead()) { + return Optional.of(found); + } + if (searchPath.toFile().canRead()) { + return Optional.of(searchPath); + } + return Optional.empty(); + } + + public Path baseDir() { + return fileResolver.baseDir(); + } + + public Path buildDir() { + // gradle? + if (isGradleDirectory()) { + return gradleBuildDir(); + } + if (isMavenDirectory()) { + return mavenBuildDir(); + } + return tempBuildDir(); + } + + private boolean isGradleDirectory() { + return List.of("build.gradle", "build.gradle.kts", "settings.gradle", "settings.gradle.kts").stream() + .map(Paths::get) + .map(this::find) + .anyMatch(Optional::isPresent); + } + + private Path gradleBuildDir() { + return fileResolver.resolvePath(Paths.get("build", "spotless-cli")); + } + + private boolean isMavenDirectory() { + return List.of("pom.xml").stream().map(Paths::get).map(this::find).anyMatch(Optional::isPresent); + } + + private Path mavenBuildDir() { + return fileResolver.resolvePath(Paths.get("target", "spotless-cli")); + } + + private Path tempBuildDir() { + String tmpDir = System.getProperty("java.io.tmpdir"); + return Path.of(tmpDir, "spotless-cli"); + } + + public Path buildDirFor(@NotNull SpotlessCLIFormatterStep step) { + Objects.requireNonNull(step); + Path buildDir = buildDir(); + String checksum = checksumCalculator.calculateChecksum(step); + if (step instanceof BuildDirGloballyReusable) { + return buildDir.resolve(checksum); + } + String commandLineChecksum = checksumCalculator.calculateChecksum(commandLineStream); + return buildDir.resolve(checksum + "-" + commandLineChecksum); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/FilePathUtil.java b/app/src/main/java/com/diffplug/spotless/cli/core/FilePathUtil.java new file mode 100644 index 0000000..80d4188 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/FilePathUtil.java @@ -0,0 +1,45 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.io.File; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +public final class FilePathUtil { + + private FilePathUtil() { + // no instance + } + + public static File asFile(Path path) { + return path == null ? null : path.toFile(); + } + + public static List asFiles(List paths) { + return paths == null ? null : paths.stream().map(Path::toFile).collect(Collectors.toList()); + } + + public static List assertDirectoryExists(File... files) { + return assertDirectoryExists(Arrays.asList(files)); + } + + public static List assertDirectoryExists(List files) { + return files.stream().map(f -> f != null && f.mkdirs()).collect(Collectors.toList()); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/FileResolver.java b/app/src/main/java/com/diffplug/spotless/cli/core/FileResolver.java new file mode 100644 index 0000000..789eba1 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/FileResolver.java @@ -0,0 +1,45 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.io.File; +import java.nio.file.Path; +import java.util.Objects; + +import org.jetbrains.annotations.NotNull; + +public class FileResolver { + private final Path baseDir; + + public FileResolver(@NotNull Path baseDir) { + this.baseDir = Objects.requireNonNull(baseDir); + } + + Path baseDir() { + return baseDir; + } + + public File resolveFile(File file) { + return resolvePath(file.toPath()).toFile(); + } + + public Path resolvePath(Path path) { + if (path.isAbsolute()) { + return path; + } + return baseDir.resolve(path); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/SpotlessActionContext.java b/app/src/main/java/com/diffplug/spotless/cli/core/SpotlessActionContext.java new file mode 100644 index 0000000..b1677ac --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/SpotlessActionContext.java @@ -0,0 +1,89 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.io.File; +import java.nio.file.Path; +import java.util.Objects; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.Provisioner; + +public class SpotlessActionContext { + + private final TargetFileTypeInferer.TargetFileType targetFileType; + private final FileResolver fileResolver; + private final ExecutionLayout executionLayout; + + private SpotlessActionContext( + @NotNull TargetFileTypeInferer.TargetFileType targetFileType, + @NotNull FileResolver fileResolver, + @NotNull SpotlessCommandLineStream commandLineStream) { + this.targetFileType = Objects.requireNonNull(targetFileType); + this.fileResolver = Objects.requireNonNull(fileResolver); + this.executionLayout = ExecutionLayout.create(fileResolver, Objects.requireNonNull(commandLineStream)); + } + + @NotNull public TargetFileTypeInferer.TargetFileType targetFileType() { + return targetFileType; + } + + public File resolveFile(File file) { + return fileResolver.resolveFile(file); + } + + public Path resolvePath(Path path) { + return fileResolver.resolvePath(path); + } + + public Provisioner provisioner() { + return CliJarProvisioner.INSTANCE; + } + + public ExecutionLayout executionLayout() { + return executionLayout; + } + + public static Builder builder() { + return new Builder(); + } + + public static class Builder { + private TargetFileTypeInferer.TargetFileType targetFileType; + private FileResolver fileResolver; + private SpotlessCommandLineStream commandLineStream; + + public Builder targetFileType(TargetFileTypeInferer.TargetFileType targetFileType) { + this.targetFileType = targetFileType; + return this; + } + + public Builder fileResolver(FileResolver fileResolver) { + this.fileResolver = fileResolver; + return this; + } + + public Builder commandLineStream(SpotlessCommandLineStream commandLineStream) { + this.commandLineStream = commandLineStream; + return this; + } + + public SpotlessActionContext build() { + return new SpotlessActionContext(targetFileType, fileResolver, commandLineStream); + } + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/SpotlessCommandLineStream.java b/app/src/main/java/com/diffplug/spotless/cli/core/SpotlessCommandLineStream.java new file mode 100644 index 0000000..5639e3f --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/SpotlessCommandLineStream.java @@ -0,0 +1,70 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.util.stream.Stream; + +import com.diffplug.spotless.cli.SpotlessAction; +import com.diffplug.spotless.cli.SpotlessActionContextProvider; +import com.diffplug.spotless.cli.steps.SpotlessCLIFormatterStep; + +import picocli.CommandLine; + +public interface SpotlessCommandLineStream { // todo turn into an interface + + static SpotlessCommandLineStream of(CommandLine.ParseResult parseResult) { + return new DefaultSpotlessCommandLineStream(parseResult); + } + + Stream formatterSteps(); + + Stream contextProviders(); + + Stream actions(); + + class DefaultSpotlessCommandLineStream implements SpotlessCommandLineStream { + + private final CommandLine.ParseResult parseResult; + + private DefaultSpotlessCommandLineStream(CommandLine.ParseResult parseResult) { + this.parseResult = parseResult; + } + + @Override + public Stream formatterSteps() { + return parseResult.asCommandLineList().stream() + .map(CommandLine::getCommand) + .filter(command -> command instanceof SpotlessCLIFormatterStep) + .map(SpotlessCLIFormatterStep.class::cast); + } + + @Override + public Stream contextProviders() { + return parseResult.asCommandLineList().stream() + .map(CommandLine::getCommand) + .filter(command -> command instanceof SpotlessActionContextProvider) + .map(SpotlessActionContextProvider.class::cast); + } + + @Override + public Stream actions() { + return parseResult.asCommandLineList().stream() + .map(CommandLine::getCommand) + .filter(command -> command instanceof SpotlessAction) + .map(SpotlessAction.class::cast); + } + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/TargetFileTypeInferer.java b/app/src/main/java/com/diffplug/spotless/cli/core/TargetFileTypeInferer.java new file mode 100644 index 0000000..f55c117 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/TargetFileTypeInferer.java @@ -0,0 +1,127 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.util.Arrays; +import java.util.Objects; + +import org.jetbrains.annotations.NotNull; + +public class TargetFileTypeInferer { + + private final TargetResolver targetResolver; + + public TargetFileTypeInferer(TargetResolver targetResolver) { + this.targetResolver = Objects.requireNonNull(targetResolver); + } + + public TargetFileType inferTargetFileType() { + return targetResolver + .resolveTargets() + .limit(5) // only check the first n files + .map(this::inferFileType) + .reduce(this::reduceFileType) + .orElseGet(TargetFileType::unknown); + } + + private TargetFileType reduceFileType(TargetFileType fileType1, TargetFileType fileType2) { + if (Objects.equals(fileType1, fileType2)) { + return fileType1; + } + return TargetFileType.unknown(); + } + + private TargetFileType inferFileType(@NotNull java.nio.file.Path path) { + String fileName = path.getFileName().toString(); + int lastDotIndex = fileName.lastIndexOf('.'); + if (lastDotIndex == -1) { + return TargetFileType.unknown(); + } + String fileExtension = fileName.substring(lastDotIndex + 1); + return new TargetFileType(fileExtension); + } + + public static final class TargetFileType { + private final String fileExtension; + + private TargetFileType(String fileExtension) { + this.fileExtension = fileExtension; + } + + public String fileExtension() { + return fileExtension; + } + + public FileType fileType() { + return FileType.fromFileExtension(fileExtension); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + TargetFileType that = (TargetFileType) o; + return Objects.equals(fileExtension, that.fileExtension); + } + + @Override + public int hashCode() { + return Objects.hashCode(fileExtension); + } + + static TargetFileType unknown() { + return new TargetFileType(null); + } + + static TargetFileType fromExtension(String fileExtension) { + return new TargetFileType(fileExtension); + } + } + + public enum FileType { + JAVA, + CPP, + ANTLR4("g4"), + GROOVY, + PROTOBUF("proto"), + KOTLIN("kt"), + UNDETERMINED(""); + + private final String fileExtensionOverride; + + FileType() { + this.fileExtensionOverride = null; + } + + FileType(String fileExtensionOverride) { + this.fileExtensionOverride = fileExtensionOverride; + } + + public String fileExtension() { + return fileExtensionOverride == null ? name().toLowerCase() : fileExtensionOverride; + } + + public static FileType fromFileExtension(String fileExtension) { + if (fileExtension == null || fileExtension.isEmpty()) { + return UNDETERMINED; + } + return Arrays.stream(values()) + .filter(fileType -> fileType.fileExtension().equalsIgnoreCase(fileExtension)) + .findFirst() + .orElse(UNDETERMINED); + } + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/core/TargetResolver.java b/app/src/main/java/com/diffplug/spotless/cli/core/TargetResolver.java new file mode 100644 index 0000000..3382b6e --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/core/TargetResolver.java @@ -0,0 +1,127 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.io.File; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitOption; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.PathMatcher; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.ThrowingEx; + +import static java.util.function.Predicate.not; + +public class TargetResolver { + + private final List targets; + + private final FileResolver fileResolver; + + public TargetResolver(@NotNull Path baseDir, @NotNull List targets) { + this.fileResolver = new FileResolver(baseDir); + this.targets = Objects.requireNonNull(targets); + } + + public Stream resolveTargets() { + return targets.parallelStream() + .map(this::resolveTarget) + .reduce(Stream::concat) // beware! when using flatmap, the stream goes to sequential + .orElse(Stream.empty()); + } + + private Stream resolveTarget(String target) { + + final boolean isGlob = target.contains("*") || target.contains("?"); + System.out.println("isGlob: " + isGlob + " target: " + target); + + if (isGlob) { + return resolveGlob(target); + } + Path targetPath = fileResolver.resolvePath(Path.of(target)); + if (Files.isReadable(targetPath)) { + return Stream.of(targetPath); + } + if (Files.isDirectory(targetPath)) { + return resolveDir(targetPath); + } + // TODO log warn? + return Stream.empty(); + } + + private Stream resolveDir(Path startDir) { + List collected = new ArrayList<>(); + ThrowingEx.run(() -> Files.walkFileTree( + startDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor<>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + collected.add(file); + return FileVisitResult.CONTINUE; + } + })); + return collected.parallelStream(); + } + + private Stream resolveGlob(String glob) { + Path startDir; + String globPart; + // if the glob is absolute, we need to split the glob into its parts and use all parts except glob chars '*', + // '**', and '?' + String[] parts = glob.split("\\Q" + File.separator + "\\E"); + List startDirParts = + Stream.of(parts).takeWhile(not(TargetResolver::isGlobPathPart)).collect(Collectors.toList()); + + startDir = Path.of( + glob.startsWith(File.separator) + ? File.separator + : fileResolver.baseDir().toString(), + startDirParts.toArray(String[]::new)); + globPart = Stream.of(parts).skip(startDirParts.size()).collect(Collectors.joining(File.separator)); + + PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + globPart); + List collected = new ArrayList<>(); + ThrowingEx.run(() -> Files.walkFileTree( + startDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor<>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + Path relativeFile = startDir.relativize(file); + if (matcher.matches(relativeFile)) { + System.out.println("Matched: " + file); + collected.add(file); + } + return FileVisitResult.CONTINUE; + } + })); + return collected.parallelStream().map(Path::normalize); + // .map(Path::toAbsolutePath); + } + + private static boolean isGlobPathPart(String part) { + return part.contains("*") || part.contains("?") || part.matches(".*\\[.*].*") || part.matches(".*\\{.*}.*"); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/execution/SpotlessExecutionStrategy.java b/app/src/main/java/com/diffplug/spotless/cli/execution/SpotlessExecutionStrategy.java new file mode 100644 index 0000000..645b05f --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/execution/SpotlessExecutionStrategy.java @@ -0,0 +1,73 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.execution; + +import java.util.List; +import java.util.stream.Collectors; + +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.cli.core.SpotlessActionContext; +import com.diffplug.spotless.cli.core.SpotlessCommandLineStream; + +import picocli.CommandLine; + +import static picocli.CommandLine.executeHelpRequest; + +public class SpotlessExecutionStrategy implements CommandLine.IExecutionStrategy { + + public int execute(CommandLine.ParseResult parseResult) throws CommandLine.ExecutionException { + Integer helpResult = executeHelpRequest(parseResult); + if (helpResult != null) { + return helpResult; + } + return runSpotlessActions(SpotlessCommandLineStream.of(parseResult)); + } + + private Integer runSpotlessActions(SpotlessCommandLineStream commandLineStream) { + // 1. prepare context + SpotlessActionContext context = provideSpotlessActionContext(commandLineStream); + + // 2. run setup (for combining steps handled as subcommands) + List steps = prepareFormatterSteps(commandLineStream, context); + + // 3. run spotless steps + return executeSpotlessAction(commandLineStream, steps); + } + + private SpotlessActionContext provideSpotlessActionContext(SpotlessCommandLineStream commandLineStream) { + return commandLineStream + .contextProviders() + .findFirst() + .map(provider -> provider.spotlessActionContext(commandLineStream)) + .orElseThrow(() -> new IllegalStateException("No SpotlessActionContextProvider found")); + } + + private List prepareFormatterSteps( + SpotlessCommandLineStream commandLineStream, SpotlessActionContext context) { + return commandLineStream + .formatterSteps() + .flatMap(step -> step.prepareFormatterSteps(context).stream()) + .collect(Collectors.toList()); + } + + private Integer executeSpotlessAction(SpotlessCommandLineStream commandLineStream, List steps) { + return commandLineStream + .actions() + .findFirst() + .map(spotlessAction -> spotlessAction.executeSpotlessAction(steps)) + .orElse(-1); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/help/OptionConstants.java b/app/src/main/java/com/diffplug/spotless/cli/help/OptionConstants.java new file mode 100644 index 0000000..542c38b --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/help/OptionConstants.java @@ -0,0 +1,31 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.help; + +public final class OptionConstants { + + public static final String NEW_LINE = "%n "; + + public static final String VALID_VALUES_SUFFIX = NEW_LINE + "One of: ${COMPLETION-CANDIDATES}"; + + public static final String DEFAULT_VALUE_SUFFIX = NEW_LINE + "(default: ${DEFAULT-VALUE})"; + + public static final String VALID_AND_DEFAULT_VALUES_SUFFIX = VALID_VALUES_SUFFIX + DEFAULT_VALUE_SUFFIX; + + private OptionConstants() { + // no instance + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/BuildDirGloballyReusable.java b/app/src/main/java/com/diffplug/spotless/cli/steps/BuildDirGloballyReusable.java new file mode 100644 index 0000000..117adf5 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/steps/BuildDirGloballyReusable.java @@ -0,0 +1,18 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +public interface BuildDirGloballyReusable {} diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/GoogleJavaFormat.java b/app/src/main/java/com/diffplug/spotless/cli/steps/GoogleJavaFormat.java new file mode 100644 index 0000000..c8f98a3 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/steps/GoogleJavaFormat.java @@ -0,0 +1,75 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.util.List; + +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.cli.core.SpotlessActionContext; +import com.diffplug.spotless.cli.help.OptionConstants; +import com.diffplug.spotless.java.GoogleJavaFormatStep; + +import picocli.CommandLine; + +@CommandLine.Command(name = "google-java-format", description = "Runs google java format") +public class GoogleJavaFormat extends SpotlessFormatterStep { + + @CommandLine.Option( + names = {"--style", "-s"}, + required = false, + defaultValue = "GOOGLE", + description = + "The style to use for the google java format." + OptionConstants.VALID_AND_DEFAULT_VALUES_SUFFIX) + Style style; + + @CommandLine.Option( + names = {"--reflow-long-strings", "-r"}, + required = false, + defaultValue = "false", + description = "Reflow long strings." + OptionConstants.DEFAULT_VALUE_SUFFIX) + boolean reflowLongStrings; + + @CommandLine.Option( + names = {"--reorder-imports", "-i"}, + required = false, + defaultValue = "false", + description = "Reorder imports." + OptionConstants.DEFAULT_VALUE_SUFFIX) + boolean reorderImports; + + @CommandLine.Option( + names = {"--format-javadoc", "-j"}, + required = false, + defaultValue = "true", + description = "Format javadoc." + OptionConstants.DEFAULT_VALUE_SUFFIX) + boolean formatJavadoc; + + @Override + public List prepareFormatterSteps(SpotlessActionContext context) { + return List.of(GoogleJavaFormatStep.create( + GoogleJavaFormatStep.defaultGroupArtifact(), + GoogleJavaFormatStep.defaultVersion(), + style.name(), + context.provisioner(), + reflowLongStrings, + reorderImports, + formatJavadoc)); + } + + public enum Style { + AOSP, + GOOGLE + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/LicenseHeader.java b/app/src/main/java/com/diffplug/spotless/cli/steps/LicenseHeader.java new file mode 100644 index 0000000..6f7e141 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/steps/LicenseHeader.java @@ -0,0 +1,141 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.io.File; +import java.nio.file.Files; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.ThrowingEx; +import com.diffplug.spotless.antlr4.Antlr4Defaults; +import com.diffplug.spotless.cli.core.SpotlessActionContext; +import com.diffplug.spotless.cli.core.TargetFileTypeInferer; +import com.diffplug.spotless.cli.help.OptionConstants; +import com.diffplug.spotless.cpp.CppDefaults; +import com.diffplug.spotless.generic.LicenseHeaderStep; +import com.diffplug.spotless.kotlin.KotlinConstants; +import com.diffplug.spotless.protobuf.ProtobufConstants; + +import picocli.CommandLine; + +@CommandLine.Command(name = "license-header", description = "Runs license header") +public class LicenseHeader extends SpotlessFormatterStep { + + @CommandLine.ArgGroup(exclusive = true, multiplicity = "1") + LicenseHeaderSourceOption licenseHeaderSourceOption; + + @CommandLine.Option( + names = {"--delimiter", "-d"}, + required = false, + description = + "The delimiter to use for the license header. If not provided, the delimiter will be guessed based on the first few files we find. Otherwise, 'java' will be assumed.") + String delimiter; + + static class LicenseHeaderSourceOption { + @CommandLine.Option( + names = {"--header", "-H"}, + required = true, + description = "The license header content to apply. May contain @|YELLOW $YEAR|@ as placeholder.") + String header; + + @CommandLine.Option( + names = {"--header-file", "-f"}, + required = true, + description = + "The license header content in a file to apply.%n May contain @|YELLOW $YEAR|@ as placeholder.") + File headerFile; + } + + @CommandLine.Option( + names = {"--year-mode", "-m"}, + required = false, + defaultValue = "PRESERVE", + description = "How and if the year in the copyright header should be updated." + + OptionConstants.VALID_AND_DEFAULT_VALUES_SUFFIX) + LicenseHeaderStep.YearMode yearMode; + + @CommandLine.Option( + names = {"--year-separator", "-Y"}, + required = false, + defaultValue = "-" /* TODO simschla: Make accessible: LicenseHeaderStep.DEFAULT_YEAR_DELIMITER*/, + description = "The separator to use for the year range in the license header." + + OptionConstants.DEFAULT_VALUE_SUFFIX) + String yearSeparator; + + @CommandLine.Option( + names = {"--skip-lines-matching", "-s"}, + required = false, + description = "Skip lines matching the given regex pattern before inserting the licence header.") + String skipLinesMatching; + + @CommandLine.Option( + names = {"--content-pattern", "-c"}, + required = false, + description = + "The pattern to match the content of the file before inserting the licence header. (If the file content does not match the pattern, the header will not be inserted/updated.)") + String contentPattern; + + @NotNull @Override + public List prepareFormatterSteps(SpotlessActionContext context) { + FormatterStep licenseHeaderStep = LicenseHeaderStep.headerDelimiter( + headerSource(context), delimiter(context.targetFileType())) + .withYearMode(yearMode) + .withYearSeparator(yearSeparator) + .withSkipLinesMatching(skipLinesMatching) + .withContentPattern(contentPattern) + .build(); + return List.of(licenseHeaderStep); + } + + private ThrowingEx.Supplier headerSource(SpotlessActionContext context) { + if (licenseHeaderSourceOption.header != null) { + return () -> licenseHeaderSourceOption.header; + } else { + return () -> ThrowingEx.get(() -> Files.readString( + context.resolveFile(licenseHeaderSourceOption.headerFile).toPath())); + } + } + + private String delimiter(TargetFileTypeInferer.TargetFileType inferredFileType) { + if (delimiter != null) { + return delimiter; + } else { + return inferredDelimiterType(inferredFileType); + } + } + + private String inferredDelimiterType(TargetFileTypeInferer.TargetFileType inferredFileType) { + switch (inferredFileType.fileType()) { + case JAVA: + // fall through + case GROOVY: + return LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER; + case CPP: + return CppDefaults.DELIMITER_EXPR; + case ANTLR4: + return Antlr4Defaults.licenseHeaderDelimiter(); + case PROTOBUF: + return ProtobufConstants.LICENSE_HEADER_DELIMITER; + case KOTLIN: + return KotlinConstants.LICENSE_HEADER_DELIMITER; + default: + return LicenseHeaderStep.DEFAULT_JAVA_HEADER_DELIMITER; + } + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/OptionDefaultUse.java b/app/src/main/java/com/diffplug/spotless/cli/steps/OptionDefaultUse.java new file mode 100644 index 0000000..0b30859 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/steps/OptionDefaultUse.java @@ -0,0 +1,43 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.util.function.Supplier; + +import org.jetbrains.annotations.Nullable; + +import com.diffplug.common.base.Suppliers; + +public class OptionDefaultUse { + + @Nullable private final T obj; + + private OptionDefaultUse(@Nullable T obj) { + this.obj = obj; + } + + public static OptionDefaultUse use(@Nullable T obj) { + return new OptionDefaultUse<>(obj); + } + + public T orIfNullGet(Supplier supplier) { + return obj != null ? obj : supplier.get(); + } + + public T orIfNull(T other) { + return orIfNullGet(Suppliers.ofInstance(other)); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/Prettier.java b/app/src/main/java/com/diffplug/spotless/cli/steps/Prettier.java new file mode 100644 index 0000000..4771ef6 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/steps/Prettier.java @@ -0,0 +1,236 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.io.File; +import java.nio.file.Path; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.cli.core.ExecutionLayout; +import com.diffplug.spotless.cli.core.SpotlessActionContext; +import com.diffplug.spotless.npm.NpmPathResolver; +import com.diffplug.spotless.npm.PrettierConfig; +import com.diffplug.spotless.npm.PrettierFormatterStep; + +import picocli.CommandLine; + +import static com.diffplug.spotless.cli.core.FilePathUtil.asFile; +import static com.diffplug.spotless.cli.core.FilePathUtil.asFiles; +import static com.diffplug.spotless.cli.core.FilePathUtil.assertDirectoryExists; +import static com.diffplug.spotless.cli.steps.OptionDefaultUse.use; + +@CommandLine.Command(name = "prettier", description = "Runs prettier") +public class Prettier extends SpotlessFormatterStep { + + @CommandLine.Option( + names = {"--dev-dependency", "-D"}, + description = "The devDependencies to use for Prettier.") + Map devDependencies; + + @CommandLine.Option( + names = {"--cache-dir", "-C"}, + description = "The directory to use for caching Prettier.") + Path cacheDir; + + @CommandLine.Option( + names = {"--npm-exec", "-n"}, + description = "The explicit path to the npm executable.") + Path explicitNpmExecutable; + + @CommandLine.Option( + names = {"--node-exec", "-N"}, + description = "The explicit path to the node executable.") + Path explicitNodeExecutable; + + @CommandLine.Option( + names = {"--npmrc-file", "-R"}, + description = "The explicit path to the .npmrc file.") + Path explicitNpmrcFile; + + @CommandLine.Option( + names = {"--additional-npmrc-location", "-A"}, + description = "Additional locations to search for .npmrc files.") + List additionalNpmrcLocations; + + @CommandLine.Option( + names = {"--prettier-config-path", "-P"}, + description = "The path to the Prettier configuration file.") + Path prettierConfigPath; + + @CommandLine.Option( + names = {"--prettier-config-option", "-c"}, + description = "The Prettier configuration options.") + Map prettierConfigOptions; + + @NotNull @Override + public List prepareFormatterSteps(SpotlessActionContext context) { + FormatterStep prettierFormatterStep = builder(context) + .withDevDependencies(devDependencies()) + .withCacheDir(cacheDir) + .withExplicitNpmExecutable(explicitNpmExecutable) + .withExplicitNodeExecutable(explicitNodeExecutable) + .withExplicitNpmrcFile(explicitNpmrcFile) + .withAdditionalNpmrcLocations(additionalNpmrcLocations()) + .withPrettierConfigOptions(prettierConfigOptions()) + .withPrettierConfigPath(prettierConfigPath) + .build(); + + // return List.of(adapt(prettierFormatterStep)); + + return List.of(prettierFormatterStep); + } + + private Map prettierConfigOptions() { + if (prettierConfigOptions == null) { + return Collections.emptyMap(); + } + Map normalized = new LinkedHashMap<>(); + prettierConfigOptions.forEach((key, value) -> { + if (value == null) { + normalized.put(key, null); + } else { + normalized.put(key, normalizePrettierOption(key, value)); + } + }); + return normalized; + } + + private Object normalizePrettierOption(String key, String value) { + if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("false")) { + return Boolean.parseBoolean(value); + } + try { + return Integer.parseInt(value); + } catch (NumberFormatException e) { + return value; + } + } + + private Map devDependencies() { + return use(devDependencies).orIfNullGet(PrettierFormatterStep::defaultDevDependencies); + } + + private List additionalNpmrcLocations() { + return use(additionalNpmrcLocations).orIfNullGet(Collections::emptyList); + } + + private PrettierFormatterStepBuilder builder(@NotNull SpotlessActionContext context) { + return new PrettierFormatterStepBuilder(context); + } + + private class PrettierFormatterStepBuilder { + + @NotNull private final SpotlessActionContext context; + + private Map devDependencies; + + private Path cacheDir = null; + + // npmPathResolver + private Path explicitNpmExecutable; + + private Path explicitNodeExecutable; + + private Path explicitNpmrcFile; + + private List additionalNpmrcLocations; + + // prettierConfig + + private Map prettierConfigOptions; + + private Path prettierConfigPath; + + private PrettierFormatterStepBuilder(@NotNull SpotlessActionContext context) { + this.context = Objects.requireNonNull(context); + } + + public PrettierFormatterStepBuilder withDevDependencies(Map devDependencies) { + this.devDependencies = devDependencies; + return this; + } + + public PrettierFormatterStepBuilder withCacheDir(Path cacheDir) { + this.cacheDir = cacheDir; + return this; + } + + public PrettierFormatterStepBuilder withExplicitNpmExecutable(Path explicitNpmExecutable) { + this.explicitNpmExecutable = explicitNpmExecutable; + return this; + } + + public PrettierFormatterStepBuilder withExplicitNodeExecutable(Path explicitNodeExecutable) { + this.explicitNodeExecutable = explicitNodeExecutable; + return this; + } + + public PrettierFormatterStepBuilder withExplicitNpmrcFile(Path explicitNpmrcFile) { + this.explicitNpmrcFile = explicitNpmrcFile; + return this; + } + + public PrettierFormatterStepBuilder withAdditionalNpmrcLocations(List additionalNpmrcLocations) { + this.additionalNpmrcLocations = additionalNpmrcLocations; + return this; + } + + public PrettierFormatterStepBuilder withPrettierConfigOptions(Map prettierConfigOptions) { + this.prettierConfigOptions = prettierConfigOptions; + return this; + } + + public PrettierFormatterStepBuilder withPrettierConfigPath(Path prettierConfigPath) { + this.prettierConfigPath = prettierConfigPath; + return this; + } + + public FormatterStep build() { + ExecutionLayout layout = context.executionLayout(); + File projectDirFile = asFile(layout.find(Path.of("package.json")) // project dir + .map(Path::getParent) + .orElseGet(layout::baseDir)); + File buildDirFile = asFile(layout.buildDirFor(Prettier.this)); + File cacheDirFile = asFile(cacheDir); + assertDirectoryExists(projectDirFile, buildDirFile, cacheDirFile); + FormatterStep step = PrettierFormatterStep.create( + use(devDependencies).orIfNullGet(PrettierFormatterStep::defaultDevDependencies), + context.provisioner(), + projectDirFile, + buildDirFile, + cacheDirFile, + new NpmPathResolver( + asFile(explicitNpmExecutable), + asFile(explicitNodeExecutable), + asFile(explicitNpmrcFile), + asFiles(additionalNpmrcLocations)), + new PrettierConfig( + asFile( + prettierConfigPath != null + ? layout.find(prettierConfigPath).orElseThrow() + : null), + prettierConfigOptions)); + return step; + } + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessCLIFormatterStep.java b/app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessCLIFormatterStep.java new file mode 100644 index 0000000..5f06e83 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessCLIFormatterStep.java @@ -0,0 +1,29 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.cli.SpotlessCommand; +import com.diffplug.spotless.cli.core.SpotlessActionContext; + +public interface SpotlessCLIFormatterStep extends SpotlessCommand { + + @NotNull List prepareFormatterSteps(SpotlessActionContext context); +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessFormatterStep.java b/app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessFormatterStep.java new file mode 100644 index 0000000..86cbb39 --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/steps/SpotlessFormatterStep.java @@ -0,0 +1,38 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.cli.core.SpotlessActionContext; + +import picocli.CommandLine; + +@CommandLine.Command(mixinStandardHelpOptions = true) +public abstract class SpotlessFormatterStep implements SpotlessCLIFormatterStep { + + @NotNull @Override + public List prepareFormatterSteps(SpotlessActionContext context) { + return prepareFormatterSteps(); + } + + protected List prepareFormatterSteps() { + throw new IllegalStateException("This method must be overridden or not be called"); + } +} diff --git a/app/src/main/java/com/diffplug/spotless/cli/version/SpotlessCLIVersionProvider.java b/app/src/main/java/com/diffplug/spotless/cli/version/SpotlessCLIVersionProvider.java new file mode 100644 index 0000000..371f95e --- /dev/null +++ b/app/src/main/java/com/diffplug/spotless/cli/version/SpotlessCLIVersionProvider.java @@ -0,0 +1,32 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.version; + +import java.util.Properties; + +import picocli.CommandLine; + +public class SpotlessCLIVersionProvider implements CommandLine.IVersionProvider { + + @Override + public String[] getVersion() throws Exception { + // load application.properties + Properties properties = new Properties(); + properties.load(getClass().getResourceAsStream("/application.properties")); + String version = properties.getProperty("cli.version"); + return new String[] {"Spotless CLI version " + version}; + } +} diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties new file mode 100644 index 0000000..6dc79bf --- /dev/null +++ b/app/src/main/resources/application.properties @@ -0,0 +1 @@ +cli.version=@cli.version@ diff --git a/app/src/test/java/com/diffplug/spotless/cli/CLIIntegrationHarness.java b/app/src/test/java/com/diffplug/spotless/cli/CLIIntegrationHarness.java new file mode 100644 index 0000000..e8ef530 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/CLIIntegrationHarness.java @@ -0,0 +1,66 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import java.io.IOException; + +import org.junit.jupiter.api.BeforeEach; + +import com.diffplug.spotless.ResourceHarness; +import com.diffplug.spotless.tag.CliNativeNpmTest; +import com.diffplug.spotless.tag.CliNativeTest; +import com.diffplug.spotless.tag.CliProcessNpmTest; +import com.diffplug.spotless.tag.CliProcessTest; + +public abstract class CLIIntegrationHarness extends ResourceHarness { + + /** + * Each test gets its own temp folder, and we create a gradle + * build there and run it. + *

+ * Because those test folders don't have a .gitattributes file, + * git (on windows) will default to \r\n. So now if you read a + * test file from the spotless test resources, and compare it + * to a build result, the line endings won't match. + *

+ * By sticking this .gitattributes file into the test directory, + * we ensure that the default Spotless line endings policy of + * GIT_ATTRIBUTES will use \n, so that tests match the test + * resources on win and linux. + */ + @BeforeEach + void gitAttributes() throws IOException { + setFile(".gitattributes").toContent("* text eol=lf"); + } + + protected SpotlessCLIRunner cliRunner() { + return createRunnerForTag().withWorkingDir(rootFolder()); + } + + private SpotlessCLIRunner createRunnerForTag() { + CliProcessTest cliProcessTest = getClass().getAnnotation(CliProcessTest.class); + CliProcessNpmTest cliProcessNpmTest = getClass().getAnnotation(CliProcessNpmTest.class); + if (cliProcessTest != null || cliProcessNpmTest != null) { + return SpotlessCLIRunner.createExternalProcess(); + } + CliNativeTest cliNativeTest = getClass().getAnnotation(CliNativeTest.class); + CliNativeNpmTest cliNativeNpmTest = getClass().getAnnotation(CliNativeNpmTest.class); + if (cliNativeTest != null || cliNativeNpmTest != null) { + return SpotlessCLIRunner.createNative(); + } + return SpotlessCLIRunner.create(); + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIHelpAndVersionTest.java b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIHelpAndVersionTest.java new file mode 100644 index 0000000..2129b1b --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIHelpAndVersionTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SpotlessCLIHelpAndVersionTest extends CLIIntegrationHarness { + + @Test + void testHelp() { + SpotlessCLIRunner.Result result = cliRunner().withOption("--help").run(); + assertThat(result.stdOut()).contains("Usage: spotless"); + } + + @Test + void testVersion() { + SpotlessCLIRunner.Result result = cliRunner().withOption("--version").run(); + assertThat(result.stdOut()).contains("Spotless CLI version"); + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunner.java b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunner.java new file mode 100644 index 0000000..9d7232d --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunner.java @@ -0,0 +1,169 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import com.diffplug.spotless.cli.steps.SpotlessCLIFormatterStep; + +import picocli.CommandLine; + +public abstract class SpotlessCLIRunner { + + private File workingDir = new File("."); + + private final List args = new ArrayList<>(); + + public static SpotlessCLIRunner create() { + return new SpotlessCLIRunnerInSameThread(); + } + + public static SpotlessCLIRunner createExternalProcess() { + return new SpotlessCLIRunnerInExternalJavaProcess(); + } + + public static SpotlessCLIRunner createNative() { + return new SpotlessCLIRunnerInNativeExternalProcess(); + } + + public SpotlessCLIRunner withWorkingDir(@NotNull File workingDir) { + this.workingDir = Objects.requireNonNull(workingDir); + return this; + } + + protected File workingDir() { + return workingDir; + } + + public SpotlessCLIRunner withOption(@NotNull String option) { + args.add(Objects.requireNonNull(option)); + return this; + } + + public SpotlessCLIRunner withOption(@NotNull String option, @NotNull String value) { + args.add(String.format("%s=%s", Objects.requireNonNull(option), Objects.requireNonNull(value))); + return this; + } + + public SpotlessCLIRunner withTargets(String... targets) { + for (String target : targets) { + withOption("--target", target); + } + return this; + } + + public SpotlessCLIRunner withStep(@NotNull String stepName) { + args.add(Objects.requireNonNull(stepName)); + return this; + } + + public SpotlessCLIRunner withStep(@NotNull Class stepClass) { + String stepName = determineStepName(stepClass); + return withStep(stepName); + } + + private String determineStepName(Class stepClass) { + CommandLine.Command annotation = stepClass.getAnnotation(CommandLine.Command.class); + if (annotation == null) { + throw new IllegalArgumentException("Step class must be annotated with @CommandLine.Command"); + } + return annotation.name(); + } + + public Result run() { + Result result = executeCommand(args); + if (result.executionException() != null) { + throwRuntimeException("Error while executing Spotless CLI command", result); + } + if (result.exitCode == null || result.exitCode != 0) { + throwRuntimeException("Spotless CLI command failed with exit code " + result.exitCode, result); + } + return result; + } + + public Result runAndFail() { + Result result = executeCommand(args); + if (result.executionException() != null) { + throwRuntimeException("Error while executing Spotless CLI command", result); + } + if (result.exitCode == null || result.exitCode == 0) { + throwRuntimeException( + "Spotless CLI command should have failed but exited with code " + result.exitCode, result); + } + return result; + } + + private void throwRuntimeException(String message, Result result) { + StringBuilder sb = new StringBuilder(message) + .append("\nExit code: ") + .append(result.exitCode()) + .append("\n") + .append("\n--- Standard output: ---\n") + .append(result.stdOut()) + .append("\n------------------------\n") + .append("\n--- Standard error: ---\n") + .append(result.stdErr()) + .append("\n------------------------\n"); + + if (result.executionException() != null) { + throw new RuntimeException(sb.toString(), result.executionException()); + } + throw new RuntimeException(sb.toString()); + } + + protected abstract Result executeCommand(List args); + + public static class Result { + + private final Integer exitCode; + private final String stdOut; + private final String stdErr; + private final Exception executionException; + + protected Result( + @Nullable Integer exitCode, + @Nullable Exception executionException, + @NotNull String stdOut, + @NotNull String stdErr) { + this.exitCode = exitCode; + this.executionException = executionException; + this.stdOut = Objects.requireNonNull(stdOut); + this.stdErr = Objects.requireNonNull(stdErr); + } + + public Integer exitCode() { + return exitCode; + } + + public String stdOut() { + return stdOut; + } + + public String stdErr() { + return stdErr; + } + + public Exception executionException() { + return executionException; + } + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInExternalJavaProcess.java b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInExternalJavaProcess.java new file mode 100644 index 0000000..4f1e0bd --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInExternalJavaProcess.java @@ -0,0 +1,62 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import java.util.ArrayList; +import java.util.List; + +import com.diffplug.spotless.ProcessRunner; +import com.diffplug.spotless.ThrowingEx; + +public class SpotlessCLIRunnerInExternalJavaProcess extends SpotlessCLIRunner { + + private static final String SPOTLESS_CLI_SHADOW_JAR_SYSPROP = "spotless.cli.shadowJar"; + + public SpotlessCLIRunnerInExternalJavaProcess() { + super(); + if (System.getProperty(SPOTLESS_CLI_SHADOW_JAR_SYSPROP) == null) { + throw new IllegalStateException( + "spotless.cli.shadowJar system property must be set to the path of the shadow jar"); + } + } + + protected Result executeCommand(List args) { + try (ProcessRunner runner = new ProcessRunner()) { + + ProcessRunner.Result pResult = + ThrowingEx.get(() -> runner.exec(workingDir(), System.getenv(), null, processArgs(args))); + + return new Result(pResult.exitCode(), null, pResult.stdOutUtf8(), pResult.stdErrUtf8()); + } + } + + private List processArgs(List args) { + List processArgs = new ArrayList<>(); + processArgs.add(currentJavaExecutable()); + processArgs.add("-jar"); + String jarPath = System.getProperty(SPOTLESS_CLI_SHADOW_JAR_SYSPROP); + processArgs.add(jarPath); + + // processArgs.add(SpotlessCLI.class.getProtectionDomain().getCodeSource().getLocation().getPath()); + + processArgs.addAll(args); + return processArgs; + } + + private String currentJavaExecutable() { + return ProcessHandle.current().info().command().orElse("java"); + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInNativeExternalProcess.java b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInNativeExternalProcess.java new file mode 100644 index 0000000..bd51985 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInNativeExternalProcess.java @@ -0,0 +1,60 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import java.util.ArrayList; +import java.util.List; + +import com.diffplug.spotless.ProcessRunner; +import com.diffplug.spotless.ThrowingEx; + +public class SpotlessCLIRunnerInNativeExternalProcess extends SpotlessCLIRunner { + + private static final String SPOTLESS_CLI_NATIVE_IMAGE_SYSPROP = "spotless.cli.nativeImage"; + + public SpotlessCLIRunnerInNativeExternalProcess() { + super(); + if (System.getProperty(SPOTLESS_CLI_NATIVE_IMAGE_SYSPROP) == null) { + throw new IllegalStateException(SPOTLESS_CLI_NATIVE_IMAGE_SYSPROP + + " system property must be set to the path of the native binary"); + } + System.out.println( + "SpotlessCLIRunnerInNativeExternalProcess: " + System.getProperty(SPOTLESS_CLI_NATIVE_IMAGE_SYSPROP)); + } + + protected Result executeCommand(List args) { + try (ProcessRunner runner = new ProcessRunner()) { + + ProcessRunner.Result pResult = + ThrowingEx.get(() -> runner.exec(workingDir(), System.getenv(), null, processArgs(args))); + + return new Result(pResult.exitCode(), null, pResult.stdOutUtf8(), pResult.stdErrUtf8()); + } + } + + private List processArgs(List args) { + List processArgs = new ArrayList<>(); + processArgs.add(System.getProperty(SPOTLESS_CLI_NATIVE_IMAGE_SYSPROP)); + // processArgs.add(SpotlessCLI.class.getProtectionDomain().getCodeSource().getLocation().getPath()); + + processArgs.addAll(args); + return processArgs; + } + + private String currentJavaExecutable() { + return ProcessHandle.current().info().command().orElse("java"); + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInSameThread.java b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInSameThread.java new file mode 100644 index 0000000..841e2d3 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/SpotlessCLIRunnerInSameThread.java @@ -0,0 +1,60 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; + +import picocli.CommandLine; + +public class SpotlessCLIRunnerInSameThread extends SpotlessCLIRunner { + + protected Result executeCommand(List args) { + SpotlessCLI cli = SpotlessCLI.createInstance(); + CommandLine commandLine = SpotlessCLI.createCommandLine(cli); + + StringWriter out = new StringWriter(); + StringWriter err = new StringWriter(); + + try (PrintWriter outWriter = new PrintWriter(out); + PrintWriter errWriter = new PrintWriter(err)) { + commandLine.setOut(outWriter); + commandLine.setErr(errWriter); + Exception executionException = null; + Integer exitCode = null; + try { + exitCode = commandLine.execute(argsWithBaseDir(args)); + } catch (Exception e) { + executionException = e; + } + + // finalize + outWriter.flush(); + errWriter.flush(); + return new Result(exitCode, executionException, out.toString(), err.toString()); + } + } + + private String[] argsWithBaseDir(List args) { + // prepend the base dir + String[] argsWithBaseDir = new String[args.size() + 2]; + argsWithBaseDir[0] = "--basedir"; + argsWithBaseDir[1] = workingDir().getAbsolutePath(); + System.arraycopy(args.toArray(new String[0]), 0, argsWithBaseDir, 2, args.size()); + return argsWithBaseDir; + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/core/ChecksumCalculatorTest.java b/app/src/test/java/com/diffplug/spotless/cli/core/ChecksumCalculatorTest.java new file mode 100644 index 0000000..300b895 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/core/ChecksumCalculatorTest.java @@ -0,0 +1,241 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.core; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.ThreadLocalRandom; +import java.util.stream.Stream; + +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Test; + +import com.diffplug.spotless.FormatterStep; +import com.diffplug.spotless.cli.SpotlessAction; +import com.diffplug.spotless.cli.SpotlessActionContextProvider; +import com.diffplug.spotless.cli.steps.SpotlessCLIFormatterStep; +import com.diffplug.spotless.cli.steps.SpotlessFormatterStep; + +import picocli.CommandLine; + +import static org.assertj.core.api.Assertions.assertThat; + +class ChecksumCalculatorTest { + + private ChecksumCalculator checksumCalculator = new ChecksumCalculator(); + + @Test + void itCalculatesAChecksumForStep() { + Step step = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + + String checksum = checksumCalculator.calculateChecksum(step); + + assertThat(checksum).isNotNull(); + } + + @Test + void itCalculatesDifferentChecksumsForSteps() { + Step step1 = + step(randomPath(), randomString(), argGroup(randomString(), null), List.of(randomPath(), randomPath())); + Step step2 = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + + String checksum1 = checksumCalculator.calculateChecksum(step1); + String checksum2 = checksumCalculator.calculateChecksum(step2); + + assertThat(checksum1).isNotEqualTo(checksum2); + } + + @Test + void itRecalculatesSameChecksumsForStep() { + Step step = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + + String checksum1 = checksumCalculator.calculateChecksum(step); + String checksum2 = checksumCalculator.calculateChecksum(step); + + assertThat(checksum1).isEqualTo(checksum2); + } + + @Test + void itCalculatesAChecksumForCommandLineStream() { + Step step = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + Action action = action(randomPath()); + SpotlessCommandLineStream commandLineStream = commandLine(action, step); + + String checksum = checksumCalculator.calculateChecksum(commandLineStream); + + assertThat(checksum).isNotNull(); + } + + @Test + void itCalculatesDifferentChecksumForDifferentCommandLineStreamDueToAction() { + Step step = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + Action action1 = action(randomPath()); + Action action2 = action(randomPath()); + SpotlessCommandLineStream commandLineStream1 = commandLine(action1, step); + SpotlessCommandLineStream commandLineStream2 = commandLine(action2, step); + + String checksum1 = checksumCalculator.calculateChecksum(commandLineStream1); + String checksum2 = checksumCalculator.calculateChecksum(commandLineStream2); + + assertThat(checksum1).isNotEqualTo(checksum2); + } + + @Test + void itCalculatesDifferentChecksumForDifferentCommandLineStreamDueToSteps() { + Step step1 = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + Step step2 = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + Action action = action(randomPath()); + SpotlessCommandLineStream commandLineStream1 = commandLine(action, step1); + SpotlessCommandLineStream commandLineStream2 = commandLine(action, step2); + + String checksum1 = checksumCalculator.calculateChecksum(commandLineStream1); + String checksum2 = checksumCalculator.calculateChecksum(commandLineStream2); + + assertThat(checksum1).isNotEqualTo(checksum2); + } + + @Test + void itCalculatesDifferentChecksumForDifferentCommandLineStreamDueToStepOrder() { + Step step1 = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + Step step2 = step( + randomPath(), randomString(), argGroup(null, randomByteArray()), List.of(randomPath(), randomPath())); + Action action = action(randomPath()); + SpotlessCommandLineStream commandLineStream1 = commandLine(action, step1, step2); + SpotlessCommandLineStream commandLineStream2 = commandLine(action, step2, step1); + + String checksum1 = checksumCalculator.calculateChecksum(commandLineStream1); + String checksum2 = checksumCalculator.calculateChecksum(commandLineStream2); + + assertThat(checksum1).isNotEqualTo(checksum2); + } + + @Test + void itDoesSomething2() { + System.out.println("Hello"); + } + + private static Step step(Path test1, String test2, StepArgGroup argGroup, List parameters) { + Step step = new Step(); + step.test1 = test1; + step.test2 = test2; + step.argGroup = argGroup; + step.parameters = parameters; + return step; + } + + private static StepArgGroup argGroup(String test3, byte[] test4) { + StepArgGroup argGroup = new StepArgGroup(); + argGroup.test3 = test3; + argGroup.test4 = test4; + return argGroup; + } + + private static Path randomPath() { + return Path.of(randomString()); + } + + private static byte[] randomByteArray() { + return randomString().getBytes(StandardCharsets.UTF_8); + } + + private static String randomString() { + return Long.toHexString(ThreadLocalRandom.current().nextLong()); + } + + static class Step extends SpotlessFormatterStep { + + @CommandLine.Option(names = "--test1") + Path test1; + + @CommandLine.Option(names = "--test2") + String test2; + + @CommandLine.ArgGroup(exclusive = true) + StepArgGroup argGroup; + + @CommandLine.Parameters + List parameters; + + @NotNull @Override + public List prepareFormatterSteps(SpotlessActionContext context) { + return List.of(); + } + } + + static class StepArgGroup { + @CommandLine.Option(names = "--test3") + String test3; + + @CommandLine.Option(names = "--test4") + byte[] test4; + } + + private static Action action(Path baseDir) { + Action action = new Action(); + action.baseDir = baseDir; + return action; + } + + @CommandLine.Command(name = "action") + static class Action implements SpotlessAction { + @CommandLine.Option(names = {"--basedir"}) + Path baseDir; + + @Override + public Integer executeSpotlessAction(@NotNull List formatterSteps) { + return 0; + } + } + + private static SpotlessCommandLineStream commandLine(SpotlessAction action, SpotlessFormatterStep... steps) { + return new FixedCommandLineStream(Arrays.asList(steps), List.of(action)); + } + + static class FixedCommandLineStream implements SpotlessCommandLineStream { + private final List formatterSteps; + private final List actions; + + FixedCommandLineStream(List formatterSteps, List actions) { + this.formatterSteps = formatterSteps; + this.actions = actions; + } + + @Override + public Stream formatterSteps() { + return formatterSteps.stream(); + } + + @Override + public Stream actions() { + return actions.stream(); + } + + @Override + public Stream contextProviders() { + return Stream.empty(); + } + } +} diff --git a/app/src/test/java/org/example/app/MessageUtilsTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatJavaProcessTest.java similarity index 66% rename from app/src/test/java/org/example/app/MessageUtilsTest.java rename to app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatJavaProcessTest.java index 8e0d0ba..939b3b3 100644 --- a/app/src/test/java/org/example/app/MessageUtilsTest.java +++ b/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatJavaProcessTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2025 DiffPlug + * Copyright 2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,15 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.example.app; +package com.diffplug.spotless.cli.steps; -import org.junit.jupiter.api.Test; +import com.diffplug.spotless.tag.CliProcessTest; -import static org.junit.jupiter.api.Assertions.assertEquals; - -class MessageUtilsTest { - @Test - void testGetMessage() { - assertEquals("Hello World!", MessageUtils.getMessage()); - } -} +@CliProcessTest +public class GoogleJavaFormatJavaProcessTest extends GoogleJavaFormatTest {} diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatNativeProcessTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatNativeProcessTest.java new file mode 100644 index 0000000..241723d --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatNativeProcessTest.java @@ -0,0 +1,24 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import com.diffplug.spotless.tag.CliNativeTest; + +@CliNativeTest +public class GoogleJavaFormatNativeProcessTest extends GoogleJavaFormatTest { + + // TODO include the correct google-java-format class to be available in native +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatTest.java new file mode 100644 index 0000000..7cd4890 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/steps/GoogleJavaFormatTest.java @@ -0,0 +1,41 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.io.IOException; + +import org.junit.jupiter.api.Test; + +import com.diffplug.spotless.cli.CLIIntegrationHarness; +import com.diffplug.spotless.cli.SpotlessCLIRunner; + +public class GoogleJavaFormatTest extends CLIIntegrationHarness { + + @Test + void formattingWithGoogleJavaFormatWorks() throws IOException { + setFile("Java.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("*.java") + .withStep(GoogleJavaFormat.class) + .run(); + + System.out.println(result.stdOut()); + System.out.println("-------"); + System.out.println(result.stdErr()); + assertFile("Java.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test"); + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderJavaProcessTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderJavaProcessTest.java new file mode 100644 index 0000000..b6fa1f0 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderJavaProcessTest.java @@ -0,0 +1,21 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import com.diffplug.spotless.tag.CliProcessTest; + +@CliProcessTest +public class LicenseHeaderJavaProcessTest extends LicenseHeaderTest {} diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderNativeProcessTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderNativeProcessTest.java new file mode 100644 index 0000000..e9659d2 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderNativeProcessTest.java @@ -0,0 +1,21 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import com.diffplug.spotless.tag.CliNativeTest; + +@CliNativeTest +public class LicenseHeaderNativeProcessTest extends LicenseHeaderTest {} diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderTest.java new file mode 100644 index 0000000..30807e7 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/steps/LicenseHeaderTest.java @@ -0,0 +1,167 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.time.LocalDate; + +import org.junit.jupiter.api.Test; + +import com.diffplug.spotless.cli.CLIIntegrationHarness; +import com.diffplug.spotless.cli.SpotlessCLIRunner; +import com.diffplug.spotless.generic.LicenseHeaderStep; + +import static org.assertj.core.api.Assertions.assertThat; + +public class LicenseHeaderTest extends CLIIntegrationHarness { + + @Test + void assertHeaderMustBeSpecified() { + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("**/*.java") + .withStep(LicenseHeader.class) + .runAndFail(); + + assertThat(result.stdErr()).containsPattern(".*Missing required.*header.*"); + } + + @Test + void assertHeaderIsApplied() { + setFile("TestFile.java").toContent("public class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License */") + .run(); + + assertFile("TestFile.java").hasContent("/* License */\npublic class TestFile {}"); + } + + @Test + void assertHeaderFileIsApplied() { + setFile("TestFile.java").toContent("public class TestFile {}"); + setFile("header.txt").toContent("/* License */"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header-file", "header.txt") + .run(); + + assertFile("TestFile.java").hasContent("/* License */\npublic class TestFile {}"); + } + + @Test + void assertDelimiterIsApplied() { + setFile("TestFile.java").toContent("/* keep me */\npublic class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License */") + .withOption("--delimiter", "\\/\\* keep me") + .run(); + + assertFile("TestFile.java").hasContent("/* License */\n/* keep me */\npublic class TestFile {}"); + } + + @Test + void assertYearModeIsApplied() { + setFile("TestFile.java").toContent("/* License (c) 2022 */\npublic class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License (c) $YEAR */") + .withOption("--year-mode", LicenseHeaderStep.YearMode.UPDATE_TO_TODAY.toString()) + .run(); + + assertFile("TestFile.java") + .hasContent("/* License (c) 2022-" + LocalDate.now().getYear() + " */\npublic class TestFile {}"); + } + + @Test + void assertYearSeparatorIsApplied() { + setFile("TestFile.java").toContent("/* License (c) 2022...2023 */\npublic class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License (c) $YEAR */") + .withOption("--year-mode", LicenseHeaderStep.YearMode.UPDATE_TO_TODAY.toString()) + .withOption("--year-separator", "...") + .run(); + + assertFile("TestFile.java") + .hasContent("/* License (c) 2022..." + LocalDate.now().getYear() + " */\npublic class TestFile {}"); + } + + @Test + void assertSkipLinesMatchingIsApplied() { + setFile("TestFile.java").toContent("/* skip me */\npublic class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License */") + .withOption("--skip-lines-matching", ".*skip me.*") + .run(); + + assertFile("TestFile.java").hasContent("/* skip me */\n/* License */\npublic class TestFile {}"); + } + + @Test + void assertPreserveModeIsApplied() { + setFile("TestFile.java").toContent("/* License (c) 2022 */\npublic class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License (c) $YEAR */") + .withOption("--year-mode", LicenseHeaderStep.YearMode.PRESERVE.toString()) + .run(); + + assertFile("TestFile.java").hasContent("/* License (c) 2022 */\npublic class TestFile {}"); + } + + @Test + void assertContentPatternIsAppliedIfMatching() { + setFile("TestFile.java").toContent("public class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License */") + .withOption("--content-pattern", ".*TestFile.*") + .run(); + + assertFile("TestFile.java").hasContent("/* License */\npublic class TestFile {}"); + } + + @Test + void assertContentPatternIsNotAppliedIfNotMatching() { + setFile("TestFile.java").toContent("public class TestFile {}"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("TestFile.java") + .withStep(LicenseHeader.class) + .withOption("--header", "/* License */") + .withOption("--content-pattern", ".*NonExistent.*") + .run(); + + assertFile("TestFile.java").hasContent("public class TestFile {}"); + } +} diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/PrettierTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/PrettierTest.java new file mode 100644 index 0000000..0273884 --- /dev/null +++ b/app/src/test/java/com/diffplug/spotless/cli/steps/PrettierTest.java @@ -0,0 +1,58 @@ +/* + * Copyright 2024 DiffPlug + * + * 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 com.diffplug.spotless.cli.steps; + +import java.io.IOException; + +import org.junit.jupiter.api.Test; + +import com.diffplug.spotless.cli.CLIIntegrationHarness; +import com.diffplug.spotless.cli.SpotlessCLIRunner; +import com.diffplug.spotless.tag.NpmTest; + +@NpmTest +public class PrettierTest extends CLIIntegrationHarness { + + // TODO + + @Test + void itRunsPrettierForTsFilesWithOptions() throws IOException { + setFile("test.ts").toResource("npm/prettier/config/typescript.dirty"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("test.ts") + .withStep(Prettier.class) + .withOption("--prettier-config-option", "printWidth=20") + .withOption("--prettier-config-option", "parser=typescript") + .run(); + + assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean"); + } + + @Test + void itRunsPrettierForTsFilesWithOptionFile() throws Exception { + setFile(".prettierrc.yml").toResource("npm/prettier/config/.prettierrc.yml"); + setFile("test.ts").toResource("npm/prettier/config/typescript.dirty"); + + SpotlessCLIRunner.Result result = cliRunner() + .withTargets("test.ts") + .withStep(Prettier.class) + .withOption("--prettier-config-path", ".prettierrc.yml") + .run(); + + assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean"); + } +} diff --git a/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle index 81a8085..fcaad81 100644 --- a/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle @@ -11,3 +11,9 @@ plugins { // Apply the application plugin to add support for building a CLI application in Java. id 'application' } + +dependencies { + testImplementation libs.junit.jupiter.api + testImplementation libs.assertj.core + testImplementation project(':testlib') +} diff --git a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle index 9941af9..3bcf91e 100644 --- a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle @@ -20,6 +20,9 @@ dependencies { // Define dependency versions as constraints implementation 'org.apache.commons:commons-text:1.12.0' } + implementation libs.annotations + implementation libs.bundles.spotless.libs + implementation libs.bundles.durian.libs } testing { diff --git a/build-logic/src/main/groovy/buildlogic.java-testlibrary-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-testlibrary-conventions.gradle new file mode 100644 index 0000000..08ebf41 --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.java-testlibrary-conventions.gradle @@ -0,0 +1,18 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the common convention plugin for shared build configuration between library and application projects. + id 'buildlogic.java-common-conventions' + + // Apply the java-library plugin for API and implementation separation. + id 'java-library' +} + +dependencies { + implementation libs.junit.jupiter.api + implementation libs.assertj.core +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4ac3234..3204fac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,2 +1,27 @@ # This file was generated by the Gradle 'init' task. # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +annotations = "26.0.2" +assertj-core = "3.27.3" +durian = "1.2.0" +junit = "5.8.1" +picocli = "4.7.6" +spotless-lib = "3.0.2" + +[libraries] +annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" } +assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj-core" } +durian-core = { module = "com.diffplug.durian:durian-core", version.ref = "durian" } +durian-io = { module = "com.diffplug.durian:durian-io", version.ref = "durian" } +durian-collect = { module = "com.diffplug.durian:durian-collect", version.ref = "durian" } +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +picocli = { module = "info.picocli:picocli", version.ref = "picocli" } +picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" } +spotless-lib = { module = "com.diffplug.spotless:spotless-lib", version.ref = "spotless-lib" } +spotless-lib-extra = { module = "com.diffplug.spotless:spotless-lib-extra", version.ref = "spotless-lib" } + +[bundles] +spotless-libs = ["spotless-lib", "spotless-lib-extra"] +durian-libs = ["durian-core", "durian-io", "durian-collect"] diff --git a/settings.gradle b/settings.gradle index b4820e2..deb47a8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,4 +28,4 @@ plugins { } rootProject.name = 'spotless-cli' -include('app', 'list', 'utilities') +include('app', 'testlib', 'list', 'utilities') diff --git a/testlib/build.gradle b/testlib/build.gradle new file mode 100644 index 0000000..f914706 --- /dev/null +++ b/testlib/build.gradle @@ -0,0 +1,8 @@ +plugins { + id 'buildlogic.java-testlibrary-conventions' +} + +dependencies { + implementation libs.junit.jupiter.api + implementation libs.bundles.durian.libs +} diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java new file mode 100644 index 0000000..ea9ccce --- /dev/null +++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java @@ -0,0 +1,253 @@ +/* + * Copyright 2016-2024 DiffPlug + * + * 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 com.diffplug.spotless; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.UnaryOperator; + +import org.assertj.core.api.AbstractCharSequenceAssert; +import org.assertj.core.util.CheckReturnValue; +import org.junit.jupiter.api.io.TempDir; + +import com.diffplug.common.base.Errors; +import com.diffplug.common.io.Resources; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ResourceHarness { + /** + * On OS X, the temp folder is a symlink, + * and some of gradle's stuff breaks symlinks. + * By only accessing it through the {@link #rootFolder()} + * and {@link #newFile(String)} apis, we can guarantee there + * will be no symlink problems. + */ + @TempDir + File folderDontUseDirectly; + + /** Returns the root folder (canonicalized to fix OS X issue) */ + public File rootFolder() { + return Errors.rethrow().get(() -> folderDontUseDirectly.getCanonicalFile()); + } + + /** Returns a new child of the root folder. */ + public File newFile(String subpath) { + return new File(rootFolder(), subpath); + } + + /** Creates and returns a new child-folder of the root folder. */ + public File newFolder(String subpath) throws IOException { + File targetDir = newFile(subpath); + if (!targetDir.mkdir()) { + throw new IOException("Failed to create " + targetDir); + } + return targetDir; + } + + /** + * List the resources found in the specified path (directory) on the classpath + * @param path - absolute path using unix-style file separators (if it is relative, it will be made absolute before class path scanning) + * @return the list of resources in that directory on the classpath, unix-style file separators + * @throws IOException + */ + public List listTestResources(String path) throws IOException { + // add leading slash if required, otherwise resources won't be found + if (!path.startsWith("/")) { + path = path + "/"; + } + List filenames = new ArrayList<>(); + + try (InputStream in = ResourceHarness.class.getResourceAsStream(path)) { + if (in == null) { + if (new File(path).isAbsolute()) { + throw new RuntimeException(String.format("Resource not found in classpath: '%s'", path)); + } else { + throw new RuntimeException( + String.format("Resource not found in classpath: '%s' - did you mean '/%1$s'?", path)); + } + } + try (BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) { + String resource; + while ((resource = br.readLine()) != null) { + filenames.add(resource); + } + } + } + return filenames; + } + + public String relativeToRoot(String path) { + return new File(path).toPath().relativize(rootFolder().toPath()).toString(); + } + + public String read(String path) throws IOException { + return read(newFile(path).toPath(), StandardCharsets.UTF_8); + } + + public String read(Path path, Charset encoding) throws IOException { + return new String(Files.readAllBytes(path), encoding); + } + + public void replace(String path, String toReplace, String replaceWith) throws IOException { + String before = read(path); + String after = before.replace(toReplace, replaceWith); + if (before.equals(after)) { + throw new IllegalArgumentException("Replace was ineffective! '" + toReplace + "' was not found in " + path); + } + setFile(path).toContent(after); + } + + /** Returns the contents of the given file from the src/test/resources directory. */ + public static String getTestResource(String filename) { + Optional resourceUrl = getTestResourceUrl(filename); + if (resourceUrl.isPresent()) { + return ThrowingEx.get( + () -> LineEnding.toUnix(Resources.toString(resourceUrl.get(), StandardCharsets.UTF_8))); + } + throw new IllegalArgumentException("No such resource " + filename); + } + + public static boolean existsTestResource(String filename) { + return getTestResourceUrl(filename).isPresent(); + } + + private static Optional getTestResourceUrl(String filename) { + URL url = ResourceHarness.class.getResource("/" + filename); + return Optional.ofNullable(url); + } + + /** Returns Files (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */ + public List createTestFiles(String... filenames) { + List files = new ArrayList<>(filenames.length); + for (String filename : filenames) { + files.add(createTestFile(filename)); + } + return files; + } + + /** Returns a File (in a temporary folder) which has the contents of the given file from the src/test/resources directory. */ + public File createTestFile(String filename) { + return createTestFile(filename, UnaryOperator.identity()); + } + + /** + * Returns a File (in a temporary folder) which has the contents, possibly processed, of the given file from the + * src/test/resources directory. + */ + public File createTestFile(String filename, UnaryOperator fileContentsProcessor) { + int lastSlash = filename.lastIndexOf('/'); + String name = lastSlash >= 0 ? filename.substring(lastSlash) : filename; + File file = newFile(name); + file.getParentFile().mkdirs(); + ThrowingEx.run(() -> Files.write( + file.toPath(), + fileContentsProcessor.apply(getTestResource(filename)).getBytes(StandardCharsets.UTF_8))); + return file; + } + + @CheckReturnValue + public ReadAsserter assertFile(String path) { + return new ReadAsserter(newFile(path)); + } + + @CheckReturnValue + public ReadAsserter assertFile(File file) { + return new ReadAsserter(file); + } + + public static class ReadAsserter { + private final File file; + + private ReadAsserter(File file) { + this.file = file; + } + + public void hasContent(String expected) { + hasContent(expected, StandardCharsets.UTF_8); + } + + public void hasContent(String expected, Charset charset) { + assertThat(file).usingCharset(charset).hasContent(expected); + } + + public void hasLines(String... lines) { + hasContent(String.join("\n", Arrays.asList(lines))); + } + + public void sameAsResource(String resource) throws IOException { + hasContent(getTestResource(resource)); + } + + public void matches(Consumer> conditions) throws IOException { + String content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); + conditions.accept(assertThat(content)); + } + } + + public WriteAsserter setFile(String path) { + return new WriteAsserter(newFile(path)); + } + + public static class WriteAsserter { + private File file; + + private WriteAsserter(File file) { + file.getParentFile().mkdirs(); + this.file = file; + } + + public File toLines(String... lines) { + return toContent(String.join("\n", Arrays.asList(lines))); + } + + public File toContent(String content) { + return toContent(content, StandardCharsets.UTF_8); + } + + public File toContent(String content, Charset charset) { + ThrowingEx.run(() -> { + Files.write(file.toPath(), content.getBytes(charset)); + }); + return file; + } + + public File toResource(String path) { + ThrowingEx.run(() -> { + Files.write(file.toPath(), getTestResource(path).getBytes(StandardCharsets.UTF_8)); + }); + return file; + } + + public File deleted() throws IOException { + Files.delete(file.toPath()); + return file; + } + } +} diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/CliNativeNpmTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/CliNativeNpmTest.java new file mode 100644 index 0000000..4c1e70b --- /dev/null +++ b/testlib/src/main/java/com/diffplug/spotless/tag/CliNativeNpmTest.java @@ -0,0 +1,30 @@ +/* + * Copyright 2021-2024 DiffPlug + * + * 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 com.diffplug.spotless.tag; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.Tag; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Tag("cliNativeNpm") +public @interface CliNativeNpmTest {} diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/CliNativeTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/CliNativeTest.java new file mode 100644 index 0000000..377f175 --- /dev/null +++ b/testlib/src/main/java/com/diffplug/spotless/tag/CliNativeTest.java @@ -0,0 +1,30 @@ +/* + * Copyright 2021-2024 DiffPlug + * + * 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 com.diffplug.spotless.tag; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.Tag; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Tag("cliNative") +public @interface CliNativeTest {} diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/CliProcessNpmTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/CliProcessNpmTest.java new file mode 100644 index 0000000..ffe6c4f --- /dev/null +++ b/testlib/src/main/java/com/diffplug/spotless/tag/CliProcessNpmTest.java @@ -0,0 +1,30 @@ +/* + * Copyright 2021-2024 DiffPlug + * + * 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 com.diffplug.spotless.tag; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.Tag; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Tag("cliProcessNpm") +public @interface CliProcessNpmTest {} diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/CliProcessTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/CliProcessTest.java new file mode 100644 index 0000000..ff5ff22 --- /dev/null +++ b/testlib/src/main/java/com/diffplug/spotless/tag/CliProcessTest.java @@ -0,0 +1,30 @@ +/* + * Copyright 2021-2024 DiffPlug + * + * 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 com.diffplug.spotless.tag; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.Tag; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Tag("cliProcess") +public @interface CliProcessTest {} From d5bb6b3aa090e985a4bc4008c2d4c358ed857f96 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Mon, 17 Feb 2025 21:18:11 +0100 Subject: [PATCH 014/141] chore(deps): allow to read spotless-libs from maven local --- .../main/groovy/buildlogic.java-common-conventions.gradle | 5 +++++ gradle/libs.versions.toml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle index 3bcf91e..a85d16e 100644 --- a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle @@ -13,6 +13,11 @@ plugins { repositories { // Use Maven Central for resolving dependencies. mavenCentral() + // if we are in localdev, also use the local maven repository + def isCI = providers.environmentVariable('CI').present + if (!isCI) { + mavenLocal() + } } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3204fac..7e3d7f2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ assertj-core = "3.27.3" durian = "1.2.0" junit = "5.8.1" picocli = "4.7.6" -spotless-lib = "3.0.2" +spotless-lib = "3.0.2-SNAPSHOT" [libraries] annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" } From 93d57d3168a9d72b54e79538c2088ac8ff5422dd Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Mon, 17 Feb 2025 21:26:45 +0100 Subject: [PATCH 015/141] chore: allow handling of special tests --- app/build.gradle | 1 + ...ogic.java-special-tests-conventions.gradle | 32 +++++++++++++++++++ settings.gradle | 3 ++ .../com/diffplug/spotless/tag/NpmTest.java | 30 +++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java diff --git a/app/build.gradle b/app/build.gradle index 0fe080d..e691974 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,7 @@ plugins { id 'buildlogic.java-application-conventions' + id 'buildlogic.java-special-tests-conventions' } dependencies { diff --git a/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle new file mode 100644 index 0000000..49f23d6 --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle @@ -0,0 +1,32 @@ +plugins { + id 'java' + id 'com.adarshr.test-logger' +} + +// See com.diffplug.spotless.tag package for available JUnit 5 @Tag annotations +def special = [ + 'cliProcess', + 'cliProcessNpm', + 'cliNative', + 'cliNativeNpm' +] + +tasks.named('test').configure { + useJUnitPlatform { + excludeTags special as String[] + } +} + +special.forEach { tag -> + tasks.register("test${tag.capitalize()}", Test) { + useJUnitPlatform { includeTags tag } + } +} + +tasks.register('testAll') { + dependsOn tasks.matching { it.name.startsWith('test') && it.name != 'testAll' } +} + +tasks.withType(Test).configureEach { + testLogging.showStandardStreams = true +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index deb47a8..80decb8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,6 +25,9 @@ plugins { // https://github.com/diffplug/spotless-changelog/blob/main/README.md id 'com.diffplug.spotless-changelog' version '3.1.2' apply false + + // https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md + id 'com.adarshr.test-logger' version '4.0.0' apply false } rootProject.name = 'spotless-cli' diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java new file mode 100644 index 0000000..793e74c --- /dev/null +++ b/testlib/src/main/java/com/diffplug/spotless/tag/NpmTest.java @@ -0,0 +1,30 @@ +/* + * Copyright 2021-2024 DiffPlug + * + * 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 com.diffplug.spotless.tag; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.Tag; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Tag("npm") +public @interface NpmTest {} From d43ac8f79dbd2aae359afd9915d3e2dc3d61199d Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Mon, 17 Feb 2025 22:04:26 +0100 Subject: [PATCH 016/141] chore: porting over graal and picocli configuration --- app/build.gradle | 37 ++++++++-- build-logic/build.gradle | 4 ++ build-logic/settings.gradle | 4 +- .../buildlogic.changelog-conventions.gradle | 3 +- .../buildlogic.jar-shadow-conventions.gradle | 3 + .../buildlogic.java-common-conventions.gradle | 2 +- ...buildlogic.java-graalvm-conventions.gradle | 72 +++++++++++++++++++ ...ogic.java-special-tests-conventions.gradle | 31 ++++---- .../buildlogic.picocli-conventions.gradle | 43 +++++++++++ gradle/libs.versions.toml | 5 ++ settings.gradle | 9 ++- 11 files changed, 187 insertions(+), 26 deletions(-) create mode 100644 build-logic/src/main/groovy/buildlogic.jar-shadow-conventions.gradle create mode 100644 build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle create mode 100644 build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle diff --git a/app/build.gradle b/app/build.gradle index e691974..ebb691e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,8 +5,9 @@ */ plugins { - id 'buildlogic.java-application-conventions' + id 'buildlogic.picocli-conventions' id 'buildlogic.java-special-tests-conventions' + id 'buildlogic.java-graalvm-conventions' } dependencies { @@ -15,11 +16,37 @@ dependencies { testImplementation project(':testlib') implementation libs.bundles.spotless.libs - implementation libs.picocli - annotationProcessor libs.picocli.codegen + implementation libs.bundles.native.includes } application { - // Define the main class for the application. - mainClass = 'org.example.app.App' + mainClass = 'com.diffplug.spotless.cli.SpotlessCLI' + applicationName = 'spotless' + archivesBaseName = 'spotless-cli' +} + +gradle.taskGraph.whenReady { TaskExecutionGraph graph -> + // println "Graph: " + graph.allTasks*.name + if (graph.hasTask(':app:nativeCompile') || graph.hasTask(':app:metadataCopy') || graph.hasTask(':app:shadowJar')) { + // enable graalvm agent using property here instead of command line `-Pagent=standard` + // this collects information about reflective access and resources used by the application (e.g. GJF) + project.ext.agent = 'standard' + } +} + +tasks.withType(Test).configureEach { + if (it.name == 'test' || it.name == 'testNpm') { + it.outputs.dir(nativeCompileMetaDir) + if (project.hasProperty('agent')) { + it.inputs.property('agent', project.property('agent')) // make sure to re-run tests if agent changes + } + } + if (it.name == 'testCliProcess' || it.name == 'testCliProcessNpm') { + it.dependsOn('shadowJar') + it.systemProperty 'spotless.cli.shadowJar', tasks.shadowJar.archiveFile.get().asFile + } + if (it.name == 'testCliNative' || it.name == 'testCliNativeNpm') { + it.dependsOn('nativeCompile') + it.systemProperty 'spotless.cli.nativeImage', tasks.nativeCompile.outputFile.get().asFile + } } diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 4cafb01..c9752ec 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -16,6 +16,10 @@ repositories { mavenCentral() } +dependencies { + implementation 'com.gradleup.shadow:shadow-gradle-plugin:8.3.6' +} + spotless { encoding 'UTF-8' diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle index ff10d06..21a9a95 100644 --- a/build-logic/settings.gradle +++ b/build-logic/settings.gradle @@ -7,8 +7,10 @@ plugins { // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md id 'com.diffplug.spotless' version '7.0.2' apply false -} + // https://github.com/GradleUp/shadow/releases + id 'com.gradleup.shadow' version '8.3.6' apply false +} dependencyResolutionManagement { // Reuse version catalog from the main build. diff --git a/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle index 3774b6f..c59c9c7 100644 --- a/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.changelog-conventions.gradle @@ -2,7 +2,8 @@ plugins { id 'com.diffplug.spotless-changelog' } - spotlessChangelog { appendDashSnapshotUnless_dashPrelease=true } + +version = spotlessChangelog.versionNext diff --git a/build-logic/src/main/groovy/buildlogic.jar-shadow-conventions.gradle b/build-logic/src/main/groovy/buildlogic.jar-shadow-conventions.gradle new file mode 100644 index 0000000..b4aa0ae --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.jar-shadow-conventions.gradle @@ -0,0 +1,3 @@ +plugins { + id 'com.gradleup.shadow' +} diff --git a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle index a85d16e..999bbd1 100644 --- a/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle @@ -35,7 +35,7 @@ testing { // Configure the built-in test suite test { // Use JUnit Jupiter test framework - useJUnitJupiter('5.11.1') + useJUnitJupiter(libs.versions.junit) } } } diff --git a/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle new file mode 100644 index 0000000..99f8132 --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle @@ -0,0 +1,72 @@ +plugins { + id 'java' + id 'org.graalvm.buildtools.native' + id 'buildlogic.jar-shadow-conventions' +} + + +def nativeCompileMetaDir = project.layout.buildDirectory.dir('nativeCompile/src/main/resources/native-image/' + project.group + '/' + project.name) + +// use tasks 'nativeCompile' and 'nativeRun' to compile and run the native image +graalvmNative { + agent { + enabled = !project.hasProperty('skipGraalAgent') // we would love to make this dynamic, but it's not possible + defaultMode = "standard" + metadataCopy { + inputTaskNames.add('test') + inputTaskNames.add('testNpm') + mergeWithExisting = false + outputDirectories.add(nativeCompileMetaDir.get().asFile.path) + } + tasksToInstrumentPredicate = new java.util.function.Predicate() { + @Override + boolean test(Task task) { + // if (project.hasProperty('agent')) { + println ("Instrumenting task: " + task.name + " " + task.name == 'test' + "proj: " + task.project.hasProperty('agent')) + return task.name == 'test' || task.name == 'testNpm' + // } + // return false + } + } + } + binaries { + main { + imageName = 'spotless' + mainClass = 'com.diffplug.spotless.cli.SpotlessCLI' + sharedLibrary = false + useFatJar = true // use shadowJar as input to have same classpath + + // optimizations, see https://www.graalvm.org/latest/reference-manual/native-image/optimizations-and-performance/ + //buildArgs.add('-O3') // on production builds + + // the following options are required for GJF + // see: + buildArgs.add('-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED') + buildArgs.add('-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED') + buildArgs.add('-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED') + buildArgs.add('-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED') + buildArgs.add('-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED') + + buildArgs.add('--initialize-at-build-time=com.sun.tools.javac.file.Locations') + + buildArgs.add('-H:IncludeResourceBundles=com.sun.tools.javac.resources.compiler') + buildArgs.add('-H:IncludeResourceBundles=com.sun.tools.javac.resources.javac') + } + } +} + +tasks.named('metadataCopy') { + dependsOn('test', 'testNpm') +} + +tasks.named('nativeCompile') { + dependsOn('shadowJar') + classpathJar = tasks.shadowJar.archiveFile.get().asFile +} + +tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { + dependsOn('metadataCopy') // produces graalvm agent info + from(nativeCompileMetaDir.get().asFile.path) { + into('META-INF/native-image/' + project.group + '/' + project.name) + } +} diff --git a/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle index 49f23d6..70f21bf 100644 --- a/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle @@ -1,32 +1,33 @@ plugins { - id 'java' - id 'com.adarshr.test-logger' + id 'java' + id 'com.adarshr.test-logger' } // See com.diffplug.spotless.tag package for available JUnit 5 @Tag annotations def special = [ - 'cliProcess', - 'cliProcessNpm', - 'cliNative', - 'cliNativeNpm' + 'npm', + 'cliProcess', + 'cliProcessNpm', + 'cliNative', + 'cliNativeNpm' ] tasks.named('test').configure { - useJUnitPlatform { - excludeTags special as String[] - } + useJUnitPlatform { + excludeTags special as String[] + } } special.forEach { tag -> - tasks.register("test${tag.capitalize()}", Test) { - useJUnitPlatform { includeTags tag } - } + tasks.register("test${tag.capitalize()}", Test) { + useJUnitPlatform { includeTags tag } + } } tasks.register('testAll') { - dependsOn tasks.matching { it.name.startsWith('test') && it.name != 'testAll' } + dependsOn tasks.matching { it.name.startsWith('test') && it.name != 'testAll' } } tasks.withType(Test).configureEach { - testLogging.showStandardStreams = true -} \ No newline at end of file + testLogging.showStandardStreams = true +} diff --git a/build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle b/build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle new file mode 100644 index 0000000..3609c54 --- /dev/null +++ b/build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle @@ -0,0 +1,43 @@ +plugins { + id 'buildlogic.java-application-conventions' +} + +dependencies { + implementation libs.picocli + annotationProcessor libs.picocli.codegen +} + +compileJava { + // options for picocli codegen + // https://github.com/remkop/picocli/tree/main/picocli-codegen#222-other-options + options.compilerArgs += [ + "-Aproject=${project.group}/${project.name}", + "-Aother.resource.bundles=application", + // patterns require double-escaping (one escape is removed by groovy, the other one is needed in the resulting json file) + "-Aother.resource.patterns=.*\\\\.properties,.*\\\\.json,.*\\\\.js" + ] +} + +tasks.withType(ProcessResources).configureEach(new ApplicationPropertiesProcessResourcesAction(project.version)) + +class ApplicationPropertiesProcessResourcesAction implements Action { + + private final String cliVersion + + ApplicationPropertiesProcessResourcesAction(String cliVersion) { + this.cliVersion = cliVersion + } + + @Override + void execute(ProcessResources processResources) { + def localCliVersion = cliVersion // prevent issues with decorated closure + processResources.filesMatching("application.properties") { + filter( + org.apache.tools.ant.filters.ReplaceTokens, + tokens: [ + 'cli.version': localCliVersion + ] + ) + } + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7e3d7f2..8036900 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ annotations = "26.0.2" assertj-core = "3.27.3" durian = "1.2.0" junit = "5.8.1" +native-include-googleJavaFormat = "1.24.0" picocli = "4.7.6" spotless-lib = "3.0.2-SNAPSHOT" @@ -17,6 +18,7 @@ durian-io = { module = "com.diffplug.durian:durian-io", version.ref = "durian" } durian-collect = { module = "com.diffplug.durian:durian-collect", version.ref = "durian" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +native-include-googleJavaFormat = { module = "com.google.googlejavaformat:google-java-format", version.ref = "native-include-googleJavaFormat" } picocli = { module = "info.picocli:picocli", version.ref = "picocli" } picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" } spotless-lib = { module = "com.diffplug.spotless:spotless-lib", version.ref = "spotless-lib" } @@ -25,3 +27,6 @@ spotless-lib-extra = { module = "com.diffplug.spotless:spotless-lib-extra", vers [bundles] spotless-libs = ["spotless-lib", "spotless-lib-extra"] durian-libs = ["durian-core", "durian-io", "durian-collect"] +native-includes = [ + "native-include-googleJavaFormat" +] \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 80decb8..a8c2d60 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,9 +17,6 @@ pluginManagement { } plugins { - // Apply the foojay-resolver plugin to allow automatic download of JDKs - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' - // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md id 'com.diffplug.spotless' version '7.0.2' apply false @@ -28,6 +25,12 @@ plugins { // https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md id 'com.adarshr.test-logger' version '4.0.0' apply false + + // https://github.com/graalvm/native-build-tools/releases + id 'org.graalvm.buildtools.native' version '0.10.2' apply false + + // https://github.com/GradleUp/shadow/releases + id 'com.gradleup.shadow' version '8.3.6' apply false } rootProject.name = 'spotless-cli' From d108e36642b433ca747737c0339b593c5a866ae7 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Mon, 17 Feb 2025 22:22:19 +0100 Subject: [PATCH 017/141] chore: transport formatting files over from spotless --- .../testlib/spotless-cli.testlib.main.iml | 1 + build-logic/build.gradle | 1 + .../buildlogic.java-graalvm-conventions.gradle | 8 ++++++++ settings.gradle | 2 +- .../googlejavaformat/JavaCodeFormatted.test | 12 ++++++++++++ .../googlejavaformat/JavaCodeUnformatted.test | 15 +++++++++++++++ .../npm/prettier/config/.prettierrc.yml | 2 ++ .../typescript.configfile_prettier_2.clean | 18 ++++++++++++++++++ .../npm/prettier/config/typescript.dirty | 10 ++++++++++ 9 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test create mode 100644 testlib/src/main/resources/npm/prettier/config/.prettierrc.yml create mode 100644 testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean create mode 100644 testlib/src/main/resources/npm/prettier/config/typescript.dirty diff --git a/.idea/modules/testlib/spotless-cli.testlib.main.iml b/.idea/modules/testlib/spotless-cli.testlib.main.iml index 76ece22..a20ef52 100644 --- a/.idea/modules/testlib/spotless-cli.testlib.main.iml +++ b/.idea/modules/testlib/spotless-cli.testlib.main.iml @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/build-logic/build.gradle b/build-logic/build.gradle index c9752ec..895af10 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -18,6 +18,7 @@ repositories { dependencies { implementation 'com.gradleup.shadow:shadow-gradle-plugin:8.3.6' + implementation 'org.graalvm.buildtools:native-gradle-plugin:0.10.5' } spotless { diff --git a/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle index 99f8132..ae60716 100644 --- a/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle +++ b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle @@ -4,6 +4,12 @@ plugins { id 'buildlogic.jar-shadow-conventions' } +tasks.withType(org.graalvm.buildtools.gradle.tasks.GenerateResourcesConfigFile).configureEach { + notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8') +} +tasks.withType(org.graalvm.buildtools.gradle.tasks.BuildNativeImageTask).configureEach { + notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8') +} def nativeCompileMetaDir = project.layout.buildDirectory.dir('nativeCompile/src/main/resources/native-image/' + project.group + '/' + project.name) @@ -70,3 +76,5 @@ tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.Shadow into('META-INF/native-image/' + project.group + '/' + project.name) } } + +project.ext.nativeCompileMetaDir = nativeCompileMetaDir diff --git a/settings.gradle b/settings.gradle index a8c2d60..8c645a3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,7 +27,7 @@ plugins { id 'com.adarshr.test-logger' version '4.0.0' apply false // https://github.com/graalvm/native-build-tools/releases - id 'org.graalvm.buildtools.native' version '0.10.2' apply false + id 'org.graalvm.buildtools.native' version '0.10.5' apply false // https://github.com/GradleUp/shadow/releases id 'com.gradleup.shadow' version '8.3.6' apply false diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test new file mode 100644 index 0000000..a0aeb21 --- /dev/null +++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeFormatted.test @@ -0,0 +1,12 @@ +import mylib.UsedA; +import mylib.UsedB; + +public class Java { + /** Some javadoc. */ + public static void main(String[] args) { + System.out.println( + "A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length."); + UsedB.someMethod(); + UsedA.someMethod(); + } +} diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test new file mode 100644 index 0000000..8e66776 --- /dev/null +++ b/testlib/src/main/resources/java/googlejavaformat/JavaCodeUnformatted.test @@ -0,0 +1,15 @@ + +import mylib.Unused; +import mylib.UsedB; +import mylib.UsedA; + +public class Java { +/** + * Some javadoc. + */ +public static void main(String[] args) { +System.out.println("A very very very very very very very very very very very very very very very very very very very very very long string that goes beyond the 100-character line length."); +UsedB.someMethod(); +UsedA.someMethod(); +} +} \ No newline at end of file diff --git a/testlib/src/main/resources/npm/prettier/config/.prettierrc.yml b/testlib/src/main/resources/npm/prettier/config/.prettierrc.yml new file mode 100644 index 0000000..828586c --- /dev/null +++ b/testlib/src/main/resources/npm/prettier/config/.prettierrc.yml @@ -0,0 +1,2 @@ +parser: typescript +printWidth: 20 diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean b/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean new file mode 100644 index 0000000..451b546 --- /dev/null +++ b/testlib/src/main/resources/npm/prettier/config/typescript.configfile_prettier_2.clean @@ -0,0 +1,18 @@ +export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary + extends AbstractController + implements + DisposeAware, + CallbackAware +{ + public myValue: string[]; + + constructor( + private myService: Service, + name: string, + private field: any + ) { + super(name); + } + + //... +} diff --git a/testlib/src/main/resources/npm/prettier/config/typescript.dirty b/testlib/src/main/resources/npm/prettier/config/typescript.dirty new file mode 100644 index 0000000..a3a30bf --- /dev/null +++ b/testlib/src/main/resources/npm/prettier/config/typescript.dirty @@ -0,0 +1,10 @@ +export class MyVeryOwnControllerWithARatherLongNameThatIsNotReallyNecessary extends AbstractController implements DisposeAware, CallbackAware { + + +public myValue:string[]; + +constructor(private myService:Service,name:string,private field:any){ super(name) ;} + + +//... +} From db717a9f5f810f4ab2acf95a57157092d6b31ed9 Mon Sep 17 00:00:00 2001 From: Simon Gamma Date: Tue, 18 Feb 2025 20:51:12 +0100 Subject: [PATCH 018/141] chore(ide): update module config files --- .idea/compiler.xml | 3 +++ .idea/modules.xml | 1 + .idea/modules/app/spotless-cli.app.main.iml | 8 ++++++++ 3 files changed, 12 insertions(+) create mode 100644 .idea/modules/app/spotless-cli.app.main.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0bd692e..0593af1 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -4,6 +4,9 @@ +