This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new b8b7bdd Fix Java 11 compilation errors/warnings.
b8b7bdd is described below
commit b8b7bddeacdc8173f4ee2453b6f4525c824f570d
Author: JamesBognar <[email protected]>
AuthorDate: Mon Dec 7 16:31:25 2020 -0500
Fix Java 11 compilation errors/warnings.
---
.../juneau/config/store/ConfigFileStore.java | 3 ++-
.../org/apache/juneau/http/remote/Remote_Test.java | 2 --
.../java/org/apache/juneau/internal/IOUtils.java | 26 +++++++++++++---------
.../apache/juneau/internal/ReaderInputStream.java | 5 ++---
.../org/apache/juneau/internal/StringUtils.java | 2 +-
.../serializer/OutputStreamSerializerSession.java | 2 +-
juneau-doc/pom.xml | 4 +++-
.../juneau/examples/rest/springboot/App.java | 1 +
.../microservice/springboot/template/App.java | 1 +
.../juneau/rest/client/RestResponseBody.java | 1 +
.../juneau/rest/mock/MockServletResponse.java | 2 +-
.../juneau/rest/Header_AcceptEncoding_Test.java | 1 -
.../apache/juneau/rest/RestMethod_Params_Test.java | 2 --
.../juneau/rest/RestMethod_Returns_Test.java | 1 -
.../java/org/apache/juneau/rest/StaticFiles.java | 3 +--
.../juneau/rest/annotation/RestAnnotation.java | 1 -
.../rest/annotation/RestMethodAnnotation.java | 1 -
17 files changed, 29 insertions(+), 29 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
index 1c04d42..309cd2b 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
@@ -253,6 +253,7 @@ public class ConfigFileStore extends ConfigStore {
}
}
+ @SuppressWarnings("cast")
@Override /* ConfigStore */
public synchronized String read(String name) throws IOException {
name = resolveName(name);
@@ -278,7 +279,7 @@ public class ConfigFileStore extends ConfigStore {
ByteBuffer buf = ByteBuffer.allocate(1024);
StringBuilder sb = new StringBuilder();
while (fc.read(buf) != -1) {
-
sb.append(charset.decode((ByteBuffer)(buf.flip())));
+
sb.append(charset.decode((ByteBuffer)((Buffer)(buf.flip())))); // Fixes Java 11
issue involving overridden flip method.
buf.clear();
}
s = sb.toString();
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index 13d5047..42b3ed6 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -24,8 +24,6 @@ import org.apache.juneau.rest.client.remote.*;
import org.apache.juneau.rest.config.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.http.*;
-import org.apache.juneau.http.remote.RemoteMethod;
-import org.apache.juneau.http.remote.RemoteReturn;
import org.apache.juneau.marshall.*;
import org.junit.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
index a6cf8c1..ba58f97 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
@@ -235,15 +235,13 @@ public final class IOUtils {
public static byte[] readBytes(InputStream in, int buffSize) throws
IOException {
if (buffSize == 0)
buffSize = 1024;
- final ByteArrayOutputStream buff = new ByteArrayOutputStream(buffSize);
- try {
- int nRead;
- byte[] b = new byte[buffSize];
- while ((nRead = in.read(b, 0, b.length)) != -1)
- buff.write(b, 0, nRead);
- buff.flush();
- return buff.toByteArray();
- }
+ ByteArrayOutputStream buff = new
ByteArrayOutputStream(buffSize);
+ int nRead;
+ byte[] b = new byte[buffSize];
+ while ((nRead = in.read(b, 0, b.length)) != -1)
+ buff.write(b, 0, nRead);
+ buff.flush();
+ return buff.toByteArray();
}
/**
@@ -489,7 +487,10 @@ public final class IOUtils {
* @param os The output stream to close.
*/
public static void closeQuietly(OutputStream os) {
-
+ try {
+ if (os != null)
+ os.close();
+ } catch (IOException e) {}
}
/**
@@ -516,7 +517,10 @@ public final class IOUtils {
* @param w The writer to close.
*/
public static void closeQuietly(Writer w) {
-
+ try {
+ if (w != null)
+ w.close();
+ } catch (IOException e) {}
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ReaderInputStream.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ReaderInputStream.java
index 7aa1453..dda39e8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ReaderInputStream.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ReaderInputStream.java
@@ -19,8 +19,7 @@ package org.apache.juneau.internal;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
+import java.nio.*;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
@@ -118,7 +117,7 @@ public class ReaderInputStream extends InputStream {
this.reader = reader;
this.encoder = encoder;
this.encoderIn = CharBuffer.allocate(bufferSize);
- this.encoderIn.flip();
+ ((Buffer)this.encoderIn).flip(); // Fixes Java 11 issue.
this.encoderOut = ByteBuffer.allocate(128);
this.encoderOut.flip();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index 87556f9..81245ca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -1821,7 +1821,7 @@ public final class StringUtils {
ByteBuffer buff = ByteBuffer.allocate(hex.length()/2);
for (int i = 0; i < hex.length(); i+=2)
buff.put((byte)Integer.parseInt(hex.substring(i, i+2),
16));
- buff.rewind();
+ ((Buffer)buff).rewind(); // Fixes Java 11 issue.
return buff.array();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
index 381426b..e9415bd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
@@ -82,10 +82,10 @@ public abstract class OutputStreamSerializerSession extends
SerializerSession {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
serialize(o, baos);
+ baos.flush();
} catch (IOException e) {
throw new SerializeException(e); // Should never happen.
}
- baos.flush();
return baos.toByteArray();
}
diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index b131875..433faed 100644
--- a/juneau-doc/pom.xml
+++ b/juneau-doc/pom.xml
@@ -34,7 +34,9 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
+
+ <!-- Note: If you want to build the docs, you have to update
the following location for tools.jar -->
+
<toolsjar>/Library/Java/JavaVirtualMachines/sfdc-openjdk1.8.0_212.jdk/Contents/Home/lib/tools.jar</toolsjar>
</properties>
<dependencies>
diff --git
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java
index 678b069..e8709e3 100644
---
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java
+++
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/App.java
@@ -37,6 +37,7 @@ public class App {
* Entry point method.
* @param args Command-line arguments.
*/
+ @SuppressWarnings("resource")
public static void main(String[] args) {
new SpringApplicationBuilder(App.class)
.initializers(new JuneauRestInitializer(App.class))
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
index 060c3c9..7cbb2c9 100644
---
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
+++
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/App.java
@@ -33,6 +33,7 @@ public class App {
*
* @param args Command-line arguments
*/
+ @SuppressWarnings("resource")
public static void main(String[] args) {
new SpringApplicationBuilder(App.class)
.initializers(new JuneauRestInitializer(App.class))
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponseBody.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponseBody.java
index 8162f55..b7b6ac2 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponseBody.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponseBody.java
@@ -192,6 +192,7 @@ public class RestResponseBody implements HttpEntity {
* <br>For responses without a body(e.g. HTTP 204), returns an
empty stream.
* @throws IOException If a stream or illegal state exception was
thrown.
*/
+ @SuppressWarnings("resource")
public InputStream asInputStream() throws IOException {
try {
if (cache != null)
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
index 23c7a9b..885a567 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
@@ -279,7 +279,7 @@ public class MockServletResponse implements
HttpServletResponse {
return headerMap.keySet();
}
- byte[] getBody() {
+ byte[] getBody() throws IOException {
baos.flush();
return baos.toByteArray();
}
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
index 31a9e92..71f0b80 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/Header_AcceptEncoding_Test.java
@@ -19,7 +19,6 @@ import java.io.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.rest.RestResponse;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java
index d854ea2..3e597b9 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Params_Test.java
@@ -30,8 +30,6 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.plaintext.*;
-import org.apache.juneau.rest.RestRequest;
-import org.apache.juneau.rest.RestResponse;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Returns_Test.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Returns_Test.java
index c75a010..48a08e6 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Returns_Test.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestMethod_Returns_Test.java
@@ -21,7 +21,6 @@ import java.io.*;
import java.util.*;
import org.apache.juneau.dto.swagger.*;
-import org.apache.juneau.rest.RestRequest;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
index 1df609d..3987b83 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java
@@ -47,8 +47,7 @@ class StaticFiles {
String remainder = (p.equals(path) ? "" :
p.substring(path.length()));
if (remainder.isEmpty() || remainder.startsWith("/")) {
String p2 = location + remainder;
- InputStream is =
staticResourceManager.getStream(p2, null);
- try {
+ try (InputStream is =
staticResourceManager.getStream(p2, null)) {
if (is != null) {
int i = p2.lastIndexOf('/');
String name = (i == -1 ? p2 :
p2.substring(i+1));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index f3e7b6a..febb4d2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -32,7 +32,6 @@ import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.annotation.Logging;
import org.apache.juneau.rest.util.*;
import org.apache.juneau.svl.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
index 588d613..5d67b31 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethodAnnotation.java
@@ -29,7 +29,6 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.annotation.Logging;
import org.apache.juneau.rest.util.*;
import org.apache.juneau.svl.*;
