Merge pull request #350 from Pi4J/feature/codeCleanup

Code cleanup

pi4j-core/src/main/java/com/pi4j/io/IODataReader.java

@@ -512,7 +512,7 @@ default int read(CharBuffer buffer) {
     default byte readByte() {
         int actual = read();
         if(actual < 0) throw new IOReadException("I2C READ ERROR; " + actual);
-        return (byte)actual;
+        return (byte) actual;
     }
 
     /**

pi4j-core/src/main/java/com/pi4j/io/IOType.java

@@ -115,7 +115,7 @@ public Class<? extends IOConfigBuilder> getConfigBuilderClass() {
     public <CB extends IOConfigBuilder>CB newConfigBuilder(Context context) {
         try {
             Method newInstance = getConfigBuilderClass().getMethod("newInstance", Context.class);
-            return (CB)newInstance.invoke(null, context);
+            return (CB) newInstance.invoke(null, context);
         } catch (Exception e) {
             throw new Pi4JException(e);
         }

pi4j-core/src/main/java/com/pi4j/io/gpio/analog/AnalogBase.java

@@ -80,14 +80,14 @@ public AnalogBase(PROVIDER_TYPE provider, CONFIG_TYPE config){
     @Override
     public ANALOG_TYPE addListener(AnalogValueChangeListener... listener) {
         valueChangeEventManager.add(listener);
-        return (ANALOG_TYPE)this;
+        return (ANALOG_TYPE) this;
     }
 
     /** {@inheritDoc} */
     @Override
     public ANALOG_TYPE removeListener(AnalogValueChangeListener... listener) {
         valueChangeEventManager.add(listener);
-        return (ANALOG_TYPE)this;
+        return (ANALOG_TYPE) this;
     }
 
     /** {@inheritDoc} */

pi4j-core/src/main/java/com/pi4j/io/i2c/impl/DefaultI2CRegister.java

@@ -127,14 +127,14 @@ public int readRegister(int register) {
     /** {@inheritDoc} */
     @Override
     public int readRegister(byte[] register, byte[] buffer, int offset, int length) {
-        return(this.i2c.readRegister(register,buffer,offset,length));
+        return this.i2c.readRegister(register,buffer,offset,length);
     }
 
 
     /** {@inheritDoc} */
     @Override
     public int readRegister(int register, byte[] buffer, int offset, int length) {
-        return(this.i2c.readRegister(register,buffer,offset,length));
+        return this.i2c.readRegister(register,buffer,offset,length);
     }
 
 
@@ -147,12 +147,12 @@ public int writeRegister(int register, byte b) {
     /** {@inheritDoc} */
     @Override
     public int writeRegister(int register, byte[] data, int offset, int length) {
-        return(this.i2c.writeRegister(register,data,offset,length));
+        return this.i2c.writeRegister(register,data,offset,length);
     }
 
     /** {@inheritDoc} */
     @Override
     public int writeRegister(byte[] register, byte[] data, int offset, int length) {
-        return(this.i2c.writeRegister(register,data,offset,length));
+        return this.i2c.writeRegister(register,data,offset,length);
     }
 }

pi4j-core/src/main/java/com/pi4j/util/Frequency.java

@@ -98,10 +98,10 @@ public static float milliseconds(Number frequency){
     public static int getFrequencyFromNanos(Number nanoseconds){
         int frequency;
         if(nanoseconds.longValue() <= 0){
-            return(0);
+            return 0;
         }
-        long period = 1000000000; // NANOSECONDS PER SECOND;
-        frequency = Math.round(1000000000/nanoseconds.longValue());
+        long period = 1_000_000_000; // NANOSECONDS PER SECOND;
+        frequency = (int) Math.round(period / (nanoseconds.longValue() * 1.0));
         return frequency;
     }
 }

pi4j-test/src/test/java/com/pi4j/test/io/i2c/I2CRegisterDataTest.java

@@ -343,7 +343,7 @@ public boolean compareArray( byte[] a, byte[]b, int aOffset, int numBytes){
                 }
             }
         }
-        return (rval);
+        return rval;
     }
 
 

plugins/pi4j-plugin-gpiod/src/main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalInputProviderImpl.java

