Fixes for guava version bump

Naenyn · Naenyn · commit f2e3a459f9df · 2026-04-21T18:21:19.000-04:00
diff --git a/uPortal-rendering/src/main/java/org/apereo/portal/portlet/container/cache/CachingPortletOutputHandler.java b/uPortal-rendering/src/main/java/org/apereo/portal/portlet/container/cache/CachingPortletOutputHandler.java
@@ -14,7 +14,6 @@
  */
 package org.apereo.portal.portlet.container.cache;
 
-import com.google.common.base.Function;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -102,14 +101,7 @@ public PrintWriter getPrintWriter() throws IOException {
                             this.maximumSize,
                             delegateWriter,
                             this.cachingWriter,
-                            new Function<LimitingTeeWriter, Object>() {
-                                @Override
-                                public Object apply(LimitingTeeWriter input) {
-                                    // Limit hit, clear the cache
-                                    clearCachedWriter();
-                                    return null;
-                                }
-                            });
+                            input -> clearCachedWriter());
 
             // Wrap the limiting tee writer in a PrintWriter to return to the caller
             this.printWriter = new PrintWriter(this.teeWriter);
@@ -135,14 +127,7 @@ public OutputStream getOutputStream() throws IOException {
                             this.maximumSize,
                             delegateOutputStream,
                             this.cachingOutputStream,
-                            new Function<LimitingTeeOutputStream, Object>() {
-                                @Override
-                                public Object apply(LimitingTeeOutputStream input) {
-                                    // Limit hit, clear the cache
-                                    clearCachedStream();
-                                    return null;
-                                }
-                            });
+                            input -> clearCachedStream());
         }
 
         return teeStream;
diff --git a/uPortal-rendering/src/main/java/org/apereo/portal/portlet/container/cache/LimitingTeeOutputStream.java b/uPortal-rendering/src/main/java/org/apereo/portal/portlet/container/cache/LimitingTeeOutputStream.java
@@ -14,9 +14,9 @@
  */
 package org.apereo.portal.portlet.container.cache;
 
-import com.google.common.base.Function;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.function.Consumer;
 import org.apache.commons.io.output.NullOutputStream;
 import org.apereo.portal.utils.TeeOutputStream;
 
