put y axis definition into its own object

pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.lucares.pdb.plot.api.Aggregate;
-import org.lucares.pdb.plot.api.AxisScale;
 import org.lucares.pdb.plot.api.Limit;
+import org.lucares.pdb.plot.api.YAxisDefinition;
 
 public class PlotRequest {
     private String query;
@@ -22,18 +22,15 @@ public class PlotRequest {
 
     private Limit limitBy = Limit.NO_LIMIT;
 
-    private AxisScale yAxisScale = AxisScale.LINEAR;
-
     private int limit = Integer.MAX_VALUE;
 
+    private YAxisDefinition y1 = new YAxisDefinition();
+    private YAxisDefinition y2 = new YAxisDefinition();
+
     private String dateRange;
 
     private List<Aggregate> aggregates = new ArrayList<>();
 
-    private int yRangeMin;
-    private int yRangeMax;
-    private TimeRangeUnit yRangeUnit = TimeRangeUnit.AUTOMATIC;
-
     private boolean keyOutside;
 
     private boolean generateThumbnail;
@@ -115,14 +112,6 @@ public class PlotRequest {
         this.dateRange = dateRange;
     }
 
-    public AxisScale getAxisScale() {
-        return yAxisScale;
-    }
-
-    public void setAxisScale(final AxisScale yAxis) {
-        this.yAxisScale = yAxis;
-    }
-
     public void setAggregate(final List<Aggregate> aggregates) {
         this.aggregates = aggregates;
     }
@@ -147,27 +136,19 @@ public class PlotRequest {
         this.generateThumbnail = generateThumbnail;
     }
 
-    public int getyRangeMin() {
-        return yRangeMin;
+    public YAxisDefinition getY1() {
+        return y1;
     }
 
-    public void setyRangeMin(final int yRangeMin) {
-        this.yRangeMin = yRangeMin;
+    public void setY1(final YAxisDefinition y1) {
+        this.y1 = y1;
     }
 
-    public int getyRangeMax() {
-        return yRangeMax;
+    public YAxisDefinition getY2() {
+        return y2;
     }
 
-    public void setyRangeMax(final int yRangeMax) {
-        this.yRangeMax = yRangeMax;
-    }
-
-    public TimeRangeUnit getyRangeUnit() {
-        return yRangeUnit;
-    }
-
-    public void setyRangeUnit(final TimeRangeUnit yRangeUnit) {
-        this.yRangeUnit = yRangeUnit;
+    public void setY2(final YAxisDefinition y2) {
+        this.y2 = y2;
     }
 }

pdb-ui/src/main/java/org/lucares/pdbui/domain/TimeRangeUnit.java

@@ -1,5 +0,0 @@
-package org.lucares.pdbui.domain;
-
-public enum TimeRangeUnit {
-    AUTOMATIC, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
-}