NMS-7797: Migrate to Vaadin v8.5.2 (#2224)

* NMS-7797: Update vaadin version to 7.7.15 and make it compile and start

* NMS-7797: Add custom stylings to default topology theme

* NMS-7797: Update Vaadin to 8.0.7

* NMS-7797: Refactor vaadin-jmxconfiggenerator to fix UI.getCurrent() being null when invoked not from VaadinRequest

* NMS-7797: Use official vaadin-context-menu addon to get vaadin 7 backwards compatibility

* NMS-7797: Rework widgetset compilation and wiring

* NMS-7797: Use default gwt version 2.8.2 instead of old 2.6.x

* NMS-7797: Revert scss changes as they don't work with our current layout

* NMS-7797: Enable vaadin-opennms-pluginmanager

* NMS-7797: Add auto-detection for custom widgetsets

* Remove RemotePollerMap

* NMS-7797: Fix plugin manager integration with Vaadin 7

* NMS-7797: Fix Property name

* NMS-7797: Update to Vaadin v8.5.2

* NMS-7797: Use getText() instead of getDescription()

* NMS-7797: Only hover over sub-menu elements instead of clicking them

* NMS-7797: Prevent sub-menus to cause NPEs when beeing clicked

* NMS-7797: Do not re-use Notification object as they are not re-usable (over multiple requests)

* NMS-7797: Use getUI().getSession() instead of VaadinSession.getCurrent() to prevent NPEs

* NMS-7797: Remove TODO

* NMS-7797: Remove unused import

* NMS-7797: Use getUI().getPage() instead of Page.getCurrent() to prevent NPEs

* NMS-7797: Make UserTimeZoneExtractor use instance of UI instead of VaadinSession.getCurrent() to prevent NPEs

* NMS-7797: Fixed Vaadin Surveillance Views

* NMS-7797: Fixed Vaadin Ops Board

* NMS-7797: Fixed Vaadin Alarm Dashlet

* NMS-7797: Fixed Vaadin BSM Dashlet

* NMS-7797: Fixed Vaadin Image Dashlet

* NMS-7797: Fixed Vaadin KSC Dashlet

* NMS-7797: Fixed Vaadin RTC Dashlet

* NMS-7797: Fixed Vaadin Charts Dashlet

* NMS-7797: Fixed Vaadin URL Dashlet

* NMS-7797: Fixed Vaadin Map Dashlet

* NMS-7797: Fixed Vaadin RRD Dashlet

* NMS-7797: Fixed Vaadin Surveillance Dashlet

* NMS-7797: Fixed Vaadin Topology Dashlet

* NMS-7797: Fixed Vaadin Grafana Dashlet

* NMS-7797: Fixed OpsBoardAdminPageIT

* NMS-7797: Fixed margin in Ops Board

* NMS-7797: Fixed missing progress indicator in Ops Board

* NMS-7797: Fix tooltips

* NMS-7797: Migrate vaadin-snmp-events-and-metrics to properly use isReadOnly and setReadOnly methods

* NMS-7797: Make table scale dynaimcally with available pixels vs fixed height

* NMS-7797: Use release version instead of snapshot

features/bsm/vaadin-adminpage/pom.xml

@@ -25,6 +25,7 @@
                         <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Vaadin-Package-Version>1</Vaadin-Package-Version>
+                        <Vaadin-Widgetsets>org.opennms.vaadin.DefaultWidgetset</Vaadin-Widgetsets>
                     </instructions>
                 </configuration>
             </plugin>
@@ -54,6 +55,11 @@
             <artifactId>core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opennms.features.vaadin-components</groupId>
+            <artifactId>widgetset</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.opennms.features.topology</groupId>
             <artifactId>org.opennms.features.topology.link</artifactId>

features/bsm/vaadin-adminpage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceContainer.java

@@ -37,7 +37,7 @@
 import org.opennms.netmgt.bsm.service.model.graph.GraphVertex;
 
 import com.google.common.collect.Maps;
-import com.vaadin.data.util.BeanContainer;
+import com.vaadin.v7.data.util.BeanContainer;
 
 /**
  * Container which holds {@link BusinessServiceRow} objects.

features/bsm/vaadin-adminpage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceEdgeEditWindow.java

@@ -53,16 +53,16 @@
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
-import com.vaadin.data.Validator;
-import com.vaadin.shared.ui.combobox.FilteringMode;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.ui.FormLayout;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.HorizontalLayout;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 /**

features/bsm/vaadin-adminpage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceEditWindow.java

@@ -57,17 +57,17 @@
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
-import com.vaadin.data.Property;
-import com.vaadin.data.Validator;
-import com.vaadin.data.validator.AbstractStringValidator;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.validator.AbstractStringValidator;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Field;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.HorizontalLayout;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 /**

features/bsm/vaadin-adminpage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceFilter.java

@@ -30,9 +30,9 @@
 
 import java.util.Map;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 public class BusinessServiceFilter implements Container.Filter {
     public static final String NAME_PROPERTY = "name";

features/bsm/vaadin-adminpage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceMainLayout.java

@@ -34,16 +34,16 @@
 import org.opennms.netmgt.bsm.service.model.BusinessService;
 import org.opennms.netmgt.vaadin.core.UIHelper;
 
-import com.vaadin.event.FieldEvents;
+import com.vaadin.v7.event.FieldEvents;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.HorizontalLayout;
+import com.vaadin.v7.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Notification.Type;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.VerticalLayout;
 
 /**
  * This class represents the main  Vaadin component for editing Business Service definitions.

features/bsm/vaadin-adminpage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceTreeTable.java

@@ -48,19 +48,19 @@
 
 import com.google.common.base.Strings;
 import com.google.common.collect.HashBasedTable;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.HorizontalLayout;
+import com.vaadin.v7.ui.Label;
 import com.vaadin.ui.Link;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
 
 /**
  * {@link TreeTable} for {@link BusinessServiceRow} objects.

features/bsm/vaadin-adminpage/src/main/resources/OSGI-INF/blueprint/blueprint.xml

@@ -21,6 +21,7 @@
     <service interface="org.opennms.vaadin.extender.ApplicationFactory" ref="bsmAdminPageApplicationFactory">
         <service-properties>
             <entry key="alias" value="/admin/bsm-admin-page" />
+            <entry key="init.widgetset" value="org.opennms.vaadin.DefaultWidgetset" />
         </service-properties>
     </service>
     <service interface="org.opennms.web.navigate.PageNavEntry" ref="bsmAdminPageUi">

features/geolocation/feature/pom.xml

@@ -16,6 +16,11 @@
             <plugin>
                 <groupId>org.opennms.maven.plugins</groupId>
                 <artifactId>features-maven-plugin</artifactId>
+                <configuration>
+                    <features>
+                        <feature>opennms-core-web</feature>
+                    </features>
+                </configuration>
             </plugin>
         </plugins>
     </build>

features/jest/client/src/main/java/org/opennms/plugins/elasticsearch/rest/RestClientFactory.java

@@ -29,8 +29,11 @@
 package org.opennms.plugins.elasticsearch.rest;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
+import java.net.Socket;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -44,7 +47,9 @@
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
+import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.protocol.HttpContext;
 import org.opennms.plugins.elasticsearch.rest.credentials.CredentialsParser;
 import org.opennms.plugins.elasticsearch.rest.credentials.CredentialsProvider;
 import org.opennms.plugins.elasticsearch.rest.executors.LimitedRetriesRequestExecutor;

features/opennms-osgi-core/pom.xml

@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-server</artifactId>
+            <artifactId>vaadin-compatibility-server</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>