style: change object names in responses

Author: Rosario Trischitta

src/main/lombok/org/heigit/ohsome/ohsomeapi/executor/ExecutionUtils.java

@@ -61,7 +61,6 @@
 import org.heigit.bigspatialdata.oshdb.util.tagtranslator.OSMTag;
 import org.heigit.bigspatialdata.oshdb.util.tagtranslator.TagTranslator;
 import org.heigit.bigspatialdata.oshdb.util.time.TimestampFormatter;
-import org.heigit.ohsome.filter.FilterExpression;
 import org.heigit.ohsome.ohsomeapi.Application;
 import org.heigit.ohsome.ohsomeapi.controller.rawdata.ElementsGeometry;
 import org.heigit.ohsome.ohsomeapi.exception.DatabaseAccessException;
@@ -123,10 +122,10 @@ public MapReducer<OSMEntitySnapshot> snapshotFilter(MapReducer<OSMEntitySnapshot
    */
   public MapAggregator<OSHDBCombinedIndex<OSHDBTimestamp, Integer>, OSMEntitySnapshot>
       snapshotFilter(
-      MapAggregator<OSHDBCombinedIndex<OSHDBTimestamp, Integer>, OSMEntitySnapshot> mapRed,
-      Set<OSMType> osmTypes1, Set<OSMType> osmTypes2, Set<SimpleFeatureType> simpleFeatureTypes1,
-      Set<SimpleFeatureType> simpleFeatureTypes2, Integer[] keysInt1, Integer[] keysInt2,
-      Integer[] valuesInt1, Integer[] valuesInt2) {
+          MapAggregator<OSHDBCombinedIndex<OSHDBTimestamp, Integer>, OSMEntitySnapshot> mapRed,
+          Set<OSMType> osmTypes1, Set<OSMType> osmTypes2,
+          Set<SimpleFeatureType> simpleFeatureTypes1, Set<SimpleFeatureType> simpleFeatureTypes2,
+          Integer[] keysInt1, Integer[] keysInt2, Integer[] valuesInt1, Integer[] valuesInt2) {
     return mapRed.filter(
         snapshot -> snapshotMatches(snapshot, osmTypes1, simpleFeatureTypes1, keysInt1, valuesInt1)
             || snapshotMatches(snapshot, osmTypes2, simpleFeatureTypes2, keysInt2, valuesInt2));
@@ -226,16 +225,15 @@ SortedMap<V, SortedMap<U, A>> nest(Map<OSHDBCombinedIndex<U, V>, A> result) {
    *         {@link com.fasterxml.jackson.core.JsonGenerator#writeObject(Object) writeObject},
    *         {@link javax.servlet.ServletResponse#getOutputStream() getOutputStream},
    *         {@link java.io.OutputStream#write(byte[]) write},
-   *         {@link org.heigit.ohsome.ohsomeapi.executor.ExecutionUtils
-   *         #writeStreamResponse(ThreadLocal, Stream, ThreadLocal, ServletOutputStream)
+   *         {@link org.heigit.ohsome.ohsomeapi.executor.ExecutionUtils #writeStreamResponse(ThreadLocal, Stream, ThreadLocal, ServletOutputStream)
    *         writeStreamResponse}, {@link javax.servlet.ServletOutputStream#print(String) print},
    *         and {@link javax.servlet.ServletResponse#flushBuffer() flushBuffer}
    * @throws ExecutionException thrown by
-   *         {@link org.heigit.ohsome.ohsomeapi.executor.ExecutionUtils#writeStreamResponse(
-   *         ThreadLocal, Stream, ThreadLocal, ServletOutputStream) writeStreamResponse}
+   *         {@link org.heigit.ohsome.ohsomeapi.executor.ExecutionUtils#writeStreamResponse( ThreadLocal, Stream, ThreadLocal, ServletOutputStream)
+   *         writeStreamResponse}
    * @throws InterruptedException thrown by
-   *         {@link org.heigit.ohsome.ohsomeapi.executor.ExecutionUtils#writeStreamResponse(
-   *         ThreadLocal, Stream, ThreadLocal, ServletOutputStream) writeStreamResponse}
+   *         {@link org.heigit.ohsome.ohsomeapi.executor.ExecutionUtils#writeStreamResponse( ThreadLocal, Stream, ThreadLocal, ServletOutputStream)
+   *         writeStreamResponse}
    */
   public void streamResponse(HttpServletResponse servletResponse, DataResponse osmData,
       Stream<org.wololo.geojson.Feature> resultStream) throws Exception {
@@ -450,10 +448,10 @@ public org.wololo.geojson.Feature createOSMFeature(OSMEntity entity, Geometry ge
    */
   @SuppressWarnings({"unchecked"}) // intentionally suppressed as type format is valid
   public <K extends Comparable<K> & Serializable, V extends Number>
-      SortedMap<OSHDBCombinedIndex<OSHDBTimestamp, K>, V> computeResult(
-      RequestResource requestResource,
-      MapAggregator<OSHDBCombinedIndex<OSHDBTimestamp, K>, OSMEntitySnapshot> preResult)
-      throws Exception {
+      SortedMap<OSHDBCombinedIndex<OSHDBTimestamp, K>, V>
+      computeResult(RequestResource requestResource,
+          MapAggregator<OSHDBCombinedIndex<OSHDBTimestamp, K>, OSMEntitySnapshot> preResult)
+          throws Exception {
     switch (requestResource) {
       case COUNT:
         return (SortedMap<OSHDBCombinedIndex<OSHDBTimestamp, K>, V>) preResult.count();
@@ -486,28 +484,27 @@ SortedMap<OSHDBCombinedIndex<OSHDBTimestamp, K>, V> computeResult(
   @SuppressWarnings({"unchecked"}) // intentionally suppressed as type format is valid
   public <K extends Comparable<K> & Serializable, V extends Number>
       SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>
-      computeNestedResult(
-      RequestResource requestResource,
-      MapAggregator<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, Geometry>
-          preResult) throws Exception {
+      computeNestedResult(RequestResource requestResource,
+          MapAggregator<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, Geometry> preResult)
+          throws Exception {
     switch (requestResource) {
       case COUNT:
-        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>)
-            preResult.count();
+        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>) preResult
+            .count();
       case PERIMETER:
-        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>)
-            preResult.sum(geom -> {
+        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>) preResult
+            .sum(geom -> {
               if (!(geom instanceof Polygonal)) {
                 return 0.0;
               }
               return cacheInUserData(geom, () -> Geo.lengthOf(geom.getBoundary()));
             });
       case LENGTH:
-        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>)
-            preResult.sum(geom -> cacheInUserData(geom, () -> Geo.lengthOf(geom)));
+        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>) preResult
+            .sum(geom -> cacheInUserData(geom, () -> Geo.lengthOf(geom)));
       case AREA:
-        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>)
-            preResult.sum(geom -> cacheInUserData(geom, () -> Geo.areaOf(geom)));
+        return (SortedMap<OSHDBCombinedIndex<OSHDBCombinedIndex<Integer, K>, OSHDBTimestamp>, V>) preResult
+            .sum(geom -> cacheInUserData(geom, () -> Geo.areaOf(geom)));
       default:
         return null;
     }
@@ -587,8 +584,7 @@ public Double[] fillElementsRatioGroupByBoundaryResultValues(
       DecimalFormat df) {
     Double[] resultValues = new Double[resultSet.size()];
     int valueCount = 0;
-    for (Entry<OSHDBCombinedIndex<OSHDBTimestamp, Integer>, ? extends Number> innerEntry :
-        resultSet) {
+    for (Entry<OSHDBCombinedIndex<OSHDBTimestamp, Integer>, ? extends Number> innerEntry : resultSet) {
       resultValues[valueCount] = Double.parseDouble(df.format(innerEntry.getValue().doubleValue()));
       valueCount++;
     }
@@ -746,8 +742,8 @@ public String combineFiltersWithOr(String firstFilter, String secondFilter) {
    *        containing <code>ElementsResult</code> objects
    * @return <code>Pair</code> containing the column names (left) and the data rows (right)
    */
-  private ImmutablePair<List<String>, List<String[]>> createCsvResponseForElementsGroupBy(
-      GroupByObject[] resultSet) {
+  private ImmutablePair<List<String>, List<String[]>>
+      createCsvResponseForElementsGroupBy(GroupByObject[] resultSet) {
     List<String> columnNames = new LinkedList<>();
     columnNames.add("timestamp");
     List<String[]> rows = new LinkedList<>();
@@ -782,8 +778,8 @@ private ImmutablePair<List<String>, List<String[]>> createCsvResponseForElements
    *        objects containing <code>RatioResult</code> objects
    * @return <code>Pair</code> containing the column names (left) and the data rows (right)
    */
-  private ImmutablePair<List<String>, List<String[]>> createCsvResponseForElementsRatioGroupBy(
-      GroupByObject[] resultSet) {
+  private ImmutablePair<List<String>, List<String[]>>
+      createCsvResponseForElementsRatioGroupBy(GroupByObject[] resultSet) {
     List<String> columnNames = new LinkedList<>();
     columnNames.add("timestamp");
     List<String[]> rows = new LinkedList<>();
@@ -792,8 +788,8 @@ private ImmutablePair<List<String>, List<String[]>> createCsvResponseForElements
       columnNames.add(ratioGroupByResult.getGroupByObject() + "_value");
       columnNames.add(ratioGroupByResult.getGroupByObject() + "_value2");
       columnNames.add(ratioGroupByResult.getGroupByObject() + "_ratio");
-      for (int j = 0; j < ratioGroupByResult.getRatioResult().length; j++) {
-        RatioResult ratioResult = ratioGroupByResult.getRatioResult()[j];
+      for (int j = 0; j < ratioGroupByResult.getResult().length; j++) {
+        RatioResult ratioResult = ratioGroupByResult.getResult()[j];
         if (i == 0) {
           String[] row = new String[resultSet.length * 3 + 1];
           row[0] = ratioResult.getTimestamp();
@@ -819,8 +815,8 @@ private ImmutablePair<List<String>, List<String[]>> createCsvResponseForElements
    *        containing <code>UsersResult</code> objects
    * @return <code>Pair</code> containing the column names (left) and the data rows (right)
    */
-  private ImmutablePair<List<String>, List<String[]>> createCsvResponseForUsersGroupBy(
-      GroupByObject[] resultSet) {
+  private ImmutablePair<List<String>, List<String[]>>
+      createCsvResponseForUsersGroupBy(GroupByObject[] resultSet) {
     List<String> columnNames = new LinkedList<>();
     columnNames.add("fromTimestamp");
     columnNames.add("toTimestamp");

src/main/lombok/org/heigit/ohsome/ohsomeapi/output/dataaggregationresponse/RatioResponse.java

@@ -26,5 +26,5 @@ public class RatioResponse implements Response {
   @ApiModelProperty(notes = "Metadata describing the output")
   private Metadata metadata;
   @ApiModelProperty(notes = "ElementsResult for /ratio requests", required = true)
-  private RatioResult[] ratioResult;
+  private RatioResult[] result;
 }

src/main/lombok/org/heigit/ohsome/ohsomeapi/output/dataaggregationresponse/groupbyresponse/RatioGroupByBoundaryResponse.java

@@ -39,14 +39,14 @@ public class RatioGroupByBoundaryResponse implements Response {
   private Feature[] features;
   @ApiModelProperty(notes = "RatioGroupByResult array holding the respective objects "
       + "with their timestamp-value-value2-ratio values", required = true)
-  private RatioGroupByResult[] groupByBoundaryResult;
+  private RatioGroupByResult[] groupByResult;
 
   public RatioGroupByBoundaryResponse(Attribution attribution, String apiVersion, Metadata metadata,
-      RatioGroupByResult[] groupByBoundaryResult) {
+      RatioGroupByResult[] groupByResult) {
     this.attribution = attribution;
     this.apiVersion = apiVersion;
     this.metadata = metadata;
-    this.groupByBoundaryResult = groupByBoundaryResult;
+    this.groupByResult = groupByResult;
   }
 
   /** Static factory method returning the whole GeoJSON response. */

src/main/lombok/org/heigit/ohsome/ohsomeapi/output/dataaggregationresponse/groupbyresponse/RatioGroupByResult.java

@@ -14,10 +14,10 @@ public class RatioGroupByResult extends GroupByObject {
 
   @ApiModelProperty(notes = "RatioResult array holding timestamp, whole and part values",
       required = true)
-  private RatioResult[] ratioResult;
+  private RatioResult[] result;
 
-  public RatioGroupByResult(Object groupByObject, RatioResult[] ratioResult) {
+  public RatioGroupByResult(Object groupByObject, RatioResult[] result) {
     super(groupByObject);
-    this.ratioResult = ratioResult;
+    this.result = result;
   }
 }

src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/GroupByBoundaryGeoJsonGenerator.java

@@ -38,11 +38,11 @@ private static Feature[] generateRatioGroupByResultGeoJson(GroupByObject[] resul
       int tstampCount) {
     Feature[] features;
     RatioGroupByResult[] groupByResults = (RatioGroupByResult[]) results;
-    int resultLength = groupByResults[0].getRatioResult().length;
+    int resultLength = groupByResults[0].getResult().length;
     int featuresLength = groupByResultsLength * resultLength;
     features = new Feature[featuresLength];
     for (int i = 0; i < featuresLength; i++) {
-      RatioResult result = groupByResults[groupByResultCount].getRatioResult()[tstampCount];
+      RatioResult result = groupByResults[groupByResultCount].getResult()[tstampCount];
       String tstamp = result.getTimestamp();
       Feature feature = fillGeojsonFeature(results, groupByResultCount, tstamp);
       feature.setProperty("value", result.getValue());