From 0b2cca0eb9de873998535af15c0066a71e2e363f Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 1 Feb 2018 17:06:32 +0100 Subject: [PATCH 01/27] [website] added the German JUG week to the main page. --- build.xml | 2 +- website/templates/main.html | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 633d7922..06754e7e 100644 --- a/build.xml +++ b/build.xml @@ -876,7 +876,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The - diff --git a/website/templates/main.html b/website/templates/main.html index d52df167..00d64dab 100644 --- a/website/templates/main.html +++ b/website/templates/main.html @@ -31,5 +31,18 @@
+
+ <@main.h2 title="Upcoming presentations" /> +

+ Roel and Reinier will be talking about (near) future java features; a preview of what Java10 and Java11 will probably look like, across germany:

+ See you there! (We'll have stickers!) +

+
From fee0ad33abceb0219076dde05c9d5d9ba950000f Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 05:42:03 +0100 Subject: [PATCH 02/27] [jdk9] add support for using lombok with JDK9 code when compiling using the new module syntax, and having module-info.java files in your source. --- build.xml | 11 +++++ doc/changelog.markdown | 3 +- .../lombok/bytecode/ClassFileMetaData.java | 5 ++ src/core9/module-info.java | 18 +++++++ .../spi/AstModifyingAnnotationProcessor.java | 48 +++++++++++++++++++ 5 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 src/core9/module-info.java create mode 100644 src/j9stubs/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.java diff --git a/build.xml b/build.xml index 06754e7e..8e3fb2d1 100644 --- a/build.xml +++ b/build.xml @@ -218,6 +218,15 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + + + + + + + + + @@ -281,6 +290,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor + @@ -291,6 +301,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor + diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 7172b166..11c4bddc 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -3,7 +3,8 @@ Lombok Changelog ### v1.16.21 "Edgy Guinea Pig" * v1.16.20 is the latest stable release of Project Lombok. -* Potential fix for Netbeans < 9. [Issue #1555](https://github.com/rzwitserloot/lombok/issues/1555) +* PLATFORM: Fix for using lombok together with JDK9's new `module-info.java` feature. [Issue #985](https://github.com/rzwitserloot/lombok/issues/985) +* BUGFIX: Potential fix for Netbeans < 9. [Issue #1555](https://github.com/rzwitserloot/lombok/issues/1555) ### v1.16.20 (January 9th, 2018) * PLATFORM: Better support for jdk9 in the new IntelliJ, Netbeans and for Gradle. diff --git a/src/core/lombok/bytecode/ClassFileMetaData.java b/src/core/lombok/bytecode/ClassFileMetaData.java index 68b8bb7d..36976ee8 100644 --- a/src/core/lombok/bytecode/ClassFileMetaData.java +++ b/src/core/lombok/bytecode/ClassFileMetaData.java @@ -44,6 +44,9 @@ public class ClassFileMetaData { private static final byte METHOD_HANDLE = 15; private static final byte METHOD_TYPE = 16; private static final byte INVOKE_DYNAMIC = 18; + // New in java9: support for modules + private static final byte MODULE = 19; + private static final byte PACKAGE = 20; private static final int NOT_FOUND = -1; private static final int START_OF_CONSTANT_POOL = 8; @@ -79,6 +82,8 @@ public class ClassFileMetaData { case CLASS: case STRING: case METHOD_TYPE: + case MODULE: + case PACKAGE: position += 2; break; case METHOD_HANDLE: diff --git a/src/core9/module-info.java b/src/core9/module-info.java new file mode 100644 index 00000000..a4c97a89 --- /dev/null +++ b/src/core9/module-info.java @@ -0,0 +1,18 @@ +module lombok { + requires java.compiler; + requires java.instrument; + requires jdk.unsupported; + + exports lombok; + exports lombok.experimental; + exports lombok.extern.apachecommons; + exports lombok.extern.java; + exports lombok.extern.jbosslog; + exports lombok.extern.log4j; + exports lombok.extern.slf4j; + + provides javax.annotation.processing.Processor with lombok.launch.AnnotationProcessorHider.AnnotationProcessor; +// provides javax.annotation.processing.Processor with lombok.launch.AnnotationProcessorHider.ClaimingProcessor; + provides org.mapstruct.ap.spi.AstModifyingAnnotationProcessor with lombok.launch.AnnotationProcessorHider.AstModificationNotifier; +} + diff --git a/src/j9stubs/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.java b/src/j9stubs/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.java new file mode 100644 index 00000000..ffb99030 --- /dev/null +++ b/src/j9stubs/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.java @@ -0,0 +1,48 @@ +/** + * Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/) + * and/or other contributors as indicated by the @authors tag. See the + * copyright.txt file in the distribution for a full listing of all + * contributors. + * + * 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.mapstruct.ap.spi; + +import javax.lang.model.type.TypeMirror; + +/** + * A contract to be implemented by other annotation processors which - against the design philosophy of JSR 269 - alter + * the types under compilation. + *

+ * This contract will be queried by MapStruct when examining types referenced by mappers to be generated, most notably + * the source and target types of mapping methods. If at least one AST-modifying processor announces further changes to + * such type, the generation of the affected mapper(s) will be deferred to a future round in the annnotation processing + * cycle. + *

+ * Implementations are discovered via the service loader, i.e. a JAR providing an AST-modifying processor needs to + * declare its implementation in a file {@code META-INF/services/org.mapstruct.ap.spi.AstModifyingAnnotationProcessor}. + * + * @author Gunnar Morling + */ +//@org.mapstruct.util.Experimental +public interface AstModifyingAnnotationProcessor { + + /** + * Whether the specified type has been fully processed by this processor or not (i.e. this processor will amend the + * given type's structure after this invocation). + * + * @param type The type of interest + * @return {@code true} if this processor has fully processed the given type, {@code false} otherwise. + */ + boolean isTypeComplete(TypeMirror type); +} \ No newline at end of file From e9d86650ffae683d86e59cff96c74a7c9931b6d0 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 05:43:10 +0100 Subject: [PATCH 03/27] =?UTF-8?q?[jdk9]=20[opinionated]=20The=20java9=20wa?= =?UTF-8?q?rning=20when=20using=20lombok=20about=20=E2=80=98inaccessible?= =?UTF-8?q?=20API=E2=80=99=20is=20now=20suppressed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lombok/launch/AnnotationProcessor.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/launch/lombok/launch/AnnotationProcessor.java b/src/launch/lombok/launch/AnnotationProcessor.java index 05c900ab..b92cad91 100644 --- a/src/launch/lombok/launch/AnnotationProcessor.java +++ b/src/launch/lombok/launch/AnnotationProcessor.java @@ -21,6 +21,7 @@ */ package lombok.launch; +import java.lang.reflect.Field; import java.util.Set; import javax.annotation.processing.AbstractProcessor; @@ -37,6 +38,8 @@ import javax.lang.model.type.TypeMirror; import org.mapstruct.ap.spi.AstModifyingAnnotationProcessor; +import sun.misc.Unsafe; + class AnnotationProcessorHider { public static class AstModificationNotifier implements AstModifyingAnnotationProcessor { @Override public boolean isTypeComplete(TypeMirror type) { @@ -65,11 +68,33 @@ class AnnotationProcessorHider { } @Override public void init(ProcessingEnvironment processingEnv) { + disableJava9SillyWarning(); AstModificationNotifierData.lombokInvoked = true; instance.init(processingEnv); super.init(processingEnv); } + // sunapi suppresses javac's warning about using Unsafe; 'all' suppresses eclipse's warning about the unspecified 'sunapi' key. Leave them both. + // Yes, javac's definition of the word 'all' is quite contrary to what the dictionary says it means. 'all' does NOT include 'sunapi' according to javac. + @SuppressWarnings({"sunapi", "all"}) + private void disableJava9SillyWarning() { + // JVM9 complains about using reflection to access packages from a module that aren't exported. This makes no sense; the whole point of reflection + // is to get past such issues. The only comment from the jigsaw team lead on this was some unspecified mumbling about security which makes no sense, + // as the SecurityManager is invoked to check such things. Therefore this warning is a bug, so we shall patch java to fix it. + + try { + Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe"); + theUnsafe.setAccessible(true); + Unsafe u = (Unsafe) theUnsafe.get(null); + + Class cls = Class.forName("jdk.internal.module.IllegalAccessLogger"); + Field logger = cls.getDeclaredField("logger"); + u.putObjectVolatile(cls, u.staticFieldOffset(logger), null); + } catch (Throwable t) { + // We shall ignore it; the effect of this code failing is that the user gets to see a warning they remove with various --add-opens magic. + } + } + @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { return instance.process(annotations, roundEnv); } @@ -82,7 +107,7 @@ class AnnotationProcessorHider { ClassLoader cl = Main.createShadowClassLoader(); try { Class mc = cl.loadClass("lombok.core.AnnotationProcessor"); - return (AbstractProcessor) mc.newInstance(); + return (AbstractProcessor) mc.getDeclaredConstructor().newInstance(); } catch (Throwable t) { if (t instanceof Error) throw (Error) t; if (t instanceof RuntimeException) throw (RuntimeException) t; From 116a9dbb75200223664e26093b0e238b57d4255e Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 05:42:41 +0100 Subject: [PATCH 04/27] [compiling] running the ant compile job now no longer emits any warnings. Each warning that was emitted has been addressed, or analysed and suppressed. --- build.xml | 8 +++++--- buildScripts/website.ant.xml | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 8e3fb2d1..914b658b 100644 --- a/build.xml +++ b/build.xml @@ -174,6 +174,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + @@ -195,17 +196,17 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + - + - + @@ -237,6 +238,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr + diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index 36b3a193..15a0f95f 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -80,6 +80,8 @@ such as applying the templates to produce the website, converting the changelog + + From b6f17ef81acdff9896a8e2b2eced40223491ed4e Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 06:09:48 +0100 Subject: [PATCH 05/27] [jdk9] added a best-effort attempt to claim away lombok annotations when lombok is deployed in JDK9-module mode. Due to a bug or oversight in jigsaw it is no longer possible to supply 2 providers for the Processor service, which was the common and as far as I know only way to deal with the situation that you want to claim a subset of annotations but look at all of them (which is what lombok wants to do). --- src/core/lombok/core/AnnotationProcessor.java | 17 ++++++++++++++++- src/core9/module-info.java | 1 - 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/core/lombok/core/AnnotationProcessor.java b/src/core/lombok/core/AnnotationProcessor.java index 5531ad8e..64b8de43 100644 --- a/src/core/lombok/core/AnnotationProcessor.java +++ b/src/core/lombok/core/AnnotationProcessor.java @@ -40,6 +40,7 @@ import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; +import javax.lang.model.element.Name; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; @@ -163,7 +164,21 @@ public class AnnotationProcessor extends AbstractProcessor { for (ProcessorDescriptor proc : active) proc.process(annotations, roundEnv); - return false; + boolean onlyLombok = true; + boolean zeroElems = true; + for (TypeElement elem : annotations) { + zeroElems = false; + Name n = elem.getQualifiedName(); + if (n.length() > 7 && n.subSequence(0, 7).toString().equals("lombok.")) continue; + onlyLombok = false; + } + + // Normally we rely on the claiming processor to claim away all lombok annotations. + // One of the many Java9 oversights is that this 'process' API has not been fixed to address the point that 'files I want to look at' and 'annotations I want to claim' must be one and the same, + // and yet in java9 you can no longer have 2 providers for the same service, thus, if you go by module path, lombok no longer loads the ClaimingProcessor. + // This doesn't do as good a job, but it'll have to do. The only way to go from here, I think, is either 2 modules, or use reflection hackery to add ClaimingProcessor during our init. + + return onlyLombok && !zeroElems; } /** diff --git a/src/core9/module-info.java b/src/core9/module-info.java index a4c97a89..f11e2922 100644 --- a/src/core9/module-info.java +++ b/src/core9/module-info.java @@ -12,7 +12,6 @@ module lombok { exports lombok.extern.slf4j; provides javax.annotation.processing.Processor with lombok.launch.AnnotationProcessorHider.AnnotationProcessor; -// provides javax.annotation.processing.Processor with lombok.launch.AnnotationProcessorHider.ClaimingProcessor; provides org.mapstruct.ap.spi.AstModifyingAnnotationProcessor with lombok.launch.AnnotationProcessorHider.AstModificationNotifier; } From bb95ad218d29a9f5b1011b7c7b919ed41337a00b Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 06:17:28 +0100 Subject: [PATCH 06/27] [website] Updated docs for JDK9 module-info support. --- website/templates/setup/javac.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/website/templates/setup/javac.html b/website/templates/setup/javac.html index 9cc9a560..113be9c0 100644 --- a/website/templates/setup/javac.html +++ b/website/templates/setup/javac.html @@ -9,7 +9,18 @@ <@s.section title="JDK 9">

- Support for JDK9 is ongoing. You need to set up some configuration to make lombok play nice with jigsaw (the JDK9 module system). The github issue about JDK9 support for Lombok has the details on how to set it up. + Support for JDK9, if you haven't modularized your own projects yet (no module-info.java yet), is included in lombok starting with version 1.16.20. Just use lombok as normal: javac -cp lombok.jar ... +

+ Support for JDK9 if you did modularize your own projects (you've written a module-info.java file) is available in the edge release. To use it, you can choose:

    +
  • javac --processor-module-path lombok.jar -p lombok.jar ...
    • +
  • javac -cp lombok.jar -p lombok.jar ...
    • +
+ Both are equally effective. Note that you will have to add lombok to your module-info.java file:
+module myapp {
+	requires lombok;
+}
+

+ Feedback about JDK9 module-info support can be given at github issue #985.

From 55bcc142d08ac8a4de0c3965333e3816c496799f Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 22:14:03 +0100 Subject: [PATCH 07/27] =?UTF-8?q?[jdk9]=20forcing=20new=20rounds=20when=20?= =?UTF-8?q?compiling=20multiple=20modules=20didn=E2=80=99t=20work.=20(File?= =?UTF-8?q?rException=20on=20creating=20the=20new=20round).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apt/InterceptingJavaFileManager.java | 8 ++--- .../lombok/javac/apt/LombokProcessor.java | 30 +++++++++++++++---- website/templates/setup/javac.html | 4 ++- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/core/lombok/javac/apt/InterceptingJavaFileManager.java b/src/core/lombok/javac/apt/InterceptingJavaFileManager.java index 303bdc2f..a9a4d200 100644 --- a/src/core/lombok/javac/apt/InterceptingJavaFileManager.java +++ b/src/core/lombok/javac/apt/InterceptingJavaFileManager.java @@ -42,14 +42,14 @@ final class InterceptingJavaFileManager extends ForwardingJavaFileManager Both are equally effective. Note that you will have to add lombok to your module-info.java file:
 module myapp {
-	requires lombok;
+	requires static lombok;
 }
+

+ The 'static' part ensures that you won't need lombok to be present at runtime.

Feedback about JDK9 module-info support can be given at github issue #985.

From 66469e04fe35e5ceb3723cb563379a03e4883101 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 22:12:42 +0100 Subject: [PATCH 08/27] [var] various upgrades to var: * var is promoted to the main package. * It is no longer an opt-in thing. * bug: var (unlike val) is allowed in old-style for loops, but if you multi-init: for (var i = 0, j="Foo";;), you now get an error that you can't do that. * tests both for the multi-for situation and the new main package variant. --- doc/changelog.markdown | 1 + .../lombok/core/LombokInternalAliasing.java | 1 + .../core/configuration/AllowHelper.java | 6 ++-- .../lombok/eclipse/handlers/HandleVal.java | 14 ++++++-- src/core/lombok/experimental/var.java | 5 ++- src/core/lombok/javac/handlers/HandleVal.java | 12 +++++-- src/core/lombok/var.java | 35 +++++++++++++++++++ .../lombok/eclipse/agent/PatchVal.java | 2 +- .../lombok/eclipse/agent/PatchValEclipse.java | 2 +- .../resource/after-delombok/VarWarning.java | 6 ++++ .../resource/after-ecj/VarComplex.java | 2 +- .../resource/after-ecj/VarInFor.java | 2 +- .../resource/after-ecj/VarInForOld.java | 2 +- .../resource/after-ecj/VarNullInit.java | 2 +- .../resource/after-ecj/VarWarning.java | 10 ++++++ .../transform/resource/before/VarComplex.java | 3 +- test/transform/resource/before/VarInFor.java | 3 +- .../resource/before/VarInForOld.java | 3 +- .../resource/before/VarInForOldMulti.java | 10 ++++++ .../resource/before/VarModifier.java | 1 - .../resource/before/VarNullInit.java | 3 +- .../transform/resource/before/VarWarning.java | 3 +- .../VarInForOldMulti.java.messages | 1 + .../VarNullInit.java.messages | 2 +- .../VarWarning.java.messages | 2 +- .../ValInTryWithResources.java.messages | 1 + .../VarInForOldMulti.java.messages | 1 + .../messages-ecj/VarModifier.java.messages | 3 ++ .../messages-ecj/VarNullInit.java.messages | 2 +- .../messages-ecj/VarWarning.java.messages | 2 +- website/templates/features/index.html | 4 +++ .../features/{experimental => }/var.html | 22 ++++-------- 32 files changed, 120 insertions(+), 48 deletions(-) create mode 100644 src/core/lombok/var.java create mode 100644 test/transform/resource/after-delombok/VarWarning.java create mode 100644 test/transform/resource/after-ecj/VarWarning.java create mode 100644 test/transform/resource/before/VarInForOldMulti.java create mode 100644 test/transform/resource/messages-delombok/VarInForOldMulti.java.messages create mode 100644 test/transform/resource/messages-ecj/ValInTryWithResources.java.messages create mode 100644 test/transform/resource/messages-ecj/VarInForOldMulti.java.messages create mode 100644 test/transform/resource/messages-ecj/VarModifier.java.messages rename website/templates/features/{experimental => }/var.html (65%) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 11c4bddc..fcde09da 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -5,6 +5,7 @@ Lombok Changelog * v1.16.20 is the latest stable release of Project Lombok. * PLATFORM: Fix for using lombok together with JDK9's new `module-info.java` feature. [Issue #985](https://github.com/rzwitserloot/lombok/issues/985) * BUGFIX: Potential fix for Netbeans < 9. [Issue #1555](https://github.com/rzwitserloot/lombok/issues/1555) +* PROMOTION: `var` has been promoted from experimental to the main package with no changes. The 'old' experimental one is still around but is deprecated, and is an alias for the new main package one. [var documentation](https://projectlombok.org/features/var.html). ### v1.16.20 (January 9th, 2018) * PLATFORM: Better support for jdk9 in the new IntelliJ, Netbeans and for Gradle. diff --git a/src/core/lombok/core/LombokInternalAliasing.java b/src/core/lombok/core/LombokInternalAliasing.java index 08764a5c..a1909df3 100644 --- a/src/core/lombok/core/LombokInternalAliasing.java +++ b/src/core/lombok/core/LombokInternalAliasing.java @@ -51,6 +51,7 @@ public class LombokInternalAliasing { Map m2 = new HashMap(); m2.put("lombok.experimental.Value", "lombok.Value"); m2.put("lombok.experimental.Builder", "lombok.Builder"); + m2.put("lombok.experimental.var", "lombok.var"); m2.put("lombok.Delegate", "lombok.experimental.Delegate"); ALIASES = Collections.unmodifiableMap(m2); } diff --git a/src/core/lombok/core/configuration/AllowHelper.java b/src/core/lombok/core/configuration/AllowHelper.java index 3873b055..1146ccde 100644 --- a/src/core/lombok/core/configuration/AllowHelper.java +++ b/src/core/lombok/core/configuration/AllowHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Project Lombok Authors. + * Copyright (C) 2018 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,10 +24,8 @@ package lombok.core.configuration; import java.util.Collection; import java.util.Collections; -import lombok.ConfigurationKeys; - public final class AllowHelper { - private final static Collection> ALLOWABLE = Collections.singleton(ConfigurationKeys.VAR_FLAG_USAGE); + private final static Collection> ALLOWABLE = Collections.emptySet(); private AllowHelper() { // Prevent instantiation diff --git a/src/core/lombok/eclipse/handlers/HandleVal.java b/src/core/lombok/eclipse/handlers/HandleVal.java index d8901067..3742ac00 100644 --- a/src/core/lombok/eclipse/handlers/HandleVal.java +++ b/src/core/lombok/eclipse/handlers/HandleVal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2016 The Project Lombok Authors. + * Copyright (C) 2010-2018 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,13 +25,14 @@ import static lombok.core.handlers.HandlerUtil.handleFlagUsage; import static lombok.eclipse.handlers.EclipseHandlerUtil.typeMatches; import lombok.ConfigurationKeys; import lombok.val; +import lombok.var; import lombok.core.HandlerPriority; import lombok.eclipse.DeferUntilPostDiet; import lombok.eclipse.EclipseASTAdapter; import lombok.eclipse.EclipseASTVisitor; import lombok.eclipse.EclipseNode; -import lombok.experimental.var; +import org.eclipse.jdt.internal.compiler.ast.ASTNode; import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer; import org.eclipse.jdt.internal.compiler.ast.ForStatement; import org.eclipse.jdt.internal.compiler.ast.ForeachStatement; @@ -74,11 +75,18 @@ public class HandleVal extends EclipseASTAdapter { return; } - if (isVal && localNode.directUp().get() instanceof ForStatement) { + ASTNode parentRaw = localNode.directUp().get(); + + if (isVal && parentRaw instanceof ForStatement) { localNode.addError("'val' is not allowed in old-style for loops"); return; } + if (parentRaw instanceof ForStatement && ((ForStatement) parentRaw).initializations != null && ((ForStatement) parentRaw).initializations.length > 1) { + localNode.addError("'var' is not allowed in old-style for loops if there is more than 1 initializer"); + return; + } + if (local.initialization != null && local.initialization.getClass().getName().equals("org.eclipse.jdt.internal.compiler.ast.LambdaExpression")) { localNode.addError("'" + annotation + "' is not allowed with lambda expressions."); return; diff --git a/src/core/lombok/experimental/var.java b/src/core/lombok/experimental/var.java index d8de8b19..71cc141a 100644 --- a/src/core/lombok/experimental/var.java +++ b/src/core/lombok/experimental/var.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 The Project Lombok Authors. + * Copyright (C) 2010-2017 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,9 @@ package lombok.experimental; /** * like val but not final + * + * @deprecated {@code var} has been promoted to the main package; use {@link lombok.var} instead. */ +@Deprecated public @interface var { } diff --git a/src/core/lombok/javac/handlers/HandleVal.java b/src/core/lombok/javac/handlers/HandleVal.java index f0f6eb2a..14130bc4 100644 --- a/src/core/lombok/javac/handlers/HandleVal.java +++ b/src/core/lombok/javac/handlers/HandleVal.java @@ -26,7 +26,7 @@ import static lombok.javac.handlers.JavacHandlerUtil.*; import lombok.ConfigurationKeys; import lombok.val; import lombok.core.HandlerPriority; -import lombok.experimental.var; +import lombok.var; import lombok.javac.JavacASTAdapter; import lombok.javac.JavacASTVisitor; import lombok.javac.JavacNode; @@ -54,10 +54,10 @@ import com.sun.tools.javac.util.List; public class HandleVal extends JavacASTAdapter { private static boolean eq(String typeTreeToString, String key) { - return (typeTreeToString.equals(key) || typeTreeToString.equals("lombok." + key)); + return typeTreeToString.equals(key) || typeTreeToString.equals("lombok." + key) || typeTreeToString.equals("lombok.experimental." + key); } - @Override + @SuppressWarnings("deprecation") @Override public void visitLocal(JavacNode localNode, JCVariableDecl local) { JCTree typeTree = local.vartype; if (typeTree == null) return; @@ -77,6 +77,11 @@ public class HandleVal extends JavacASTAdapter { return; } + if (parentRaw instanceof JCForLoop && ((JCForLoop) parentRaw).getInitializer().size() > 1) { + localNode.addError("'var' is not allowed in old-style for loops if there is more than 1 initializer"); + return; + } + JCExpression rhsOfEnhancedForLoop = null; if (local.init == null) { if (parentRaw instanceof JCEnhancedForLoop) { @@ -98,6 +103,7 @@ public class HandleVal extends JavacASTAdapter { if (localNode.shouldDeleteLombokAnnotations()) { JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, val.class.getName()); + JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, lombok.experimental.var.class.getName()); JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, var.class.getName()); } diff --git a/src/core/lombok/var.java b/src/core/lombok/var.java new file mode 100644 index 00000000..63a70213 --- /dev/null +++ b/src/core/lombok/var.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2010-2018 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok; + +/** + * Use {@code var} as the type of any local variable declaration (even in a {@code for} statement), and the type will be inferred from the initializing expression + * (any further assignments to the variable are not involved in this type inference). + *

+ * For example: {@code var x = 10.0;} will infer {@code double}, and {@code var y = new ArrayList();} will infer {@code ArrayList}. + *

+ * Note that this is an annotation type because {@code var x = 10;} will be desugared to {@code @var int x = 10;} + *

+ * Complete documentation is found at the project lombok features page for @var. + */ +public @interface var { +} diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java index e4dd7b26..632dd865 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java @@ -212,7 +212,7 @@ public class PatchVal { } private static boolean isVar(LocalDeclaration local, BlockScope scope) { - return is(local.type, scope, "lombok.experimental.var"); + return is(local.type, scope, "lombok.experimental.var") || is(local.type, scope, "lombok.var"); } private static boolean isVal(LocalDeclaration local, BlockScope scope) { diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java index 505eb767..839fce6e 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipse.java @@ -103,7 +103,7 @@ public class PatchValEclipse { } private static boolean couldBeVar(TypeReference type) { - return PatchVal.couldBe("lombok.experimental.var", type); + return PatchVal.couldBe("lombok.experimental.var", type) || PatchVal.couldBe("lombok.var", type); } public static void addFinalAndValAnnotationToSingleVariableDeclaration(Object converter, SingleVariableDeclaration out, LocalDeclaration in) { diff --git a/test/transform/resource/after-delombok/VarWarning.java b/test/transform/resource/after-delombok/VarWarning.java new file mode 100644 index 00000000..a333c87c --- /dev/null +++ b/test/transform/resource/after-delombok/VarWarning.java @@ -0,0 +1,6 @@ +public class VarWarning { + public void isOkay() { + java.lang.String x = "Warning"; + x.toLowerCase(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/VarComplex.java b/test/transform/resource/after-ecj/VarComplex.java index 10c456eb..97a0a177 100644 --- a/test/transform/resource/after-ecj/VarComplex.java +++ b/test/transform/resource/after-ecj/VarComplex.java @@ -1,4 +1,4 @@ -import lombok.experimental.var; +import lombok.var; public class VarComplex { private String field = ""; private static final int CONSTANT = 20; diff --git a/test/transform/resource/after-ecj/VarInFor.java b/test/transform/resource/after-ecj/VarInFor.java index 0192aaed..1799d9b7 100644 --- a/test/transform/resource/after-ecj/VarInFor.java +++ b/test/transform/resource/after-ecj/VarInFor.java @@ -1,4 +1,4 @@ -import lombok.experimental.var; +import lombok.var; public class VarInFor { public VarInFor() { super(); diff --git a/test/transform/resource/after-ecj/VarInForOld.java b/test/transform/resource/after-ecj/VarInForOld.java index 98fedf03..065ea94d 100644 --- a/test/transform/resource/after-ecj/VarInForOld.java +++ b/test/transform/resource/after-ecj/VarInForOld.java @@ -1,4 +1,4 @@ -import lombok.experimental.var; +import lombok.var; public class VarInForOld { public VarInForOld() { super(); diff --git a/test/transform/resource/after-ecj/VarNullInit.java b/test/transform/resource/after-ecj/VarNullInit.java index 3eb2d506..848744cc 100644 --- a/test/transform/resource/after-ecj/VarNullInit.java +++ b/test/transform/resource/after-ecj/VarNullInit.java @@ -1,4 +1,4 @@ -import lombok.experimental.var; +import lombok.var; public class VarNullInit { public VarNullInit() { super(); diff --git a/test/transform/resource/after-ecj/VarWarning.java b/test/transform/resource/after-ecj/VarWarning.java new file mode 100644 index 00000000..4caf90f8 --- /dev/null +++ b/test/transform/resource/after-ecj/VarWarning.java @@ -0,0 +1,10 @@ +import lombok.var; +public class VarWarning { + public VarWarning() { + super(); + } + public void isOkay() { + @var java.lang.String x = "Warning"; + x.toLowerCase(); + } +} \ No newline at end of file diff --git a/test/transform/resource/before/VarComplex.java b/test/transform/resource/before/VarComplex.java index bfaa8804..c93e177a 100644 --- a/test/transform/resource/before/VarComplex.java +++ b/test/transform/resource/before/VarComplex.java @@ -1,5 +1,4 @@ -//CONF: lombok.var.flagUsage = ALLOW -import lombok.experimental.var; +import lombok.var; public class VarComplex { private String field = ""; diff --git a/test/transform/resource/before/VarInFor.java b/test/transform/resource/before/VarInFor.java index cc8c387e..7f7bb7a7 100644 --- a/test/transform/resource/before/VarInFor.java +++ b/test/transform/resource/before/VarInFor.java @@ -1,5 +1,4 @@ -//CONF: lombok.var.flagUsage = ALLOW -import lombok.experimental.var; +import lombok.var; public class VarInFor { public void enhancedFor() { diff --git a/test/transform/resource/before/VarInForOld.java b/test/transform/resource/before/VarInForOld.java index f90aba7f..99e83b57 100644 --- a/test/transform/resource/before/VarInForOld.java +++ b/test/transform/resource/before/VarInForOld.java @@ -1,5 +1,4 @@ -//CONF: lombok.var.flagUsage = ALLOW -import lombok.experimental.var; +import lombok.var; public class VarInForOld { public void oldFor() { diff --git a/test/transform/resource/before/VarInForOldMulti.java b/test/transform/resource/before/VarInForOldMulti.java new file mode 100644 index 00000000..e2ea9682 --- /dev/null +++ b/test/transform/resource/before/VarInForOldMulti.java @@ -0,0 +1,10 @@ +//skip compare contents +import lombok.var; + +public class VarInForOldMulti { + public void oldForMulti() { + for (var i = 0, j = "Hey"; i < 100; ++i) { + System.out.println(i); + } + } +} \ No newline at end of file diff --git a/test/transform/resource/before/VarModifier.java b/test/transform/resource/before/VarModifier.java index 7250c1c5..5c68caa7 100644 --- a/test/transform/resource/before/VarModifier.java +++ b/test/transform/resource/before/VarModifier.java @@ -1,4 +1,3 @@ -//CONF: lombok.var.flagUsage = ALLOW import lombok.experimental.var; public class VarModifier { diff --git a/test/transform/resource/before/VarNullInit.java b/test/transform/resource/before/VarNullInit.java index efdc9d9e..f9bb53a3 100644 --- a/test/transform/resource/before/VarNullInit.java +++ b/test/transform/resource/before/VarNullInit.java @@ -1,5 +1,4 @@ -//CONF: lombok.var.flagUsage = ALLOW -import lombok.experimental.var; +import lombok.var; public class VarNullInit { void method() { diff --git a/test/transform/resource/before/VarWarning.java b/test/transform/resource/before/VarWarning.java index 85559587..90464d30 100644 --- a/test/transform/resource/before/VarWarning.java +++ b/test/transform/resource/before/VarWarning.java @@ -1,6 +1,5 @@ //CONF: lombok.var.flagUsage = WARNING -//skip compare contents -import lombok.experimental.var; +import lombok.var; public class VarWarning { public void isOkay() { diff --git a/test/transform/resource/messages-delombok/VarInForOldMulti.java.messages b/test/transform/resource/messages-delombok/VarInForOldMulti.java.messages new file mode 100644 index 00000000..f65fe823 --- /dev/null +++ b/test/transform/resource/messages-delombok/VarInForOldMulti.java.messages @@ -0,0 +1 @@ +6 'var' is not allowed in old-style for loops if there is more than 1 initializer diff --git a/test/transform/resource/messages-delombok/VarNullInit.java.messages b/test/transform/resource/messages-delombok/VarNullInit.java.messages index 190ab7c4..5a2a6ae1 100644 --- a/test/transform/resource/messages-delombok/VarNullInit.java.messages +++ b/test/transform/resource/messages-delombok/VarNullInit.java.messages @@ -1 +1 @@ -6 variable initializer is 'null' \ No newline at end of file +5 variable initializer is 'null' \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/VarWarning.java.messages b/test/transform/resource/messages-delombok/VarWarning.java.messages index 48c89581..886e98f4 100644 --- a/test/transform/resource/messages-delombok/VarWarning.java.messages +++ b/test/transform/resource/messages-delombok/VarWarning.java.messages @@ -1 +1 @@ -7 Use of var is flagged according to lombok configuration \ No newline at end of file +6 Use of var is flagged according to lombok configuration \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/ValInTryWithResources.java.messages b/test/transform/resource/messages-ecj/ValInTryWithResources.java.messages new file mode 100644 index 00000000..9d0d7a6e --- /dev/null +++ b/test/transform/resource/messages-ecj/ValInTryWithResources.java.messages @@ -0,0 +1 @@ +OPTIONAL 8 Resource leak: 'i' is never closed diff --git a/test/transform/resource/messages-ecj/VarInForOldMulti.java.messages b/test/transform/resource/messages-ecj/VarInForOldMulti.java.messages new file mode 100644 index 00000000..0bfd6e65 --- /dev/null +++ b/test/transform/resource/messages-ecj/VarInForOldMulti.java.messages @@ -0,0 +1 @@ +6 'var' is not allowed in old-style for loops if there is more than 1 initializer \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/VarModifier.java.messages b/test/transform/resource/messages-ecj/VarModifier.java.messages new file mode 100644 index 00000000..051d1ad7 --- /dev/null +++ b/test/transform/resource/messages-ecj/VarModifier.java.messages @@ -0,0 +1,3 @@ +1 The type var is deprecated +7 The type var is deprecated +8 The type var is deprecated diff --git a/test/transform/resource/messages-ecj/VarNullInit.java.messages b/test/transform/resource/messages-ecj/VarNullInit.java.messages index 190ab7c4..5a2a6ae1 100644 --- a/test/transform/resource/messages-ecj/VarNullInit.java.messages +++ b/test/transform/resource/messages-ecj/VarNullInit.java.messages @@ -1 +1 @@ -6 variable initializer is 'null' \ No newline at end of file +5 variable initializer is 'null' \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/VarWarning.java.messages b/test/transform/resource/messages-ecj/VarWarning.java.messages index 48c89581..25096b84 100644 --- a/test/transform/resource/messages-ecj/VarWarning.java.messages +++ b/test/transform/resource/messages-ecj/VarWarning.java.messages @@ -1 +1 @@ -7 Use of var is flagged according to lombok configuration \ No newline at end of file +6 Use of var is flagged according to lombok configuration. \ No newline at end of file diff --git a/website/templates/features/index.html b/website/templates/features/index.html index 73b5dce8..d077ab4d 100644 --- a/website/templates/features/index.html +++ b/website/templates/features/index.html @@ -12,6 +12,10 @@ Finally! Hassle-free final local variables. + <@main.feature title="var" href="var"> + Mutably! Hassle-free local variables. + + <@main.feature title="@NonNull" href="NonNull"> or: How I learned to stop worrying and love the NullPointerException. diff --git a/website/templates/features/experimental/var.html b/website/templates/features/var.html similarity index 65% rename from website/templates/features/experimental/var.html rename to website/templates/features/var.html index fa35ac5e..60e24914 100644 --- a/website/templates/features/experimental/var.html +++ b/website/templates/features/var.html @@ -1,23 +1,13 @@ -<#import "../_features.html" as f> +<#import "_features.html" as f> -<@f.scaffold title="var" logline="Modifiable local variables with a type inferred by assigning value."> +<@f.scaffold title="var" logline="Mutably! Hassle-free local variables."> <@f.history> -

- var was introduced in lombok 1.16.12 as experimental feature. -

+

    +
  • var was promoted to the main package in lombok 2.0.0; given that JEP 286 establishes expectations, and lombok's take on var follows these, we've decided to promote var eventhough the feature remains controversial.
    • +
  • var was introduced in lombok 1.16.12 as experimental feature.
    • +

- <@f.experimental> -
    -
  • - This feature is very controversial. -
  • - There is JEP 286 that should make var obsolete. -
    • -
- Current status: uncertain – Currently we feel this feature cannot move out of experimental status. - - <@f.overview>

var works exactly like val, except the local variable is not marked as final. From 6484537e2e87ff990b3de574876490f0bdd7e0ec Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 6 Feb 2018 22:42:38 +0100 Subject: [PATCH 09/27] =?UTF-8?q?URLs=20to=20the=20=E2=80=98experimental?= =?UTF-8?q?=E2=80=99=20feature=20page=20of=20features=20that=20have=20been?= =?UTF-8?q?=20promoted=20will=20now=20redirect=20(permanently)=20to=20the?= =?UTF-8?q?=20(non-experimental)=20feature=20page=20equivalent.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/extra/htaccess | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/extra/htaccess b/website/extra/htaccess index fd18c145..ea53d49c 100644 --- a/website/extra/htaccess +++ b/website/extra/htaccess @@ -39,6 +39,10 @@ RewriteRule ^features/${pg?no_esc}$ /features/${pg?no_esc}.html [L,END] RewriteRule ^features/${pg?no_esc}(\.html)?$ /features/${pg?no_esc} [NC,R=301] +RewriteRule ^features/experimental/Builder(\.html)?$ /features/Builder [NC,R=301] +RewriteRule ^features/experimental/Value(\.html)?$ /features/Value [NC,R=301] +RewriteRule ^features/experimental/var(\.html)?$ /features/var [NC,R=301] + RewriteRule ^features/experimental/all$ /features/experimental/index.html [L,END] RewriteRule ^features/experimental(/all)?$ /features/experimental/all [NC,R=301] RewriteRule ^features/experimental/index(\.html)?$ /features/experimental/all [NC,R=301] From e6ecbe4f3ab2c16332c0209033dbb58aa2e28c2a Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 7 Feb 2018 00:00:28 +0100 Subject: [PATCH 10/27] =?UTF-8?q?As=20we=E2=80=99re=20preparing=20to=20rel?= =?UTF-8?q?ease=20v2,=20we=20want=20to=20delete=20the=20experimental=20edi?= =?UTF-8?q?tions=20of=20the=20Builder=20and=20Value=20annotations=E2=80=A6?= =?UTF-8?q?=20but=20in=20case=20you=20install=20lombok=20v2=20into=20eclip?= =?UTF-8?q?se=20but=20use=20an=20older=20lombok=20as=20dep=20in=20your=20p?= =?UTF-8?q?roject,=20we=20still=20do=20want=20to=20process=20the=20old=20a?= =?UTF-8?q?nnotations.=20Had=20to=20stringly-type=20a=20few=20things=20to?= =?UTF-8?q?=20make=20that=20happen,=20but,=20works=20now.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/changelog.markdown | 1 + .../lombok/core/handlers/HandlerUtil.java | 11 +- .../eclipse/handlers/EclipseHandlerUtil.java | 51 +++++- .../eclipse/handlers/HandleBuilder.java | 3 +- src/core/lombok/experimental/Builder.java | 149 ------------------ src/core/lombok/experimental/Value.java | 62 -------- .../lombok/javac/handlers/HandleBuilder.java | 8 +- .../javac/handlers/HandleBuilderDefault.java | 3 +- .../lombok/javac/handlers/HandleValue.java | 9 +- .../javac/handlers/JavacHandlerUtil.java | 86 ++++++++-- 10 files changed, 137 insertions(+), 246 deletions(-) delete mode 100644 src/core/lombok/experimental/Builder.java delete mode 100644 src/core/lombok/experimental/Value.java diff --git a/doc/changelog.markdown b/doc/changelog.markdown index fcde09da..41178d2a 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -6,6 +6,7 @@ Lombok Changelog * PLATFORM: Fix for using lombok together with JDK9's new `module-info.java` feature. [Issue #985](https://github.com/rzwitserloot/lombok/issues/985) * BUGFIX: Potential fix for Netbeans < 9. [Issue #1555](https://github.com/rzwitserloot/lombok/issues/1555) * PROMOTION: `var` has been promoted from experimental to the main package with no changes. The 'old' experimental one is still around but is deprecated, and is an alias for the new main package one. [var documentation](https://projectlombok.org/features/var.html). +* OLD-CRUFT: `lombok.experimental.Builder` and `lombok.experimental.Value` are deprecated remnants of when these features were still in experimental. They are now removed entirely. If your project is dependent on an older version of lombok which still has those; fret not, lombok still processes these annotations. It just no longer includes them in the jar. ### v1.16.20 (January 9th, 2018) * PLATFORM: Better support for jdk9 in the new IntelliJ, Netbeans and for Gradle. diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java index f4705e5b..c53dc5ac 100644 --- a/src/core/lombok/core/handlers/HandlerUtil.java +++ b/src/core/lombok/core/handlers/HandlerUtil.java @@ -171,11 +171,12 @@ public class HandlerUtil { } @SuppressWarnings({"all", "unchecked", "deprecation"}) - public static final List> INVALID_ON_BUILDERS = Collections.unmodifiableList( - Arrays.>asList( - Getter.class, Setter.class, Wither.class, ToString.class, EqualsAndHashCode.class, - RequiredArgsConstructor.class, AllArgsConstructor.class, NoArgsConstructor.class, - Data.class, Value.class, lombok.experimental.Value.class, FieldDefaults.class)); + public static final List INVALID_ON_BUILDERS = Collections.unmodifiableList( + Arrays.asList( + Getter.class.getName(), Setter.class.getName(), Wither.class.getName(), + ToString.class.getName(), EqualsAndHashCode.class.getName(), + RequiredArgsConstructor.class.getName(), AllArgsConstructor.class.getName(), NoArgsConstructor.class.getName(), + Data.class.getName(), Value.class.getName(), "lombok.experimental.Value", FieldDefaults.class.getName())); /** * Given the name of a field, return the 'base name' of that field. For example, {@code fFoobar} becomes {@code foobar} if {@code f} is in the prefix list. diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index f49fff7f..6213c3f3 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -197,17 +197,36 @@ public class EclipseHandlerUtil { TypeResolver resolver = new TypeResolver(node.getImportList()); return resolver.typeMatches(node, type.getName(), typeName); + } + + /** + * Checks if the given TypeReference node is likely to be a reference to the provided class. + * + * @param type An actual type. This method checks if {@code typeNode} is likely to be a reference to this type. + * @param node A Lombok AST node. Any node in the appropriate compilation unit will do (used to get access to import statements). + * @param typeRef A type reference to check. + */ + public static boolean typeMatches(String type, EclipseNode node, TypeReference typeRef) { + if (typeRef == null || typeRef.getTypeName() == null || typeRef.getTypeName().length == 0) return false; + String lastPartA = new String(typeRef.getTypeName()[typeRef.getTypeName().length -1]); + int lastIndex = type.lastIndexOf('.'); + String lastPartB = lastIndex == -1 ? type : type.substring(lastIndex + 1); + if (!lastPartA.equals(lastPartB)) return false; + String typeName = toQualifiedName(typeRef.getTypeName()); + TypeResolver resolver = new TypeResolver(node.getImportList()); + return resolver.typeMatches(node, type, typeName); } public static void sanityCheckForMethodGeneratingAnnotationsOnBuilderClass(EclipseNode typeNode, EclipseNode errorNode) { List disallowed = null; for (EclipseNode child : typeNode.down()) { if (child.getKind() != Kind.ANNOTATION) continue; - for (Class annType : INVALID_ON_BUILDERS) { + for (String annType : INVALID_ON_BUILDERS) { if (annotationTypeMatches(annType, child)) { if (disallowed == null) disallowed = new ArrayList(); - disallowed.add(annType.getSimpleName()); + int lastIndex = annType.lastIndexOf('.'); + disallowed.add(lastIndex == -1 ? annType : annType.substring(lastIndex + 1)); } } } @@ -444,6 +463,24 @@ public class EclipseHandlerUtil { } } + public static boolean hasAnnotation(String type, EclipseNode node) { + if (node == null) return false; + if (type == null) return false; + switch (node.getKind()) { + case ARGUMENT: + case FIELD: + case LOCAL: + case TYPE: + case METHOD: + for (EclipseNode child : node.down()) { + if (annotationTypeMatches(type, child)) return true; + } + // intentional fallthrough + default: + return false; + } + } + public static EclipseNode findAnnotation(Class type, EclipseNode node) { if (node == null) return null; if (type == null) return null; @@ -472,6 +509,16 @@ public class EclipseHandlerUtil { return typeMatches(type, node, ((Annotation) node.get()).type); } + /** + * Checks if the provided annotation type is likely to be the intended type for the given annotation node. + * + * This is a guess, but a decent one. + */ + public static boolean annotationTypeMatches(String type, EclipseNode node) { + if (node.getKind() != Kind.ANNOTATION) return false; + return typeMatches(type, node, ((Annotation) node.get()).type); + } + public static TypeReference cloneSelfType(EclipseNode context) { return cloneSelfType(context, null); } diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index 12b8f6bc..5b2f63a4 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -185,8 +185,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { TypeDeclaration td = (TypeDeclaration) tdParent.get(); List allFields = new ArrayList(); - @SuppressWarnings("deprecation") - boolean valuePresent = (hasAnnotation(lombok.Value.class, parent) || hasAnnotation(lombok.experimental.Value.class, parent)); + boolean valuePresent = (hasAnnotation(lombok.Value.class, parent) || hasAnnotation("lombok.experimental.Value", parent)); for (EclipseNode fieldNode : HandleConstructor.findAllFields(tdParent, true)) { FieldDeclaration fd = (FieldDeclaration) fieldNode.get(); EclipseNode isDefault = findAnnotation(Builder.Default.class, fieldNode); diff --git a/src/core/lombok/experimental/Builder.java b/src/core/lombok/experimental/Builder.java deleted file mode 100644 index 7b364bff..00000000 --- a/src/core/lombok/experimental/Builder.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (C) 2013-2017 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.experimental; - -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * The builder annotation creates a so-called 'builder' aspect to the class that is annotated or the class - * that contains a member which is annotated with {@code @Builder}. - *

- * If a member is annotated, it must be either a constructor or a method. If a class is annotated, - * then a private constructor is generated with all fields as arguments - * (as if {@code @AllArgsConstructor(AccessLevel.PRIVATE)} is present - * on the class), and it is as if this constructor has been annotated with {@code @Builder} instead. - *

- * The effect of {@code @Builder} is that an inner class is generated named TBuilder, - * with a private constructor. Instances of TBuilder are made with the - * method named {@code builder()} which is also generated for you in the class itself (not in the builder class). - *

- * The TBuilder class contains 1 method for each parameter of the annotated - * constructor / method (each field, when annotating a class), which returns the builder itself. - * The builder also has a build() method which returns a completed instance of the original type, - * created by passing all parameters as set via the various other methods in the builder to the constructor - * or method that was annotated with {@code @Builder}. The return type of this method will be the same - * as the relevant class, unless a method has been annotated, in which case it'll be equal to the - * return type of that method. - *

- * Complete documentation is found at the project lombok features page for @Builder. - *
- *

- * Before: - * - * 

- * @Builder
- * class Example {
- * 	private int foo;
- * 	private final String bar;
- * }
- *
- * - * After: - * - * 
- * class Example<T> {
- * 	private T foo;
- * 	private final String bar;
- * 	
- * 	private Example(T foo, String bar) {
- * 		this.foo = foo;
- * 		this.bar = bar;
- * 	}
- * 	
- * 	public static <T> ExampleBuilder<T> builder() {
- * 		return new ExampleBuilder<T>();
- * 	}
- * 	
- * 	public static class ExampleBuilder<T> {
- * 		private T foo;
- * 		private String bar;
- * 		
- * 		private ExampleBuilder() {}
- * 		
- * 		public ExampleBuilder foo(T foo) {
- * 			this.foo = foo;
- * 			return this;
- * 		}
- * 		
- * 		public ExampleBuilder bar(String bar) {
- * 			this.bar = bar;
- * 			return this;
- * 		}
- * 		
- * 		@java.lang.Override public String toString() {
- * 			return "ExampleBuilder(foo = " + foo + ", bar = " + bar + ")";
- * 		}
- * 		
- * 		public Example build() {
- * 			return new Example(foo, bar);
- * 		}
- * 	}
- * }
- *
- * - * @deprecated {@link lombok.Builder} has been promoted to the main package, so use that one instead. - */ -@Target({TYPE, METHOD, CONSTRUCTOR}) -@Retention(SOURCE) -@Deprecated -public @interface Builder { - /** @return Name of the method that creates a new builder instance. Default: {@code builder}. */ - String builderMethodName() default "builder"; - - /** @return Name of the method in the builder class that creates an instance of your {@code @Builder}-annotated class. */ - String buildMethodName() default "build"; - - /** - * Name of the builder class. - * - * Default for {@code @Builder} on types and constructors: {@code (TypeName)Builder}. - *

- * Default for {@code @Builder} on methods: {@code (ReturnTypeName)Builder}. - * - * @return Name of the builder class that will be generated (or if it already exists, will be filled with builder elements). - */ - String builderClassName() default ""; - - /** - * Normally the builder's 'set' methods are fluent, meaning, they have the same name as the field. Set this - * to {@code false} to name the setter method for field {@code someField}: {@code setSomeField}. - *

- * Default: true - * - * @return Whether to generate fluent methods (just {@code fieldName()} instead of {@code setFieldName()}). - */ - boolean fluent() default true; - - /** - * Normally the builder's 'set' methods are chaining, meaning, they return the builder so that you can chain - * calls to set methods. Set this to {@code false} to have these 'set' methods return {@code void} instead. - *

- * Default: true - * - * @return Whether to generate chaining methods (each build call returns itself instead of returning {@code void}). - */ - boolean chain() default true; -} diff --git a/src/core/lombok/experimental/Value.java b/src/core/lombok/experimental/Value.java deleted file mode 100644 index 06dbee13..00000000 --- a/src/core/lombok/experimental/Value.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2012-2017 The Project Lombok Authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.experimental; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Generates a lot of code which fits with a class that is a representation of an immutable entity. - *

- * Equivalent to {@code @Getter @FieldDefaults(makeFinal=true, level=AccessLevel.PRIVATE) @RequiredArgsConstructor @ToString @EqualsAndHashCode}. - *

- * Complete documentation is found at the project lombok features page for @Value. - * - * @see lombok.Getter - * @see Wither - * @see lombok.RequiredArgsConstructor - * @see lombok.ToString - * @see lombok.EqualsAndHashCode - * @see lombok.Data - * @deprecated {@link lombok.Value} has been promoted to the main package, so use that one instead. - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.SOURCE) -@Deprecated -public @interface Value { - /** - * If you specify a static constructor name, then the generated constructor will be private, and - * instead a static factory method is created that other classes can use to create instances. - * We suggest the name: "of", like so: - * - * 

-	 *     public @Data(staticConstructor = "of") class Point { final int x, y; }
-	 *
- * - * Default: No static constructor, instead the normal constructor is public. - * - * @return Name of static 'constructor' method to generate (blank = generate a normal constructor). - */ - String staticConstructor() default ""; -} diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index d5a342e4..0631f12a 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -21,7 +21,6 @@ */ package lombok.javac.handlers; -import java.lang.annotation.Annotation; import java.util.ArrayList; import javax.lang.model.element.Modifier; @@ -119,9 +118,7 @@ public class HandleBuilder extends JavacAnnotationHandler { if (!checkName("builderClassName", builderClassName, annotationNode)) return; } - @SuppressWarnings("deprecation") - Class oldExperimentalBuilder = lombok.experimental.Builder.class; - deleteAnnotationIfNeccessary(annotationNode, Builder.class, oldExperimentalBuilder); + deleteAnnotationIfNeccessary(annotationNode, Builder.class, "lombok.experimental.Builder"); JavacNode parent = annotationNode.up(); @@ -140,8 +137,7 @@ public class HandleBuilder extends JavacAnnotationHandler { tdParent = parent; JCClassDecl td = (JCClassDecl) tdParent.get(); ListBuffer allFields = new ListBuffer(); - @SuppressWarnings("deprecation") - boolean valuePresent = (hasAnnotation(lombok.Value.class, parent) || hasAnnotation(lombok.experimental.Value.class, parent)); + boolean valuePresent = (hasAnnotation(lombok.Value.class, parent) || hasAnnotation("lombok.experimental.Value", parent)); for (JavacNode fieldNode : HandleConstructor.findAllFields(tdParent, true)) { JCVariableDecl fd = (JCVariableDecl) fieldNode.get(); JavacNode isDefault = findAnnotation(Builder.Default.class, fieldNode, true); diff --git a/src/core/lombok/javac/handlers/HandleBuilderDefault.java b/src/core/lombok/javac/handlers/HandleBuilderDefault.java index 733aea5a..dac4053e 100644 --- a/src/core/lombok/javac/handlers/HandleBuilderDefault.java +++ b/src/core/lombok/javac/handlers/HandleBuilderDefault.java @@ -16,12 +16,11 @@ import lombok.javac.JavacNode; @ProviderFor(JavacAnnotationHandler.class) @HandlerPriority(-1025) //HandleBuilder's level, minus one. public class HandleBuilderDefault extends JavacAnnotationHandler { - @SuppressWarnings("deprecation") @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { JavacNode annotatedField = annotationNode.up(); if (annotatedField.getKind() != Kind.FIELD) return; JavacNode classWithAnnotatedField = annotatedField.up(); - if (!hasAnnotation(Builder.class, classWithAnnotatedField) && !hasAnnotation(lombok.experimental.Builder.class, classWithAnnotatedField)) { + if (!hasAnnotation(Builder.class, classWithAnnotatedField) && !hasAnnotation("lombok.experimental.Builder", classWithAnnotatedField)) { annotationNode.addWarning("@Builder.Default requires @Builder on the class for it to mean anything."); deleteAnnotationIfNeccessary(annotationNode, Builder.Default.class); } diff --git a/src/core/lombok/javac/handlers/HandleValue.java b/src/core/lombok/javac/handlers/HandleValue.java index 90f6a98d..3961085c 100644 --- a/src/core/lombok/javac/handlers/HandleValue.java +++ b/src/core/lombok/javac/handlers/HandleValue.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 The Project Lombok Authors. + * Copyright (C) 2012-2018 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,8 +24,6 @@ package lombok.javac.handlers; import static lombok.core.handlers.HandlerUtil.*; import static lombok.javac.handlers.JavacHandlerUtil.*; -import java.lang.annotation.Annotation; - import lombok.AccessLevel; import lombok.ConfigurationKeys; import lombok.core.AnnotationValues; @@ -50,12 +48,9 @@ import com.sun.tools.javac.tree.JCTree.JCModifiers; @HandlerPriority(-512) //-2^9; to ensure @EqualsAndHashCode and such pick up on this handler making the class final and messing with the fields' access levels, run earlier. public class HandleValue extends JavacAnnotationHandler { @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode) { - @SuppressWarnings("deprecation") - Class oldExperimentalValue = lombok.experimental.Value.class; - handleFlagUsage(annotationNode, ConfigurationKeys.VALUE_FLAG_USAGE, "@Value"); - deleteAnnotationIfNeccessary(annotationNode, Value.class, oldExperimentalValue); + deleteAnnotationIfNeccessary(annotationNode, Value.class, "lombok.experimental.Value"); JavacNode typeNode = annotationNode.up(); boolean notAClass = !isClass(typeNode); diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index 956ab446..f12450c6 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -162,6 +162,10 @@ public class JavacHandlerUtil { return node; } + public static boolean hasAnnotation(String type, JavacNode node) { + return hasAnnotation(type, node, false); + } + public static boolean hasAnnotation(Class type, JavacNode node) { return hasAnnotation(type, node, false); } @@ -191,6 +195,27 @@ public class JavacHandlerUtil { } } + private static boolean hasAnnotation(String type, JavacNode node, boolean delete) { + if (node == null) return false; + if (type == null) return false; + switch (node.getKind()) { + case ARGUMENT: + case FIELD: + case LOCAL: + case TYPE: + case METHOD: + for (JavacNode child : node.down()) { + if (annotationTypeMatches(type, child)) { + if (delete) deleteAnnotationIfNeccessary(child, type); + return true; + } + } + // intentional fallthrough + default: + return false; + } + } + static JavacNode findAnnotation(Class type, JavacNode node, boolean delete) { if (node == null) return null; if (type == null) return null; @@ -223,6 +248,17 @@ public class JavacHandlerUtil { return typeMatches(type, node, ((JCAnnotation)node.get()).annotationType); } + /** + * Checks if the Annotation AST Node provided is likely to be an instance of the provided annotation type. + * + * @param type An actual annotation type, such as {@code lombok.Getter.class}. + * @param node A Lombok AST node representing an annotation in source code. + */ + public static boolean annotationTypeMatches(String type, JavacNode node) { + if (node.getKind() != Kind.ANNOTATION) return false; + return typeMatches(type, node, ((JCAnnotation)node.get()).annotationType); + } + /** * Checks if the given TypeReference node is likely to be a reference to the provided class. * @@ -231,10 +267,21 @@ public class JavacHandlerUtil { * @param typeNode A type reference to check. */ public static boolean typeMatches(Class type, JavacNode node, JCTree typeNode) { + return typeMatches(type.getName(), node, typeNode); + } + + /** + * Checks if the given TypeReference node is likely to be a reference to the provided class. + * + * @param type An actual type. This method checks if {@code typeNode} is likely to be a reference to this type. + * @param node A Lombok AST node. Any node in the appropriate compilation unit will do (used to get access to import statements). + * @param typeNode A type reference to check. + */ + public static boolean typeMatches(String type, JavacNode node, JCTree typeNode) { String typeName = typeNode.toString(); TypeResolver resolver = new TypeResolver(node.getImportList()); - return resolver.typeMatches(node, type.getName(), typeName); + return resolver.typeMatches(node, type, typeName); } /** @@ -346,8 +393,7 @@ public class JavacHandlerUtil { * then removes any import statement that imports this exact annotation (not star imports). * Only does this if the DeleteLombokAnnotations class is in the context. */ - @SuppressWarnings("unchecked") - public static void deleteAnnotationIfNeccessary(JavacNode annotation, Class annotationType) { + public static void deleteAnnotationIfNeccessary(JavacNode annotation, String annotationType) { deleteAnnotationIfNeccessary0(annotation, annotationType); } @@ -356,12 +402,29 @@ public class JavacHandlerUtil { * then removes any import statement that imports this exact annotation (not star imports). * Only does this if the DeleteLombokAnnotations class is in the context. */ - @SuppressWarnings("unchecked") - public static void deleteAnnotationIfNeccessary(JavacNode annotation, Class annotationType1, Class annotationType2) { - deleteAnnotationIfNeccessary0(annotation, annotationType1, annotationType2); + public static void deleteAnnotationIfNeccessary(JavacNode annotation, Class annotationType) { + deleteAnnotationIfNeccessary0(annotation, annotationType.getName()); } - private static void deleteAnnotationIfNeccessary0(JavacNode annotation, Class... annotationTypes) { + /** + * Removes the annotation from javac's AST (it remains in lombok's AST), + * then removes any import statement that imports this exact annotation (not star imports). + * Only does this if the DeleteLombokAnnotations class is in the context. + */ + public static void deleteAnnotationIfNeccessary(JavacNode annotation, Class annotationType1, Class annotationType2) { + deleteAnnotationIfNeccessary0(annotation, annotationType1.getName(), annotationType2.getName()); + } + + /** + * Removes the annotation from javac's AST (it remains in lombok's AST), + * then removes any import statement that imports this exact annotation (not star imports). + * Only does this if the DeleteLombokAnnotations class is in the context. + */ + public static void deleteAnnotationIfNeccessary(JavacNode annotation, Class annotationType1, String annotationType2) { + deleteAnnotationIfNeccessary0(annotation, annotationType1.getName(), annotationType2); + } + + private static void deleteAnnotationIfNeccessary0(JavacNode annotation, String... annotationTypes) { if (inNetbeansEditor(annotation)) return; if (!annotation.shouldDeleteLombokAnnotations()) return; JavacNode parentNode = annotation.directUp(); @@ -390,8 +453,8 @@ public class JavacHandlerUtil { } parentNode.getAst().setChanged(); - for (Class annotationType : annotationTypes) { - deleteImportFromCompilationUnit(annotation, annotationType.getName()); + for (String annotationType : annotationTypes) { + deleteImportFromCompilationUnit(annotation, annotationType); } } @@ -1405,9 +1468,10 @@ public class JavacHandlerUtil { public static void sanityCheckForMethodGeneratingAnnotationsOnBuilderClass(JavacNode typeNode, JavacNode errorNode) { List disallowed = List.nil(); for (JavacNode child : typeNode.down()) { - for (Class annType : INVALID_ON_BUILDERS) { + for (String annType : INVALID_ON_BUILDERS) { if (annotationTypeMatches(annType, child)) { - disallowed = disallowed.append(annType.getSimpleName()); + int lastIndex = annType.lastIndexOf('.'); + disallowed = disallowed.append(lastIndex == -1 ? annType : annType.substring(lastIndex + 1)); } } } From 2f1069e48c4641928ab3151a13a52b49062a29af Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Wed, 7 Feb 2018 00:18:20 +0100 Subject: [PATCH 11/27] Keep indentations in javadoc. Fixes #1571 --- src/delombok/lombok/delombok/DocCommentIntegrator.java | 2 +- test/transform/resource/after-delombok/JavadocGenerally.java | 3 +++ test/transform/resource/before/JavadocGenerally.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/delombok/lombok/delombok/DocCommentIntegrator.java b/src/delombok/lombok/delombok/DocCommentIntegrator.java index c3b07f32..2e96cb37 100644 --- a/src/delombok/lombok/delombok/DocCommentIntegrator.java +++ b/src/delombok/lombok/delombok/DocCommentIntegrator.java @@ -74,7 +74,7 @@ public class DocCommentIntegrator { return out; } - private static final Pattern CONTENT_STRIPPER = Pattern.compile("^(?:\\s*\\*)?[ \\t]*(.*?)$", Pattern.MULTILINE); + private static final Pattern CONTENT_STRIPPER = Pattern.compile("^(?:\\s*\\*)?(.*?)$", Pattern.MULTILINE); @SuppressWarnings("unchecked") private boolean attach(JCCompilationUnit top, final JCTree node, CommentInfo cmt) { String docCommentContent = cmt.content; if (docCommentContent.startsWith("/**")) docCommentContent = docCommentContent.substring(3); diff --git a/test/transform/resource/after-delombok/JavadocGenerally.java b/test/transform/resource/after-delombok/JavadocGenerally.java index 729cdce3..ec9483bc 100644 --- a/test/transform/resource/after-delombok/JavadocGenerally.java +++ b/test/transform/resource/after-delombok/JavadocGenerally.java @@ -9,6 +9,9 @@ package testPackage; class JavadocGenerally { /** * Doc on field + * 
+	 * 	// code
+	 *
*/ private int someField; /** diff --git a/test/transform/resource/before/JavadocGenerally.java b/test/transform/resource/before/JavadocGenerally.java index e47de44d..1df93385 100644 --- a/test/transform/resource/before/JavadocGenerally.java +++ b/test/transform/resource/before/JavadocGenerally.java @@ -11,6 +11,9 @@ package testPackage; class JavadocGenerally { /** * Doc on field + * 
+	 * 	// code
+	 *
*/ private int someField; From 9ecfe2302f3cd1d654196e072cce0b334f21ffd9 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Wed, 7 Feb 2018 00:19:10 +0100 Subject: [PATCH 12/27] Fix version parsing for jdk10. --- src/utils/lombok/javac/Javac.java | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/utils/lombok/javac/Javac.java b/src/utils/lombok/javac/Javac.java index 6f99463b..2adc5265 100644 --- a/src/utils/lombok/javac/Javac.java +++ b/src/utils/lombok/javac/Javac.java @@ -63,8 +63,8 @@ public class Javac { /** Matches any of the 8 primitive names, such as {@code boolean}. */ private static final Pattern PRIMITIVE_TYPE_NAME_PATTERN = Pattern.compile("^(boolean|byte|short|int|long|float|double|char)$"); - private static final Pattern VERSION_PARSER = Pattern.compile("^(\\d{1,6})\\.(\\d{1,6}).*$"); - private static final Pattern SOURCE_PARSER = Pattern.compile("^JDK(\\d{1,6})_(\\d{1,6}).*$"); + private static final Pattern VERSION_PARSER = Pattern.compile("^(\\d{1,6})\\.?(\\d{1,6})?.*$"); + private static final Pattern SOURCE_PARSER = Pattern.compile("^JDK(\\d{1,6})_?(\\d{1,6})?.*$"); private static final AtomicInteger compilerVersion = new AtomicInteger(-1); @@ -79,11 +79,11 @@ public class Javac { Matcher m = VERSION_PARSER.matcher(JavaCompiler.version()); if (m.matches()) { int major = Integer.parseInt(m.group(1)); - int minor = Integer.parseInt(m.group(2)); if (major == 1) { - compilerVersion.set(minor); - return minor; + int minor = Integer.parseInt(m.group(2)); + return setVersion(minor); } + if (major >= 9) return setVersion(major); } } @@ -92,16 +92,19 @@ public class Javac { Matcher m = SOURCE_PARSER.matcher(name); if (m.matches()) { int major = Integer.parseInt(m.group(1)); - int minor = Integer.parseInt(m.group(2)); if (major == 1) { - compilerVersion.set(minor); - return minor; + int minor = Integer.parseInt(m.group(2)); + return setVersion(minor); } + if (major >= 9) return setVersion(major); } } - - compilerVersion.set(6); - return 6; + return setVersion(6); + } + + private static int setVersion(int version) { + compilerVersion.set(version); + return version; } private static final Class DOCCOMMENTTABLE_CLASS; From fada93e90fbb47873de1e02704ad756f836f41a8 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 7 Feb 2018 00:24:46 +0100 Subject: [PATCH 13/27] documented in changelog work on supporting JDK10. --- doc/changelog.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 41178d2a..9e84afb8 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -4,6 +4,7 @@ Lombok Changelog ### v1.16.21 "Edgy Guinea Pig" * v1.16.20 is the latest stable release of Project Lombok. * PLATFORM: Fix for using lombok together with JDK9's new `module-info.java` feature. [Issue #985](https://github.com/rzwitserloot/lombok/issues/985) +* PLATFORM: Some initial work on supporting JDK10. * BUGFIX: Potential fix for Netbeans < 9. [Issue #1555](https://github.com/rzwitserloot/lombok/issues/1555) * PROMOTION: `var` has been promoted from experimental to the main package with no changes. The 'old' experimental one is still around but is deprecated, and is an alias for the new main package one. [var documentation](https://projectlombok.org/features/var.html). * OLD-CRUFT: `lombok.experimental.Builder` and `lombok.experimental.Value` are deprecated remnants of when these features were still in experimental. They are now removed entirely. If your project is dependent on an older version of lombok which still has those; fret not, lombok still processes these annotations. It just no longer includes them in the jar. From 42961e8921cd98f688252eedc68cbe0baa0496ea Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 7 Feb 2018 00:49:08 +0100 Subject: [PATCH 14/27] [trivial] copyright header year bump to 2018 --- build.xml | 2 +- .../lombok/bytecode/ClassFileMetaData.java | 2 +- src/core/lombok/core/AnnotationProcessor.java | 2 +- .../lombok/core/LombokInternalAliasing.java | 2 +- .../lombok/core/handlers/HandlerUtil.java | 2 +- .../eclipse/handlers/EclipseHandlerUtil.java | 2 +- .../eclipse/handlers/HandleBuilder.java | 2 +- .../handlers/HandleBuilderDefault.java | 21 +++++++++++++++++++ .../apt/InterceptingJavaFileManager.java | 2 +- .../javac/handlers/HandleBuilderDefault.java | 21 +++++++++++++++++++ .../javac/handlers/JavacHandlerUtil.java | 2 +- src/core9/module-info.java | 21 +++++++++++++++++++ .../lombok/delombok/DocCommentIntegrator.java | 2 +- .../lombok/eclipse/agent/PatchVal.java | 2 +- .../lombok/eclipse/agent/PatchValEclipse.java | 2 +- .../lombok/launch/AnnotationProcessor.java | 2 +- src/utils/lombok/javac/Javac.java | 2 +- 17 files changed, 77 insertions(+), 14 deletions(-) diff --git a/build.xml b/build.xml index 914b658b..3a8d6c14 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ + diff --git a/website/templates/setup/javac.html b/website/templates/setup/javac.html index f90cb727..48b0ebcf 100644 --- a/website/templates/setup/javac.html +++ b/website/templates/setup/javac.html @@ -11,11 +11,8 @@

Support for JDK9, if you haven't modularized your own projects yet (no module-info.java yet), is included in lombok starting with version 1.16.20. Just use lombok as normal: javac -cp lombok.jar ...

- Support for JDK9 if you did modularize your own projects (you've written a module-info.java file) is available in the edge release. To use it, you can choose:

    -
  • javac --processor-module-path lombok.jar -p lombok.jar ...
    • -
  • javac -cp lombok.jar -p lombok.jar ...
    • -
- Both are equally effective. Note that you will have to add lombok to your module-info.java file:
+			Support for JDK9 if you did modularize your own projects (you've written a module-info.java file) is available in the edge release. To use it: javac -cp lombok.jar -p lombok.jar ...

+			Note that you will have to add lombok to your module-info.java file:
 module myapp {
 	requires static lombok;
 }


From 1853b71c05ea083b5e103611a617a4d4b7d1c074 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Wed, 7 Feb 2018 00:49:41 +0100
Subject: [PATCH 16/27] [bugfix] builder.default with the old
 lombok.experimental.Builder annotation only worked in javac, not eclipse.

---
 src/core/lombok/eclipse/handlers/HandleBuilderDefault.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java b/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java
index 51a23721..be2b986d 100644
--- a/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java
@@ -39,7 +39,7 @@ public class HandleBuilderDefault extends EclipseAnnotationHandler
Date: Wed, 7 Feb 2018 00:49:58 +0100
Subject: [PATCH 17/27] Parsing for source level broken under JDK9 due to
 change in 1.X->X versioning by oracle.

---
 src/core/lombok/javac/JavacAST.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/lombok/javac/JavacAST.java b/src/core/lombok/javac/JavacAST.java
index af812498..45679fd3 100644
--- a/src/core/lombok/javac/JavacAST.java
+++ b/src/core/lombok/javac/JavacAST.java
@@ -125,6 +125,8 @@ public class JavacAST extends AST {
 			String nm = Source.instance(context).name();
 			int underscoreIdx = nm.indexOf('_');
 			if (underscoreIdx > -1) return Integer.parseInt(nm.substring(underscoreIdx + 1));
+			// assume java9+
+			return Integer.parseInt(nm);
 		} catch (Exception ignore) {}
 		return 6;
 	}

From 757ddee80765600a542f2470c9487d0ba793f62c Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Fri, 2 Mar 2018 16:34:28 +0100
Subject: [PATCH 18/27] [website] Added JUG details and updated links for
 german JUG week.

---
 website/templates/main.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/templates/main.html b/website/templates/main.html
index 00d64dab..2089cb5e 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -35,10 +35,10 @@
 			<@main.h2 title="Upcoming presentations" />
 			

 				Roel and Reinier will be talking about (near) future java features; a preview of what Java10 and Java11 will probably look like, across germany:

 				See you there! (We'll have stickers!)

From cc55391a7544b0ce0cc37b8aa628dc8f9a46db49 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Mon, 2 Oct 2017 15:50:06 +0200
Subject: [PATCH 19/27] Website updated to list supporters on the website.

---
 .gitignore                                |   3 +-
 build.xml                                 |  13 +-
 buildScripts/ivy.xml                      |  15 +-
 buildScripts/supporters.ant.xml           |  57 ++++++
 buildScripts/website.ant.xml              |  12 +-
 website/resources/css/custom.css          |  23 +++
 website/resources/files/supporters.json   |  13 ++
 website/resources/img/spinner.gif         | Bin 0 -> 828 bytes
 website/resources/js/order-license.js     | 102 +++++++++++
 website/resources/js/supporters.js        | 214 ++++++++++++++++++++++
 website/templates/main.html               |   1 +
 website/templates/order-license-info.html |  24 +++
 website/templates/order-license.html      |  78 ++++++++
 website/templates/supporters.html         |  10 +
 14 files changed, 554 insertions(+), 11 deletions(-)
 create mode 100644 buildScripts/supporters.ant.xml
 create mode 100644 website/resources/files/supporters.json
 create mode 100644 website/resources/img/spinner.gif
 create mode 100644 website/resources/js/order-license.js
 create mode 100644 website/resources/js/supporters.js
 create mode 100644 website/templates/order-license-info.html
 create mode 100644 website/templates/order-license.html
 create mode 100644 website/templates/supporters.html

diff --git a/.gitignore b/.gitignore
index b05ce2c6..49316515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@
 /junit*.properties
 /eclipse.location
 /.apt_generated/
-/out
\ No newline at end of file
+/out
+/website/lombokSupporters
diff --git a/build.xml b/build.xml
index 14d67ffc..629db4a6 100644
--- a/build.xml
+++ b/build.xml
@@ -118,6 +118,11 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		
 	
 	
+	
+		
+		
+	
+	
 	
 		
 		
@@ -889,7 +894,11 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 		
 	
 	
-	
+		
+	
+	
+	
 		
 			
@@ -897,7 +906,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 		
 	
 	
-	
 		
 			
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 81f50f4c..cf62377e 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -14,6 +14,7 @@
 		
 		
 		
+		
 	
 	
 		
@@ -22,10 +23,10 @@
 		
 		
 		
-		
-		
-		
-		
+		
+		
+		
+		
 	
 		
 		
@@ -56,5 +57,11 @@
 		
 		
 		
+		
+		
+		
+		
+		
+		
 	
 
diff --git a/buildScripts/supporters.ant.xml b/buildScripts/supporters.ant.xml
new file mode 100644
index 00000000..d19e0bb6
--- /dev/null
+++ b/buildScripts/supporters.ant.xml
@@ -0,0 +1,57 @@
+
+
+	
+This buildfile is part of projectlombok.org. It is responsible for updating/maintaining the separate git repository
+containing the status of lombok's supporters.
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+	
+		
+	
+	
+	
+		
+			
+		
+	
+	
+	
+		
+			
+		
+	
+	
+	
+		
+			
+		
+	
+
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 15a0f95f..5c996fc6 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -37,13 +37,17 @@ such as applying the templates to produce the website, converting the changelog
 		
 	
 	
-	
+	
 	
 	
 		
 	
 	
-	
+	
+	
+	
+		
+	
 	
 	
 		lombok.version already set.
@@ -134,8 +138,8 @@ such as applying the templates to produce the website, converting the changelog
 		
 	
 	
-	
-	
+	
+	
 	
 		Qx1VcBu(M-;tC5}oGb2z|@h1x-7m(HgsRS9zz~Uirg41i^jHub^99P){SiaRh
z^q6+fb8XJ-iB}3sgqs+)^}gP9Z!Pnkp9KuEM-xu)ut}&*{#2v4l%bI!pfzsut+k@!
z_mtFc`LRF^=SDW%yWr$brv*U6pIcttCc^qn*3)9r((g-!Z|{=ylyox}Jks>oO78vi
z*BsRjcbnV=IgB`1j=fx>vFH-#S4#<fCa6lc;&5{&I(D5L{d%%VZT-_$aj%4^1gOXqY6vJ5?
zPl#~A3};Ft&hQp+$Vgn>Cc%bexJXmU0is4HGPRQ`V40lK%&gBA&K!z(`-NwU=WOztm$z%l-!&L=NNbtZ6KTM>{Il!q=
e^XfJQ4rIdxN-i6q82+^21P2Q&%$v~-w*~;Ns5yZE

literal 0
HcmV?d00001

diff --git a/website/resources/js/order-license.js b/website/resources/js/order-license.js
new file mode 100644
index 00000000..82627f2b
--- /dev/null
+++ b/website/resources/js/order-license.js
@@ -0,0 +1,102 @@
+"use strict";
+
+(function() {
+	var imgDataUrl = null;
+	function applyLicense() {
+		$("#submit").on("click", function(evt) {
+			evt.preventDefault();
+			
+			var onSuccess = function() {
+				alert("Form submitted!");
+			};
+			
+			var onFailure = function() {
+				alert("Whoops");
+			};
+			
+			var data = {};
+			data.name = $("#name").val();
+			var rnd = generateRandom();
+			var err = processImageUpload();
+			if (err) {
+				alert(err);
+				$("#logo")[0].value = null;
+				return;
+			}
+			if (imgDataUrl) data.logo = imgDataUrl;
+			$.ajax({
+				url: "/license-submit/" + rnd,
+				method: "PUT",
+				contentType: "application/json",
+				data: JSON.stringify(data),
+				processData: false,
+				success: onSuccess,
+				failure: onFailure
+			});
+		});
+		
+		$("#companyLogo").on("click", function(evt) {
+			evt.preventDefault();
+			$("#logo").click();
+		});
+		
+		$("#deleteCompanyLogo").on("click", function(evt) {
+			evt.preventDefault();
+			$("#logo")[0].value = null;
+			$("#logoCnt").empty().hide();
+			$("#companyLogo").show();
+			$("#deleteCompanyLogo").hide();
+		});
+		
+		$("#logo").on("change", function() {
+			var err = showImage();
+			if (err) {
+				alert(err);
+				$("#logo")[0].value = null;
+			} else {
+				$("#companyLogo").hide();
+				$("#deleteCompanyLogo").show();
+			}
+		});
+	}
+	
+	function generateRandom() {
+		var buf = new Uint8Array(40);
+		window.crypto.getRandomValues(buf);
+		return btoa(String.fromCharCode.apply(null, buf)).replace(/\+/g, '_').replace(/\//gi, '-');
+	}
+	
+	function showImage() {
+		$("#logoCnt").empty().hide();
+		try {
+			return processImageUpload(function(dataUrl) {
+				var img = $("");
+				img.css({
+					"max-width": "500px",
+					"max-height": "300px"
+				});
+				$("#logoCnt").append(img).show();
+				img.attr("src", dataUrl);
+			});
+		} catch (e) {
+			if (console && console.log) console.log(e);
+		}
+	}
+	
+	function processImageUpload(fnc) {
+		var f = $("#logo")[0].files[0];
+		if (!f) return;
+		if (f.size > 10000000) return "Logo too large; please give us a logo below 10MiB in size.";
+		var imageType = /^image\//;
+		if (!imageType.test(f.type)) return "Please upload an image, for example in PNG format.";
+		var reader = new FileReader();
+		reader.onload = function(e) {
+			imgDataUrl = e.target.result;
+			if (fnc) fnc(e.target.result);
+		};
+		reader.readAsDataURL(f);
+		return null;
+	}
+	
+	$(applyLicense);
+})();
diff --git a/website/resources/js/supporters.js b/website/resources/js/supporters.js
new file mode 100644
index 00000000..5ec1b057
--- /dev/null
+++ b/website/resources/js/supporters.js
@@ -0,0 +1,214 @@
+"use strict";
+
+(function($) {
+	var supporters = {};
+	var weights = {};
+	var types = ["patron", "professional", "enterprise"];
+	
+	function shuffle(array) {
+		var i = 0, j = 0, temp = null;
+		for (i = array.length - 1; i > 0; i -= 1) {
+			j = Math.floor(Math.random() * (i + 1));
+			temp = array[i];
+			array[i] = array[j];
+			array[j] = temp;
+		}
+	}
+	
+	function pad(number) {
+		return number < 10 ? '0' + number : number;
+	}
+	
+	function fromDate(d) {
+		return d.getUTCFullYear() + '-' + pad(d.getUTCMonth() + 1) + '-' + pad(d.getUTCDate());
+		
+	}
+	
+	function toDate(s) {
+		var x = /^(\d{4})-(\d{2})-(\d{2})$/.exec(s);
+		if (x) return new Date(parseInt(x[1]), parseInt(x[2]), parseInt(x[3]));
+		return null;
+	}
+	
+	function Supporter(type, json) {
+		this.type = type;
+		this.name = json.name;
+		this.logo = json.logo;
+		this.url = json.url;
+		this.showName = json.showName;
+		this.start = json.range ? toDate(json.range[0]) : null;
+		this.end = json.range ? toDate(json.range[1]) : null;
+		this.weight = (!json.weight && json.weight !== 0.0) ? 1.0 : json.weight;
+	}
+	
+	Supporter.prototype.inRange = function(d) {
+		return (!this.start || this.start <= d) && (!this.end || this.end > d);
+	};
+	
+	Supporter.prototype.render = function() {
+		var d = $("
").addClass("supportItem").addClass(this.type);
+		var a = d;
+		if (this.url) {
+			a = $("").attr("href", this.url).attr("rel", "noopener");
+			d.append(a);
+		}
+		var n = $("").text(this.name);
+		a.append(n);
+		
+		if (this.logo) {
+			a.addClass("logo");
+			var i = new Image();
+			var showName = this.showName;
+			i.onload = function() {
+				var w = i.width;
+				var h = i.height;
+				var wf = w / 162;
+				var hf = h / 80;
+				var f = hf > wf ? hf : wf;
+				var wt = Math.round(w / f);
+				var ht = Math.round(h / f);
+				i.width = wt;
+				i.height = ht;
+				if (!showName) a.empty();
+				a.prepend(i);
+			};
+			i.src = 'files/' + this.logo;
+		}
+		return d;
+	}
+	
+	function errorHandler(xhr, statusText, err) {
+		var errMsg = "Can't connect to projectlombok.org to fetch the list of licensees and supporters.";
+		if (console && console.log) {
+			console.log("AJAX error for loading list of supporters:");
+			console.log(err);
+		}
+		var errBox = $("
").addClass("errorBox").text(errMsg);
+		$(".supporters").text("").append(errBox);
+	}
+	
+	function successHandler(data) {
+		$.each(types, function() {
+			var t = this;
+			supporters[t] = [];
+			if (data && data[t]) $.each(data[t], function() {
+				supporters[t].push(new Supporter(t, this));
+			});
+		});
+		weights = data.modWeight;
+		if (typeof weights !== 'object') weights = {};
+		updatePage();
+	}
+	
+	function build() {
+		var spinner = $("").attr("title", "loading").attr("src", "/img/spinner.gif").addClass("spinner");
+		$(".supporters").append(spinner);
+		$.ajax({
+			url: "/files/supporters.json",
+			dataType: "json",
+			cache: true,
+			error: errorHandler,
+			success: function(data) {
+				spinner.remove();
+				successHandler(data);
+			}
+		});
+	}
+	
+	function applySupporters() {
+		build();
+	}
+	
+	function updatePage() {
+		updateSupporters();
+		updateSupporterBar();
+	}
+	
+	var supPerBar = 4;
+	function updateSupporterBar() {
+		var s = $(".supporterBar");
+		s.find(".introText").show();
+		s.append($("
").addClass("sbCnt"));
+		s = s.find(".sbCnt");
+		var now = new Date();
+		var list = [];
+		$.each(types, function() {
+			var t = this;
+			$.each(supporters[t], function() {
+				if (this.inRange(now)) {
+					var w = weights[t] ? weights[t] : 1.0;
+					if (this.weight) w = w * this.weight;
+					for (var i = 0; i < w; i++) list.push(this);
+				}
+			});
+		});
+		
+		shuffle(list);
+		
+		var len = list.length;
+		var pos = 0;
+		var c = [], cd = [];
+		for (var i = 0; i < supPerBar; i++) {
+			c[i] = null;
+			cd[i] = $("
").addClass("barItem");
+		}
+		
+		var upd = function() {
+			var nw = [], a = [], fo = $(), fi = $();
+			var sPos = pos;
+			for (var i = 0; i < supPerBar; i++) {
+				if (++pos === len) pos = 0;
+				var z = false;
+				for (var j = 0; j < i; j++) if (nw[j] === list[pos]) z = true;
+				if (z) i--;
+				else nw[i] = list[pos];
+				if (pos === sPos) break;
+			}
+			for (var i = 0; i < supPerBar; i++) a[i] = (nw[i] === c[i] || !nw[i]) ? null : nw[i].render(i + 1).hide();
+			for (var i = 0; i < supPerBar; i++) {
+				if (a[i]) {
+					fi = fi.add(a[i]);
+					fo = fo.add(cd[i].children());
+					if (cd[i].parent().length === 0) s.append(cd[i]);
+					cd[i].append(a[i]);
+					c[i] = nw[i];
+				}
+			}
+			
+			if (fo.length === 0) fi.fadeIn();
+			else {
+				fo.fadeOut("normal", function() {
+					fi.fadeIn();
+					fo.remove();
+				});
+			}
+		};
+		
+		setInterval(upd, 10000);
+		upd();
+	}
+	
+	function updateSupporters() {
+		var s = $(".supporters");
+		s.empty();
+		var now = new Date();
+		$.each(types, function() {
+			var t = this;
+			var d = $("
").addClass("row");
+			var h = $("
").text(t);
+			d.append(h);
+			$.each(supporters[t], function() {
+				if (this.inRange(now)) d.append(this.render());
+			});
+			if (d.children().length > 1) s.append(d);
+		});
+		if (s.children().length < 1) {
+			var x = $("
").addClass("noSupportersBox").html(
+				"We don't have any supporters yet this month.
Become a patron " +
+				"or order a professional or enterprise license today!");
+			s.append(x);
+		}
+	}
+	
+	$(applySupporters);
+})($);
\ No newline at end of file
diff --git a/website/templates/main.html b/website/templates/main.html
index 2089cb5e..df096955 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -29,6 +29,7 @@
 				

 			

 			

+				
 			

 		

 		

diff --git a/website/templates/order-license-info.html b/website/templates/order-license-info.html
new file mode 100644
index 00000000..b465eaf0
--- /dev/null
+++ b/website/templates/order-license-info.html
@@ -0,0 +1,24 @@
+<#import "/_scaffold.html" as main>
+
+<@main.scaffold>
+	

+		

+			
Order a professional or enterprise license

+		

+		

+			

+				Lombok is open source. We offer three licenses for using lombok. The standard license is free. Here you can order a professional or enterprise license.
+			

+				As part of being a professional or enterprise licensee, we normally offer to put your name, a logo, and possibly a link on our ‘supporters and licensees’ page. From time to time we’ll put a supporter or licensee on our front page. You may of course opt out of this offer. We may, at our discretion, opt not to list you. If we elect not to do so, you will be notified at the email address you fill in on our form, and you are as always free to cancel your license at any time.
+			

+				The license fee is based on the number of developers that work for you or your company using Project Lombok, per month. The fee is charged in advance. You may choose to pay either monthly or yearly (for sufficiently small licensees, only a yearly option is available).
+			

+				Project Lombok is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed, even for professional and enterprise license holders. In no event shall the copyright holder or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
+			

+				Instead of a professional or enterprise license, if you’d like to support the efforts of Project Lombok, you can also support us via Patreon.
+			

+				Order a professional or enterprise license now.
+			

+		

+	

+
diff --git a/website/templates/order-license.html b/website/templates/order-license.html
new file mode 100644
index 00000000..4d52d93a
--- /dev/null
+++ b/website/templates/order-license.html
@@ -0,0 +1,78 @@
+<#import "/_scaffold.html" as main>
+
+<@main.scaffold load=["/js/order-license.js"]>
+	

+		

+			
Order a professional or enterprise license

+		

+		

+			

+				

+					Basic information
+					

+						
+						
+						If applying for an individual license, fill in your own name.
+					

+					

+						
+						
+						We will never share this email with any third parties; we'll email you the invoice at this email address.
+					

+				

+				

+					Type of license
+					

+						
+					

+					

+						
+					

+				

+				

+					Mention
+					

+						
+					

+					

+						
+						
+					

+					

+						
+						
+						
+						
+						
+					

+				

+				
+			

+		

+	

+	

+Form fields:
+
+* EU / US / Elders
+* Naam bedrijf
+* Do you want to be mentioned?
+* Link to logo
+* Link to website
+* Professional of enterprise
+* # of developers
+* Email of contact.sta
+* In EU: VAT Number
+* In EU: How would you like to pay? IBAN or Payoneer
+* In US: How would you like to pay? International wire transfer, or Payoneer (default = payoneer).
+* Elders: We’ll get back to you..
+	
		
+
diff --git a/website/templates/supporters.html b/website/templates/supporters.html
new file mode 100644
index 00000000..2003a23f
--- /dev/null
+++ b/website/templates/supporters.html
@@ -0,0 +1,10 @@
+<#import "/_scaffold.html" as main>
+
+<@main.scaffold load=["js/supporters.js"]>
+	

+		

+			
Project Lombok supporters

+		

+		

+	

+

From 2f1a26b6069d6d75729a971be20d45f0fc5fefcc Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Sun, 11 Mar 2018 16:57:22 +0100
Subject: [PATCH 20/27] [website] added supporters infrastructure.

---
 build.xml                                 |   6 +
 buildScripts/ivy.xml                      |   4 +-
 buildScripts/supporters.ant.xml           |   4 +-
 website/extra/htaccess                    |   6 +
 website/resources/W8BEN_lombok.pdf        | Bin 0 -> 60743 bytes
 website/resources/css/custom.css          |  71 ++++++++++-
 website/resources/js/order-license.js     | 139 +++++++++++++++++++++-
 website/resources/js/supporters.js        |  13 +-
 website/templates/_scaffold.html          |  15 ++-
 website/templates/contributing.html       |   5 +
 website/templates/main.html               |  16 +--
 website/templates/order-license-info.html |  25 ++--
 website/templates/order-license.html      | 118 ++++++++++++++----
 13 files changed, 357 insertions(+), 65 deletions(-)
 create mode 100644 website/resources/W8BEN_lombok.pdf

diff --git a/build.xml b/build.xml
index 629db4a6..645114a7 100644
--- a/build.xml
+++ b/build.xml
@@ -898,6 +898,12 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 		
 	
 	
+	
+		
+			
+		
+	
+	
 	
 		
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index cf62377e..a27c909e 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -58,8 +58,8 @@
 		
 		
 		
-		
-		
+		
+		
 		
 		
 		
diff --git a/buildScripts/supporters.ant.xml b/buildScripts/supporters.ant.xml
index d19e0bb6..d1d3fedc 100644
--- a/buildScripts/supporters.ant.xml
+++ b/buildScripts/supporters.ant.xml
@@ -39,11 +39,11 @@ containing the status of lombok's supporters.
 	
 	
 		
-			
+			
 		
 	
 	
-	
+	
 		
 			
 		
diff --git a/website/extra/htaccess b/website/extra/htaccess
index ea53d49c..db3393af 100644
--- a/website/extra/htaccess
+++ b/website/extra/htaccess
@@ -24,6 +24,12 @@ RewriteRule ^disable-checked-exceptions$ /disable-checked-exceptions.html [L,END
 RewriteRule ^disable-checked-exceptions(\.html)?$ /disable-checked-exceptions [NC,R=301]
 RewriteRule ^contributing$ /contributing.html [L,END]
 RewriteRule ^contributing(\.html)?$ /contributing [NC,R=301]
+RewriteRule ^supporters$ /supporters.html [L,END]
+RewriteRule ^supporters(.html)?$ /supporters [NC,R=301]
+RewriteRule ^order-license-info$ /order-license-info.html [L,END]
+RewriteRule ^order-?license-?info(.html)?$ /order-license-info [NC,R=301]
+RewriteRule ^order-license$ /order-license.html [L,END]
+RewriteRule ^order-?license(.html)?$ /order-license [NC,R=301]
 
 <#list setupPages as pg>
 RewriteRule ^setup/${pg?no_esc}$ /setup/${pg?no_esc}.html [L,END]
diff --git a/website/resources/W8BEN_lombok.pdf b/website/resources/W8BEN_lombok.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b87bded84c822793d680f9ebafcaf0023c3f01c7
GIT binary patch
literal 60743
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
GF#QjYT3n(4

literal 0
HcmV?d00001

diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css
index e5bb720e..674d341c 100644
--- a/website/resources/css/custom.css
+++ b/website/resources/css/custom.css
@@ -7,6 +7,68 @@
 	margin-bottom: 40px;
 }
 
+.buttonLike {
+	cursor: pointer;
+	background: -webkit-linear-gradient(top, #FFFEF7, #CFCEC7);
+	background: -moz-linear-gradient(top, #FFFEF7, #CFCEC7);
+	background: -o-linear-gradient(#FFFEF7, #CFCEC7);
+	background: -ms-linear-gradient(#FFFEF7, #CFCEC7);
+	background: linear-gradient(top, #FFFEF7, #CFCEC7);
+	line-height: 1;
+	padding: 3px 10px;
+	border: 1px solid black;
+	position: relative;
+	overflow: visible;
+	color: black;
+	margin: 2px;
+	border-radius: 5px;
+	display: inline-block;
+	text-align: center;
+}
+
+.orderButton {
+	width: 280px;
+}
+
+.formErr {
+	color: #FF7777;
+}
+
+.order-license #deleteCompanyLogo {
+	margin-top: 12px;
+}
+
+.formSubmitFail {
+	color: #FF6666;
+	font-size: 1.2em;
+	font-style: italic;
+}
+
+.order-license .btn-primary {
+	float: left;
+	margin-right: 20px;
+	background: -webkit-linear-gradient(#1725e0, #0923df 6%, #0b21ce);
+	background: -o-linear-gradient(#1725e0, #0923df 6%, #0b21ce);
+	background: -webkit-gradient(linear, left top, left bottom, from(#1725e0), color-stop(6%, #0923df), to(#0b21ce));
+	background: linear-gradient(#1725e0, #0923df 6%, #0b21ce);
+	background-repeat: no-repeat;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff1725e0', endColorstr='#ff0b21ce', GradientType=0);
+	-webkit-filter: none;
+	filter: none;
+	border: 1px solid #091bac;
+}
+
+#onlyYearlyWarning {
+	font-size: 0.8em;
+	padding-left: 16px;
+}
+
+.deemphasize {
+	color: #AAAAAA;
+	font-size: 0.8em;
+	font-style: italic;
+}
+
 .supporterBar .introText {
 	margin-top: 16px;
 }
@@ -24,6 +86,10 @@
 	display: inline-block;
 }
 
+.supporters .supportItem {
+	margin: 6px 10px;
+}
+
 .supporterBar {
 	width: 100%;
 	margin-left: auto;
@@ -53,11 +119,6 @@
 	height: 16px;
 }
 
-.legalese {
-	font-style: italic;
-	font-size: 0.8em;
-}
-
 #companyLogo {
 	margin-right: 8px;
 }
diff --git a/website/resources/js/order-license.js b/website/resources/js/order-license.js
index 82627f2b..4a3edca0 100644
--- a/website/resources/js/order-license.js
+++ b/website/resources/js/order-license.js
@@ -1,21 +1,140 @@
 "use strict";
 
 (function() {
+	if (!String.prototype.trim) {
+		String.prototype.trim = function () {
+			return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+		};
+	}
+	
 	var imgDataUrl = null;
+	
+	function updateLocationInfo() {
+		var locationType = $("input:radio[name='locationType']:checked").val();
+		$("#locationType_usa").toggle(locationType === "usa");
+		$("#locationType_eu").toggle(locationType === "eu");
+		$("#locationType_other").toggle(locationType === "other");
+		$("#paymentMethod_iban").toggle(locationType === "eu");
+		if ($("#paymentMethod_iban input").is(":checked") && locationType !== "eu") $("#paymentMethod_payoneer input").prop("checked", true);
+		if ($("#paymentMethod_intl input").is(":checked") && locationType === "eu") $("#paymentMethod_iban input").prop("checked", true);
+		$("#paymentMethod_intl").toggle(locationType !== "eu");
+	}
+	
+	function updatePriceIndication() {
+		$("#onlyYearlyWarning").hide();
+		var x = getPriceIndication();
+		if (x === "") {
+			$("#costIndicator").text("").hide();
+		} else {
+			$("#costIndicator").text(x).show();
+		}
+	}
+	
+	function getPriceIndication() {
+		try {
+			var seats = parseInt($("#seats").val());
+			if (isNaN(seats)) return "";
+			var licenseType = $("input:radio[name='licenseType']:checked").val();
+			var costPer;
+			if (licenseType === "enterprise") costPer = 5;
+			else if (licenseType === "professional") costPer = 2;
+			else return "";
+			var periodRaw = $("input:radio[name='paymentType']:checked").val();
+			if (periodRaw === "monthly") {
+				if (costPer*seats < 50) {
+					$("#onlyYearlyWarning").show();
+					return "Your license will cost €" + (costPer*seats*12) + ",- per year.";
+				}
+				return "Your license will cost €" + (costPer*seats) + ",- per month.";
+			}
+			return "Your license will cost €" + (costPer*seats*12) + ",- per year.";
+		} catch (e) {
+			return "";
+		}
+	}
+	
+	function showError(elemName) {
+		var elem = $("#" + elemName + "Err");
+		elem.fadeIn();
+		$("#" + elemName).on("change keyup", function() {
+			elem.hide();
+		});
+	}
+	
 	function applyLicense() {
-		$("#submit").on("click", function(evt) {
+		var submitButton = $("#submit");
+		var spinner = $("").attr("src", "/img/spinner.gif").attr("alt", "submitting").css("float", "left").css("margin-right", "20px");
+		
+		submitButton.on("click", function(evt) {
 			evt.preventDefault();
 			
 			var onSuccess = function() {
-				alert("Form submitted!");
+				$("#orderHelp").hide();
+				var okMsg = $("
").addClass("formSubmitOk").html("Thank you for ordering a Project Lombok license! We'll send your bill via email. If you have any further questions please contact us at orders@projectlombok.org.");
+				spinner.replaceWith(okMsg);
 			};
 			
 			var onFailure = function() {
-				alert("Whoops");
+				$("#orderHelp").hide();
+				var errMsg = $("
").addClass("formSubmitFail").html("Our order form appears to be broken. Could you do us a favour and contact us at orders@projectlombok.org? Thank you!");
+				spinner.replaceWith(errMsg);
 			};
 			
 			var data = {};
-			data.name = $("#name").val();
+			data.name = $("#companyName").val();
+			data.email = $("#email").val();
+			data.licenseType = $("input:radio[name='licenseType']:checked").val();
+			data.seats = parseInt($("#seats").val());
+			data.paymentType = $("input:radio[name='paymentType']:checked").val();
+			data.mentionMe = $("#mentionMe").prop("checked");
+			data.companyUrl = $("#companyUrl").val();
+			data.locationType = $("input:radio[name='locationType']:checked").val();
+			data.euVat = $("#euVat").val();
+			data.paymentMethod = $("input:radio[name='paymentMethod']:checked").val();
+			
+			var formFail = false;
+			
+			if (!data.paymentMethod) {
+				showError("paymentMethod");
+				formFail = true;
+			}
+			
+			if (!data.euVat && data.locationType === 'eu') {
+				$("#euVat").focus();
+				showError("euVat");
+				formFail = true;
+			}
+			
+			if (!data.locationType) {
+				showError("locationType");
+				formFail = true;
+			}
+			
+			if (!data.seats || isNaN(data.seats)) {
+				$("#seats").focus();
+				showError("seats");
+				formFail = true;
+			}
+			
+			if (!data.paymentType) {
+				showError("paymentType");
+				formFail = true;
+			}
+			
+			if (data.email.indexOf('@') === -1) {
+				$("#email").focus();
+				showError("email");
+				formFail = true;
+			}
+			
+			if (data.name.trim().length < 1) {
+				$("#companyName").focus();
+				showError("companyName");
+				formFail = true;
+			}
+			
+			if (formFail) return;
+			
 			var rnd = generateRandom();
 			var err = processImageUpload();
 			if (err) {
@@ -24,6 +143,9 @@
 				return;
 			}
 			if (imgDataUrl) data.logo = imgDataUrl;
+			
+			submitButton.replaceWith(spinner);
+			
 			$.ajax({
 				url: "/license-submit/" + rnd,
 				method: "PUT",
@@ -31,7 +153,7 @@
 				data: JSON.stringify(data),
 				processData: false,
 				success: onSuccess,
-				failure: onFailure
+				error: onFailure
 			});
 		});
 		
@@ -58,6 +180,13 @@
 				$("#deleteCompanyLogo").show();
 			}
 		});
+		
+		$("#seats,.paymentType,.licenseType").on("change keyup", function() {
+			updatePriceIndication();
+		});
+		$(".locationType").on("change", function() {
+			updateLocationInfo();
+		});
 	}
 	
 	function generateRandom() {
diff --git a/website/resources/js/supporters.js b/website/resources/js/supporters.js
index 5ec1b057..5f21c79c 100644
--- a/website/resources/js/supporters.js
+++ b/website/resources/js/supporters.js
@@ -3,7 +3,7 @@
 (function($) {
 	var supporters = {};
 	var weights = {};
-	var types = ["patron", "professional", "enterprise"];
+	var types = ["enterprise", "professional", "patron"];
 	
 	function shuffle(array) {
 		var i = 0, j = 0, temp = null;
@@ -49,7 +49,7 @@
 		var d = $("
").addClass("supportItem").addClass(this.type);
 		var a = d;
 		if (this.url) {
-			a = $("").attr("href", this.url).attr("rel", "noopener");
+			a = $("").attr("href", this.url).attr("rel", "noopener").attr("target", "_blank");
 			d.append(a);
 		}
 		var n = $("").text(this.name);
@@ -69,8 +69,13 @@
 				var ht = Math.round(h / f);
 				i.width = wt;
 				i.height = ht;
+				var ji = $(i);
 				if (!showName) a.empty();
-				a.prepend(i);
+				ji.css("width", wt + "px");
+				ji.css("height", ht + "px");
+				ji.attr("alt", n);
+				ji.attr("title", n);
+				a.prepend(ji);
 			};
 			i.src = 'files/' + this.logo;
 		}
@@ -129,6 +134,8 @@
 		var s = $(".supporterBar");
 		s.find(".introText").show();
 		s.append($("
").addClass("sbCnt"));
+		var sf = s.find(".supporterFooter").show();
+		s.append(sf);
 		s = s.find(".sbCnt");
 		var now = new Date();
 		var list = [];
diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index c461423f..767f28e5 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -92,14 +92,17 @@ ga('send', 'pageview');
 								
  • Experimental
    • 
 							
 						
-						
  • 
-							
-								Discuss/Help
-							
+						
  • 
+							Community
+							
 						
    • 
 						
  • 
-							
-								Contribute
+							
+								Order / Donate
 							
 						
    • 
 						
  • 
diff --git a/website/templates/contributing.html b/website/templates/contributing.html
index dde6e3ff..3a99c77a 100644
--- a/website/templates/contributing.html
+++ b/website/templates/contributing.html
@@ -2,6 +2,11 @@
 
 <@main.scaffold>
 	
    
+		
    
+			<@main.h1 title="Contributing to Project Lombok's development" />
+		
    
+			You can choose to become a project lombok licensee or support us on patreon.
+		
    
 		
    
 			<@main.h1 title="How to work on Project Lombok yourself" />
 		
    
diff --git a/website/templates/main.html b/website/templates/main.html
index df096955..e89557d6 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -28,22 +28,18 @@
 					Show me a text and images based explanation and tutorial instead!
 				
    
 			
    
-			
    
-				
-			
    
 		
    • 
 		
    
 			<@main.h2 title="Upcoming presentations" />
 			
    
-				Roel and Reinier will be talking about (near) future java features; a preview of what Java10 and Java11 will probably look like, across germany:
    
+				Roel and Reinier will be talking about (near) future java features:
     JavaLand March 14th 2018, 12:00, room: Schauspielhaus.
+			
    
 				See you there! (We'll have stickers!)
 			
    
 		
    
+		
    
+			
+			
+		
    
 	
    
 
diff --git a/website/templates/order-license-info.html b/website/templates/order-license-info.html
index b465eaf0..a58ef913 100644
--- a/website/templates/order-license-info.html
+++ b/website/templates/order-license-info.html
@@ -9,15 +9,22 @@
 			
    
 				Lombok is open source. We offer three licenses for using lombok. The standard license is free. Here you can order a professional or enterprise license.
 			
    
-				As part of being a professional or enterprise licensee, we normally offer to put your name, a logo, and possibly a link on our ‘supporters and licensees’ page. From time to time we’ll put a supporter or licensee on our front page. You may of course opt out of this offer. We may, at our discretion, opt not to list you. If we elect not to do so, you will be notified at the email address you fill in on our form, and you are as always free to cancel your license at any time.
-			
    
-				The license fee is based on the number of developers that work for you or your company using Project Lombok, per month. The fee is charged in advance. You may choose to pay either monthly or yearly (for sufficiently small licensees, only a yearly option is available).
-			
    
-				Project Lombok is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed, even for professional and enterprise license holders. In no event shall the copyright holder or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
-			
    
-				Instead of a professional or enterprise license, if you’d like to support the efforts of Project Lombok, you can also support us via Patreon.
-			
    
-				Order a professional or enterprise license now.
+				Order a professional or enterprise license
    
+				For individuals: Become a patreon
+			
    
+			
    
+				
    Benefits of becoming a licensee
    
+			
    
+			
    
+				Lombok is and will remain a free, open source product. However, we ask you to consider becoming a licensee. Licensees will be listed on the projectlombok.org website, we'll send you some stickers, and an official license. You'll be supporting the development of Project Lombok.
+			
    
+			
    
+				
    Small print
    
+			
    
+			
    
+				As part of being a professional or enterprise licensee, we will put your name, a logo, and possibly a link on our ‘supporters and licensees’ page. We'll also put (at random) some supporters and licensees on our front page. You may of course opt out of this offer. We may, at our discretion, opt not to list you. If we elect not to do so, you will be notified at the email address you fill in on our form, and you are as always free to cancel your license at any time.
+			
    
+				Project Lombok is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed, even for professional and enterprise license holders. In no event shall the copyright holder or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
 			
    
 		
    
 	
    
diff --git a/website/templates/order-license.html b/website/templates/order-license.html
index 4d52d93a..91693c0a 100644
--- a/website/templates/order-license.html
+++ b/website/templates/order-license.html
@@ -1,7 +1,7 @@
 <#import "/_scaffold.html" as main>
 
 <@main.scaffold load=["/js/order-license.js"]>
-	
    
+	
    
 		
    
 			
    Order a professional or enterprise license
    
 		
    
@@ -12,34 +12,62 @@
 					
    
 						
 						
+						
 						If applying for an individual license, fill in your own name.
 					
    
 					
    
 						
 						
+						
 						We will never share this email with any third parties; we'll email you the invoice at this email address.
 					
    
 				
 				
    
 					Type of license
+					
    
+						
    
+							
+						
    
+						
    
+							
+						
    
+					
    
+					
+					
    
+						
+						
+						
+					
    
+				
    
+				
    
+					Payment
 					
    
 						
 					
    
 					
    
 						
 					
    
+					
+					
 				
    
 				
    
 					Mention
 					
    
 						
 					
    
@@ -55,24 +83,68 @@
 						
 					
    
 				
-				
+				
    
+					Location and VAT
+					
    
+						
    
+							
+						
    
+						
    
+							
+						
    
+						
    
+							
+						
    
+						
+					
    
+					
    
+						
+						
+						
+					
    
+					
+					
+				
    
+				
    
+					Payment method
+					
    
+						
    
+							
+						
    
+						
+						
    
+							
+						
    
+						
+					
    
+				
    
+				
+				
    If you run into issues with the order form, or you have any other questions, please send us an email at orders@projectlombok.org
    
 			
    
 		
    
 	
    
-	
    
-Form fields:
-
-* EU / US / Elders
-* Naam bedrijf
-* Do you want to be mentioned?
-* Link to logo
-* Link to website
-* Professional of enterprise
-* # of developers
-* Email of contact.sta
-* In EU: VAT Number
-* In EU: How would you like to pay? IBAN or Payoneer
-* In US: How would you like to pay? International wire transfer, or Payoneer (default = payoneer).
-* Elders: We’ll get back to you..
-	
    		
 

From 9b4bf8334b21393bb0a587ac0a4f0dc342d22bb2 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Sun, 11 Mar 2018 17:08:03 +0100
Subject: [PATCH 21/27] last minute bugfixes to license order form mechanics.

---
 website/resources/js/main.js              | 2 +-
 website/resources/js/order-license.js     | 4 ++--
 website/templates/main.html               | 2 +-
 website/templates/order-license-info.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/resources/js/main.js b/website/resources/js/main.js
index 3ad77958..f07da70d 100644
--- a/website/resources/js/main.js
+++ b/website/resources/js/main.js
@@ -37,7 +37,7 @@
 		if (self.data("clc")) return;
 		var href = self.attr("href");
 		self.data("clc", true);
-		if (!href || href.substr(0, 4) === "http" || href === "/api/") return;
+		if (!href || href.substr(0, 4) === "http" || href === "/api/" || href === "/" || href === "/supporters" || href === "/order-license") return;
 		var ext = href.substr(href.length - 4, 4);
 		if (ext === ".xml" || ext === ".jar") return;
 		self.on("click", function(evt) {
diff --git a/website/resources/js/order-license.js b/website/resources/js/order-license.js
index 4a3edca0..b2842456 100644
--- a/website/resources/js/order-license.js
+++ b/website/resources/js/order-license.js
@@ -33,7 +33,7 @@
 	function getPriceIndication() {
 		try {
 			var seats = parseInt($("#seats").val());
-			if (isNaN(seats)) return "";
+			if (isNaN(seats) || seats < 1) return "";
 			var licenseType = $("input:radio[name='licenseType']:checked").val();
 			var costPer;
 			if (licenseType === "enterprise") costPer = 5;
@@ -110,7 +110,7 @@
 				formFail = true;
 			}
 			
-			if (!data.seats || isNaN(data.seats)) {
+			if (!data.seats || isNaN(data.seats) || data.seats < 1) {
 				$("#seats").focus();
 				showError("seats");
 				formFail = true;
diff --git a/website/templates/main.html b/website/templates/main.html
index e89557d6..52b3ac0e 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -39,7 +39,7 @@
 		
    
 		
    
 			
-			
+			
 		
    
 	
    
 
diff --git a/website/templates/order-license-info.html b/website/templates/order-license-info.html
index a58ef913..724e44f7 100644
--- a/website/templates/order-license-info.html
+++ b/website/templates/order-license-info.html
@@ -9,7 +9,7 @@
 			
    
 				Lombok is open source. We offer three licenses for using lombok. The standard license is free. Here you can order a professional or enterprise license.
 			
    
-				Order a professional or enterprise license
    
+				Order a professional or enterprise license
    
 				For individuals: Become a patreon
 			
    
 			
    

From 0c48f41aef81d2f3b66a96e8e7751ee63f4d7d17 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Sun, 18 Mar 2018 14:57:49 +0100
Subject: [PATCH 22/27] Added test case for issue #1615: non-static inner
 classes where both inner and outer have generics fails if inner is annotated
 with @Data

---
 test/transform/resource/before/DataWithGenericsOnInners.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 test/transform/resource/before/DataWithGenericsOnInners.java

diff --git a/test/transform/resource/before/DataWithGenericsOnInners.java b/test/transform/resource/before/DataWithGenericsOnInners.java
new file mode 100644
index 00000000..c0afacee
--- /dev/null
+++ b/test/transform/resource/before/DataWithGenericsOnInners.java
@@ -0,0 +1,4 @@
+public class DataWithGenericsOnInners {
+	@lombok.Data class Inner {}
+}
+

From aa8ce194f50be2e521c11bb1a3f5171a8d92f2d5 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Sun, 18 Mar 2018 15:02:07 +0100
Subject: [PATCH 23/27] [website] Some minor updates and fixes to the website
 order page.

---
 website/resources/css/custom.css     | 6 ++++++
 website/resources/js/supporters.js   | 4 ++--
 website/templates/order-license.html | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css
index 674d341c..f81a3dd9 100644
--- a/website/resources/css/custom.css
+++ b/website/resources/css/custom.css
@@ -30,6 +30,12 @@
 	width: 280px;
 }
 
+.orderDetails {
+	font-style: italic;
+	font-size: 10px;
+	margin-top: 20px;
+}
+
 .formErr {
 	color: #FF7777;
 }
diff --git a/website/resources/js/supporters.js b/website/resources/js/supporters.js
index 5f21c79c..11f77640 100644
--- a/website/resources/js/supporters.js
+++ b/website/resources/js/supporters.js
@@ -73,8 +73,8 @@
 				if (!showName) a.empty();
 				ji.css("width", wt + "px");
 				ji.css("height", ht + "px");
-				ji.attr("alt", n);
-				ji.attr("title", n);
+				ji.attr("alt", n.text());
+				ji.attr("title", n.text());
 				a.prepend(ji);
 			};
 			i.src = 'files/' + this.logo;
diff --git a/website/templates/order-license.html b/website/templates/order-license.html
index 91693c0a..a364fc79 100644
--- a/website/templates/order-license.html
+++ b/website/templates/order-license.html
@@ -143,7 +143,8 @@
 					
    
 				
 				
-				
+				
    If you run into issues with the order form, or you have any other questions, please send us an email at orders@projectlombok.org. You can cancel your subscription at any time.
    
+				
    Our EU VAT number: NL858105378B01
    
 			
    
 		
    
 	

From 3cfd7a80eddab24b868fb5cfcec4d5cf2b55604c Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Mon, 19 Mar 2018 23:34:05 +0100
Subject: [PATCH 24/27] =?UTF-8?q?Fresh=20builds=20wouldn=E2=80=99t=20work?=
 =?UTF-8?q?=20anymore=20due=20to=20a=20weird=20addition=20in=20ecj9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java b/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
index b42761f4..89964914 100644
--- a/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
+++ b/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
@@ -369,11 +369,6 @@ public final class SetGeneratedByVisitor extends ASTVisitor {
 		return super.visit(node, scope);
 	}
 	
-	@Override public boolean visit(ArrayInitializer node, ClassScope scope) {
-		fixPositions(setGeneratedBy(node, source));
-		return super.visit(node, scope);
-	}
-	
 	@Override public boolean visit(ArrayQualifiedTypeReference node, BlockScope scope) {
 		fixPositions(setGeneratedBy(node, source));
 		return super.visit(node, scope);

From ae611e168718bc226d5ca530484b9a92c2836b30 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot 
Date: Mon, 19 Mar 2018 23:43:54 +0100
Subject: [PATCH 25/27] [website] Added instruction page about VS Code support
 in lombok. Updated upcoming talks section.

---
 website/templates/_scaffold.html      |  3 ++-
 website/templates/main.html           |  5 ++---
 website/templates/setup/intellij.html |  2 +-
 website/templates/setup/vscode.html   | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 website/templates/setup/vscode.html

diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index 767f28e5..646f0247 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -22,7 +22,8 @@
 		"Netbeans": "netbeans",
 		"MyEclipse": "eclipse",
 		"Spring Tool Suite": "eclipse",
-		"JBoss Developer Studio": "eclipse"
+		"JBoss Developer Studio": "eclipse",
+		"Visual Studio Code": "vscode"
 	},
 	"Platforms": {
 		"Android": "android",
diff --git a/website/templates/main.html b/website/templates/main.html
index 52b3ac0e..25098758 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -32,9 +32,8 @@
 		
    
 			<@main.h2 title="Upcoming presentations" />
 			
    
-				Roel and Reinier will be talking about (near) future java features:
     JavaLand March 14th 2018, 12:00, room: Schauspielhaus.
-			
    
-				See you there! (We'll have stickers!)
+				We're talking to NL-JUG to give a presentation soon in the The Hague (The Netherlands) area.
    
+				Want us to present at your JUG or conference? Feel free to contact us, via email (info@) or twitter: @project_lombok.
 			
    
 		
    
 		
    
diff --git a/website/templates/setup/intellij.html b/website/templates/setup/intellij.html
index 989986e5..331a7bcd 100644
--- a/website/templates/setup/intellij.html
+++ b/website/templates/setup/intellij.html
@@ -5,7 +5,7 @@
 		
    
 			The Jetbrains IntelliJ IDEA editor is compatible with lombok.
 		
    
-			Add the Lombok IntelliJ plugin to add lombok support IntelliJ:
+			Add the Lombok IntelliJ plugin to add lombok support for IntelliJ: