introduced right exception for metrcc type null

eclipse · Jul 20, 2023 · 6ba39ec · 6ba39ec
1 parent 6fe286b
commit 6ba39ec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...esources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java b/...esources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
@@ -14,6 +14,7 @@
 
 import com.google.common.base.Strings;
 import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.KapuaIllegalNullArgumentException;
 import org.eclipse.kapua.app.api.core.resources.AbstractKapuaResource;
 import org.eclipse.kapua.app.api.core.model.CountResult;
 import org.eclipse.kapua.app.api.core.model.DateParam;
@@ -221,11 +222,14 @@ private StorablePredicate getChannelPredicate(String channel, boolean strictChan
         return channelPredicate;
     }
 
-    private <V extends Comparable<V>> StorablePredicate getMetricPredicate(String metricName, MetricType<V> metricType, String metricMinValue, String metricMaxValue) {
+    private <V extends Comparable<V>> StorablePredicate getMetricPredicate(String metricName, MetricType<V> metricType, String metricMinValue, String metricMaxValue) throws KapuaIllegalNullArgumentException {
         if (metricMinValue == null && metricMaxValue == null) {
             Class<V> type = metricType != null ? metricType.getType() : null;
             return DATASTORE_PREDICATE_FACTORY.newMetricExistsPredicate(metricName, type);
         } else {
+            if (metricType == null) {
+                throw new KapuaIllegalNullArgumentException("metricType");
+            }
             V minValue = (V) ObjectValueConverter.fromString(metricMinValue, metricType.getType());
             V maxValue = (V) ObjectValueConverter.fromString(metricMaxValue, metricType.getType());