cleanup code and address revise

Author: DivineThreepwood

module/dal/lib/src/main/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderService.java

@@ -22,9 +22,9 @@
  * #L%
  */
 
+import org.jetbrains.annotations.NotNull;
 import org.openbase.bco.dal.lib.layer.service.operation.OperationService;
 import org.openbase.jul.annotation.RPCMethod;
-import org.openbase.jul.exception.CouldNotPerformException;
 import org.openbase.jul.exception.CouldNotTransformException;
 import org.openbase.jul.exception.NotAvailableException;
 import org.openbase.jul.exception.VerificationFailedException;
@@ -38,6 +38,9 @@
 import org.openbase.type.vision.RGBColorType.RGBColor;
 import org.slf4j.LoggerFactory;
 
+import java.util.function.DoubleUnaryOperator;
+import java.util.function.BiPredicate;
+
 import static org.openbase.type.domotic.service.ServiceTemplateType.ServiceTemplate.ServiceType.COLOR_STATE_SERVICE;
 
 /**
@@ -164,8 +167,7 @@ static Boolean isCompatible(final ColorState colorState, final PowerState powerS
     }
 
     static Boolean equalServiceStates(final ColorState colorStateA, final ColorState colorStateB) {
-        //TODO: explain this (required because of openhab) and put margins into constants
-
+        
         final HSBColor hsbColorA = colorStateA.getColor().getHsbColor();
         final HSBColor hsbColorB = colorStateB.getColor().getHsbColor();
 
@@ -176,13 +178,13 @@ static Boolean equalServiceStates(final ColorState colorStateA, final ColorState
         final double BRIGHTNESS_MARGIN = 0.01;
 
         // normalize angle to [0,360)
-        java.util.function.DoubleUnaryOperator normalize = (v) -> {
+        DoubleUnaryOperator normalize = (v) -> {
             double r = v % 360.0;
             if (r < 0) r += 360.0;
             return r;
         };
 
-        java.util.function.BiPredicate<Double, Double> hueEqualsWithWrap = (ha, hb) -> {
+        BiPredicate<Double, Double> hueEqualsWithWrap = (ha, hb) -> {
             double aNorm = normalize.applyAsDouble(ha);
             double bNorm = normalize.applyAsDouble(hb);
             double diff = Math.abs(aNorm - bNorm);

module/dal/lib/src/test/java/org/openbase/bco/dal/lib/layer/service/provider/ColorStateProviderServiceTest.kt

@@ -35,8 +35,7 @@ import org.openbase.type.domotic.state.ColorStateType.ColorState
 class ColorStateProviderServiceTest {
     @Test
     @Timeout(10)
-    @Throws(VerificationFailedException::class, JPServiceException::class)
-    fun verifyColorState() {
+    fun `should fix color values once they are defined out of range`() {
         JPService.setupJUnitTestMode()
 
         val builder = ColorState.newBuilder()
@@ -70,7 +69,6 @@ class ColorStateProviderServiceTest {
 
     @Test
     @Timeout(10)
-    @Throws(VerificationFailedException::class, JPServiceException::class)
     fun `should handle color state comparison with equal state`() {
         JPService.setupJUnitTestMode()
 
@@ -111,7 +109,6 @@ class ColorStateProviderServiceTest {
 
     @Test
     @Timeout(10)
-    @Throws(VerificationFailedException::class, JPServiceException::class)
     fun `should handle color state comparison with non equal state`() {
         JPService.setupJUnitTestMode()
 
@@ -221,7 +218,6 @@ class ColorStateProviderServiceTest {
 
     @Test
     @Timeout(10)
-    @Throws(VerificationFailedException::class, JPServiceException::class)
     fun `should handle color state comparison with neutral state`() {
         JPService.setupJUnitTestMode()