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 ace33ef0a Minor fixes.
ace33ef0a is described below
commit ace33ef0a5967d251888d79ce04b46ce8b3f1b34
Author: James Bognar <[email protected]>
AuthorDate: Wed May 14 10:24:46 2025 -0400
Minor fixes.
---
.../assertions/FluentComparableAssertion.java | 4 +++
.../org/apache/juneau/config/store/FileStore.java | 8 ++---
.../org/apache/juneau/collections/JsonList.java | 1 +
.../org/apache/juneau/collections/JsonMap.java | 1 +
.../apache/juneau/internal/ReaderInputStream.java | 12 +++----
.../juneau/serializer/SerializerSession.java | 2 +-
.../apache/juneau/rest/client/ResponseHeader.java | 2 +-
.../juneau/rest/mock/MockServletResponse.java | 2 +-
pom.xml | 41 +---------------------
9 files changed, 20 insertions(+), 53 deletions(-)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index 88fb8fc22..ddc0c88bf 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -166,6 +166,7 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
+ @SuppressWarnings("unchecked")
public R isGt(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) <= 0)
@@ -180,6 +181,7 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
+ @SuppressWarnings("unchecked")
public R isGte(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) < 0)
@@ -194,6 +196,7 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
+ @SuppressWarnings("unchecked")
public R isLt(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) >= 0)
@@ -208,6 +211,7 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
+ @SuppressWarnings("unchecked")
public R isLte(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) > 0)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
index d7b463982..823fc6777 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
@@ -420,8 +420,8 @@ public class FileStore extends ConfigStore {
ByteBuffer buf = ByteBuffer.allocate(1024);
StringBuilder sb = new StringBuilder();
while (fc.read(buf) != -1) {
-
sb.append(charset.decode((ByteBuffer)(((Buffer)buf).flip()))); // Fixes Java 11
issue involving overridden flip method.
- ((Buffer)buf).clear();
+
sb.append(charset.decode((buf.flip()))); // Fixes Java 11 issue involving
overridden flip method.
+ buf.clear();
}
s = sb.toString();
cache.put(name, s);
@@ -461,8 +461,8 @@ public class FileStore extends ConfigStore {
ByteBuffer buf =
ByteBuffer.allocate(1024);
StringBuilder sb = new
StringBuilder();
while (fc.read(buf) !=
-1) {
-
sb.append(charset.decode((ByteBuffer)((Buffer)buf).flip()));
-
((Buffer)buf).clear();
+
sb.append(charset.decode(buf.flip()));
+ buf.clear();
}
currentContents =
sb.toString();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index a0d689b06..dacb7e797 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -1018,6 +1018,7 @@ public class JsonList extends LinkedList<Object> {
private static final class UnmodifiableJsonList extends JsonList {
private static final long serialVersionUID = 1L;
+ @SuppressWarnings("synthetic-access")
UnmodifiableJsonList(JsonList contents) {
if (contents != null)
this.forEach(super::add);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index 998a0661b..a2675f029 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -1780,6 +1780,7 @@ public class JsonMap extends LinkedHashMap<String,Object>
{
private static final class UnmodifiableJsonMap extends JsonMap {
private static final long serialVersionUID = 1L;
+ @SuppressWarnings("synthetic-access")
UnmodifiableJsonMap(JsonMap contents) {
if (contents != null)
contents.forEach(super::put);
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 c30bc1eda..7059e6261 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
@@ -120,9 +120,9 @@ public class ReaderInputStream extends InputStream {
this.reader = reader;
this.encoder = encoder;
this.encoderIn = CharBuffer.allocate(bufferSize);
- ((Buffer)this.encoderIn).flip(); // Fixes Java 11 issue.
+ this.encoderIn.flip(); // Fixes Java 11 issue.
this.encoderOut = ByteBuffer.allocate(128);
- ((Buffer)this.encoderOut).flip(); // Fixes Java 11 issue.
+ this.encoderOut.flip(); // Fixes Java 11 issue.
}
/**
@@ -182,7 +182,7 @@ public class ReaderInputStream extends InputStream {
private void fillBuffer() throws IOException {
if (!endOfInput && (lastCoderResult == null ||
lastCoderResult.isUnderflow())) {
encoderIn.compact();
- final int position = ((Buffer)encoderIn).position();
+ final int position = encoderIn.position();
// We don't use Reader#read(CharBuffer) here because it
is more efficient
// to write directly to the underlying char array (the
default implementation
// copies data to a temporary char array).
@@ -190,13 +190,13 @@ public class ReaderInputStream extends InputStream {
if (c == -1) {
endOfInput = true;
} else {
- ((Buffer)encoderIn).position(position+c);
+ encoderIn.position(position+c);
}
- ((Buffer)encoderIn).flip();
+ encoderIn.flip();
}
encoderOut.compact();
lastCoderResult = encoder.encode(encoderIn, encoderOut,
endOfInput);
- ((Buffer)encoderOut).flip();
+ encoderOut.flip();
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 703003afc..8038f03a7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -614,7 +614,7 @@ public class SerializerSession extends BeanTraverseSession {
* @param m The map being consumed.
* @param consumer The map entry consumer.
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes", "cast" })
public final <K,V> void forEachEntry(Map<K,V> m,
Consumer<Map.Entry<K,V>> consumer) {
if (m == null || m.isEmpty())
return;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
index 10b738ff7..620867f93 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
@@ -189,7 +189,7 @@ public class ResponseHeader extends BasicHeader {
return cc.invoke(getName(), getValue());
} catch (Throwable e) {
if (e instanceof ExecutableException)
- e = ((ExecutableException)e).getCause();
+ e = e.getCause();
throw asRuntimeException(e);
}
throw new BasicRuntimeException("Could not determine a method
to construct type {0}", className(c));
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 7c55e7495..a7bc0b5fc 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
@@ -185,7 +185,7 @@ public class MockServletResponse implements
HttpServletResponse {
headerMap.put("Location", new String[] {location});
}
- // @Override /* HttpServletResponse */
+ @Override /* HttpServletResponse */
public void sendRedirect(String location, int sc, boolean clearBuffer)
throws IOException {
this.sc = sc;
headerMap.put("Location", new String[] {location});
diff --git a/pom.xml b/pom.xml
index f7895ba55..612a93bc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,52 +220,13 @@
<version>6.0.0</version>
</plugin>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
-
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-remote-resources-plugin</artifactId>
-
<versionRange>[1.0,)</versionRange>
-
<goals>
-
<goal>process</goal>
-
</goals>
-
</pluginExecutionFilter>
- <action>
-
<ignore>
-
</ignore>
-
</action>
-
</pluginExecution>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-enforcer-plugin</artifactId>
-
<versionRange>[1.0.0,)</versionRange>
-
<goals>
-
<goal>enforce</goal>
-
</goals>
-
</pluginExecutionFilter>
- <action>
-
<ignore />
-
</action>
-
</pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.plugin.version}</version>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<!-- Same version as
org.apache:apache:30 for now -->
