Merge pull request #154 from shadogray/master

replace myfaces-api Assert
apache · Feb 29, 2024 · 61cd09b · 61cd09b
2 parents 3cea667 + 6abec92
commit 61cd09b
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/...odules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java b/...odules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java
@@ -26,17 +26,12 @@
 import jakarta.faces.render.ResponseStateManager;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.deltaspike.jsf.api.config.base.JsfBaseConfig;
-import org.apache.myfaces.core.api.shared.lang.Assert;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -85,7 +80,10 @@ public static String constructRequestUrl(FacesContext facesContext, ExternalCont
     // copied from MyFaces
     private static String encodeURL(String baseUrl, FacesContext facesContext, String encoding)
     {
-        Assert.notNull(baseUrl, "url");
+        if (baseUrl == null)
+        {
+            throw new NullPointerException("baseUrl is null");
+        }
 
         String fragment = null;
         String queryString = null;