Minor updates on bashscript and deprecated API on Java 9

Author: haiphucnguyen

mycollab-app-community/src/main/scripts/mycollab.sh

@@ -21,7 +21,7 @@
 # OS specific support. $var _must_ be set to either true or false.
 
 export MYCOLLAB_PORT=8080
-export MYCOLLAB_OPTS=-noverify -server -Xms394m -Xmx768m -XX:NewSize=128m -XX:+DisableExplicitGC -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
+export MYCOLLAB_OPTS="-noverify -server -Xms394m -Xmx768m -XX:NewSize=128m -XX:+DisableExplicitGC -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
 
 cygwin=false
 darwin=false

mycollab-config/src/main/java/com/mycollab/logging/LogFilter.kt

@@ -28,7 +28,8 @@ class LogFilter : Filter<ILoggingEvent>() {
 
  override fun decide(event: ILoggingEvent): FilterReply =
  if (event.message.contains("Failed to execute SQL (stacktrace on DEBUG log level)")
- || event.message.contains("ERROR o.j.p.CENTRAL_LOCK")) {
+ || event.message.contains("org.jgroups.protocols")
+ || event.message.contains("member is not present in the current view")) {
  FilterReply.DENY
  } else {
  FilterReply.NEUTRAL

mycollab-core/src/main/java/com/mycollab/core/utils/NumberUtils.kt

@@ -17,6 +17,7 @@
 package com.mycollab.core.utils
 
 import java.math.BigDecimal
+import java.math.RoundingMode
 
 /**
  * @author MyCollab Ltd
@@ -27,7 +28,7 @@ object NumberUtils {
  fun roundDouble(scale: Int, value: Double?): Double =
  when (value) {
  null -> 0.0
- else -> BigDecimal(value.toString()).setScale(scale, BigDecimal.ROUND_HALF_UP).toDouble()
+ else -> BigDecimal(value.toString()).setScale(scale, RoundingMode.HALF_UP).toDouble()
  }
 
  @JvmStatic

mycollab-esb/src/main/java/com/mycollab/module/user/esb/SendVerifyUserEmailCommand.kt

@@ -39,6 +39,7 @@ class SendVerifyUserEmailCommand(private val deploymentMode: IDeploymentMode,
  @Subscribe
  @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
  fun sendVerifyEmailRequest(event: SendUserEmailVerifyRequestEvent) {
+ Thread.sleep(5000)
  sendConfirmEmailToUser(event.sAccountId, event.user)
  event.user.status = UserStatusConstants.EMAIL_VERIFIED_REQUEST
  userService.updateWithSession(event.user, event.user.username)

mycollab-migration/src/main/resources/db/migration/mysql/V20190212_1__Add_Files_View.sql

@@ -1,5 +1,2 @@
 ALTER TABLE `m_prj_customize_view`
 CHANGE COLUMN `displayStandup` `displayFile` BIT(1) NOT NULL ;
-
-ALTER TABLE `s_live_instances`
-CHANGE COLUMN `installedDate` `installedDate` DATE NOT NULL ;

mycollab-services/src/main/resources/sqlMap/project/ProjectMemberMapperExt.xml

@@ -220,7 +220,7 @@
  <![CDATA[
  SELECT DISTINCT s_user.username, s_user.firstname, s_user.lastname, s_user.email, 
  s_user.website, s_user.registeredTime, s_user_account.registerStatus,
- s_user_account.accountId, s_user.language, s_user.avatarid
+ s_user_account.accountId, s_user.language, s_user.avatarid, s_user.status
  FROM s_user, s_user_account
  WHERE s_user.username=s_user_account.username AND
  EXISTS (SELECT 1

mycollab-web/pom.xml

@@ -230,7 +230,7 @@
  <dependency>
  <groupId>org.vaadin</groupId>
  <artifactId>viritin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
  <exclusions>
  <exclusion>
  <groupId>javax.el</groupId>

mycollab-web/src/main/java/com/mycollab/module/project/view/bug/BugEditForm.java

@@ -39,6 +39,8 @@
 import com.mycollab.vaadin.web.ui.DefaultDynaFormLayout;
 import com.mycollab.vaadin.web.ui.WebThemes;
 import com.mycollab.vaadin.web.ui.field.AttachmentUploadField;
+import com.vaadin.event.ShortcutAction;
+import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.ui.AbstractComponent;
@@ -124,7 +126,7 @@ public AbstractComponent getLayout() {
  }
  postExecution();
  }
- }).withIcon(VaadinIcons.CLIPBOARD).withStyleName(WebThemes.BUTTON_ACTION);
+ }).withIcon(VaadinIcons.CLIPBOARD).withStyleName(WebThemes.BUTTON_ACTION).withClickShortcut(KeyCode.ENTER);
 
  MButton cancelBtn = new MButton(UserUIContext.getMessage(GenericI18Enum.BUTTON_CANCEL), clickEvent -> postExecution())
  .withStyleName(WebThemes.BUTTON_OPTION);

mycollab-web/src/main/java/com/mycollab/module/project/view/bug/LinkIssueWindow.java

@@ -21,7 +21,7 @@
 import com.mycollab.form.view.LayoutType;
 import com.mycollab.module.project.event.BugEvent;
 import com.mycollab.module.project.i18n.BugI18nEnum;
-import com.mycollab.module.project.i18n.OptionI18nEnum;
+import com.mycollab.module.project.i18n.OptionI18nEnum.BugRelation;
 import com.mycollab.module.tracker.domain.RelatedBug;
 import com.mycollab.module.tracker.domain.SimpleBug;
 import com.mycollab.module.tracker.service.BugRelationService;
@@ -64,7 +64,7 @@ class LinkIssueWindow extends MWindow {
  editForm = new RelatedBugEditForm();
  relatedBug = new RelatedBug();
  relatedBug.setBugid(bug.getId());
- relatedBug.setRelatetype(OptionI18nEnum.BugRelation.Duplicated.name());
+ relatedBug.setRelatetype(BugRelation.Duplicated.name());
  editForm.setBean(relatedBug);
  contentLayout.add(editForm);
 
@@ -138,8 +138,8 @@ private class EditFormFieldFactory extends AbstractBeanFieldGroupEditFieldFactor
  @Override
  protected HasValue<?> onCreateField(Object propertyId) {
  if (RelatedBug.Field.relatetype.equalTo(propertyId)) {
- I18nValueComboBox<OptionI18nEnum.BugRelation> relationSelection = new I18nValueComboBox<>(OptionI18nEnum.BugRelation.class,
- OptionI18nEnum.BugRelation.Block, OptionI18nEnum.BugRelation.Duplicated, OptionI18nEnum.BugRelation.Related);
+ I18nValueComboBox<BugRelation> relationSelection = new I18nValueComboBox<>(BugRelation.class,
+ BugRelation.Block, BugRelation.Duplicated, BugRelation.Related);
  relationSelection.setWidth(WebThemes.FORM_CONTROL_WIDTH);
  return relationSelection;
  } else if (RelatedBug.Field.relatedid.equalTo(propertyId)) {

mycollab-web/src/main/java/com/mycollab/module/project/view/milestone/MilestoneListViewImpl.java

@@ -119,10 +119,8 @@ private Component buildHeader() {
  HeaderWithIcon headerText = ComponentUtils.headerH2(ProjectTypeConstants.MILESTONE,
  UserUIContext.getMessage(MilestoneI18nEnum.LIST));
 
- MHorizontalLayout header = new MHorizontalLayout(headerText, createHeaderRight()).withMargin(true)
+ return new MHorizontalLayout(headerText, createHeaderRight()).withMargin(true)
  .withAlign(headerText, Alignment.MIDDLE_LEFT).expand(headerText);
-
- return header;
  }
 
  private HorizontalLayout createHeaderRight() {