Implementation of "fields" Query Parameter

dao/src/main/java/org/n52/io/extension/metadata/DatabaseMetadataExtension.java

@@ -29,7 +29,7 @@
 
 package org.n52.io.extension.metadata;
 
-import java.util.List;
+import java.util.Collection;
 import java.util.Map;
 
 import org.n52.io.request.IoParameters;
@@ -55,11 +55,8 @@ public Map<String, Object> getExtras(ParameterOutput output, IoParameters parame
     }
 
     @Override
-    public void addExtraMetadataFieldNames(ParameterOutput output) {
-        List<String> fieldNames = repository.getFieldNames(output.getId());
-        for (String fieldName : fieldNames) {
-            output.addExtra(fieldName);
-        }
+    public Collection<String> getExtraMetadataFieldNames(ParameterOutput output) {
+        return repository.getFieldNames(output.getId());
     }
 
 }

dao/src/main/java/org/n52/io/extension/parents/HierarchicalParameterExtension.java

@@ -50,11 +50,6 @@ public Map<String, Object> getExtras(PlatformOutput output, IoParameters paramet
         return wrapSingleIntoMap(service.getExtras(output.getId(), parameters));
     }
 
-    @Override
-    public void addExtraMetadataFieldNames(PlatformOutput output) {
-        output.addExtra(EXTENSION_NAME);
-    }
-
     public HierarchicalParameterService getService() {
         return service;
     }

dao/src/main/java/org/n52/io/extension/resulttime/ResultTimeExtension.java

@@ -32,6 +32,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -74,12 +75,12 @@ public String getExtensionName() {
     }
 
     @Override
-    public void addExtraMetadataFieldNames(DatasetOutput output) {
-        final ParameterOutput serviceOutput = output.getDatasetParameters()
+    public Collection<String> getExtraMetadataFieldNames(DatasetOutput output) {
+        final ParameterOutput serviceOutput = output.getDatasetParameters(true)
                                                     .getService();
-        if (isAvailableFor(serviceOutput.getId())) {
-            output.addExtra(EXTENSION_NAME);
-        }
+        return isAvailableFor(serviceOutput.getId())
+                ? Collections.singleton(EXTENSION_NAME)
+                : Collections.emptySet();
     }
 
     private boolean isAvailableFor(String serviceId) {

dao/src/main/java/org/n52/series/db/beans/CountDatasetEntity.java

@@ -32,14 +32,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.n52.io.response.dataset.count.CountDatasetOutput;
+import org.n52.io.response.dataset.count.CountValue;
 
 public class CountDatasetEntity extends DatasetEntity<CountDataEntity> {
 
     private Set<CountDatasetEntity> referenceValues = new HashSet<>();
 
     public CountDatasetEntity() {
-        super(CountDatasetOutput.VALUE_TYPE);
+        super(CountValue.TYPE);
     }
 
     public Set<CountDatasetEntity> getReferenceValues() {

dao/src/main/java/org/n52/series/db/beans/DatasetEntity.java

@@ -36,7 +36,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.n52.io.response.dataset.quantity.QuantityDatasetOutput;
+import org.n52.io.response.dataset.quantity.QuantityValue;
 import org.n52.series.db.DataModelUtil;
 
 public class DatasetEntity<T extends DataEntity< ? >> extends DescribableEntity {
@@ -229,7 +229,7 @@ public void setLastValueAt(Date lastValueAt) {
     public String getValueType() {
         return valueType == null || valueType.isEmpty()
                 // backward compatible
-                ? QuantityDatasetOutput.VALUE_TYPE
+                ? QuantityValue.TYPE
                 : valueType;
     }
 

dao/src/main/java/org/n52/series/db/beans/DescribableEntity.java

@@ -29,7 +29,9 @@
 
 package org.n52.series.db.beans;
 
+import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.n52.series.db.beans.parameter.Parameter;
 
@@ -129,6 +131,14 @@ public boolean hasParameters() {
         return getParameters() != null && !getParameters().isEmpty();
     }
 
+    public Set<Map<String, Object>> getMappedParameters(String locale) {
+        return hasParameters()
+                ? parameters.stream()
+                            .map(e -> e.toValueMap(locale))
+                            .collect(Collectors.toSet())
+                : null;
+    }
+
     public ServiceEntity getService() {
         return service;
     }

dao/src/main/java/org/n52/series/db/beans/GeometryEntity.java

@@ -57,7 +57,7 @@ public class GeometryEntity implements Serializable {
     private Double alt;
 
     private int srid;
-    
+
     public boolean isSetGeometry() {
         return geometry != null && !geometry.isEmpty();
     }

dao/src/main/java/org/n52/series/db/beans/QuantityDatasetEntity.java

@@ -33,7 +33,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.n52.io.response.dataset.quantity.QuantityDatasetOutput;
+import org.n52.io.response.dataset.quantity.QuantityValue;
 
 public class QuantityDatasetEntity extends DatasetEntity<QuantityDataEntity> {
 
@@ -42,7 +42,7 @@ public class QuantityDatasetEntity extends DatasetEntity<QuantityDataEntity> {
     private Set<QuantityDatasetEntity> referenceValues = new HashSet<>();
 
     public QuantityDatasetEntity() {
-        super(QuantityDatasetOutput.VALUE_TYPE);
+        super(QuantityValue.TYPE);
     }
 
     public Set<QuantityDatasetEntity> getReferenceValues() {

dao/src/main/java/org/n52/series/db/beans/TextDatasetEntity.java

@@ -32,14 +32,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.n52.io.response.dataset.text.TextDatasetOutput;
+import org.n52.io.response.dataset.text.TextValue;
 
 public class TextDatasetEntity extends DatasetEntity<TextDataEntity> {
 
     private Set<TextDatasetEntity> referenceValues = new HashSet<>();
 
     public TextDatasetEntity() {
-        super(TextDatasetOutput.VALUE_TYPE);
+        super(TextValue.TYPE);
     }
 
     public Set<TextDatasetEntity> getReferenceValues() {

dao/src/main/java/org/n52/series/db/da/CategoryRepository.java

@@ -31,6 +31,7 @@
 
 import org.hibernate.Session;
 import org.n52.io.response.CategoryOutput;
+import org.n52.io.response.ServiceOutput;
 import org.n52.series.db.beans.CategoryEntity;
 import org.n52.series.db.dao.AbstractDao;
 import org.n52.series.db.dao.CategoryDao;
@@ -67,13 +68,12 @@ protected SearchableDao<CategoryEntity> createSearchableDao(Session session) {
     }
 
     @Override
-    protected CategoryOutput createExpanded(CategoryEntity entity, DbQuery parameters, Session session) {
-        CategoryOutput result = createCondensed(entity, parameters, session);
-        if (parameters.getHrefBase() != null) {
-            result.setService(getCondensedExtendedService(getServiceEntity(entity), parameters));
-        } else {
-            result.setService(getCondensedService(entity.getService(), parameters));
-        }
+    protected CategoryOutput createExpanded(CategoryEntity entity, DbQuery query, Session session) {
+        CategoryOutput result = createCondensed(entity, query, session);
+        ServiceOutput service = (query.getHrefBase() != null)
+                ? getCondensedExtendedService(getServiceEntity(entity), query)
+                : getCondensedService(getServiceEntity(entity), query);
+        result.setValue(CategoryOutput.SERVICE, service, query.getParameters(), result::setService);
         return result;
     }