Update branch #9665

TatuLund · 2020-12-16T06:36:27Z

No description provided.

Lock the registry when registering dynamic route in serviceInit to not have a race where 2 inits note that path is not registered and then try to register the route. Fixes #9223

8d012f7 removed some log and converted others into debug but log in disconnectedCallback was left.

Exposes DataCommunicator::getDataProviderSize to the components, in order to get the items count taking into account the countCallback, if it has been set previously. Related-to: vaadin/flow-components#282

Fix typo in DataCommunicator::getDataProviderSize() javadoc.

#9275) HierarchicalDataCommunicator's expanded state were not being synchronised with client side and TreeGrid's expanded nodes were being collapsed after re-attaching. Warranty: Sync TreeGrid expanded items state with the client side when detaching and reattaching Fixes: #9175

* feat: Create Flow plugins for webpack Moved stats file handling to a custom plugin. Added feature for copying custom Flow plugins for use with webpack. Fixes #9283

AppShellConfigurator is now also considered when scanning for annotations and deciding theme. Fixes #9110

…der (#9336) Fixes: #9328 Details: HierarchicalDataProvider's reset method was called before recreating the HierrarchyMapper in setDataProvider. This was creating wrong updates for the client side.

Having the `@Theme` annotation on Flow views or router layouts will not be allowed anymore, it should be on `AppShellConfigurator` instead. Fixes #9092

…dated (#9329) * test(TypeScript): ensure CSRF token is updated when session is invalidated Fixes #9164 * add log message

- Use tree-shakeable ES imports for TS form validators based on the latest version of validators lib. - Add missing `return` in the `submit()` method

Add a string definition for theme that matches the "application theme" in the theme folder inside /frontend/theme/, loading the css automatically from there. This is based on Lumo theme, always. Change old class based theme to use themeClass for theme selection. Fixes #9281

In-memory filtering and sorting are now stored directly in component, which gives an opportunity to change it through the data view API for a certain component separately from other components bound to the same data provider. Fixes #8655

…ed (#9368) Supports headers of the type Range: -123 and Range: 123-. Fixes #9083.

…nent' (#9390) Revert the changes for #8655 to be able to bump the version of components and avoid compile errors.

This module is subsumed by test-router-custom-context.

Theme Class and Theme Name is not supported in the same Theme annotation as theme name builds on the Lumo theme. test-themes is now for testing the Application theme only. Old theme test was moved into test-misc. Fixes #9370

In-memory filtering and sorting are now stored directly in component, which gives an opportunity to change it through the data view API for a certain component separately from other components bound to the same data provider. Fixes: #8655

Now we only handle the theme with the name inside the Theme annotation. Fixes #9383

Read token file as a bundle resource in OSGi Fixes #9146 Fix NPE Revert logic back to the previous state # Conflicts: # flow-server/src/main/java/com/vaadin/flow/server/DeploymentConfigurationFactory.java # flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendUtils.java # flow-server/src/main/java/com/vaadin/flow/server/osgi/OSGiAccess.java

Fixes #9185 Exclude non-serializable classes Drop dependency to flow-push from flow-server # Conflicts: # flow-server/src/main/java/com/vaadin/flow/server/BootstrapHandler.java # flow-server/src/main/java/com/vaadin/flow/server/DeploymentConfigurationFactory.java # flow-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer # flow-server/src/test/java/com/vaadin/flow/server/connect/generator/endpoints/model/OSGiInstantiatorFactory.java # flow-server/src/test/java/com/vaadin/flow/server/connect/generator/endpoints/model/OSGiResourceProvider.java # flow-server/src/test/java/com/vaadin/flow/server/connect/typeconversion/StringConversionTest.java

# Conflicts: # flow-push/pom.xml # flow-server/src/main/java/com/vaadin/flow/server/osgi/VaadinBundleTracker.java

vaadin-bot · 2020-12-16T07:55:57Z

flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/FrontendDependencies.java

+                    theme = getFinder().loadClass(themeClass);
+                } else {
+                    theme = getDefaultTheme();
+                    if (theme == null) {


Refactor this code to not nest more than 3 if/for/while/switch/try statements.

vaadin-bot · 2020-12-16T07:55:58Z

flow-server/src/main/java/com/vaadin/flow/server/startup/LookupInitializer.java

+        initStandardLookup(classSet, servletContext);
+
+        DeferredServletContextInitializers initializers;
+        synchronized (servletContext) {


"servletContext" is a method parameter, and should not be used for synchronization.

vaadin-bot · 2020-12-16T07:55:59Z

flow-server/src/main/java/com/vaadin/flow/server/startup/LookupInitializer.java

+ *
+ */
+@HandlesTypes({ ResourceProvider.class, InstantiatorFactory.class,
+        DeprecatedPolymerPublishedEventHandler.class,


Remove this use of "DeprecatedPolymerPublishedEventHandler"; it is deprecated.

vaadin-bot · 2020-12-16T07:56:00Z

flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendUtils.java

     * @see #DEFAULT_FLOW_RESOURCES_FOLDER
     */
    @Deprecated
-    public static final String DEAULT_FLOW_RESOURCES_FOLDER =
-            DEFAULT_FLOW_RESOURCES_FOLDER;
+    public static final String DEAULT_FLOW_RESOURCES_FOLDER = DEFAULT_FLOW_RESOURCES_FOLDER;


Do not forget to remove this deprecated code someday.

vaadin-bot · 2020-12-16T07:56:01Z

flow-server/src/main/java/com/vaadin/flow/server/DevModeHandler.java

            getLogger().error("Failed to start the webpack process", e);
+        } catch (InterruptedException e) {


Either re-interrupt this method or rethrow the "InterruptedException".

vaadin-bot · 2020-12-16T07:56:02Z

...rc/main/java/com/vaadin/flow/server/startup/ClassLoaderAwareServletContainerInitializer.java

-        ClassLoader webClassLoader = ctx.getClassLoader();
-        ClassLoader classLoader = getClass().getClassLoader();
+        // see DeferredServletContextIntializers
+        DeferredServletContextInitializers.Initializer deferredInitializer = ctx -> {


Reduce this lambda expression number of lines from 37 to at most 20.

vaadin-bot · 2020-12-16T07:56:03Z

...rc/main/java/com/vaadin/flow/server/startup/ClassLoaderAwareServletContainerInitializer.java

+                } else {
+                    /*
+                     * The classloader which has loaded this class ({@code
+                     * classLoader}) should be either the {@code webClassLoader}


This block of commented-out lines of code should be removed.

vaadin-bot · 2020-12-16T07:56:04Z

...rc/main/java/com/vaadin/flow/server/startup/ClassLoaderAwareServletContainerInitializer.java

+                    DeferredServletContextInitializers initializers = vaadinContext
+                            .getAttribute(
+                                    DeferredServletContextInitializers.class,
+                                    () -> new DeferredServletContextInitializers());


Replace this lambda with a method reference.

vaadin-bot · 2020-12-16T07:56:06Z

...rc/main/java/com/vaadin/flow/server/startup/ClassLoaderAwareServletContainerInitializer.java

+                                    DeferredServletContextInitializers.class,
+                                    () -> new DeferredServletContextInitializers());
+                    initializers.addInitializer(
+                            ctx -> deferredInitializer.init(ctx));


Replace this lambda with a method reference.

vaadin-bot · 2020-12-16T07:56:07Z

...rc/main/java/com/vaadin/flow/server/startup/ClassLoaderAwareServletContainerInitializer.java

+        if (requiresLookup()) {
+            VaadinServletContext vaadinContext = new VaadinServletContext(
+                    context);
+            synchronized (context) {


"context" is a method parameter, and should not be used for synchronization.

vaadin-bot · 2020-12-16T07:56:08Z

...oint/src/test/java/com/vaadin/flow/server/startup/fusion/DevModeInitializerEndpointTest.java

+            DevModeInitializer devModeInitializer = new DevModeInitializer();
+            devModeInitializer.onStartup(classes, servletContext);
+            waitForDevModeServer();
+            Thread.sleep(200);


Remove this use of "Thread.sleep()".

vaadin-bot · 2020-12-16T07:56:08Z

flow-server/src/main/java/com/vaadin/flow/server/startup/AbstractConfigurationFactory.java

+     *            the token file data
+     * @return the config parameters
+     */
+    public Map<String, String> getConfigParametersUsingTokenData(


Refactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.

vaadin-bot · 2020-12-16T07:56:09Z

flow-server/src/main/java/com/vaadin/flow/server/DeploymentConfigurationFactory.java

-    }
-
-    private static String getTokenFileContents(Properties initParameters) {
+    private static String getTokenFileContents(Class<?> systemPropertyBaseClass,


Remove this unused method parameter "systemPropertyBaseClass".

vaadin-bot · 2020-12-16T07:56:11Z

flow-server/src/main/java/com/vaadin/flow/server/DeploymentConfigurationFactory.java


        // Read the json and set the appropriate system properties if not
        // already set.
        if (json != null) {
            JsonObject buildInfo = JsonUtil.parse(json);
-            setInitParametersUsingTokenData(initParameters, buildInfo);
+            // TODO : will be rewritten properly without extra instantiation


Complete the task associated to this TODO comment.

vaadin-bot · 2020-12-16T07:56:11Z

flow-server/src/main/java/com/vaadin/flow/server/DeploymentConfigurationFactory.java

@@ -146,6 +133,7 @@ protected static Properties createInitParameters(
        readUiFromEnclosingClass(systemPropertyBaseClass, initParameters);
        readConfigurationAnnotation(systemPropertyBaseClass, initParameters);

+        // TODO : will be removed in futher commits


Complete the task associated to this TODO comment.

vaadin-bot · 2020-12-16T07:56:12Z

flow-server/src/main/java/com/vaadin/flow/server/startup/DevModeInitializer.java

-
-        DevModeHandler.start(config, builder.npmFolder, runNodeTasks);
+        // Check whether executor is provided by the caller (framework)
+        Executor service = lookup.lookup(Executor.class);


A "NullPointerException" could be thrown; "lookup" is nullable here.

vaadin-bot · 2020-12-16T07:56:13Z

flow-server/src/main/java/com/vaadin/flow/server/BootstrapHandler.java

+        }
+
+        private ResourceProvider getResourceProvider(BootstrapContext context) {
+            ResourceProvider resourceProvider = context.getSession()


Immediately return this expression instead of assigning it to the temporary variable "resourceProvider".

vaadin-bot · 2020-12-16T07:56:14Z

flow-server/src/main/java/com/vaadin/flow/di/Lookup.java

+
+            @Override
+            public <U> U lookup(Class<U> serviceClass) {
+                if (services.contains(serviceClass)) {


A "Set" cannot contain a "Class"

vaadin-bot · 2020-12-16T07:56:16Z

flow-server/src/main/java/com/vaadin/flow/internal/ResponseWriter.java

-        while (rangeMatcher.find()) {
-            final long start = Long.parseLong(rangeMatcher.group(1));
-            final long end = Long.parseLong(rangeMatcher.group(2));
+        Stack<Pair<Long, Long>> ranges = new Stack<>();


Replace the synchronized class "Stack" by an unsynchronized one such as "Deque".

vaadin-bot · 2020-12-16T07:56:17Z

flow-server/src/main/java/com/vaadin/flow/internal/ResponseWriter.java

            if (end < start
                    || (resourceLength >= 0 && start >= resourceLength)) {
                // illegal range -> 416
+                getLogger().info("received an illegal range '{}' for resource '{}'",
+                        rangeMatcher.group(), resourceURL);


Invoke method(s) only conditionally.

vaadin-bot · 2020-12-16T07:56:18Z

flow-server/src/main/java/com/vaadin/flow/internal/ResponseWriter.java

+            if (startGroup.isEmpty() && endGroup.isEmpty()) {
+                response.setContentLengthLong(0L);
+                response.setStatus(416); // Range Not Satisfiable
+                getLogger().info("received a malformed range: '{}'", rangeMatcher.group());


Invoke method(s) only conditionally.

vaadin-bot · 2020-12-16T07:56:19Z

flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeTasks.java

@@ -125,51 +126,54 @@
         */
        private URI nodeDownloadRoot = URI.create(NodeInstaller.DEFAULT_NODEJS_DOWNLOAD_ROOT);

+        private Lookup lookup;


Make "lookup" transient or serializable.

vaadin-bot · 2020-12-16T07:56:20Z