Fix Sonar maintainability issues.

kiegroup · Nov 12, 2019 · 2822420 · 2822420
1 parent 7f4adbf
commit 2822420
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 37 deletions.
diff --git a/...java/org/kie/workbench/common/dmn/client/widgets/grid/model/BaseHasDynamicHeightCell.java b/...java/org/kie/workbench/common/dmn/client/widgets/grid/model/BaseHasDynamicHeightCell.java
@@ -24,6 +24,8 @@
 
 public abstract class BaseHasDynamicHeightCell<T> extends DMNGridCell<T> implements HasDynamicHeight {
 
+    public static final double DEFAULT_HEIGHT = 48.0;
+
     protected final double lineHeight;
 
     private double height;
@@ -58,4 +60,25 @@ protected double getExpressionTextHeight() {
         final int expressionLineCount = asText.split("\\r?\\n", -1).length;
         return expressionLineCount * lineHeight + (RendererUtils.EXPRESSION_TEXT_PADDING * 3);
     }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof BaseHasDynamicHeightCell)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        final BaseHasDynamicHeightCell<?> that = (BaseHasDynamicHeightCell<?>) o;
+        return Double.compare(that.lineHeight, lineHeight) == 0 &&
+                Double.compare(that.height, height) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), lineHeight, height);
+    }
 }
