From a209b01ddbe8c982c3cc6e984188d5f0b1f8e25a Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 17 Mar 2025 22:45:39 +0100 Subject: [PATCH 1/2] ci: enforce formatting --- .github/workflows/main.yml | 2 + formatter.xml | 400 +++++++++++++++++++++++++++++++++++++ 2 files changed, 402 insertions(+) create mode 100644 formatter.xml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9140494..bf15bf7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,8 @@ jobs: java-version: 17 - name: Build and Verify run: mvn clean verify + - name: Check formatting + run: mvn spotless:check - name: Publish Nightly Update Site if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'DataFlowAnalysis' uses: peaceiris/actions-gh-pages@v4 diff --git a/formatter.xml b/formatter.xml new file mode 100644 index 0000000..2b759a0 --- /dev/null +++ b/formatter.xml @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e486f853b22164c593944f8bf7c8065ffe054730 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 17 Mar 2025 22:47:41 +0100 Subject: [PATCH 2/2] style: format after enforcing formatter --- .../org/dataflowanalysis/examplemodels/TuhhModels.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/TuhhModels.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/TuhhModels.java index f86c1b3..8304b1f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/TuhhModels.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/TuhhModels.java @@ -1,14 +1,13 @@ package org.dataflowanalysis.examplemodels; +import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.collect.ImmutableMap; - public class TuhhModels { - + private static final Map> TUHH_MODELS = ImmutableMap.>builder() .put("anilallewar", List.of(0, 6, 7, 8, 9, 11, 12, 18)) .put("apssouza22", List.of(0, 2, 4, 6, 7, 8, 12, 18)) @@ -26,13 +25,13 @@ public class TuhhModels { .put("sqshq", List.of(0, 6, 7, 8, 9, 10, 11, 12, 18)) .put("yidongnan", List.of(0, 2, 3, 4, 5, 6, 7, 8, 9, 18)) .build(); - + /** * Returns a deep copy of the {@code TUHH_MODELS} map. */ public static Map> getTuhhModels() { Map> deepCopy = new HashMap<>(); - + for (var entry : TUHH_MODELS.entrySet()) { deepCopy.put(entry.getKey(), new ArrayList<>(entry.getValue())); }