From a045aac83e3d3f40ac90ac2a43f7e6a1ee455d82 Mon Sep 17 00:00:00 2001
From: Julien Lengrand-Lambert <julien@lengrand.fr>
Date: Sat, 14 Dec 2019 09:10:36 +0100
Subject: [PATCH] Working makefile. Starting helidon app

---
 cellar-app/pom.xml                            | 11 ++++++
 .../main/java/nl/lengrand/CellarProvider.java | 11 ++++++
 .../main/java/nl/lengrand/CellarResource.java | 39 +++++++++++++++++++
 .../main/java/nl/lengrand/SensorValues.java   |  4 ++
 cellar-driver/src/main/c/Makefile             |  2 +-
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 cellar-app/src/main/java/nl/lengrand/CellarProvider.java
 create mode 100644 cellar-app/src/main/java/nl/lengrand/CellarResource.java
 create mode 100644 cellar-app/src/main/java/nl/lengrand/SensorValues.java

diff --git a/cellar-app/pom.xml b/cellar-app/pom.xml
index 831595d..10db715 100644
--- a/cellar-app/pom.xml
+++ b/cellar-app/pom.xml
@@ -36,6 +36,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>nl.lengrand</groupId>
+            <artifactId>cellar-driver</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
             <artifactId>helidon-microprofile</artifactId>
@@ -60,6 +65,12 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>nl.lengrand</groupId>
+            <artifactId>cellar-driver</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/cellar-app/src/main/java/nl/lengrand/CellarProvider.java b/cellar-app/src/main/java/nl/lengrand/CellarProvider.java
new file mode 100644
index 0000000..9d7b7f0
--- /dev/null
+++ b/cellar-app/src/main/java/nl/lengrand/CellarProvider.java
@@ -0,0 +1,11 @@
+package nl.lengrand;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class CellarProvider {
+
+    public SensorValues getSensorValues(){
+        return null;
+    }
+}
diff --git a/cellar-app/src/main/java/nl/lengrand/CellarResource.java b/cellar-app/src/main/java/nl/lengrand/CellarResource.java
new file mode 100644
index 0000000..2ea43bb
--- /dev/null
+++ b/cellar-app/src/main/java/nl/lengrand/CellarResource.java
@@ -0,0 +1,39 @@
+package nl.lengrand;
+
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.json.Json;
+import javax.json.JsonBuilderFactory;
+import javax.json.JsonObject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.Collections;
+
+@Path("/sensor")
+@RequestScoped
+public class CellarResource {
+
+    private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());
+    private final CellarProvider cellarProvider;
+
+    @Inject
+    public CellarResource(CellarProvider cellarConfig){
+        this.cellarProvider = cellarConfig;
+    }
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public JsonObject getSensorValues(){
+        return createResponse(cellarProvider.getSensorValues());
+    }
+
+    private JsonObject createResponse(SensorValues values) {
+        return JSON.createObjectBuilder()
+                .add("test", "test")
+                .build();
+    }
+
+}
diff --git a/cellar-app/src/main/java/nl/lengrand/SensorValues.java b/cellar-app/src/main/java/nl/lengrand/SensorValues.java
new file mode 100644
index 0000000..aaccc54
--- /dev/null
+++ b/cellar-app/src/main/java/nl/lengrand/SensorValues.java
@@ -0,0 +1,4 @@
+package nl.lengrand;
+
+public class SensorValues {
+}
diff --git a/cellar-driver/src/main/c/Makefile b/cellar-driver/src/main/c/Makefile
index c267680..d893d48 100644
--- a/cellar-driver/src/main/c/Makefile
+++ b/cellar-driver/src/main/c/Makefile
@@ -4,7 +4,7 @@ HEADERS = ../../target/headers/Dht11Driver.h adafruit/common_dht_read.h adafruit
 FILES = adafruit/common_dht_read.c adafruit/Raspberry_Pi_2/pi_2_mmio.c adafruit/Raspberry_Pi_2/pi_2_dht_read.c Dht11Driver.c
 OUT = libdht11
 
-default: library
+default: library move
 
 program: Dht11Driver.c
 	gcc -Wall $(INCLUDES) $(HEADERS) $(FILES) -o $(OUT)