Use Spring WebClient

src/main/java/org/corpus_tools/annis/gui/AnnisBaseUI.java

@@ -39,6 +39,7 @@
 import java.util.TreeSet;
 import org.apache.commons.io.filefilter.SuffixFileFilter;
 import org.apache.commons.lang3.StringUtils;
+import org.corpus_tools.annis.gui.objects.InstanceConfig;
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 

src/main/java/org/corpus_tools/annis/gui/AnnisUI.java

@@ -13,8 +13,6 @@
  */
 package org.corpus_tools.annis.gui;
 
-import static org.corpus_tools.annis.gui.Helper.DEFAULT_CONFIG;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.vaadin.annotations.Push;
@@ -27,32 +25,35 @@
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.communication.PushMode;
+import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.spring.annotation.SpringUI;
+import com.vaadin.spring.navigator.SpringViewProvider;
 import com.vaadin.ui.Component;
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import javax.servlet.ServletContext;
-import org.corpus_tools.annis.ApiClient;
 import org.corpus_tools.annis.api.model.CorpusConfiguration;
 import org.corpus_tools.annis.gui.admin.AdminView;
 import org.corpus_tools.annis.gui.components.ExceptionDialog;
+import org.corpus_tools.annis.gui.components.MainToolbar;
+import org.corpus_tools.annis.gui.controller.QueryController;
 import org.corpus_tools.annis.gui.exporter.ExporterPlugin;
 import org.corpus_tools.annis.gui.objects.QueryUIState;
 import org.corpus_tools.annis.gui.query_references.UrlShortener;
-import org.corpus_tools.annis.gui.querybuilder.QueryBuilderPlugin;
+import org.corpus_tools.annis.gui.querybuilder.tiger.QueryBuilderPlugin;
 import org.corpus_tools.annis.gui.requesthandler.BinaryRequestHandler;
-import org.corpus_tools.annis.gui.security.AuthenticationSuccessListener;
-import org.corpus_tools.annis.gui.security.AutoTokenRefreshClient;
 import org.corpus_tools.annis.gui.security.SecurityConfiguration;
+import org.corpus_tools.annis.gui.util.Helper;
 import org.corpus_tools.annis.gui.visualizers.VisualizerPlugin;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Profiles;
+import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * GUI for searching in corpora.
@@ -62,7 +63,7 @@
 @Theme("annis")
 @Widgetset("org.corpus_tools.annis.gui.widgets.gwt.AnnisWidgetSet")
 @SpringUI(path = "/*")
