Merge pull request #133 from oskopek/PLANNER-284-fix

PLANNER-284: Code style + performance
apache · Aug 26, 2015 · bdb6b8c · bdb6b8c
2 parents 7473adf + a6c3352
commit bdb6b8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...planner-core/src/main/java/org/optaplanner/core/api/score/holder/AbstractScoreHolder.java b/...planner-core/src/main/java/org/optaplanner/core/api/score/holder/AbstractScoreHolder.java
@@ -257,28 +257,28 @@ protected interface ConstraintUndoListener {
 
     private static class MultiLevelActivationUnMatchListener implements ActivationUnMatchListener {
 
-        private final Map<Integer, ConstraintUndoListener> scoreLevelToConstraintUndoListenerMap;
+        private static final int INITIAL_MAP_CAPACITY = 2;
+
+        private Map<Integer, ConstraintUndoListener> scoreLevelToConstraintUndoListenerMap;
 
         public MultiLevelActivationUnMatchListener(int scoreLevel, ConstraintUndoListener constraintUndoListener) {
             // Most use cases use only 1 scoreLevel per score rule and there are likely many instances of this class,
             // so the initialCapacity is very memory conservative
-            scoreLevelToConstraintUndoListenerMap = new HashMap<Integer, ConstraintUndoListener>(2);
+            scoreLevelToConstraintUndoListenerMap = new HashMap<Integer, ConstraintUndoListener>(INITIAL_MAP_CAPACITY);
             scoreLevelToConstraintUndoListenerMap.put(scoreLevel, constraintUndoListener);
         }
 
         @Override
         public final void unMatch(RuleRuntime ruleRuntime, Match match) {
             for (ConstraintUndoListener constraintUndoListener : scoreLevelToConstraintUndoListenerMap.values()) {
-                // Both parameters can be null because they are not used by our constraintUndoListeners anyway
                 constraintUndoListener.unMatch();
             }
-            scoreLevelToConstraintUndoListenerMap.clear();
+            scoreLevelToConstraintUndoListenerMap = new HashMap<Integer, ConstraintUndoListener>(INITIAL_MAP_CAPACITY);
         }
 
         public void overwriteMatch(int scoreLevel, ConstraintUndoListener constraintUndoListener) {
             ConstraintUndoListener oldConstraintUndoListener = scoreLevelToConstraintUndoListenerMap.put(scoreLevel, constraintUndoListener);
             if (oldConstraintUndoListener != null) {
-                // Both parameters can be null because they are not used by our constraintUndoListeners anyway
                 oldConstraintUndoListener.unMatch();
             }
         }

diff --git a/...aplanner/core/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHolderTest.java b/...aplanner/core/api/score/buildin/bendablebigdecimal/BendableBigDecimalScoreHolderTest.java
@@ -39,7 +39,6 @@ public void addConstraintMatchWithoutConstraintMatch() {
     public void addConstraintMatch(boolean constraintMatchEnabled) {
         BendableBigDecimalScoreHolder scoreHolder = new BendableBigDecimalScoreHolder(constraintMatchEnabled, 1, 2);
 
-
         scoreHolder.addHardConstraintMatch(mockRuleContext("scoreRule1"), 0, BigDecimal.valueOf(-10000));
 
         RuleContext ruleContext2 = mockRuleContext("scoreRule2");

diff --git a/...er-distribution/src/main/assembly/filtered-resources/UpgradeFromPreviousVersionRecipe.txt b/...er-distribution/src/main/assembly/filtered-resources/UpgradeFromPreviousVersionRecipe.txt
@@ -2637,7 +2637,7 @@ Before in *.drl:
     then
         scoreHolder.addSoftConstraintMatch(kcontext, -1); // Employee happiness cost
     end
-Before in *.drl:
+After in *.drl:
     rule "Costly and unfair"
     when
         // Complex pattern