Use Map.merge
diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java
index dce14aa..8d40da2 100644
--- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java
+++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java
@@ -80,11 +80,7 @@
     public EnumeratedIntegerDistribution(final int[] data) {
         final Map<Integer, Integer> dataMap = new HashMap<>();
         for (int value : data) {
-            Integer count = dataMap.get(value);
-            if (count == null) {
-                count = 0;
-            }
-            dataMap.put(value, ++count);
+            dataMap.merge(value, 1, Integer::sum);
         }
         final int massPoints = dataMap.size();
         final double denom = data.length;
diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java
index 4dad124..36f7018 100644
--- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java
+++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java
@@ -82,11 +82,7 @@
     public EnumeratedRealDistribution(final double[] data) {
         final Map<Double, Integer> dataMap = new HashMap<>();
         for (double value : data) {
-            Integer count = dataMap.get(value);
-            if (count == null) {
-                count = 0;
-            }
-            dataMap.put(value, ++count);
+            dataMap.merge(value, 1, Integer::sum);
         }
         final int massPoints = dataMap.size();
         final double denom = data.length;