-@Push(value = PushMode.AUTOMATIC)
+@Push(value = PushMode.AUTOMATIC, transport = Transport.LONG_POLLING)
 public class AnnisUI extends CommonUI implements ErrorHandler, ViewChangeListener {
 
   private static final Profiles DESKTOP_PROFILES = Profiles.of("desktop & !test");
@@ -75,7 +76,8 @@ public class AnnisUI extends CommonUI implements ErrorHandler, ViewChangeListene
 
   private QueryController queryController;
 
-  private SearchView searchView;
+  @Autowired
+  SpringViewProvider viewProvider;
 
   @Autowired
   private List<VisualizerPlugin> visualizerPlugins;
@@ -92,7 +94,10 @@ public class AnnisUI extends CommonUI implements ErrorHandler, ViewChangeListene
   @Autowired
   private UIConfig config;
 
-  private final AuthenticationSuccessListener authListener;
+  @Autowired
+  private WebClient webClient;
+
+  private SearchView searchView;
 
   private AdminView adminView;
 
@@ -113,10 +118,8 @@ public class AnnisUI extends CommonUI implements ErrorHandler, ViewChangeListene
    */
   private MainToolbar toolbar;
 
-  @Autowired
-  public AnnisUI(ServiceStarter serviceStarter, AuthenticationSuccessListener authListener) {
-    super("", serviceStarter, authListener);
-    this.authListener = authListener;
+  public AnnisUI(ServiceStarter serviceStarter) {
+    super("", serviceStarter);
     initTransients();
   }
 
@@ -130,11 +133,11 @@ public boolean beforeViewChange(ViewChangeEvent event) {
     // make sure the toolbar is removed from the old view
     searchView.setToolbar(null);
     adminView.setToolbar(null);
-    toolbar.setSidebar(null);
+    toolbar.setSearchView(null);
 
     if (event.getNewView() == searchView) {
       searchView.setToolbar(toolbar);
-      toolbar.setSidebar(searchView);
+      toolbar.setSearchView(searchView);
       toolbar.setNavigationTarget(MainToolbar.NavigationTarget.ADMIN, AnnisUI.this);
     } else if (event.getNewView() == adminView) {
       adminView.setToolbar(toolbar);
@@ -182,12 +185,7 @@ public CorpusConfiguration getCorpusConfigWithCache(String corpus) {
     if (corpusConfigCache != null) {
       config = corpusConfigCache.getIfPresent(corpus);
       if (config == null) {
-        if (corpus.equals(DEFAULT_CONFIG)) {
-          config = Helper.getDefaultCorpusConfig();
-        } else {
-          config = Helper.getCorpusConfig(corpus, AnnisUI.this);
-        }
-
+        config = Helper.getCorpusConfig(corpus, AnnisUI.this).block();
         corpusConfigCache.put(corpus, config);
       }
     }
@@ -227,11 +225,11 @@ protected void init(VaadinRequest request) {
     setErrorHandler(this);
 
     adminView = new AdminView(AnnisUI.this);
+    searchView = new SearchView(AnnisUI.this);
 
     toolbar = new MainToolbar(getConfig(), oauth2Clients);
     toolbar.setQueryController(queryController);
 
-    this.searchView = new SearchView(this);
     this.queryController = new QueryController(this, searchView, queryState);
 
     toolbar.addLoginListener(searchView);
@@ -246,10 +244,10 @@ protected void init(VaadinRequest request) {
 
     loadInstanceFonts();
 
-    if (Helper.getUser(this).isPresent()) {
+    if (Helper.getUser().isPresent()) {
       getToolbar().onLogin();
     }
-    
+
     Object fragmentToRestore =
         VaadinSession.getCurrent().getAttribute(SecurityConfiguration.FRAGMENT_TO_RESTORE);
     if (fragmentToRestore instanceof String) {
@@ -260,8 +258,8 @@ protected void init(VaadinRequest request) {
   }
 
   @Override
-  public ApiClient getClient() {
-    return new AutoTokenRefreshClient(this, this.getAuthListener());
+  public WebClient getWebClient() {
+    return webClient;
   }
 
 
@@ -319,8 +317,4 @@ public ServletContext getServletContext() {
   public OAuth2ClientProperties getOauth2ClientProperties() {
     return this.oauth2Clients;
   }
-
-  public AuthenticationSuccessListener getAuthListener() {
-    return authListener;
-  }
 }

src/main/java/org/corpus_tools/annis/gui/AnnisUiApplication.java

@@ -7,7 +7,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 

src/main/java/org/corpus_tools/annis/gui/CommonUI.java

@@ -21,18 +21,20 @@
 import java.util.Map;
 import java.util.Optional;
 import javax.servlet.ServletContext;
-import org.corpus_tools.annis.ApiClient;
-import org.corpus_tools.annis.ApiException;
 import org.corpus_tools.annis.gui.components.SettingsStorage;
+import org.corpus_tools.annis.gui.objects.FontConfig;
+import org.corpus_tools.annis.gui.objects.InstanceConfig;
 import org.corpus_tools.annis.gui.requesthandler.ResourceRequestHandler;
-import org.corpus_tools.annis.gui.security.AuthenticationSuccessListener;
 import org.corpus_tools.annis.gui.security.SecurityConfiguration;
+import org.corpus_tools.annis.gui.util.Helper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
 
 /**
  *
@@ -49,18 +51,14 @@ public abstract class CommonUI extends AnnisBaseUI {
 
     private InstanceConfig instanceConfig;
 
-    private SecurityContext securityContext;
-
-    protected CommonUI(String urlPrefix, ServiceStarter serviceStarter,
-        AuthenticationSuccessListener authListener) {
-        this.urlPrefix = urlPrefix;
-        Optional<Authentication> desktopAuth = serviceStarter.getDesktopUserToken();
-        if (desktopAuth.isPresent()) {
-          // Login the provided desktop user
-          getSecurityContext().setAuthentication(desktopAuth.get());
-          authListener.setToken(desktopAuth.get().getCredentials().toString());
-        }
-    }
+	protected CommonUI(String urlPrefix, ServiceStarter serviceStarter) {
+		this.urlPrefix = urlPrefix;
+		Optional<Authentication> userToken = serviceStarter.getDesktopUserToken();
+		if(userToken.isPresent()) {
+			// Login with the static desktop token
+			SecurityContextHolder.getContext().setAuthentication(userToken.get());
+		}
+	}
 
 
     public InstanceConfig getInstanceConfig() {
@@ -173,9 +171,7 @@ public String getUrlPrefix() {
         return urlPrefix;
     }
 
-    public abstract ApiClient getClient();
-
-
+    public abstract WebClient getWebClient();
 
     /**
      * Handle common errors like database/service connection problems and display a unified error
@@ -194,10 +190,10 @@ public boolean handleCommonError(Throwable ex, String action) {
           rootCause = rootCause.getCause();
         }
 
-        if (rootCause instanceof ApiException) {
-          ApiException apiEx = (ApiException) rootCause;
+        if (rootCause instanceof WebClientResponseException) {
+          WebClientResponseException apiEx = (WebClientResponseException) rootCause;
 
-          if (apiEx.getCode() == 503) {
+          if (apiEx.getStatusCode() == HttpStatus.SERVICE_UNAVAILABLE) {
             // database connection error
             Notification n = new Notification(
                 "Can't execute " + (action == null ? "" : "\"" + action + "\"")
@@ -214,7 +210,7 @@ public boolean handleCommonError(Throwable ex, String action) {
 
             n.show(this.getPage());
             return true;
-          } else if (apiEx.getCode() == 401) {
+          } else if (apiEx.getStatusCode() == HttpStatus.UNAUTHORIZED) {
             redirectToLogin();
             return true;
           }
@@ -225,13 +221,6 @@ public boolean handleCommonError(Throwable ex, String action) {
 
     public abstract ServletContext getServletContext();
 
-    public SecurityContext getSecurityContext() {
-      if (this.securityContext == null) {
-        this.securityContext = SecurityContextHolder.getContext();
-      }
-      return securityContext;
-    }
-
     public abstract OAuth2ClientProperties getOauth2ClientProperties();
 
     public abstract UIConfig getConfig();