Rename findAndFilterDependencies to findDependencies (#9366)

The old findDependencies method is made private since it's only an
implementation detail and should not be used from outside the class.

At the same time, the new findAndFilterDependencies method is renamed to
findDependencies since there's no longer necessary to have a name that
distinguishes it from the variant that doesn't do any filtering.

diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
index bd091c6cc19bc5967b75fde97bad50f9093530ed..01fd2bf880fe26080b1bb352be1cb36b1d2dbc90 100644 (file)
--- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
@@ -577,10 +577,10 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
                     .attr("href", themeUri + "/favicon.ico");
         }
 
-        Collection<? extends Dependency> deps = Dependency
-                .findAndFilterDependencies(Collections.singletonList(uiClass),
-                        context.getSession().getCommunicationManager(),
-                        new FilterContext(context.getSession()));
+        Collection<? extends Dependency> deps = Dependency.findDependencies(
+                Collections.singletonList(uiClass),
+                context.getSession().getCommunicationManager(),
+                new FilterContext(context.getSession()));
         for (Dependency dependency : deps) {
             Type type = dependency.getType();
             String url = context.getUriResolver()

diff --git a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java
index ee25a95f8a2466f6fe566e0c98879700f59b85c8..c6c2d77fcb19888f8387bca0bc052e3cf20ece6c 100644 (file)
--- a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java
@@ -285,8 +285,8 @@ public class UidlWriter implements Serializable {
 
             List<Dependency> dependencies = new ArrayList<>();
             dependencies.addAll(ui.getPage().getPendingDependencies());
-            dependencies.addAll(Dependency.findAndFilterDependencies(
-                    newConnectorTypes, manager, new FilterContext(session)));
+            dependencies.addAll(Dependency.findDependencies(newConnectorTypes,
+                    manager, new FilterContext(session)));
 
             // Include dependencies in output if there are any
             if (!dependencies.isEmpty()) {

diff --git a/server/src/main/java/com/vaadin/ui/Dependency.java b/server/src/main/java/com/vaadin/ui/Dependency.java
index 537887a9f248d569ec5c2bd931e2e59363294ea3..6557590c0899b5f76dbd776a4a398daae44cd67a 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/Dependency.java
+++ b/server/src/main/java/com/vaadin/ui/Dependency.java
@@ -158,7 +158,7 @@ public class Dependency implements Serializable {
      * @return the list of found dependencies
      */
     @SuppressWarnings("deprecation")
-    public static List<Dependency> findDependencies(
+    private static List<Dependency> findDependencies(
             List<Class<? extends ClientConnector>> connectorTypes,
             LegacyCommunicationManager manager) {
         List<Dependency> dependencies = new ArrayList<>();
@@ -191,7 +191,7 @@ public class Dependency implements Serializable {
      *            the context information for the filtering operation
      * @return the list of found and filtered dependencies
      */
-    public static List<Dependency> findAndFilterDependencies(
+    public static List<Dependency> findDependencies(
             List<Class<? extends ClientConnector>> connectorTypes,
             LegacyCommunicationManager manager, FilterContext context) {
         List<Dependency> dependencies = findDependencies(connectorTypes,