Java units API rewrite

wpiunits/src/main/java/edu/wpi/first/units/AccelerationUnit.java

@@ -54,15 +54,15 @@ public Acceleration<D> ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AccelerationUnit<D>> zero() {
-    return (Measure<AccelerationUnit<D>>) super.zero();
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  public Acceleration<D> zero() {
+    return (Acceleration<D>) (Acceleration) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AccelerationUnit<D>> one() {
-    return (Measure<AccelerationUnit<D>>) super.one();
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  public Acceleration<D> one() {
+    return (Acceleration<D>) (Acceleration) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/AngularAccelerationUnit.java

@@ -59,15 +59,13 @@ public AngularAcceleration ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AngularAccelerationUnit> zero() {
-    return (Measure<AngularAccelerationUnit>) super.zero();
+  public AngularAcceleration zero() {
+    return (AngularAcceleration) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AngularAccelerationUnit> one() {
-    return (Measure<AngularAccelerationUnit>) super.one();
+  public AngularAcceleration one() {
+    return (AngularAcceleration) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/AngularMomentumUnit.java

@@ -61,15 +61,13 @@ public AngularMomentum ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AngularMomentumUnit> zero() {
-    return (Measure<AngularMomentumUnit>) super.zero();
+  public AngularMomentum zero() {
+    return (AngularMomentum) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AngularMomentumUnit> one() {
-    return (Measure<AngularMomentumUnit>) super.one();
+  public AngularMomentum one() {
+    return (AngularMomentum) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/AngularVelocityUnit.java

@@ -58,15 +58,13 @@ public AngularVelocity ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AngularVelocityUnit> zero() {
-    return (Measure<AngularVelocityUnit>) super.zero();
+  public AngularVelocity zero() {
+    return (AngularVelocity) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<AngularVelocityUnit> one() {
-    return (Measure<AngularVelocityUnit>) super.one();
+  public AngularVelocity one() {
+    return (AngularVelocity) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/CurrentUnit.java

@@ -62,15 +62,13 @@ public Current ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<CurrentUnit> zero() {
-    return (Measure<CurrentUnit>) super.zero();
+  public Current zero() {
+    return (Current) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<CurrentUnit> one() {
-    return (Measure<CurrentUnit>) super.one();
+  public Current one() {
+    return (Current) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/DimensionlessUnit.java

@@ -49,15 +49,13 @@ public Dimensionless ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<DimensionlessUnit> zero() {
-    return (Measure<DimensionlessUnit>) super.zero();
+  public Dimensionless zero() {
+    return (Dimensionless) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<DimensionlessUnit> one() {
-    return (Measure<DimensionlessUnit>) super.one();
+  public Dimensionless one() {
+    return (Dimensionless) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/DistanceUnit.java

@@ -74,15 +74,13 @@ public Distance ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<DistanceUnit> zero() {
-    return (Measure<DistanceUnit>) super.zero();
+  public Distance zero() {
+    return (Distance) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<DistanceUnit> one() {
-    return (Measure<DistanceUnit>) super.one();
+  public Distance one() {
+    return (Distance) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/EnergyUnit.java

@@ -80,15 +80,13 @@ public Energy ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<EnergyUnit> zero() {
-    return (Measure<EnergyUnit>) super.zero();
+  public Energy zero() {
+    return (Energy) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<EnergyUnit> one() {
-    return (Measure<EnergyUnit>) super.one();
+  public Energy one() {
+    return (Energy) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/ForceUnit.java

@@ -73,15 +73,13 @@ public Force ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<ForceUnit> zero() {
-    return (Measure<ForceUnit>) super.zero();
+  public Force zero() {
+    return (Force) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<ForceUnit> one() {
-    return (Measure<ForceUnit>) super.one();
+  public Force one() {
+    return (Force) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/FrequencyUnit.java

@@ -71,15 +71,13 @@ public Frequency ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<FrequencyUnit> zero() {
-    return (Measure<FrequencyUnit>) super.zero();
+  public Frequency zero() {
+    return (Frequency) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<FrequencyUnit> one() {
-    return (Measure<FrequencyUnit>) super.one();
+  public Frequency one() {
+    return (Frequency) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/LinearAccelerationUnit.java

@@ -61,15 +61,13 @@ public LinearAcceleration ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<LinearAccelerationUnit> zero() {
-    return (Measure<LinearAccelerationUnit>) super.zero();
+  public LinearAcceleration zero() {
+    return (LinearAcceleration) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<LinearAccelerationUnit> one() {
-    return (Measure<LinearAccelerationUnit>) super.one();
+  public LinearAcceleration one() {
+    return (LinearAcceleration) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/LinearMomentumUnit.java

@@ -58,15 +58,13 @@ public LinearMomentum ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<LinearMomentumUnit> zero() {
-    return (Measure<LinearMomentumUnit>) super.zero();
+  public LinearMomentum zero() {
+    return (LinearMomentum) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<LinearMomentumUnit> one() {
-    return (Measure<LinearMomentumUnit>) super.one();
+  public LinearMomentum one() {
+    return (LinearMomentum) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/LinearVelocityUnit.java

@@ -58,15 +58,13 @@ public LinearVelocity ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<LinearVelocityUnit> zero() {
-    return (Measure<LinearVelocityUnit>) super.zero();
+  public LinearVelocity zero() {
+    return (LinearVelocity) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<LinearVelocityUnit> one() {
-    return (Measure<LinearVelocityUnit>) super.one();
+  public LinearVelocity one() {
+    return (LinearVelocity) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/MassUnit.java

@@ -48,15 +48,13 @@ public Mass ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<MassUnit> zero() {
-    return (Measure<MassUnit>) super.zero();
+  public Mass zero() {
+    return (Mass) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<MassUnit> one() {
-    return (Measure<MassUnit>) super.one();
+  public Mass one() {
+    return (Mass) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/MomentOfInertiaUnit.java

@@ -64,15 +64,13 @@ public MomentOfInertia ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<MomentOfInertiaUnit> zero() {
-    return (Measure<MomentOfInertiaUnit>) super.zero();
+  public MomentOfInertia zero() {
+    return (MomentOfInertia) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<MomentOfInertiaUnit> one() {
-    return (Measure<MomentOfInertiaUnit>) super.one();
+  public MomentOfInertia one() {
+    return (MomentOfInertia) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/PowerUnit.java

@@ -121,15 +121,13 @@ public Power ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<PowerUnit> zero() {
-    return (Measure<PowerUnit>) super.zero();
+  public Power zero() {
+    return (Power) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<PowerUnit> one() {
-    return (Measure<PowerUnit>) super.one();
+  public Power one() {
+    return (Power) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/TemperatureUnit.java

@@ -43,15 +43,13 @@ public Temperature ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<TemperatureUnit> zero() {
-    return (Measure<TemperatureUnit>) super.zero();
+  public Temperature zero() {
+    return (Temperature) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<TemperatureUnit> one() {
-    return (Measure<TemperatureUnit>) super.one();
+  public Temperature one() {
+    return (Temperature) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/TimeUnit.java

@@ -86,15 +86,13 @@ public Time ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<TimeUnit> zero() {
-    return (Measure<TimeUnit>) super.zero();
+  public Time zero() {
+    return (Time) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<TimeUnit> one() {
-    return (Measure<TimeUnit>) super.one();
+  public Time one() {
+    return (Time) super.one();
   }
 
   @Override

wpiunits/src/main/java/edu/wpi/first/units/TorqueUnit.java

@@ -58,15 +58,13 @@ public Torque ofBaseUnits(double baseUnitMagnitude) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<TorqueUnit> zero() {
-    return (Measure<TorqueUnit>) super.zero();
+  public Torque zero() {
+    return (Torque) super.zero();
   }
 
   @Override
-  @SuppressWarnings("unchecked")
-  public Measure<TorqueUnit> one() {
-    return (Measure<TorqueUnit>) super.one();
+  public Torque one() {
+    return (Torque) super.one();
   }
 
   @Override