fix: changed parameter type for rest params when we use generics to f…

…ix jersey warning
eclipse · Jun 25, 2024 · d77802f · d77802f
1 parent b38d7a3
commit d77802f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
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
@@ -89,7 +89,7 @@ public <V extends Comparable<V>> MessageListResult simpleQuery(@PathParam("scope
                                                                    @QueryParam("startDate") DateParam startDateParam,
                                                                    @QueryParam("endDate") DateParam endDateParam,
                                                                    @QueryParam("metricName") String metricName,
-                                                                   @QueryParam("metricType") MetricType<V> metricType,
+                                                                   @QueryParam("metricType") String metricType,
                                                                    @QueryParam("metricMin") String metricMinValue,
                                                                    @QueryParam("metricMax") String metricMaxValue,
                                                                    @QueryParam("sortDir") @DefaultValue("DESC") SortDirection sortDir,
@@ -115,7 +115,9 @@ public <V extends Comparable<V>> MessageListResult simpleQuery(@PathParam("scope
         }
 
         if (!Strings.isNullOrEmpty(metricName)) {
-            andPredicate.getPredicates().add(getMetricPredicate(metricName, metricType, metricMinValue, metricMaxValue));
+            MetricType<V> internalMetricType = new MetricType<>(metricType);
+
+            andPredicate.getPredicates().add(getMetricPredicate(metricName, internalMetricType, metricMinValue, metricMaxValue));
         }
 
         MessageQuery query = MESSAGE_STORE_FACTORY.newQuery(scopeId);

diff --git a/...rces/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java b/...rces/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java
@@ -16,7 +16,6 @@
 import org.eclipse.kapua.app.api.core.resources.AbstractKapuaResource;
 import org.eclipse.kapua.app.api.resources.v1.resources.marker.JsonSerializationFixed;
 import org.eclipse.kapua.app.api.core.model.DateParam;
-import org.eclipse.kapua.app.api.core.model.MetricType;
 import org.eclipse.kapua.app.api.core.model.ScopeId;
 import org.eclipse.kapua.app.api.core.model.StorableEntityId;
 import org.eclipse.kapua.app.api.core.model.data.JsonDatastoreMessage;
@@ -89,7 +88,7 @@ public <V extends Comparable<V>> JsonMessageListResult simpleQueryJson(@PathPara
                                                                            @QueryParam("startDate") DateParam startDateParam,
                                                                            @QueryParam("endDate") DateParam endDateParam,
                                                                            @QueryParam("metricName") String metricName,
-                                                                           @QueryParam("metricType") MetricType<V> metricType,
+                                                                           @QueryParam("metricType") String metricType,
                                                                            @QueryParam("metricMin") String metricMinValue,
                                                                            @QueryParam("metricMax") String metricMaxValue,
                                                                            @QueryParam("sortDir") @DefaultValue("DESC") SortDirection sortDir,