Skip to content

Commit

Permalink
Merge branch 'main' into feature/#124-i18n
Browse files Browse the repository at this point in the history
  • Loading branch information
jpraet authored Dec 6, 2024
2 parents 66412bd + c36e0c9 commit a8103be
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven-ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify -Psonar
run: mvn ${{ runner.debug && '-X -e' || '' }} -B verify -Psonar
- name: Publish doc
if: github.ref == 'refs/heads/main'
uses: peaceiris/actions-gh-pages@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
password: ${{ secrets.REDHAT_REGISTRY_TOKEN }}
registry: registry.redhat.io
- name: Build with Maven
run: mvn -B deploy -Drevision=${GITHUB_REF_NAME:1} -Prelease
run: mvn ${{ runner.debug && '-X -e' || '' }} -B deploy -Drevision=${GITHUB_REF_NAME:1} -Prelease
env:
MAVEN_GPG_KEY: ${{ secrets.OPENAPI_OSSRH_GPG_SECRET_KEY }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.OPENAPI_OSSRH_GPG_SECRET_KEY_PASSWORD }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public class InputValidationIssues {
URI.create("urn:problem-type:belgif:input-validation:schemaViolation");
public static final URI ISSUE_TYPE_UNKNOWN_INPUT =
URI.create("urn:problem-type:belgif:input-validation:unknownInput");
public static final URI ISSUE_TYPE_REFERENCED_RESOURCE_NOT_FOUND =
URI.create("urn:problem-type:belgif:input-validation:referencedResourceNotFound");

// CBSS input-validation issue types for Belgif openapi types
// TODO: standardize @ Belgif: https://github.com/belgif/rest-guide/issues/126
Expand All @@ -29,8 +31,6 @@ public class InputValidationIssues {
URI.create("urn:problem-type:cbss:input-validation:invalidStructure");
public static final URI ISSUE_TYPE_OUT_OF_RANGE =
URI.create("urn:problem-type:cbss:input-validation:outOfRange");
public static final URI ISSUE_TYPE_REFERENCED_RESOURCE_NOT_FOUND =
URI.create("urn:problem-type:cbss:input-validation:referencedResourceNotFound");
public static final URI ISSUE_TYPE_REJECTED_INPUT =
URI.create("urn:problem-type:cbss:input-validation:rejectedInput");
public static final URI ISSUE_TYPE_REQUIRED_INPUT =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void outOfRangeMinAndMaxNull() {
void referencedResourceNotFound() {
InputValidationIssue issue =
InputValidationIssues.referencedResourceNotFound(InEnum.BODY, "test", "value");
assertThat(issue.getType()).hasToString("urn:problem-type:cbss:input-validation:referencedResourceNotFound");
assertThat(issue.getType()).hasToString("urn:problem-type:belgif:input-validation:referencedResourceNotFound");
assertThat(issue.getTitle()).isEqualTo("Referenced resource not found");
assertThat(issue.getIn()).isEqualTo(InEnum.BODY);
assertThat(issue.getName()).isEqualTo("test");
Expand Down Expand Up @@ -216,7 +216,7 @@ void invalidSsin() {
void unknownSsin() {
InputValidationIssue issue =
InputValidationIssues.unknownSsin(InEnum.BODY, "ssin", "00000000196");
assertThat(issue.getType()).hasToString("urn:problem-type:cbss:input-validation:referencedResourceNotFound");
assertThat(issue.getType()).hasToString("urn:problem-type:belgif:input-validation:referencedResourceNotFound");
assertThat(issue.getTitle()).isEqualTo("Referenced resource not found");
assertThat(issue.getIn()).isEqualTo(InEnum.BODY);
assertThat(issue.getName()).isEqualTo("ssin");
Expand Down
2 changes: 2 additions & 0 deletions src/main/asciidoc/release-notes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

* Add internationalization support for localized detail messages based on Accept-Language HTTP request header
* Don't include null (issue) input values when serializing
* Replace `urn:problem-type:cbss:input-validation:referencedResourceNotFound`
by standardized `urn:problem-type:belgif:input-validation:referencedResourceNotFound`

== Version 0.11

Expand Down

0 comments on commit a8103be

Please sign in to comment.