project refactoring

README.md

@@ -1,14 +1,15 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![Build and Test](https://github.com/jveverka/itx-rpi-drivers/workflows/Build%20and%20Test/badge.svg)
+![Build and Test](https://github.com/jveverka/rpi-drivers/workflows/Build%20and%20Test/badge.svg)
 
 # Raspberry PI projects and drivers
 
 ![banner](docs/graphics-banner.svg)
 
 This project contains various DYI projects, hardware drivers, schematics and code examples for Raspberry PI.
 
-* __[pi4j-drivers](pi4j-drivers)__ - Java APIs for some PRi/[pi4j](https://pi4j.com/) compatible hardware.
+* __[rpi-drivers](rpi-drivers)__ - Java APIs for some PRi/[pi4j](https://pi4j.com/) compatible hardware.
 * __[rpi-powercontroller](rpi-powercontroller)__ - Control relay power switch via HTTP/REST APIs. 
+* __[rpi-powercontroller-client](rpi-powercontroller-client)__ - Java Client for __[rpi-powercontroller](rpi-powercontroller)__.
 * __[rpi-camera](rpi-camera)__ - Capture images via HTTP/REST APIs. 
 * __[waveshare-lcd-13-driver](waveshare-lcd-13-driver)__ - Java driver for small LCD display.
 * __[sensehat-games](sensehat-games)__ - small compilation of python games for 8x8 [sensehat](https://www.raspberrypi.org/products/sense-hat/) display.

build.gradle

@@ -6,11 +6,15 @@ subprojects {
     }
 }
 
-project(':pi4j-drivers') {
+project(':rpi-drivers') {
+}
+
+project(':rpi-powercontroller-client') {
 }
 
 project(':rpi-powercontroller') {
     dependencies {
-        implementation project(':pi4j-drivers')
+        implementation project(':rpi-drivers')
+        implementation project(':rpi-powercontroller-client')
     }
 }

pi4j-drivers/README.md → rpi-drivers/README.md

@@ -19,22 +19,22 @@ Written in Java using [pi4j](http://pi4j.com/).
 ### maven:
 ```
 <dependency>
-    <groupId>itx.rpi.hardware</groupId>
-    <artifactId>itx-rpi-drivers</artifactId>
+    <groupId>one.microproject.rpi</groupId>
+    <artifactId>rpi-drivers</artifactId>
     <version>1.0.0</version>
 </dependency>
 ```
 
 ### gradle:
 ```
-implementation 'itx.rpi.hardware:itx-rpi-drivers:1.0.0'
+implementation 'one.microproject.rpi:rpi-drivers:1.0.0'
 ```
 
 ### testing:
 * install java on raspberry pi
 * enable I2C on raspberry pi
-* copy pi4j and itx-rpi-drivers jars in tmp directory
+* copy pi4j and rpi-drivers jars in tmp directory
 * wire hardware as necessary
-* start tests in itx.rpi.hardware.gpio.tests
+* start tests in one.microproject.rpi.hardware.gpio.tests
 
 

pi4j-drivers/build.gradle → rpi-drivers/build.gradle

@@ -6,7 +6,7 @@ plugins {
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-group = 'itx.rpi.hardware'
+group = 'one.microproject.rpi'
 version = '1.0.0'
 
 repositories {
@@ -19,17 +19,17 @@ dependencies {
 }
 
 jar {
-    archiveBaseName = 'itx-rpi-drivers'
+    archiveBaseName = 'rpi-drivers'
 }
 
 task jarSources(type: Jar, dependsOn: classes) {
     archiveClassifier = 'sources'
-    archiveBaseName = 'itx-rpi-drivers'
+    archiveBaseName = 'rpi-drivers'
 }
 
 task jarJavadoc(type: Jar, dependsOn: javadoc) {
     archiveClassifier = 'javadoc'
-    archiveBaseName = 'itx-rpi-drivers'
+    archiveBaseName = 'rpi-drivers'
 }
 
 artifacts {

rpi-drivers/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'rpi-drivers'

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/sensors/BMP180.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/sensors/BMP180.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.sensors;
+package one.microproject.rpi.hardware.gpio.sensors;
 
 import com.pi4j.io.i2c.I2CBus;
 import com.pi4j.io.i2c.I2CDevice;

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/sensors/DS1621.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/sensors/DS1621.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.sensors;
+package one.microproject.rpi.hardware.gpio.sensors;
 
 import java.io.IOException;
 

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/sensors/HCSR04.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/sensors/HCSR04.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.sensors;
+package one.microproject.rpi.hardware.gpio.sensors;
 
 import com.pi4j.io.gpio.GpioController;
 import com.pi4j.io.gpio.GpioFactory;

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/sensors/HCSR501.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/sensors/HCSR501.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.sensors;
+package one.microproject.rpi.hardware.gpio.sensors;
 
 import com.pi4j.io.gpio.GpioController;
 import com.pi4j.io.gpio.GpioFactory;

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/sensors/HTU21DF.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/sensors/HTU21DF.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.sensors;
+package one.microproject.rpi.hardware.gpio.sensors;
 
 import com.pi4j.io.i2c.I2CBus;
 import com.pi4j.io.i2c.I2CDevice;

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/sensors/MCP9808.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/sensors/MCP9808.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.sensors;
+package one.microproject.rpi.hardware.gpio.sensors;
 
 import com.pi4j.io.i2c.I2CBus;
 import com.pi4j.io.i2c.I2CDevice;

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/BMP180Test.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/BMP180Test.java

@@ -1,6 +1,6 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
-import itx.rpi.hardware.gpio.sensors.BMP180;
+import one.microproject.rpi.hardware.gpio.sensors.BMP180;
 
 public class BMP180Test {
 

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/ButtonTest.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/ButtonTest.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
 import com.pi4j.io.gpio.GpioController;
 import com.pi4j.io.gpio.GpioFactory;

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/DS1621Test.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/DS1621Test.java

@@ -1,6 +1,6 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
-import itx.rpi.hardware.gpio.sensors.DS1621;
+import one.microproject.rpi.hardware.gpio.sensors.DS1621;
 
 public class DS1621Test {
 

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/HCSR04Test.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/HCSR04Test.java

@@ -1,6 +1,6 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
-import itx.rpi.hardware.gpio.sensors.HCSR04;
+import one.microproject.rpi.hardware.gpio.sensors.HCSR04;
 
 public class HCSR04Test {
 

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/HCSR501Test.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/HCSR501Test.java

@@ -1,9 +1,9 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
 import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;
 import com.pi4j.io.gpio.event.GpioPinListenerDigital;
 
-import itx.rpi.hardware.gpio.sensors.HCSR501;
+import one.microproject.rpi.hardware.gpio.sensors.HCSR501;
 
 public class HCSR501Test {
 

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/HTU21DTest.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/HTU21DTest.java

@@ -1,6 +1,6 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
-import itx.rpi.hardware.gpio.sensors.HTU21DF;
+import one.microproject.rpi.hardware.gpio.sensors.HTU21DF;
 
 public class HTU21DTest {
 

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/LEDBlinkTest.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/LEDBlinkTest.java

@@ -1,4 +1,4 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
 import com.pi4j.io.gpio.GpioController;
 import com.pi4j.io.gpio.GpioFactory;

pi4j-drivers/src/main/java/itx/rpi/hardware/gpio/tests/Test.java → rpi-drivers/src/main/java/one/microproject/rpi/hardware/gpio/tests/Test.java

@@ -1,7 +1,7 @@
-package itx.rpi.hardware.gpio.tests;
+package one.microproject.rpi.hardware.gpio.tests;
 
-import itx.rpi.hardware.gpio.sensors.BMP180;
-import itx.rpi.hardware.gpio.sensors.HTU21DF;
+import one.microproject.rpi.hardware.gpio.sensors.BMP180;
+import one.microproject.rpi.hardware.gpio.sensors.HTU21DF;
 
 public class Test implements Runnable {
 

rpi-drivers/src/test/resources/run-gpio-test.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+export CLASSPATH=pi4j-core-1.1.jar:gpio-drivers.jar
+
+#java -classpath $CLASSPATH one.microproject.rpi.hardware.gpio.tests.ButtonTest
+#java -classpath $CLASSPATH one.microproject.rpi.hardware.gpio.tests.LEDBlinkTest
+#java -classpath $CLASSPATH one.microproject.rpi.hardware.gpio.tests.BMP180Test
+#java -classpath $CLASSPATH one.microproject.rpi.hardware.gpio.tests.HTU21DTest
+#java -classpath $CLASSPATH one.microproject.rpi.hardware.gpio.tests.HCSR04Test
+#java -classpath $CLASSPATH one.microproject.rpi.hardware.gpio.tests.HCSR501Test
+#java -classpath $CLASSPATH one.microproject.rpi.hardware.gpio.tests.DS1621Test
+
+

rpi-powercontroller-client/build.gradle

@@ -0,0 +1,31 @@
+plugins {
+    id 'java'
+    id 'maven-publish'
+}
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+group = 'one.microproject.rpi.powercontroller'
+version = '1.0.0'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'org.slf4j:slf4j-simple:1.7.30'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.11.3'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.3'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.11.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}
+

rpi-powercontroller-client/build/tmp/compileJava/source-classes-mapping.txt

@@ -0,0 +1,4 @@
+one/microproject/rpi/powercontroller/PowerControllerClientBuilder.java
+ one.microproject.rpi.powercontroller.PowerControllerClientBuilder
+one/microproject/rpi/powercontroller/PowerControllerClient.java
+ one.microproject.rpi.powercontroller.PowerControllerClient

rpi-powercontroller-client/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

rpi-powercontroller-client/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'rpi-powercontroller-client'

rpi-powercontroller-client/src/main/java/one/microproject/rpi/powercontroller/PowerControllerClient.java

@@ -0,0 +1,4 @@
+package one.microproject.rpi.powercontroller;
+
+public interface PowerControllerClient {
+}

rpi-powercontroller-client/src/main/java/one/microproject/rpi/powercontroller/PowerControllerClientBuilder.java

@@ -0,0 +1,4 @@
+package one.microproject.rpi.powercontroller;
+
+public class PowerControllerClientBuilder {
+}

rpi-powercontroller/README.md

@@ -98,7 +98,7 @@ curl -u <client-id>:<client-secret> http://<server>:<port>/uri
 
 ## Build & Test on dev PC
 RPi Power Controller is designed to be build and tested on PC. In this case  
-``itx.rpi.powercontroller.services.impl.RPiSimulatedServiceImpl`` is used instead of real RPi hardware.
+``RPiSimulatedServiceImpl`` is used instead of real RPi hardware.
 ### Development Environment
 * [OpenJDK 8 or 11](https://adoptopenjdk.net/).
 * [Gradle 6.0](https://gradle.org/install/) or later.

rpi-powercontroller/build.gradle

@@ -6,9 +6,9 @@ plugins {
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
-group = 'itx.rpi.powercontroller'
+group = 'one.microproject.rpi.powercontroller'
 version = '1.0.0'
-mainClassName = 'itx.rpi.powercontroller.PowerControllerApp'
+mainClassName = 'one.microproject.rpi.powercontroller.PowerControllerApp'
 applicationDefaultJvmArgs = ['-Xms32m', '-Xmx32m', '-XX:MaxMetaspaceSize=32m']
 
 repositories {

rpi-powercontroller/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'rpi-powercontroller'

rpi-powercontroller/src/main/java/itx/rpi/powercontroller/PowerControllerApp.java → rpi-powercontroller/src/main/java/one/microproject/rpi/powercontroller/PowerControllerApp.java

@@ -1,37 +1,37 @@
-package itx.rpi.powercontroller;
+package one.microproject.rpi.powercontroller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.undertow.Handlers;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.BlockingHandler;
 import io.undertow.server.handlers.PathHandler;
-import itx.rpi.powercontroller.config.Configuration;
-import itx.rpi.powercontroller.dto.JobId;
-import itx.rpi.powercontroller.handlers.CancelAllTasksHandler;
-import itx.rpi.powercontroller.handlers.CancelTaskHandler;
-import itx.rpi.powercontroller.handlers.CleanTaskQueueHandler;
-import itx.rpi.powercontroller.handlers.JobInfoHandler;
-import itx.rpi.powercontroller.handlers.JobKillAllIdHandler;
-import itx.rpi.powercontroller.handlers.MeasurementsHandler;
-import itx.rpi.powercontroller.handlers.PortStateHandler;
-import itx.rpi.powercontroller.handlers.SubmitTaskHandler;
-import itx.rpi.powercontroller.handlers.SystemInfoHandler;
-import itx.rpi.powercontroller.handlers.SystemStateHandler;
-import itx.rpi.powercontroller.handlers.TasksInfoHandler;
-import itx.rpi.powercontroller.handlers.WaitForTaskStartedHandler;
-import itx.rpi.powercontroller.handlers.WaitForTaskTerminationHandler;
-import itx.rpi.powercontroller.services.AAService;
-import itx.rpi.powercontroller.services.PortListener;
-import itx.rpi.powercontroller.services.RPiService;
-import itx.rpi.powercontroller.services.ShutdownHook;
-import itx.rpi.powercontroller.services.SystemInfoService;
-import itx.rpi.powercontroller.services.TaskManagerService;
-import itx.rpi.powercontroller.services.TaskQueueCleaner;
-import itx.rpi.powercontroller.services.impl.AAServiceImpl;
-import itx.rpi.powercontroller.services.impl.PortListenerImpl;
-import itx.rpi.powercontroller.services.impl.RPiServiceFactory;
-import itx.rpi.powercontroller.services.impl.SystemInfoServiceImpl;
-import itx.rpi.powercontroller.services.jobs.TaskManagerFactory;
+import one.microproject.rpi.powercontroller.config.Configuration;
+import one.microproject.rpi.powercontroller.dto.JobId;
+import one.microproject.rpi.powercontroller.handlers.CancelAllTasksHandler;
+import one.microproject.rpi.powercontroller.handlers.CancelTaskHandler;
+import one.microproject.rpi.powercontroller.handlers.CleanTaskQueueHandler;
+import one.microproject.rpi.powercontroller.handlers.JobInfoHandler;
+import one.microproject.rpi.powercontroller.handlers.JobKillAllIdHandler;
+import one.microproject.rpi.powercontroller.handlers.MeasurementsHandler;
+import one.microproject.rpi.powercontroller.handlers.PortStateHandler;
+import one.microproject.rpi.powercontroller.handlers.SubmitTaskHandler;
+import one.microproject.rpi.powercontroller.handlers.SystemInfoHandler;
+import one.microproject.rpi.powercontroller.handlers.SystemStateHandler;
+import one.microproject.rpi.powercontroller.handlers.TasksInfoHandler;
+import one.microproject.rpi.powercontroller.handlers.WaitForTaskStartedHandler;
+import one.microproject.rpi.powercontroller.handlers.WaitForTaskTerminationHandler;
+import one.microproject.rpi.powercontroller.services.AAService;
+import one.microproject.rpi.powercontroller.services.PortListener;
+import one.microproject.rpi.powercontroller.services.RPiService;
+import one.microproject.rpi.powercontroller.services.ShutdownHook;
+import one.microproject.rpi.powercontroller.services.SystemInfoService;
+import one.microproject.rpi.powercontroller.services.TaskManagerService;
+import one.microproject.rpi.powercontroller.services.TaskQueueCleaner;
+import one.microproject.rpi.powercontroller.services.impl.AAServiceImpl;
+import one.microproject.rpi.powercontroller.services.impl.PortListenerImpl;
+import one.microproject.rpi.powercontroller.services.impl.RPiServiceFactory;
+import one.microproject.rpi.powercontroller.services.impl.SystemInfoServiceImpl;
+import one.microproject.rpi.powercontroller.services.jobs.TaskManagerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;