From b27337fc6c7e97a78056b0dc719decc0ee9dbb09 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 16:41:39 +0100 Subject: [PATCH 01/20] Modify README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e26e034fc..afd696d0d 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,10 @@ This is a sample application for the verification laboratory. ## Getting started +# Rete +'''lab +**1** + * The application is implemented in Java. * The project can be built using [Gradle](https://gradle.org/) or [Maven](https://maven.apache.org/) (currently **Maven** is preferred). * [JUnit](https://junit.org/junit5/) is used for tests. From 75a1471da82d0500a507fdafa426eaf167980f4d Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 17:02:18 +0100 Subject: [PATCH 02/20] Allow user to set speed limit --- .../src/main/java/hu/bme/mit/train/user/TrainUserImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java b/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java index 93d3b2e59..98a77ad62 100644 --- a/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java +++ b/train-user/src/main/java/hu/bme/mit/train/user/TrainUserImpl.java @@ -28,4 +28,8 @@ public void overrideJoystickPosition(int joystickPosition) { controller.setJoystickPosition(joystickPosition); } + public void setSpeedLimit(int speedLimit){ + controller.setSpeedLimit(speedLimit); + } + } From c919dce9a843095e512f17ebb7e2b65663840c3d Mon Sep 17 00:00:00 2001 From: dh-anna <76448201+dh-anna@users.noreply.github.com> Date: Mon, 20 Mar 2023 17:11:22 +0100 Subject: [PATCH 03/20] Create maven.yml --- .github/workflows/maven.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 000000000..f7367e0d4 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,35 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java CI with Maven + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 From deeaaf2afd1450fbbe8d2c3670fa2077c65a4e14 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 17:16:19 +0100 Subject: [PATCH 04/20] Changes A --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 06649d278..9c94d596a 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -10,7 +10,7 @@ public class TrainControllerImpl implements TrainController { @Override public void followSpeed() { - if (referenceSpeed < 0) { + if (referenceSpeed < 1) { referenceSpeed = 0; } else { if(referenceSpeed+step > 0) { From ccc0c3e98f13b9c49750bc099067d3d311dda65f Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 17:50:53 +0100 Subject: [PATCH 05/20] Add A --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 06649d278..9c94d596a 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -10,7 +10,7 @@ public class TrainControllerImpl implements TrainController { @Override public void followSpeed() { - if (referenceSpeed < 0) { + if (referenceSpeed < 1) { referenceSpeed = 0; } else { if(referenceSpeed+step > 0) { From 6035af87158e1dc6c67ec3a3cd10c1efd60df4f0 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 17:55:08 +0100 Subject: [PATCH 06/20] Test for user modifying speedlimit --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 9c94d596a..06649d278 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -10,7 +10,7 @@ public class TrainControllerImpl implements TrainController { @Override public void followSpeed() { - if (referenceSpeed < 1) { + if (referenceSpeed < 0) { referenceSpeed = 0; } else { if(referenceSpeed+step > 0) { From 0abde2c9440bd6cbf02b914a3d03ad051ded3275 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 18:04:38 +0100 Subject: [PATCH 07/20] README branch C --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index afd696d0d..9a9802e95 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ This is a sample application for the verification laboratory. ## Getting started +Changes C + # Rete '''lab **1** From 795fc5afd8111564fb9c151c9de0cd4d42ca8e74 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 18:05:23 +0100 Subject: [PATCH 08/20] README branch D --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index afd696d0d..ffe0f4394 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ This is a sample application for the verification laboratory. +Changes D ## Getting started # Rete From 6f8215ee787a759a5a0cf8490d7bdf566d811a9a Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 18:13:45 +0100 Subject: [PATCH 09/20] Sintax error --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 06649d278..67fd121f5 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -43,7 +43,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition; + this.step = joystickPosition } } From 62f168a3519f7a23ff804bd43bb9e549353013a7 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 18:16:17 +0100 Subject: [PATCH 10/20] Sintax error corrected --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 67fd121f5..86668b38e 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -43,7 +43,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition + this.step = joystickPosition ; } } From 8940baf3668c12b693ff4d9ed2f8fd69ddb20fe2 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 18:21:28 +0100 Subject: [PATCH 11/20] Sintax error AGAIN --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 86668b38e..67fd121f5 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -43,7 +43,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition ; + this.step = joystickPosition } } From 46b2efe3282167957d98100c8e244500ab446fc7 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 20 Mar 2023 18:22:49 +0100 Subject: [PATCH 12/20] Sintax error corrected again --- .../java/hu/bme/mit/train/controller/TrainControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java index 67fd121f5..787165fe5 100644 --- a/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java +++ b/train-controller/src/main/java/hu/bme/mit/train/controller/TrainControllerImpl.java @@ -43,7 +43,7 @@ private void enforceSpeedLimit() { @Override public void setJoystickPosition(int joystickPosition) { - this.step = joystickPosition + this.step = joystickPosition; } } From c0f5a5577c59ffcca6d1a2bf95326697edb1db72 Mon Sep 17 00:00:00 2001 From: dh-anna <76448201+dh-anna@users.noreply.github.com> Date: Mon, 17 Apr 2023 15:59:38 +0200 Subject: [PATCH 13/20] Update pom.xml --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2be9fb5f5..137e1544a 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,11 @@ test + + + dh-anna + https://sonarcloud.io + @@ -53,4 +58,4 @@ - \ No newline at end of file + From acc8dc128286a72a42a45b914e3f48dc3436b9d3 Mon Sep 17 00:00:00 2001 From: dh-anna <76448201+dh-anna@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:08:20 +0200 Subject: [PATCH 14/20] Create build.yml --- .github/workflows/build.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..3a112848d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,37 @@ +name: SonarCloud +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + name: Build and analyze + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: 11 + distribution: 'zulu' # Alternative distribution options are available. + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Maven packages + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=dh-anna_base From ca7ef726a128763c2dd99282e02d479c01cf3744 Mon Sep 17 00:00:00 2001 From: dh-anna <76448201+dh-anna@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:26:15 +0200 Subject: [PATCH 15/20] Update pom.xml --- pom.xml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 137e1544a..d05fede90 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,8 @@ UTF-8 + dh-anna + https://sonarcloud.io pom @@ -39,12 +41,16 @@ 0.8.7 test + + + org.jacoco + jacoco-maven-plugin + 0.8.7 + test + + - - dh-anna - https://sonarcloud.io - @@ -56,6 +62,27 @@ 11 + + + org.jacoco + jacoco-maven-plugin + 0.8.7 + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + From f3a8469f193cea97fd7ca783084a8d6321a3da71 Mon Sep 17 00:00:00 2001 From: dh-anna <76448201+dh-anna@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:51:37 +0200 Subject: [PATCH 16/20] Update pom.xml --- pom.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pom.xml b/pom.xml index d05fede90..aa5827db4 100644 --- a/pom.xml +++ b/pom.xml @@ -63,26 +63,6 @@ - - org.jacoco - jacoco-maven-plugin - 0.8.7 - - - default-prepare-agent - - prepare-agent - - - - default-report - prepare-package - - report - - - - From df45cd3ebf2fd5a2a37858fa5c00d2603db53a8f Mon Sep 17 00:00:00 2001 From: dh-anna <76448201+dh-anna@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:53:35 +0200 Subject: [PATCH 17/20] Update pom.xml --- pom.xml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index aa5827db4..6e426b8cd 100644 --- a/pom.xml +++ b/pom.xml @@ -42,13 +42,6 @@ test - - org.jacoco - jacoco-maven-plugin - 0.8.7 - test - - @@ -63,6 +56,27 @@ + + org.jacoco + jacoco-maven-plugin + 0.8.7 + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + + From b96497fe368289ec9d6a6897022117182e367040 Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 17 Apr 2023 17:00:22 +0200 Subject: [PATCH 18/20] feat: timer --- .../src/main/java/hu/bme/mit/train/system/TrainSystem.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java index 4ef42638b..4e8b3d809 100644 --- a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java +++ b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java @@ -6,15 +6,18 @@ import hu.bme.mit.train.interfaces.TrainUser; import hu.bme.mit.train.sensor.TrainSensorImpl; import hu.bme.mit.train.user.TrainUserImpl; +import java.util.Timer; public class TrainSystem { private TrainController controller = new TrainControllerImpl(); private TrainUser user = new TrainUserImpl(controller); private TrainSensor sensor = new TrainSensorImpl(controller, user); + private Timer = new Timer(); public TrainController getController() { return controller; + timer.scheduleAtFixedRate(() -> followSpeed(), 2*60*1000, 2*60*1000); } public TrainSensor getSensor() { From f608501d31623430a10d36ded1ed9eb73559f06e Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 17 Apr 2023 17:03:36 +0200 Subject: [PATCH 19/20] feat: timer --- .../src/main/java/hu/bme/mit/train/system/TrainSystem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java index 4e8b3d809..487b740d0 100644 --- a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java +++ b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java @@ -13,7 +13,7 @@ public class TrainSystem { private TrainController controller = new TrainControllerImpl(); private TrainUser user = new TrainUserImpl(controller); private TrainSensor sensor = new TrainSensorImpl(controller, user); - private Timer = new Timer(); + private Timer timer = new Timer(); public TrainController getController() { return controller; From adb5e91e2d9afdef788205341de33ed2ac5a95eb Mon Sep 17 00:00:00 2001 From: dh-anna Date: Mon, 17 Apr 2023 17:08:53 +0200 Subject: [PATCH 20/20] feat: timer --- .../src/main/java/hu/bme/mit/train/system/TrainSystem.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java index 487b740d0..f74c0d3f8 100644 --- a/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java +++ b/train-system/src/main/java/hu/bme/mit/train/system/TrainSystem.java @@ -17,7 +17,12 @@ public class TrainSystem { public TrainController getController() { return controller; - timer.scheduleAtFixedRate(() -> followSpeed(), 2*60*1000, 2*60*1000); + timer.scheduleAtFixedRate(new TimerTask() { + @Override + public void run() { + followSpeed(); + } + }, 2*60*1000, 2*60*1000); } public TrainSensor getSensor() {