From 6ee1ccc92354b861deffc9fd2edca5fcd79a2f09 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:44:24 +0200 Subject: [PATCH] fix: compile errors and other housekeeping tasks (#100) * fix: compile errors * DEPENDENCIES * removed workflows that are also in .github repo * added dependabot config --- .github/PULL_REQUEST_TEMPLATE.md | 25 ---------- .github/dependabot.yml | 23 +++++++++ .github/workflows/dependency-check.yml | 49 +------------------ .github/workflows/trigger_snapshot.yml | 27 ---------- DEPENDENCIES | 11 +++-- ...articipantToParticipantDtoTransformer.java | 25 +++------- 6 files changed, 38 insertions(+), 122 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/trigger_snapshot.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 5345c7a0..00000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ -## What this PR changes/adds - -_Briefly describe WHAT your pr changes, which features it adds/modifies._ - -## Why it does that - -_Briefly state why the change was necessary._ - -## Further notes - -_List other areas of code that have changed but are not necessarily linked to the main feature. This could be method signature changes, package declarations, bugs that were encountered and were fixed inline, etc._ - -## Linked Issue(s) - -Closes # <-- _insert Issue number if one exists_ - -## Checklist - -- [ ] added appropriate tests? -- [ ] performed checkstyle check locally? -- [ ] added/updated copyright headers? -- [ ] documented public classes/methods? -- [ ] added/updated relevant documentation? -- [ ] assigned appropriate label? (exclude from changelog with label `no-changelog`) -- [ ] formatted title correctly? (_take a look at the [CONTRIBUTING](https://github.com/eclipse-edc/Connector/blob/main/CONTRIBUTING.md#submit-a-pull-request) and [Etiquette for pull requests](https://github.com/eclipse-edc/Connector/blob/main/pr_etiquette.md) for details_) diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..b3c3e89f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,23 @@ +version: 2 +updates: + # maintain dependencies for GitHub actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" # default = monday + open-pull-requests-limit: 5 + labels: + - "dependencies" + - "github_actions" + + # maintain dependencies for Gradle + - package-ecosystem: "gradle" # checks build.gradle(.kts) and settings.gradle(.kts) + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + labels: + - "dependencies" + - "java" + ignore: + - dependency-name: "org.eclipse.edc:edc-versions" diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 1d67c04d..721cd10b 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -9,50 +9,5 @@ permissions: contents: read jobs: - Check-Allowed-Licenses: - runs-on: ubuntu-latest - continue-on-error: false - if: ${{ github.event_name == 'pull_request' }} - steps: - - name: 'Checkout Repository' - uses: actions/checkout@v3 - - name: 'Dependency Review' - uses: actions/dependency-review-action@v3 - with: - fail-on-severity: critical - # Representation of this list: https://www.eclipse.org/legal/licenses.php# - # Expressed with the help of the following IDs: https://spdx.org/licenses/ - allow-licenses: >- - Adobe-Glyph, Apache-1.0, Apache-1.1, Apache-2.0, Artistic-2.0, BSD-2-Clause, BSD-3-Clause, - BSD-4-Clause, 0BSD, BSL-1.0, CDDL-1.0, CDDL-1.1, CPL-1.0, CC-BY-3.0, CC-BY-4.0, CC-BY-2.5, - CC-BY-SA-3.0, CC-BY-SA-4.0, CC0-1.0, EPL-1.0, EPL-2.0, FTL, GFDL-1.3-only, IPL-1.0, ISC, - MIT, MIT-0, MPL-1.1, MPL-2.0, NTP, OpenSSL, PHP-3.01, PostgreSQL, OFL-1.1, Unlicense, - Unicode-DFS-2015, Unicode-DFS-2016, Unicode-TOU, UPL-1.0, W3C-20150513, W3C-19980720, W3C, - WTFPL, X11, Zlib, ZPL-2.1 - - Dash-Dependency-Check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup-build - - name: Download latest Eclipse Dash - run: | - curl -L https://repo.eclipse.org/service/local/artifact/maven/redirect\?r\=dash-licenses\&g\=org.eclipse.dash\&a\=org.eclipse.dash.licenses\&v\=LATEST --output dash.jar - - name: Regenerate DEPENDENCIES - run: | - # dash returns a nonzero exit code if there are libs that need review. the "|| true" avoids that - ./gradlew allDependencies | grep -Poh "(?<=\s)[\w.-]+:[\w.-]+:[^:\s\[\]]+" | sort | uniq | java -jar dash.jar - -summary DEPENDENCIES-gen || true - - # log warning if restricted deps are found - grep -E 'restricted' DEPENDENCIES | if test $(wc -l) -gt 0; then - echo "::warning file=DEPENDENCIES,title=Restricted Dependencies found::Some dependencies are marked 'restricted' - please review them" - fi - - # log error and fail job if rejected deps are found - grep -E 'rejected' DEPENDENCIES | if test $(wc -l) -gt 0; then - echo "::error file=DEPENDENCIES,title=Rejected Dependencies found::Some dependencies are marked 'rejected', they cannot be used" - exit 1 - fi - - name: Check for differences - run: | - diff DEPENDENCIES DEPENDENCIES-gen \ No newline at end of file + check: + uses: eclipse-edc/.github/.github/workflows/dependency-check.yml@main \ No newline at end of file diff --git a/.github/workflows/trigger_snapshot.yml b/.github/workflows/trigger_snapshot.yml deleted file mode 100644 index 26c36485..00000000 --- a/.github/workflows/trigger_snapshot.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: "Create Snapshot Build" - -on: - push: - branches: - - main - -jobs: - Trigger-Snapshot: - runs-on: ubuntu-latest - steps: - # Trigger EF Jenkins. This job waits for Jenkins to complete the publishing, which may take a long time, because every - # module is signed individually, and parallelism is not available. Hence, the increased timeout of 3600 seconds. - # There is no way to cancel the process on Jenkins from withing GitHub. - - name: Call Jenkins API to trigger build - uses: toptal/jenkins-job-trigger-action@master - with: - jenkins_url: "https://ci.eclipse.org/edc/" - jenkins_user: ${{ secrets.EF_JENKINS_USER }} - jenkins_token: ${{ secrets.EF_JENKINS_TOKEN }} - # empty params are needed, otherwise the job will fail. - job_params: | - { - "REPO": "https://github.com/eclipse-edc/RegistrationService" - } - job_name: "Publish-Component" - job_timeout: "3600" # Default 30 sec. (optional) diff --git a/DEPENDENCIES b/DEPENDENCIES index 77129d48..0bc980d8 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -116,9 +116,9 @@ maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.86.Final, Apa maven/mavencentral/io.netty/netty-transport/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.24.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.opentelemetry/opentelemetry-api/1.24.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.opentelemetry/opentelemetry-api/1.27.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.opentelemetry/opentelemetry-api/1.28.0, , restricted, clearlydefined maven/mavencentral/io.opentelemetry/opentelemetry-context/1.24.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.opentelemetry/opentelemetry-context/1.27.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.opentelemetry/opentelemetry-context/1.28.0, , restricted, clearlydefined maven/mavencentral/io.prometheus/simpleclient/0.16.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_common/0.16.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_httpserver/0.16.0, Apache-2.0, approved, clearlydefined @@ -145,8 +145,8 @@ maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.2, Apache-2.0, maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.10, Apache-2.0, approved, clearlydefined maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.8, Apache-2.0, approved, clearlydefined maven/mavencentral/io.swagger.parser.v3/swagger-parser-core/2.1.10, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.swagger.parser.v3/swagger-parser-v2-converter/2.1.10, None, restricted, #9330 -maven/mavencentral/io.swagger.parser.v3/swagger-parser-v3/2.1.10, None, restricted, #9323 +maven/mavencentral/io.swagger.parser.v3/swagger-parser-v2-converter/2.1.10, Apache-2.0, approved, #9330 +maven/mavencentral/io.swagger.parser.v3/swagger-parser-v3/2.1.10, Apache-2.0, approved, #9323 maven/mavencentral/io.swagger.parser.v3/swagger-parser/2.1.10, Apache-2.0, approved, clearlydefined maven/mavencentral/io.swagger/swagger-annotations/1.6.9, Apache-2.0, approved, #3792 maven/mavencentral/io.swagger/swagger-compat-spec-parser/1.0.64, Apache-2.0, approved, clearlydefined @@ -255,6 +255,7 @@ maven/mavencentral/org.eclipse.edc/sql-core/0.1.4-SNAPSHOT, Apache-2.0, approved maven/mavencentral/org.eclipse.edc/state-machine/0.1.4-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.1.4-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-spi/0.1.4-SNAPSHOT, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/transform-core/0.1.4-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transform-spi/0.1.4-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/util/0.1.4-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-core/0.1.4-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -365,7 +366,7 @@ maven/mavencentral/org.slf4j/slf4j-api/2.0.7, MIT, approved, #5915 maven/mavencentral/org.testcontainers/database-commons/1.18.3, MIT, approved, clearlydefined maven/mavencentral/org.testcontainers/jdbc/1.18.3, MIT, approved, clearlydefined maven/mavencentral/org.testcontainers/junit-jupiter/1.18.3, MIT, approved, #7941 -maven/mavencentral/org.testcontainers/postgresql/1.18.3, None, restricted, #9332 +maven/mavencentral/org.testcontainers/postgresql/1.18.3, MIT, approved, #9332 maven/mavencentral/org.testcontainers/testcontainers/1.18.3, MIT, approved, #7938 maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272 maven/mavencentral/org.xmlunit/xmlunit-placeholders/2.9.1, Apache-2.0, approved, clearlydefined diff --git a/extensions/registration-service-api/src/main/java/org/eclipse/edc/registration/transform/ParticipantToParticipantDtoTransformer.java b/extensions/registration-service-api/src/main/java/org/eclipse/edc/registration/transform/ParticipantToParticipantDtoTransformer.java index 78f91cf0..d667d9d4 100644 --- a/extensions/registration-service-api/src/main/java/org/eclipse/edc/registration/transform/ParticipantToParticipantDtoTransformer.java +++ b/extensions/registration-service-api/src/main/java/org/eclipse/edc/registration/transform/ParticipantToParticipantDtoTransformer.java @@ -14,19 +14,16 @@ package org.eclipse.edc.registration.transform; -import org.eclipse.edc.api.transformer.DtoTransformer; import org.eclipse.edc.registration.model.ParticipantDto; import org.eclipse.edc.registration.model.ParticipantStatusDto; import org.eclipse.edc.registration.spi.model.Participant; import org.eclipse.edc.registration.spi.model.ParticipantStatus; -import org.eclipse.edc.spi.EdcException; import org.eclipse.edc.transform.spi.TransformerContext; +import org.eclipse.edc.transform.spi.TypeTransformer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static java.lang.String.format; - -public class ParticipantToParticipantDtoTransformer implements DtoTransformer { +public class ParticipantToParticipantDtoTransformer implements TypeTransformer { @Override public Class getInputType() { @@ -55,18 +52,10 @@ public Class getOutputType() { * @return {@link ParticipantStatusDto} */ private ParticipantStatusDto mapToDtoStatus(ParticipantStatus status) { - switch (status) { - case ONBOARDING_INITIATED: - case AUTHORIZING: - case AUTHORIZED: - return ParticipantStatusDto.ONBOARDING_IN_PROGRESS; - case ONBOARDED: - return ParticipantStatusDto.ONBOARDED; - case DENIED: - case FAILED: - return ParticipantStatusDto.DENIED; - default: - throw new EdcException(format("Unknown ParticipantStatus value: %s", status)); - } + return switch (status) { + case ONBOARDING_INITIATED, AUTHORIZING, AUTHORIZED -> ParticipantStatusDto.ONBOARDING_IN_PROGRESS; + case ONBOARDED -> ParticipantStatusDto.ONBOARDED; + case DENIED, FAILED -> ParticipantStatusDto.DENIED; + }; } }