Fix #208 [skip ci]

src/main/java/com/databasepreservation/DBVTK.java

@@ -44,7 +44,8 @@ public static class DefaultView implements WebMvcConfigurer {
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-      if (ViewerConstants.DESKTOP.equals(System.getProperty("env", "server"))) {
+      if (ViewerConstants.APPLICATION_ENV_DESKTOP
+        .equals(System.getProperty(ViewerConstants.APPLICATION_ENV_KEY, ViewerConstants.APPLICATION_ENV_SERVER))) {
         registry.addViewController("/").setViewName("forward:/desktop.html");
         registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
       }
@@ -56,7 +57,8 @@ public void addViewControllers(ViewControllerRegistry registry) {
   @Bean
   public ServletRegistrationBean<HttpServlet> browserService() {
     ServletRegistrationBean<HttpServlet> bean;
-    if (ViewerConstants.DESKTOP.equals(System.getProperty("env", "server"))) {
+    if (ViewerConstants.APPLICATION_ENV_DESKTOP
+      .equals(System.getProperty(ViewerConstants.APPLICATION_ENV_KEY, ViewerConstants.APPLICATION_ENV_SERVER))) {
       bean = new ServletRegistrationBean<>(new BrowserServiceImpl(),
         "/com.databasepreservation.desktop.Desktop/browse");
     } else {

src/main/java/com/databasepreservation/common/api/v1/ContextResource.java

@@ -8,6 +8,7 @@
 
 import javax.ws.rs.Path;
 
+import com.databasepreservation.common.server.ViewerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -27,7 +28,7 @@ public class ContextResource implements ContextService {
 
   @Override
   public String getEnvironment() {
-    return System.getProperty("env", "server");
+    return ViewerFactory.getViewerConfiguration().getApplicationEnvironment();
   }
 
   @Override

src/main/java/com/databasepreservation/common/api/v1/DatabaseResource.java

@@ -29,7 +29,6 @@
 import com.databasepreservation.common.server.ViewerFactory;
 import com.databasepreservation.common.server.controller.SIARDController;
 import com.databasepreservation.common.utils.ControllerAssistant;
-import com.databasepreservation.common.utils.UserUtility;
 
 /**
  * @author Miguel Guimarães <mguimaraes@keep.pt>
@@ -47,7 +46,7 @@ public IndexResult<ViewerDatabase> find(FindRequest findRequest, String localeSt
     LogEntryState state = LogEntryState.SUCCESS;
     User user = controllerAssistant.checkRoles(request);
 
-    if (ViewerConfiguration.getInstance().getApplicationEnvironment().equals(ViewerConstants.SERVER)) {
+    if (ViewerConfiguration.getInstance().getApplicationEnvironment().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
       if (user.isAdmin()) {
         return getViewerDatabaseIndexResult(findRequest, controllerAssistant, user, state);
       } else {

src/main/java/com/databasepreservation/common/client/ViewerConstants.java

@@ -384,8 +384,9 @@ public class ViewerConstants {
   /*
    * Application Environment
    */
-  public static final String DESKTOP = "desktop";
-  public static final String SERVER = "server";
+  public static final String APPLICATION_ENV_KEY = "env";
+  public static final String APPLICATION_ENV_DESKTOP = "desktop";
+  public static final String APPLICATION_ENV_SERVER = "server";
 
   /*
    * DBPTK Parameters

src/main/java/com/databasepreservation/common/client/common/helpers/HelperExportTableData.java

@@ -68,7 +68,7 @@ public boolean isZipHelper() {
   private FlowPanel buildCSVExport() {
     FlowPanel panel = new FlowPanel();
 
-    if (ViewerConstants.SERVER.equals(ApplicationType.getType())) {
+    if (ViewerConstants.APPLICATION_ENV_SERVER.equals(ApplicationType.getType())) {
       GenericField genericFieldFilename = GenericField.createInstance(messages.csvExportDialogLabelForFilename(),
         filenameTextBox);
       filenameTextBox.addStyleName("form-textbox");

src/main/java/com/databasepreservation/common/client/common/helpers/HelperUploadSIARDFile.java

@@ -20,7 +20,6 @@
 import com.databasepreservation.common.client.services.DatabaseService;
 import com.databasepreservation.common.client.tools.HistoryManager;
 import com.databasepreservation.common.client.tools.JSOUtils;
-import com.databasepreservation.common.client.widgets.Toast;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.i18n.client.LocaleInfo;
@@ -40,7 +39,7 @@ public class HelperUploadSIARDFile {
     "<div id='loading' class='spinner'><div class='double-bounce1'></div><div class='double-bounce2'></div></div>"));
 
   public void openFile(FlowPanel panel) {
-    if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
 
       ExtensionFilter siard = new ExtensionFilter("SIARD", Collections.singletonList("siard"));
 
@@ -67,7 +66,7 @@ private void openSIARDPath(FlowPanel panel, String path) {
         new Sublist(), Facets.NONE, false, Collections.singletonList(ViewerConstants.INDEX_ID));
       DatabaseService.Util.call((IndexResult<ViewerDatabase> result) -> {
         if (result.getTotalCount() == 1) {
-          if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+          if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
             JavascriptUtils.confirmationDialog(messages.dialogReimportSIARDTitle(), messages.dialogReimportSIARD(),
               messages.basicActionCancel(), messages.basicActionConfirm(), new DefaultAsyncCallback<Boolean>() {
                 @Override

src/main/java/com/databasepreservation/common/client/common/helpers/HelperValidator.java

@@ -83,7 +83,7 @@ public FlowPanel reporterValidatorPanel() {
     Button clearButton = new Button();
 
     reporterButton.addClickHandler((ClickEvent event) -> {
-      if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+      if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
         JavaScriptObject.createArray();
         ExtensionFilter extensionFilter = new ExtensionFilter();
         extensionFilter.setName(ViewerConstants.REPORT_FILES);
@@ -114,7 +114,7 @@ public FlowPanel udtValidatorPanel() {
     Button clearButton = new Button();
 
     udtButton.addClickHandler((ClickEvent event) -> {
-      if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+      if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
         ExtensionFilter txt = new ExtensionFilter(Constants.UDT, Collections.singletonList("txt"));
 
         JavaScriptObject options = JSOUtils.getOpenDialogOptions(Collections.singletonList("openFile"),

src/main/java/com/databasepreservation/common/client/common/lists/DatabaseList.java

@@ -119,7 +119,7 @@ public String getValue(ViewerDatabase database) {
       }
     };
     locationColumn.setFieldUpdater((index, object, value) -> {
-      if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+      if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
         JavascriptUtils.showItemInFolder(object.getPath());
       } else {
         SafeUri downloadUri = RestUtils.createFileResourceDownloadSIARDUri(object.getPath());
@@ -164,7 +164,7 @@ public String getValue(ViewerDatabase object) {
     };
     openColumn.setFieldUpdater((index, object, value) -> HistoryManager.gotoSIARDInfo(object.getUuid()));
 
-    if (ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
       UserLogin.getInstance().getAuthenticatedUser(new DefaultAsyncCallback<User>() {
         @Override
         public void onSuccess(User user) {

src/main/java/com/databasepreservation/common/client/common/visualization/browse/DatabasePanel.java

@@ -115,7 +115,7 @@ public DatabasePanel(String databaseUUID, boolean initMenu, Sidebar sidebar) {
       initMenu();
     }
 
-    if (ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
       toolbar.getElement().addClassName("filePreviewToolbar");
       breadcrumb = breadcrumbServer;
       breadcrumbDesktop.removeFromParent();

src/main/java/com/databasepreservation/common/client/common/visualization/browse/configuration/AdvancedConfiguration.java

@@ -89,7 +89,7 @@ private void init() {
 
     String style;
     SafeHtml messageDescription;
-    if (ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
       messageDescription = messages.advancedConfigurationTextForDataTransformationServer();
       style = "btn btn-outline-primary btn-play btn-block";
       btnDataTransformation.addClickHandler(event -> {

src/main/java/com/databasepreservation/common/client/common/visualization/browse/table/TablePanel.java

@@ -197,9 +197,9 @@ private void init() {
     UserLogin.getInstance().getAuthenticatedUser(new DefaultAsyncCallback<User>() {
       @Override
       public void onSuccess(User user) {
-        if (user.isAdmin() && ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+        if (user.isAdmin() && ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
           buildMenu();
-        } else if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+        } else if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
           advancedOptions.remove(configurationMenu);
           Button columnsManagementBtn = new Button(messages
             .dataTransformationBtnManageTable(collectionStatus.getTableStatus(table.getUuid()).getCustomName()));
@@ -241,7 +241,7 @@ private void buildMenu() {
       SafeHtmlUtils.fromString(
         messages.dataTransformationBtnTransformTable(collectionStatus.getTableStatus(table.getUuid()).getCustomName())),
       () -> HistoryManager.gotoDataTransformation(database.getUuid(), table.getId()));
-    if (ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
       configurationSubMenuBar.addItem(dataTransformationMenuItem);
     }
     configurationMenu.addItem(SafeHtmlUtils.fromString(messages.advancedConfigurationLabelForMainTitle()),

src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/SIARDManagerPage.java

@@ -160,7 +160,7 @@ private void setupFooterButtons() {
         || ViewerDatabaseStatus.ERROR.equals(database.getStatus())
         || ViewerDatabaseStatus.METADATA_ONLY.equals(database.getStatus())) {
         SafeHtml message = messages.SIARDHomePageTextForDeleteAllFromServer();
-        if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+        if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
           message = messages.SIARDHomePageTextForDeleteAllFromDesktop();
         }
         CommonDialogs.showConfirmDialog(messages.SIARDHomePageDialogTitleForDelete(), message,

src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/SIARDNavigationPanel.java

@@ -22,7 +22,6 @@
 import com.databasepreservation.common.client.tools.Humanize;
 import com.databasepreservation.common.client.tools.PathUtils;
 import com.databasepreservation.common.client.tools.RestUtils;
-import com.databasepreservation.common.server.ViewerConfiguration;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.safehtml.shared.SafeUri;
 import com.google.gwt.user.client.Window;
@@ -85,7 +84,7 @@ public NavigationPanel build() {
     btnShowFiles = new Button(PathUtils.getFileName(database.getPath()));
     btnShowFiles.addStyleName("btn btn-link-info");
     if (database.getPath() != null && !database.getPath().isEmpty()) {
-      if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+      if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
         btnShowFiles.addClickHandler(clickEvent -> {
           JavascriptUtils.showItemInFolder(database.getPath());
         });
@@ -138,7 +137,7 @@ public void onSuccess(Boolean result) {
     siard.addToInfoPanel(size);
 
     siard.addButton(CommonClientUtils.wrapOnDiv("btn-item", btnEditMetadata));
-    if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       siard.addButton(CommonClientUtils.wrapOnDiv("btn-item", btnMigrateToSIARD));
       siard.addButton(CommonClientUtils.wrapOnDiv("btn-item", btnSendToLiveDBMS));
     } else {

src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/ValidationNavigationPanel.java

@@ -110,7 +110,7 @@ private void buildValidateButton() {
     btnValidate.addClickHandler(event -> {
       if (database.getVersion().equals(ViewerConstants.SIARD_V21)) {
         if (database.getPath() != null && !database.getPath().isEmpty()) {
-          if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+          if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
             Dialogs.showValidatorSettings(messages.SIARDValidatorSettings(), messages.basicActionCancel(),
               messages.basicActionConfirm(), validator, new DefaultAsyncCallback<Boolean>() {
                 @Override
@@ -147,7 +147,7 @@ private void buildReportButton() {
     // See Report btn
     btnReport = new Button();
     btnReport.addStyleName("btn btn-outline-primary");
-    if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       btnReport.setText(messages.SIARDHomePageButtonTextForOpenReport());
       btnReport.addStyleName("btn-open");
       btnReport.addClickHandler(clickEvent -> JavascriptUtils.showItem(database.getValidatorReportPath()));

src/main/java/com/databasepreservation/common/client/common/visualization/manager/databasePanel/admin/DatabaseManage.java

@@ -104,7 +104,7 @@ private DatabaseManage() {
     databaseList.getSelectionModel().addSelectionChangeHandler(event -> {
       ViewerDatabase selected = databaseList.getSelectionModel().getSelectedObject();
       if (selected != null) {
-        if (ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+        if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
           HistoryManager.gotoSIARDInfo(selected.getUuid());
         }
         databaseList.getSelectionModel().clear();
@@ -115,7 +115,7 @@ private DatabaseManage() {
   }
 
   private void initButtons() {
-    if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       create.addClickHandler(event -> HistoryManager.gotoCreateSIARD());
       open.addClickHandler(event -> new HelperUploadSIARDFile().openFile(databaseList));
     } else {

src/main/java/com/databasepreservation/common/client/common/visualization/manager/databasePanel/user/UserDatabaseListPanel.java

@@ -95,7 +95,7 @@ private UserDatabaseListPanel() {
     databaseList.getSelectionModel().addSelectionChangeHandler(event -> {
       ViewerDatabase selected = databaseList.getSelectionModel().getSelectedObject();
       if (selected != null) {
-        if (ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+        if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
           HistoryManager.gotoDatabase(selected.getUuid());
         }
         databaseList.getSelectionModel().clear();

src/main/java/com/databasepreservation/common/client/common/visualization/metadata/MetadataControlPanel.java

@@ -162,7 +162,7 @@ void buttonSaveHandler(ClickEvent e) {
       message = messages.dialogLargeFileConfirmUpdateMetadata();
     }
 
-    if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       JavascriptUtils.confirmationDialog(messages.dialogUpdateMetadata(), message, messages.basicActionCancel(),
         messages.basicActionConfirm(), new DefaultAsyncCallback<Boolean>() {
 

src/main/java/com/databasepreservation/common/client/common/visualization/metadata/SIARDEditMetadataPage.java

@@ -77,7 +77,7 @@ private SIARDEditMetadataPage(final String databaseUUID) {
 
     initWidget(binder.createAndBindUi(this));
 
-    if (ApplicationType.getType().equals(ViewerConstants.SERVER)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
       toolbar.getElement().addClassName("filePreviewToolbar");
       breadcrumb = breadcrumbServer;
       breadcrumbDesktop.removeFromParent();

src/main/java/com/databasepreservation/common/client/common/visualization/validation/ValidatorPage.java

@@ -369,7 +369,7 @@ private void populateValidationInfo(Boolean enable, Boolean error) {
     // Report link
     Button report = new Button(messages.basicActionOpen());
     report.addClickHandler(event -> {
-      if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+      if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
         JavascriptUtils.showItem(database.getValidatorReportPath());
       } else {
         SafeUri downloadUri = RestUtils.createFileResourceDownloadValidationReportUri(database.getUuid());

src/main/java/com/databasepreservation/common/client/tools/BreadcrumbManager.java

@@ -204,7 +204,7 @@ public static List<BreadcrumbItem> loadingDatabase(final String databaseUUID) {
   public static List<BreadcrumbItem> forSIARDMainPage(final String databaseUUID, final String databaseName) {
     List<BreadcrumbItem> items = forManageDatabase();
 
-    if (ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       items.add(new BreadcrumbItem(
         SafeHtmlUtils.fromSafeConstant(
           FontAwesomeIconManager.getTag(FontAwesomeIconManager.DATABASE) + SafeHtmlUtils.htmlEscape(databaseName)),
@@ -247,7 +247,7 @@ public static List<BreadcrumbItem> forSIARDValidatorPage(final String databaseUU
 
   public static List<BreadcrumbItem> forManageDatabase() {
     List<BreadcrumbItem> items = new ArrayList<>();
-    if (ViewerConstants.DESKTOP.equals(ApplicationType.getType())) {
+    if (ViewerConstants.APPLICATION_ENV_DESKTOP.equals(ApplicationType.getType())) {
       items = forHome();
     }
     items.add(

src/main/java/com/databasepreservation/common/client/widgets/Toast.java

@@ -132,7 +132,7 @@ public void start() {
   public static void showError(String message) {
     Toast errorPopup = new Toast(MessagePopupType.ERROR_MESSAGE, messages.alertErrorTitle(), message);
     errorPopup.start();
-    if(ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if(ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       JavascriptUtils.showNotification(messages.alertErrorTitle(),message);
     }
   }
@@ -146,7 +146,7 @@ public static void showError(String message) {
   public static void showError(String title, String message) {
     Toast errorPopup = new Toast(MessagePopupType.ERROR_MESSAGE, title, message);
     errorPopup.start();
-    if(ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if(ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       JavascriptUtils.showNotification(title,message);
     }
   }
@@ -159,7 +159,7 @@ public static void showError(String title, String message) {
   public static void showInfo(String title, String message) {
     Toast errorPopup = new Toast(MessagePopupType.INFO, title, message);
     errorPopup.start();
-    if(ApplicationType.getType().equals(ViewerConstants.DESKTOP)) {
+    if(ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_DESKTOP)) {
       JavascriptUtils.showNotification(title,message);
     }
   }

src/main/java/com/databasepreservation/common/server/ViewerConfiguration.java

@@ -102,7 +102,7 @@ public class ViewerConfiguration extends ViewerAbstractConfiguration {
   public static final String PROPERTY_DISABLE_SIARD_DELETION = "ui.disable.siard.deletion";
 
   private static boolean instantiatedWithoutErrors = true;
-  private static String applicationEnvironment = ViewerConstants.SERVER;
+  private static String applicationEnvironment = ViewerConstants.APPLICATION_ENV_SERVER;
 
   // configurable paths related objects
   private static Path viewerHomePath;
@@ -254,7 +254,7 @@ private ViewerConfiguration() {
       addConfiguration("dbvtk-roles.properties");
       LOGGER.debug("Finished loading dbvtk-roles.properties");
 
-      applicationEnvironment = System.getProperty("env", "server");
+      applicationEnvironment = System.getProperty(ViewerConstants.APPLICATION_ENV_KEY, ViewerConstants.APPLICATION_ENV_SERVER);
 
     } catch (ConfigurationException e) {
       LOGGER.error("Error loading dbvtk properties", e);