@@ -37,7 +37,7 @@ public DigitalInput create(DigitalInputConfig config) {
     @Override
     public int getPriority() {
         // the gpioD driver should be higher priority always
-        return(150);
+        return 150;
     }
 
     /**

plugins/pi4j-plugin-gpiod/src/main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalOutputProviderImpl.java

@@ -69,7 +69,7 @@ public DigitalOutput create(DigitalOutputConfig config) {
     @Override
     public int getPriority() {
         // the gpioD driver should be higher priority always
-        return(150);
+        return 150;
     }
 
     @Override

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalInputProviderImpl.java

@@ -56,11 +56,7 @@ public LinuxFsDigitalInputProviderImpl(String gpioFileSystemPath) {
     @Override
     public int getPriority() {
         // the linux FS Digital driver should be higher priority on RP1 chip
-        int rval = 50;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 100 : 50;
     }
 
     /**

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalOutputProviderImpl.java

@@ -57,11 +57,7 @@ public LinuxFsDigitalOutputProviderImpl(String gpioFileSystemPath) {
     @Override
     public int getPriority() {
         // the linux FS Digital driver should be higher priority on RP1 chip.
-        int rval = 50;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 100 : 50;
     }
 
     /**

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2C.java

@@ -22,18 +22,17 @@
  * #L%
  */
 
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
-import java.util.Objects;
-
 import com.pi4j.io.i2c.I2C;
 import com.pi4j.io.i2c.I2CBase;
 import com.pi4j.io.i2c.I2CConfig;
 import com.pi4j.io.i2c.I2CProvider;
+import com.pi4j.plugin.linuxfs.util.SystemUtil;
 
-import  com.pi4j.plugin.linuxfs.util.SystemUtil;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+import java.util.Objects;
 
 /**
  * <p>PiGpioI2C class.</p>
@@ -312,14 +311,13 @@ public int readRegister(byte[] register, byte[] buffer, int offset, int length)
        this.i2CBus.executeIOCTL(this, command, ioctlData, offsets);
 
         // move results back into user buffer
-        for(int i = 0; i <length; i++){   // can I assume length is safe and the readBuff data is not shorter ??   I think yes
-            buffer[i] = ioctlData.get(readBuffPosition +i );
-;        }
+        for (int i = 0; i < length; i++) {   // can I assume length is safe and the readBuff data is not shorter ??   I think yes
+            buffer[i] = ioctlData.get(readBuffPosition + i);
+        }
 
-        return (readLength);
+        return readLength;
     }
 
-
     /**
      * {@inheritDoc}
      */

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2CBus.java

@@ -106,7 +106,7 @@ public int executeIOCTL(final I2C i2c, long command, ByteBuffer data, IntBuffer
             throw new Pi4JException("Failed to execute action for device " + i2c.device() + " on bus " + this.bus, e);
         }
 
-        return(rc);
+        return rc;
     }
 
     public <R> R execute(final I2C i2c, final CheckedFunction<LinuxFile, R> action) {

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2CProviderImpl.java

@@ -49,7 +49,7 @@ public LinuxFsI2CProviderImpl() {
     @Override
     public int getPriority() {
        // the linux FS driver should always be higher priority
-       return(150);
+       return 150;
     }
 
     @Override

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/pwm/LinuxFsPwmProviderImpl.java

@@ -35,6 +35,7 @@
 import com.pi4j.io.pwm.PwmProviderBase;
 import com.pi4j.io.pwm.PwmType;
 import com.pi4j.plugin.linuxfs.internal.LinuxPwm;
+
 import static java.text.MessageFormat.format;
 
 /**
@@ -61,11 +62,7 @@ public LinuxFsPwmProviderImpl(String pwmFileSystemPath, int pwmChip) {
     @Override
     public int getPriority() {
         // the linux FS PWM driver should be higher priority on RP1 chip
-        int rval = 50;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 100 : 50;
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalInputProviderImpl.java

@@ -58,11 +58,7 @@ public PiGpioDigitalInputProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip
-        int rval = 100;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 50;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 50 : 100;
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalOutputProviderImpl.java

@@ -58,11 +58,7 @@ public PiGpioDigitalOutputProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip.
-        int rval = 100;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 50;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 50 : 100;
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/i2c/PiGpioI2CProviderImpl.java

@@ -58,11 +58,7 @@ public PiGpioI2CProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip
-        int rval = 100;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 50;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 50 : 100;
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/pwm/PiGpioPwmProviderImpl.java

@@ -59,11 +59,7 @@ public PiGpioPwmProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip.
-        int rval = 100;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 50;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 50 : 100;
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/serial/PiGpioSerialProviderImpl.java

@@ -57,11 +57,7 @@ public PiGpioSerialProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on Rp1 chip.
-        int rval = 100;
-        if(BoardInfoHelper.usesRP1()) {
-            rval = 50;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 50 : 100;
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/spi/PiGpioSpiProviderImpl.java

@@ -57,11 +57,7 @@ public PiGpioSpiProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip.
-        int rval = 100;
-       if(BoardInfoHelper.usesRP1()) {
-            rval = 50;
-        }
-        return(rval);
+        return BoardInfoHelper.usesRP1() ? 50 : 100;
     }
 
     /**