diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..fe91530e7 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,37 @@ +name: SonarCloud Analysis + +on: + push: + branches: + - GSA53-pls + pull_request: + branches: + - GSA53-pls + +jobs: + sonarcloud: + name: SonarCloud Scan + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + - name: Cache Maven packages + uses: actions/cache@v3 + with: + path: ~/.m2 + key: maven-${{ runner.os }}-${{ hashFiles('**/pom.xml') }} + restore-keys: maven-${{ runner.os }} + + - name: Build and analyze with SonarCloud + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn clean verify sonar:sonar -Dsonar.projectKey=GSA53_base -Dsonar.organization=gsa53 + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..c5f3f6b9c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2be9fb5f5..c5969e978 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,9 @@ UTF-8 + GSA53_base + gsa53 + https://sonarcloud.io pom @@ -42,15 +45,25 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 11 + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 4.0.0.4121 - 11 - - - + GSA53_base + gsa53 + ${env.SONAR_TOKEN} + + + \ No newline at end of file diff --git a/target/sonar/.sonar_lock b/target/sonar/.sonar_lock new file mode 100644 index 000000000..e69de29bb 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..e2e12b880 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 @@ -7,22 +7,39 @@ public class TrainControllerImpl implements TrainController { private int step = 0; private int referenceSpeed = 0; private int speedLimit = 0; + private Thread thread; + + public TrainControllerImpl(){ + thread = new Thread(){ //szál létrehozása + public void run(){ + thread.run(); //közvetlenül meghívja a run-t a jelenlegi szálon + try{ + followSpeed(); + thread.sleep(5000); //5mp várakozás + }catch (InterruptedException e){ + e.printStackTrace(); + } + } + }; + } @Override - public void followSpeed() { - if (referenceSpeed < 0) { - referenceSpeed = 0; - } else { - if(referenceSpeed+step > 0) { - referenceSpeed += step; - } else { - referenceSpeed = 0; +public void followSpeed() { + if (referenceSpeed < 0) { + referenceSpeed = 0; + } else { + if (step > 0) { + referenceSpeed += step; //a joystick által vezérelt növelés + if (referenceSpeed > 10) { //növelés korlátozása 10-re + referenceSpeed = 10; } - } - - enforceSpeedLimit(); - } + } else { + referenceSpeed = Math.max(0, referenceSpeed + step); //csökkentés nem mehet 0 alá + } + } + enforceSpeedLimit(); +} @Override public int getReferenceSpeed() { return referenceSpeed; diff --git a/train-controller/target/maven-archiver/pom.properties b/train-controller/target/maven-archiver/pom.properties new file mode 100644 index 000000000..ce6c28613 --- /dev/null +++ b/train-controller/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.controller +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..9c6a5295e --- /dev/null +++ b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\controller\TrainControllerImpl.class diff --git a/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..831b08f85 --- /dev/null +++ b/train-controller/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-controller\src\main\java\hu\bme\mit\train\controller\TrainControllerImpl.java diff --git a/train-interfaces/target/maven-archiver/pom.properties b/train-interfaces/target/maven-archiver/pom.properties new file mode 100644 index 000000000..26b4fd913 --- /dev/null +++ b/train-interfaces/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.interfaces +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..6873b5cce --- /dev/null +++ b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +hu\bme\mit\train\interfaces\TrainController.class +hu\bme\mit\train\interfaces\TrainSensor.class +hu\bme\mit\train\interfaces\TrainUser.class diff --git a/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..a55e2acc5 --- /dev/null +++ b/train-interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +C:\Users\P\Pictures\base\train-interfaces\src\main\java\hu\bme\mit\train\interfaces\TrainUser.java +C:\Users\P\Pictures\base\train-interfaces\src\main\java\hu\bme\mit\train\interfaces\TrainController.java +C:\Users\P\Pictures\base\train-interfaces\src\main\java\hu\bme\mit\train\interfaces\TrainSensor.java diff --git a/train-sensor/target/maven-archiver/pom.properties b/train-sensor/target/maven-archiver/pom.properties new file mode 100644 index 000000000..62ab7dbc8 --- /dev/null +++ b/train-sensor/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.sensor +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..69151c36c --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\sensor\TrainSensorImpl.class diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..d3dfc4205 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-sensor\src\main\java\hu\bme\mit\train\sensor\TrainSensorImpl.java diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 000000000..0c9f43675 --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\sensor\TrainSensorTest.class diff --git a/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 000000000..af6d69fed --- /dev/null +++ b/train-sensor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-sensor\src\test\java\hu\bme\mit\train\sensor\TrainSensorTest.java diff --git a/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml new file mode 100644 index 000000000..c60d862cd --- /dev/null +++ b/train-sensor/target/surefire-reports/TEST-hu.bme.mit.train.sensor.TrainSensorTest.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt new file mode 100644 index 000000000..736e951c2 --- /dev/null +++ b/train-sensor/target/surefire-reports/hu.bme.mit.train.sensor.TrainSensorTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: hu.bme.mit.train.sensor.TrainSensorTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s -- in hu.bme.mit.train.sensor.TrainSensorTest diff --git a/train-system/target/maven-archiver/pom.properties b/train-system/target/maven-archiver/pom.properties new file mode 100644 index 000000000..47684bd8e --- /dev/null +++ b/train-system/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.system +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..bea8d2a11 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\system\TrainSystem.class diff --git a/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..04cf920e0 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-system\src\main\java\hu\bme\mit\train\system\TrainSystem.java diff --git a/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 000000000..8594e13a5 --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\system\TrainSystemTest.class diff --git a/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 000000000..46b5b302f --- /dev/null +++ b/train-system/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-system\src\test\java\hu\bme\mit\train\system\TrainSystemTest.java diff --git a/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml new file mode 100644 index 000000000..a12936aa6 --- /dev/null +++ b/train-system/target/surefire-reports/TEST-hu.bme.mit.train.system.TrainSystemTest.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt new file mode 100644 index 000000000..5a884445f --- /dev/null +++ b/train-system/target/surefire-reports/hu.bme.mit.train.system.TrainSystemTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: hu.bme.mit.train.system.TrainSystemTest +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.066 s -- in hu.bme.mit.train.system.TrainSystemTest diff --git a/train-user/target/maven-archiver/pom.properties b/train-user/target/maven-archiver/pom.properties new file mode 100644 index 000000000..177cfae41 --- /dev/null +++ b/train-user/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=hu.bme.mit.train.user +groupId=hu.bme.mit.train +version=0.5.0-SNAPSHOT diff --git a/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..6650aa321 --- /dev/null +++ b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +hu\bme\mit\train\user\TrainUserImpl.class diff --git a/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..6561b12c7 --- /dev/null +++ b/train-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\P\Pictures\base\train-user\src\main\java\hu\bme\mit\train\user\TrainUserImpl.java