aboutsummaryrefslogtreecommitdiff
path: root/src/core/lombok/javac/apt
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2018-11-05 21:40:30 +0100
committerReinier Zwitserloot <reinier@zwitserloot.com>2018-11-05 21:40:30 +0100
commit2c0ec9315577cbc8d406aca2b3f3b6ad233f4f35 (patch)
tree0724bc61f73dfd4c97563508bcbbd83067db9981 /src/core/lombok/javac/apt
parent9fc02601df84664454ac07a7225d596bb4bc7450 (diff)
downloadlombok-2c0ec9315577cbc8d406aca2b3f3b6ad233f4f35.tar.gz
lombok-2c0ec9315577cbc8d406aca2b3f3b6ad233f4f35.tar.bz2
lombok-2c0ec9315577cbc8d406aca2b3f3b6ad233f4f35.zip
[bugfix] attempting to fix an issue with buckbuild which uses some exotic trickery to compile straight from jar to jar, messing up our wrapper around javac’s javaFileObject. Bug report and suggested fix from external sources, we didn’t test it, but we only kick in this alternative if an exception occurs, so it couldn’t possibly affect anything that was already working fine. See PR #1929
Diffstat (limited to 'src/core/lombok/javac/apt')
-rw-r--r--src/core/lombok/javac/apt/Javac9BaseFileObjectWrapper.java6
-rw-r--r--src/core/lombok/javac/apt/Javac9JavaFileObjectWrapper.java107
-rw-r--r--src/core/lombok/javac/apt/LombokFileObjects.java12
3 files changed, 120 insertions, 5 deletions
diff --git a/src/core/lombok/javac/apt/Javac9BaseFileObjectWrapper.java b/src/core/lombok/javac/apt/Javac9BaseFileObjectWrapper.java
index f9fe2a7d..f71be366 100644
--- a/src/core/lombok/javac/apt/Javac9BaseFileObjectWrapper.java
+++ b/src/core/lombok/javac/apt/Javac9BaseFileObjectWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2017 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
@@ -97,9 +97,7 @@ class Javac9BaseFileObjectWrapper extends com.sun.tools.javac.file.PathFileObjec
}
@Override public boolean equals(Object obj) {
- if (!(obj instanceof Javac9BaseFileObjectWrapper)) {
- return false;
- }
+ if (!(obj instanceof Javac9BaseFileObjectWrapper)) return false;
return delegate.equals(((Javac9BaseFileObjectWrapper)obj).delegate);
}
diff --git a/src/core/lombok/javac/apt/Javac9JavaFileObjectWrapper.java b/src/core/lombok/javac/apt/Javac9JavaFileObjectWrapper.java
new file mode 100644
index 00000000..c996230a
--- /dev/null
+++ b/src/core/lombok/javac/apt/Javac9JavaFileObjectWrapper.java
@@ -0,0 +1,107 @@
+/*
+ * 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
+ * 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.javac.apt;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.URI;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.NestingKind;
+
+class Javac9JavaFileObjectWrapper implements javax.tools.JavaFileObject {
+ private final LombokFileObject delegate;
+
+ public Javac9JavaFileObjectWrapper(LombokFileObject delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override public boolean isNameCompatible(String simpleName, Kind kind) {
+ return delegate.isNameCompatible(simpleName, kind);
+ }
+
+ @Override public URI toUri() {
+ return delegate.toUri();
+ }
+
+ @SuppressWarnings("all")
+ @Override public String getName() {
+ return delegate.getName();
+ }
+
+ @Override public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+ return delegate.getCharContent(ignoreEncodingErrors);
+ }
+
+ @Override public InputStream openInputStream() throws IOException {
+ return delegate.openInputStream();
+ }
+
+ @Override public Reader openReader(boolean ignoreEncodingErrors) throws IOException {
+ return delegate.openReader(ignoreEncodingErrors);
+ }
+
+ @Override public Writer openWriter() throws IOException {
+ return delegate.openWriter();
+ }
+
+ @Override public OutputStream openOutputStream() throws IOException {
+ return delegate.openOutputStream();
+ }
+
+ @Override public long getLastModified() {
+ return delegate.getLastModified();
+ }
+
+ @Override public boolean delete() {
+ return delegate.delete();
+ }
+
+ @Override public Kind getKind() {
+ return delegate.getKind();
+ }
+
+ @Override public NestingKind getNestingKind() {
+ return delegate.getNestingKind();
+ }
+
+ @Override public Modifier getAccessLevel() {
+ return delegate.getAccessLevel();
+ }
+
+ @Override public boolean equals(Object obj) {
+ if (!(obj instanceof Javac9JavaFileObjectWrapper)) return false;
+ return delegate.equals(((Javac9JavaFileObjectWrapper)obj).delegate);
+ }
+
+ @Override public int hashCode() {
+ return delegate.hashCode();
+ }
+
+ @Override public String toString() {
+ return delegate.toString();
+ }
+} \ No newline at end of file
diff --git a/src/core/lombok/javac/apt/LombokFileObjects.java b/src/core/lombok/javac/apt/LombokFileObjects.java
index 28d3c9fa..d6c96480 100644
--- a/src/core/lombok/javac/apt/LombokFileObjects.java
+++ b/src/core/lombok/javac/apt/LombokFileObjects.java
@@ -168,7 +168,17 @@ final class LombokFileObjects {
}
@Override public JavaFileObject wrap(LombokFileObject fileObject) {
- return new Javac9BaseFileObjectWrapper(fileManager, toPath(fileObject), fileObject);
+ Path p; try {
+ p = toPath(fileObject);
+ } catch (Exception e) {
+ p = null;
+ }
+
+ // J9BFOW extends javac's internal file base impl of javax.tools.JavaFileObject.
+ // J9JFOW just straight implements it. Probably J9JFOW is fine, but we decided to extend java's internal impl possibly for a reason.
+ // Some exotic build environments don't _have_ file objects and crash with FileNotFoundEx, so if that happens, let's try the alternative.
+ if (p != null) return new Javac9BaseFileObjectWrapper(fileManager, p, fileObject);
+ return new Javac9JavaFileObjectWrapper(fileObject);
}
@Override public Method getDecoderMethod() {