Feature/team01

.gitattributes

@@ -0,0 +1,5 @@
+# Enforce Unix newlines
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.cmd text eol=crlf

.github/workflows/codeql.yml

@@ -0,0 +1,26 @@
+name: "Code Scanning - Action"
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  CodeQL-Build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: java
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
+

.github/workflows/maven.yml

@@ -1,25 +1,35 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
+name: CI
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
-jobs:
-  build:
+env:
+  FORCE_COLOR: 2
+  JAVA_VERSION: 11
 
+jobs:
+  run:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: "${{ env.JAVA_VERSION }}"
+          distribution: "adopt"
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-${{ env.JAVA_VERSION }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-${{ env.JAVA_VERSION }}-m2-${{ hashFiles('**/pom.xml') }}
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+      - name: Upload package
+        uses: actions/upload-artifact@v2
+        with:
+          name: jar
+          path: ./target/data-consumer-*-SNAPSHOT.jar
+          if-no-files-found: error

.gitignore

@@ -129,3 +129,8 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
+/src/.metadata/
+/src/main//bin/
+
+/client*-tcpbrokerhivemqcom*
+

TEAM.md

@@ -0,0 +1,25 @@
+# TEAM01
+
+* Fotis Zafiropoulos (AM 2005)
+* Michalis Nanos (AM 2012)
+
+# Scenario
+
+We have a wind sensor which depends on wind value so that we know to go for windsurfing or not. 
+
+# Sensor states for different wind values.
+
+* normal, means no windsurfing due to no wind if wind value [0,2]
+* warn, means go windsurfing if wind value [3,6]
+* danger, means no windsurfing due to strong wind if wind value >6
+
+Reference wind values (Beaufort scale):
+
+* 0: calm
+* 1: light air
+* 2: light breeze
+* 3: gentle breeze
+* 4: moderate breeze
+* 5: fresh breeze
+* 6: strong breeze
+* 7: gale

pom.xml

@@ -16,7 +16,7 @@
     <description>Demo project for Spring Boot</description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
     </properties>
     <dependencies>
         <dependency>

src/main/java/gr/esdalab/msc101/dataconsumer/model/EventDTO.java

@@ -1,6 +1,5 @@
 package gr.esdalab.msc101.dataconsumer.model;
 
-
 public class EventDTO {
     EventLevel level;
     String message;
@@ -31,9 +30,6 @@ public void setMessage(String message) {
 
     @Override
     public String toString() {
-        return "EventDTO{" +
-                "level=" + level +
-                ", message='" + message + '\'' +
-                '}';
+        return "EventDTO{level=" + level + ", message='" + message + "'}";
     }
 }

src/main/java/gr/esdalab/msc101/dataconsumer/model/EventLevel.java

@@ -1,9 +1,7 @@
 package gr.esdalab.msc101.dataconsumer.model;
 
 public enum EventLevel {
-    NORMAL("normal"),
-    WARN("warn"),
-    DANGER("danger");
+    NORMAL("normal"), WARN("warn"), DANGER("danger");
 
     String value;
 
@@ -13,8 +11,6 @@ public enum EventLevel {
 
     @Override
     public String toString() {
-        return "EventLevel{" +
-                "value='" + value + '\'' +
-                '}';
+        return "EventLevel{value='" + value + "'}";
     }
 }

src/main/java/gr/esdalab/msc101/dataconsumer/model/SensorDTO.java

@@ -1,6 +1,5 @@
 package gr.esdalab.msc101.dataconsumer.model;
 
-
 public class SensorDTO {
 
     String label;
@@ -32,9 +31,6 @@ public void setValue(Double value) {
 
     @Override
     public String toString() {
-        return "SensorDTO{" +
-                "label='" + label + '\'' +
-                ", value=" + value +
-                '}';
+        return "SensorDTO{label='" + label + "', value=" + value + "}";
     }
 }

src/main/java/gr/esdalab/msc101/dataconsumer/service/RuleService.java

@@ -9,32 +9,30 @@
 public class RuleService {
 
     /**
-     * This method implements a set of rules that apply to the sensorDTO object value
+     * This method implements a set of rules that apply to the sensorDTO object
+     * value
+     * 
      * @param sensorDTO
      * @return
      */
-    public EventDTO processData(SensorDTO sensorDTO){
+    public EventDTO processData(SensorDTO sensorDTO) {
         EventDTO eventDTO = new EventDTO();
 
-        // @TODO Implement your own rules and populate the eventDTO object
-        if (sensorDTO.getValue() <= 15) {
+        if (sensorDTO.getValue() < 0) {
             eventDTO.setLevel(EventLevel.DANGER);
-            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received.Something wrong with the air condition");
-        } else if (sensorDTO.getValue() >= 15 && sensorDTO.getValue() <= 20) {
+            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received. Something is wrong with the sensor!");
+        } else if (sensorDTO.getValue() >= 0 && sensorDTO.getValue() < 3) {
             eventDTO.setLevel(EventLevel.WARN);
-            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received. Too high, you must heat the environment!");
-        } else if (sensorDTO.getValue() > 20  && sensorDTO.getValue() < 28) {
+            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received. Not good for windsurfing :/");
+        } else if (sensorDTO.getValue() >= 3 && sensorDTO.getValue() <= 6) {
             eventDTO.setLevel(EventLevel.NORMAL);
-            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received. Everything seems ok.");
-        } else if (sensorDTO.getValue() >= 28 && sensorDTO.getValue() <= 32){
-            eventDTO.setLevel(EventLevel.WARN);
-            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received. Too high, you must cool the environment!");
-        }else if (sensorDTO.getValue() > 32){
+            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received. Go to the sea, wind's great for windsurfing :)");
+        } else if (sensorDTO.getValue() > 6) {
             eventDTO.setLevel(EventLevel.DANGER);
-            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received.Something wrong with ventilation");
+            eventDTO.setMessage("Value " + sensorDTO.getValue() + " received. Dangerous winds, no windsurfing!");
         }
 
-//      Return the eventDTO object
+        // Return the eventDTO object
         return eventDTO;
     }
 }