diff --git a/.../java/org/kie/workbench/common/dmn/client/widgets/grid/model/ExpressionEditorGridRow.java b/.../java/org/kie/workbench/common/dmn/client/widgets/grid/model/ExpressionEditorGridRow.java
@@ -42,8 +42,11 @@ public ExpressionEditorGridRow(final double height) {
 
     @Override
     public double getHeight() {
-        long currentTimeMillis = System.currentTimeMillis();
-        LOGGER.log(Level.FINEST, " - Pre- ExpressionEditorGridRow.getHeight()");
+        long currentTimeMillis = 0;
+        if (LOGGER.isLoggable(Level.FINEST)) {
+            currentTimeMillis = System.currentTimeMillis();
+            LOGGER.log(Level.FINEST, " - Pre- ExpressionEditorGridRow.getHeight()");
+        }
 
         final double height = this.getCells()
                 .values()
@@ -58,7 +61,9 @@ public double getHeight() {
                 .reduce(Double::max)
                 .orElse(defaultHeight);
 
-        LOGGER.log(Level.FINEST, " - Post- ExpressionEditorGridRow.getHeight() - " + (System.currentTimeMillis() - currentTimeMillis) + "ms");
+        if (LOGGER.isLoggable(Level.FINEST)) {
+            LOGGER.log(Level.FINEST, " - Post- ExpressionEditorGridRow.getHeight() - " + (System.currentTimeMillis() - currentTimeMillis) + "ms");
+        }
         return height;
     }
 }
diff --git a/...rc/main/java/org/kie/workbench/common/dmn/client/widgets/grid/model/HasDynamicHeight.java b/...rc/main/java/org/kie/workbench/common/dmn/client/widgets/grid/model/HasDynamicHeight.java
@@ -18,7 +18,5 @@
 
 public interface HasDynamicHeight {
 
-    double DEFAULT_HEIGHT = 48.0;
-
     double getHeight();
 }
diff --git a/...java/org/kie/workbench/common/dmn/client/widgets/grid/model/LiteralExpressionGridRow.java b/...java/org/kie/workbench/common/dmn/client/widgets/grid/model/LiteralExpressionGridRow.java
@@ -18,15 +18,17 @@
 import org.uberfire.ext.wires.core.grids.client.model.GridCell;
 import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridRow;
 
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
+
 public class LiteralExpressionGridRow extends BaseGridRow {
 
     public LiteralExpressionGridRow() {
-        super(HasDynamicHeight.DEFAULT_HEIGHT);
+        super(DEFAULT_HEIGHT);
     }
 
     @Override
     public double getHeight() {
-        double height = HasDynamicHeight.DEFAULT_HEIGHT;
+        double height = DEFAULT_HEIGHT;
         for (GridCell<?> cell : this.getCells().values()) {
             if (cell instanceof HasDynamicHeight) {
                 height = Math.max(((HasDynamicHeight) cell).getHeight(), height);

diff --git a/...-client/src/main/java/org/kie/workbench/common/dmn/client/widgets/layer/DMNGridLayer.java b/...-client/src/main/java/org/kie/workbench/common/dmn/client/widgets/layer/DMNGridLayer.java
@@ -46,7 +46,7 @@
 
 public class DMNGridLayer extends DefaultGridLayer {
 
-    private final GridLayerRedrawManager.PrioritizedCommand BATCH = new GridLayerRedrawManager.PrioritizedCommand(Integer.MIN_VALUE) {
+    private final GridLayerRedrawManager.PrioritizedCommand batch = new GridLayerRedrawManager.PrioritizedCommand(Integer.MIN_VALUE) {
         @Override
         public void execute() {
             doBatch();
@@ -71,7 +71,7 @@ public Layer draw() {
 
     @Override
     public Layer batch() {
-        return batch(BATCH);
+        return batch(batch);
     }
 
     Layer doBatch() {

diff --git a/...bench/common/dmn/client/commands/expressions/types/dtable/AddDecisionRuleCommandTest.java b/...bench/common/dmn/client/commands/expressions/types/dtable/AddDecisionRuleCommandTest.java
@@ -33,7 +33,6 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.dtable.OutputClauseColumn;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridData;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -50,6 +49,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -103,7 +103,7 @@ public void setup() {
         this.uiModelMapper = new DecisionTableUIModelMapper(() -> uiModel,
                                                             () -> Optional.of(dtable),
                                                             listSelector,
-                                                            HasDynamicHeight.DEFAULT_HEIGHT);
+                                                            DEFAULT_HEIGHT);
 
         doReturn(0).when(uiRowNumberColumn).getIndex();
         doReturn(1).when(uiInputClauseColumn).getIndex();

diff --git a/...kbench/common/dmn/client/commands/expressions/types/dtable/AddInputClauseCommandTest.java b/...kbench/common/dmn/client/commands/expressions/types/dtable/AddInputClauseCommandTest.java
@@ -34,7 +34,6 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.dtable.InputClauseColumn;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridData;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -51,6 +50,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -99,7 +99,7 @@ public void setUp() throws Exception {
         this.uiModelMapper = new DecisionTableUIModelMapper(() -> uiModel,
                                                             () -> Optional.of(dtable),
                                                             listSelector,
-                                                            HasDynamicHeight.DEFAULT_HEIGHT);
+                                                            DEFAULT_HEIGHT);
 
         doReturn(0).when(uiRowNumberColumn).getIndex();
         doReturn(1).when(uiInputClauseColumn).getIndex();

diff --git a/...bench/common/dmn/client/commands/expressions/types/dtable/AddOutputClauseCommandTest.java b/...bench/common/dmn/client/commands/expressions/types/dtable/AddOutputClauseCommandTest.java
@@ -37,7 +37,6 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.dtable.OutputClauseColumn;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridData;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -53,6 +52,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -112,7 +112,7 @@ public void setUp() throws Exception {
         this.uiModelMapper = new DecisionTableUIModelMapper(() -> uiModel,
                                                             () -> Optional.of(dtable),
                                                             listSelector,
-                                                            HasDynamicHeight.DEFAULT_HEIGHT);
+                                                            DEFAULT_HEIGHT);
 
         doReturn(0).when(uiRowNumberColumn).getIndex();
         doReturn(1).when(uiOutputClauseColumn).getIndex();

diff --git a/...nch/common/dmn/client/commands/expressions/types/dtable/DeleteInputClauseCommandTest.java b/...nch/common/dmn/client/commands/expressions/types/dtable/DeleteInputClauseCommandTest.java
@@ -32,7 +32,6 @@
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridColumn;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridData;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -47,6 +46,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
@@ -105,7 +105,7 @@ public void setup() {
         this.uiModelMapper = new DecisionTableUIModelMapper(() -> uiModel,
                                                             () -> Optional.of(dtable),
                                                             listSelector,
-                                                            HasDynamicHeight.DEFAULT_HEIGHT);
+                                                            DEFAULT_HEIGHT);
 
         makeCommand(DecisionTableUIModelMapperHelper.ROW_INDEX_COLUMN_COUNT);
 

diff --git a/...ch/common/dmn/client/commands/expressions/types/dtable/DeleteOutputClauseCommandTest.java b/...ch/common/dmn/client/commands/expressions/types/dtable/DeleteOutputClauseCommandTest.java
@@ -32,7 +32,6 @@
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridColumn;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridData;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -47,6 +46,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
@@ -105,7 +105,7 @@ public void setup() {
         this.uiModelMapper = new DecisionTableUIModelMapper(() -> uiModel,
                                                             () -> Optional.of(dtable),
                                                             listSelector,
-                                                            HasDynamicHeight.DEFAULT_HEIGHT);
+                                                            DEFAULT_HEIGHT);
 
         makeCommand(DecisionTableUIModelMapperHelper.ROW_INDEX_COLUMN_COUNT + dtable.getInput().size());
 

diff --git a/...h/common/dmn/client/commands/expressions/types/relation/AddRelationColumnCommandTest.java b/...h/common/dmn/client/commands/expressions/types/relation/AddRelationColumnCommandTest.java
@@ -30,7 +30,6 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.relation.RelationDefaultValueUtilities;
 import org.kie.workbench.common.dmn.client.editors.expressions.types.relation.RelationUIModelMapper;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -49,6 +48,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
@@ -101,7 +101,7 @@ public void setup() {
         this.uiModelMapper = new RelationUIModelMapper(() -> uiModel,
                                                        () -> Optional.of(relation),
                                                        listSelector,
-                                                       HasDynamicHeight.DEFAULT_HEIGHT);
+                                                       DEFAULT_HEIGHT);
 
         makeCommand(1);
 

diff --git a/...ench/common/dmn/client/commands/expressions/types/relation/AddRelationRowCommandTest.java b/...ench/common/dmn/client/commands/expressions/types/relation/AddRelationRowCommandTest.java
@@ -28,7 +28,6 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.relation.RelationColumn;
 import org.kie.workbench.common.dmn.client.editors.expressions.types.relation.RelationUIModelMapper;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -47,6 +46,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
@@ -98,7 +98,7 @@ public void setup() {
         this.uiModelMapper = new RelationUIModelMapper(() -> uiModel,
                                                        () -> Optional.of(relation),
                                                        listSelector,
-                                                       HasDynamicHeight.DEFAULT_HEIGHT);
+                                                       DEFAULT_HEIGHT);
 
         makeCommand(0);
 

diff --git a/...ommon/dmn/client/commands/expressions/types/relation/DeleteRelationColumnCommandTest.java b/...ommon/dmn/client/commands/expressions/types/relation/DeleteRelationColumnCommandTest.java
@@ -29,7 +29,6 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.relation.RelationUIModelMapper;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridColumn;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -46,6 +45,7 @@
 import org.uberfire.ext.wires.core.grids.client.widget.grid.columns.RowNumberColumn;
 
 import static org.junit.Assert.assertEquals;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
@@ -108,7 +108,7 @@ public void setup() {
         this.uiModelMapper = new RelationUIModelMapper(() -> uiModel,
                                                        () -> Optional.of(relation),
                                                        listSelector,
-                                                       HasDynamicHeight.DEFAULT_HEIGHT);
+                                                       DEFAULT_HEIGHT);
     }
 
     private void makeCommand(final int uiColumnIndex) {

diff --git a/...h/common/dmn/client/commands/expressions/types/relation/DeleteRelationRowCommandTest.java b/...h/common/dmn/client/commands/expressions/types/relation/DeleteRelationRowCommandTest.java
@@ -28,7 +28,6 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.relation.RelationColumn;
 import org.kie.workbench.common.dmn.client.editors.expressions.types.relation.RelationUIModelMapper;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.kie.workbench.common.stunner.core.client.canvas.AbstractCanvasHandler;
 import org.kie.workbench.common.stunner.core.client.command.CanvasCommandResultBuilder;
 import org.kie.workbench.common.stunner.core.client.command.CanvasViolation;
@@ -46,6 +45,7 @@
 import org.uberfire.ext.wires.core.grids.client.widget.grid.columns.RowNumberColumn;
 
 import static org.junit.Assert.assertEquals;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
@@ -96,7 +96,7 @@ public void setup() {
         this.uiModelMapper = new RelationUIModelMapper(() -> uiModel,
                                                        () -> Optional.of(relation),
                                                        listSelector,
-                                                       HasDynamicHeight.DEFAULT_HEIGHT);
+                                                       DEFAULT_HEIGHT);
 
         makeCommand(0);
         doReturn(ruleManager).when(handler).getRuleManager();

diff --git a/...ch/common/dmn/client/editors/expressions/types/dtable/DecisionTableUIModelMapperTest.java b/...ch/common/dmn/client/editors/expressions/types/dtable/DecisionTableUIModelMapperTest.java
@@ -29,7 +29,6 @@
 import org.kie.workbench.common.dmn.api.definition.model.UnaryTests;
 import org.kie.workbench.common.dmn.api.property.dmn.Description;
 import org.kie.workbench.common.dmn.client.widgets.grid.controls.list.ListSelectorView;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridCellValue;
@@ -39,6 +38,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 import static org.mockito.Mockito.doReturn;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -109,7 +109,7 @@ public void setup() {
         this.mapper = new DecisionTableUIModelMapper(() -> uiModel,
                                                      () -> Optional.of(dtable),
                                                      listSelector,
-                                                     HasDynamicHeight.DEFAULT_HEIGHT);
+                                                     DEFAULT_HEIGHT);
     }
 
     @Test

diff --git a/...expressions/types/function/supplementary/pmml/LiteralExpressionPMMLUIModelMapperTest.java b/...expressions/types/function/supplementary/pmml/LiteralExpressionPMMLUIModelMapperTest.java
@@ -22,9 +22,9 @@
 import org.kie.workbench.common.dmn.client.editors.expressions.types.literal.LiteralExpressionUIModelMapper;
 import org.kie.workbench.common.dmn.client.editors.expressions.types.literal.LiteralExpressionUIModelMapperTest;
 import org.kie.workbench.common.dmn.client.widgets.grid.model.DMNGridCell;
-import org.kie.workbench.common.dmn.client.widgets.grid.model.HasDynamicHeight;
 
 import static org.junit.Assert.assertTrue;
+import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 
 public class LiteralExpressionPMMLUIModelMapperTest extends LiteralExpressionUIModelMapperTest {
 
@@ -33,7 +33,7 @@ protected LiteralExpressionUIModelMapper getMapper() {
         return new LiteralExpressionPMMLUIModelMapper(() -> uiModel,
                                                       () -> Optional.of(literalExpression),
                                                       listSelector,
-                                                      HasDynamicHeight.DEFAULT_HEIGHT,
+                                                      DEFAULT_HEIGHT,
                                                       "placeholder");
     }