@@ -29,7 +29,7 @@
 public class LimitingTeeOutputStream extends TeeOutputStream {
     private final long maximumBytes;
     private final OutputStream branch;
-    private final Function<LimitingTeeOutputStream, ?> limitReachedCallback;
+    private final Consumer<LimitingTeeOutputStream> limitReachedCallback;
     private long byteCount = 0;
     private boolean limitReached = false;
 
@@ -41,7 +41,7 @@ public LimitingTeeOutputStream(
             long maximumBytes,
             OutputStream out,
             OutputStream branch,
-            Function<LimitingTeeOutputStream, ?> limitReachedCallback) {
+            Consumer<LimitingTeeOutputStream> limitReachedCallback) {
         super(out, branch);
         this.maximumBytes = maximumBytes;
         this.branch = branch;
@@ -81,7 +81,7 @@ protected void beforeWrite(int n) throws IOException {
             this.setBranch(NullOutputStream.NULL_OUTPUT_STREAM);
 
             if (this.limitReachedCallback != null) {
-                this.limitReachedCallback.apply(this);
+                this.limitReachedCallback.accept(this);
             }
         }
     }
diff --git a/uPortal-rendering/src/main/java/org/apereo/portal/portlet/container/cache/LimitingTeeWriter.java b/uPortal-rendering/src/main/java/org/apereo/portal/portlet/container/cache/LimitingTeeWriter.java
@@ -14,9 +14,9 @@
  */
 package org.apereo.portal.portlet.container.cache;
 
-import com.google.common.base.Function;
 import java.io.IOException;
 import java.io.Writer;
+import java.util.function.Consumer;
 import org.apache.commons.io.output.NullWriter;
 import org.apereo.portal.utils.TeeWriter;
 
@@ -29,7 +29,7 @@
 public class LimitingTeeWriter extends TeeWriter {
     private final long maximumCharacters;
     private final Writer branch;
-    private final Function<LimitingTeeWriter, ?> limitReachedCallback;
+    private final Consumer<LimitingTeeWriter> limitReachedCallback;
     private long characterCount = 0;
     private boolean limitReached = false;
 
@@ -41,7 +41,7 @@ public LimitingTeeWriter(
             long maximumCharacters,
             Writer out,
             Writer branch,
-            Function<LimitingTeeWriter, ?> limitReachedCallback) {
+            Consumer<LimitingTeeWriter> limitReachedCallback) {
         super(out, branch);
         this.maximumCharacters = maximumCharacters;
         this.branch = branch;
@@ -83,7 +83,7 @@ protected void beforeWrite(int n) throws IOException {
             this.setBranch(NullWriter.NULL_WRITER);
 
             if (this.limitReachedCallback != null) {
-                this.limitReachedCallback.apply(this);
+                this.limitReachedCallback.accept(this);
             }
         }
     }
diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalRawEventsAggregatorImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/events/aggr/PortalRawEventsAggregatorImplTest.java
@@ -175,13 +175,15 @@ public EventProcessingResult answer(InvocationOnMock invocation)
                         new Answer<Boolean>() {
                             @Override
                             public Boolean answer(InvocationOnMock invocation) throws Throwable {
-                                ((Function<PortalEvent, Boolean>) invocation.getArguments()[3])
-                                        .apply(
-                                                new MockPortalEvent(
-                                                        this,
-                                                        "serverName",
-                                                        "eventSessionId",
-                                                        person));
+                                Boolean ignored =
+                                        ((Function<PortalEvent, Boolean>)
+                                                        invocation.getArguments()[3])
+                                                .apply(
+                                                        new MockPortalEvent(
+                                                                this,
+                                                                "serverName",
+                                                                "eventSessionId",
+                                                                person));
 
                                 return false;
                             }
diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/LimitingTeeOutputStreamTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/LimitingTeeOutputStreamTest.java
@@ -18,7 +18,6 @@
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertArrayEquals;
 
-import com.google.common.base.Function;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
@@ -66,13 +65,7 @@ public void testContentExceedsClearBuffer() throws IOException {
                         content.length - 1,
                         NullOutputStream.NULL_OUTPUT_STREAM,
                         byteStream,
-                        new Function<LimitingTeeOutputStream, Object>() {
-                            @Override
-                            public Object apply(LimitingTeeOutputStream input) {
-                                byteStream.reset();
-                                return null;
-                            }
-                        });
+                        input -> byteStream.reset());
         // write the first few chars
         stream.write(content, 0, 5);
         // verify content successfully buffered
diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/LimitingTeeWriterTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/container/cache/LimitingTeeWriterTest.java
@@ -14,7 +14,6 @@
  */
 package org.apereo.portal.portlet.container.cache;
 
-import com.google.common.base.Function;
 import java.io.IOException;
 import org.apache.commons.io.output.NullWriter;
 import org.apache.commons.io.output.StringBuilderWriter;
@@ -60,13 +59,9 @@ public void testContentExceedsClearBuffer() throws IOException {
                         content.length() - 1,
                         NullWriter.NULL_WRITER,
                         stringWriter,
-                        new Function<LimitingTeeWriter, Object>() {
-                            @Override
-                            public Object apply(LimitingTeeWriter input) {
-                                final StringBuilder builder = stringWriter.getBuilder();
-                                builder.delete(0, builder.length());
-                                return null;
-                            }
+                        input -> {
+                            final StringBuilder builder = stringWriter.getBuilder();
+                            builder.delete(0, builder.length());
                         });
         // write the first few chars
         writer.write(content.substring(0, 5));
