Dev/v2.0.0

.github/workflows/ci-pr.yml

@@ -0,0 +1,225 @@
+name: CI/CD - Tests and Coverage
+
+on:
+  push:
+    branches: [ master, dev/*, develop ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+  pull-requests: write
+  checks: write
+  statuses: write
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    strategy:
+      matrix:
+        java-version: [ 17, 21 ]
+        os: [ ubuntu-latest ]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'corretto'
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Setup virtual display for JavaFX tests
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y xvfb
+          export DISPLAY=:99
+          Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+
+      - name: Run tests with coverage
+        run: |
+          export DISPLAY=:99
+          mvn clean test -Dmaven.test.failure.ignore=false -Dheadless=true
+        env:
+          MAVEN_OPTS: "-Xmx1024m"
+
+      - name: Generate JaCoCo coverage reports
+        run: |
+          mvn org.jacoco:jacoco-maven-plugin:0.8.8:report -pl jlmap-fx,jlmap-vaadin
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: |
+            ./jlmap-fx/target/site/jacoco/jacoco.xml
+            ./jlmap-vaadin/target/site/jacoco/jacoco.xml
+          flags: unittests
+          name: codecov-umbrella
+          fail_ci_if_error: false
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+        if: matrix.java-version == '17'
+
+      - name: Generate test summary
+        uses: dorny/test-reporter@v1
+        if: success() || failure()
+        with:
+          name: Test Results (Java ${{ matrix.java-version }})
+          path: '**/target/surefire-reports/TEST-*.xml'
+          reporter: java-junit
+          fail-on-error: false
+
+      - name: Comment coverage on PR
+        if: github.event_name == 'pull_request' && matrix.java-version == '17'
+        uses: madrapps/jacoco-report@v1.6.1
+        with:
+          paths: |
+            ${{ github.workspace }}/jlmap-fx/target/site/jacoco/jacoco.xml
+            ${{ github.workspace }}/jlmap-vaadin/target/site/jacoco/jacoco.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 70
+          min-coverage-changed-files: 80
+          title: 'Code Coverage Report'
+          update-comment: true
+
+      - name: Publish test results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: '**/target/surefire-reports/TEST-*.xml'
+          check_name: 'Test Results (Java ${{ matrix.java-version }})'
+          comment_title: 'Test Results (Java ${{ matrix.java-version }})'
+          fail_on: 'nothing'
+
+      - name: Upload test artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-results-java-${{ matrix.java-version }}
+          path: |
+            **/target/surefire-reports/
+            **/target/site/jacoco/
+          retention-days: 30
+
+  sonarqube:
+    runs-on: ubuntu-latest
+    needs: test
+    if: github.event_name == 'pull_request' || github.ref_name == 'master'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'corretto'
+
+      - name: Cache SonarQube packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Setup virtual display for JavaFX tests
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y xvfb
+          export DISPLAY=:99
+          Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+
+      - name: Build and analyze with SonarQube
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          DISPLAY: :99
+        run: |
+          mvn clean verify sonar:sonar \
+            -Dsonar.projectKey=makbn_java_leaflet \
+            -Dsonar.organization=makbn \
+            -Dsonar.host.url=https://sonarcloud.io \
+            -Dsonar.coverage.jacoco.xmlReportPaths=**/target/site/jacoco/jacoco.xml
+        if: env.SONAR_TOKEN != null
+
+  security-scan:
+    runs-on: ubuntu-latest
+    needs: test
+    permissions:
+      security-events: write
+      actions: read
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'corretto'
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Run dependency check
+        run: |
+          mvn org.owasp:dependency-check-maven:check -DfailBuildOnCVSS=8
+
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@v3
+        if: always()
+        with:
+          sarif_file: target/dependency-check-report.sarif
+
+  build-status:
+    runs-on: ubuntu-latest
+    needs: [ test, sonarqube, security-scan ]
+    if: always()
+
+    steps:
+      - name: Check build status
+        run: |
+          if [[ "${{ needs.test.result }}" == "success" ]]; then
+            echo "✅ Tests passed"
+          else
+            echo "❌ Tests failed"
+            exit 1
+          fi
+
+          if [[ "${{ needs.sonarqube.result }}" == "success" || "${{ needs.sonarqube.result }}" == "skipped" ]]; then
+            echo "✅ Code quality check passed or skipped"
+          else
+            echo "⚠️ Code quality check failed"
+          fi
+
+          if [[ "${{ needs.security-scan.result }}" == "success" ]]; then
+            echo "🔒 Security scan passed"
+          else
+            echo "⚠️ Security scan failed"
+          fi

.gitignore

@@ -6,3 +6,7 @@ application.properties
 /src/main/java/META-INF/
 /src/main/java/io/github/makbn/jlmap/META-INF/
 /src/main/resources/final.geo.json
+**/.DS_Store
+jlmap-vaadin/node_modules/
+jlmap-vaadin/src/frontend/generated/
+jlmap-vaadin/package-lock.json

.run/Vaadin Demo.run.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Vaadin Demo" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <module name="jlmap-vaadin-demo" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.makbn.vaadin.demo.Application" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="io.github.makbn.vaadin.demo.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/jlmap [javafx_run].run.xml → .run/jlmap-fx [javafx_run].run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="jlmap [javafx:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
+  <configuration default="false" name="jlmap-fx [javafx:run]" type="MavenRunConfiguration" factoryName="Maven">
     <MavenSettings>
       <option name="myGeneralSettings" />
       <option name="myRunnerSettings" />
@@ -15,15 +15,15 @@
             </list>
           </option>
           <option name="multimoduleDir" />
-          <option name="pomFileName" />
+          <option name="pomFileName" value="pom.xml" />
           <option name="profilesMap">
             <map />
           </option>
           <option name="projectsCmdOptionValues">
             <list />
           </option>
           <option name="resolveToWorkspace" value="false" />
-          <option name="workingDirPath" value="$PROJECT_DIR$" />
+          <option name="workingDirPath" value="$PROJECT_DIR$/jlmap-fx" />
         </MavenRunnerParameters>
       </option>
     </MavenSettings>

CLA.md

@@ -0,0 +1,43 @@
+# Contributor License Agreement (CLA)
+
+**JL (Java Leaflet) Map Project**
+
+Thank you for your interest in contributing to **JL (Java Leaflet) Map** (“the Project”).  
+To clarify the intellectual property rights granted with contributions, you agree to the following terms by submitting a
+contribution (including code, documentation, or other material) to the Project.
+
+## 1. Copyright License
+
+You grant the Project Maintainers a **perpetual, worldwide, non-exclusive, transferable, sublicensable, royalty-free
+license** to use, reproduce, modify, publicly display, publicly perform, sublicense, and distribute your contributions
+and derivative works.
+
+## 2. Relicensing Rights
+
+You expressly allow the Project Maintainers to **relicense your contributions under any license of their choosing** in
+the future, including permissive, copyleft, dual, or commercial licenses.
+
+## 3. Patent License
+
+You grant the Project Maintainers and recipients of the Project a perpetual, worldwide, non-exclusive, royalty-free
+patent license to make, use, sell, offer for sale, import, and otherwise transfer your contributions.
+
+## 4. Representations and Warranties
+
+By submitting a contribution, you represent that:
+
+- The contribution is your original work, or you have the right to submit it.
+- You are legally entitled to grant the above licenses.
+- The contribution does not violate any third-party rights.
+
+## 5. Definitions
+
+- **“Contribution”** means any source code, object code, patch, documentation, or other material submitted to the
+  Project.
+- **“Project Maintainers”** currently means the copyright holders of JL (Java Leaflet) Map and any successors they
+  designate.
+
+## 6. Acceptance
+
+By submitting a contribution to the Project (e.g., via pull request, patch, or other means), you **agree to the terms of
+this Contributor License Agreement.**

CONTRIBUTING.md

@@ -0,0 +1,44 @@
+# Contributing to This Project
+
+First off — thanks for checking out this project.
+
+While this is a small and focused library, and I'm not actively contributing, you're still welcome to open issues,
+suggest improvements, or fork it for your own use.
+
+## Guidelines
+
+If you do want to contribute, please read the CLA first, and then here are a few quick guidelines to follow to keep
+things clean and consistent:
+
+### 1. Keep It Aligned with the Project Scope
+
+This library is meant to stay minimal, maintainable, and aligned with its current goals. If you're adding something,
+ask:
+
+- Does this keep the project simple?
+- Does it make it easier to integrate JL (Java Leaflet) Map into existing projects?
+- Is it a core use case?
+
+If you're not sure, open an issue first before writing code — happy to talk about it.
+
+### 2. Code Style
+
+Stick to standard Java conventions. If you're using an IDE like IntelliJ, the default formatter should be fine. We also
+added spotless since v2.2.1. Some specific preferences:
+
+- Keep every block of the code as small as possible, break it down if possible
+- Avoid unnecessary abstractions.
+- Avoid unnecessary documentation.
+- Keep the code, variable/class/method/etc naming self explanatory.
+- Don’t go overboard creating tons of classes and interfaces just to perfectly follow a specific design or
+  pattern—they're guidelines, not laws of nature.
+- Prefer immutability where possible.
+- Javadoc ,at least, public APIs.
+
+### 3. Commit Messages
+
+- Keep commit messages short and meaningful.
+- Avoid using any special characters.
+- Focus on delivering enough context than being grammatically correct.
+
+Thank you.