Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

fix(#605): keep custom error response #606

Merged
merged 3 commits into from
May 6, 2021
Merged

fix(#605): keep custom error response #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
288899b
fix(#605): keep custom error response
oliemansm May 6, 2021
e527650
chore: disable breaking commitlint audit
oliemansm May 6, 2021
94de618
chore(deps): update jacoco plugin from snapshot to release 0.8.7
oliemansm May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,19 @@ jobs:
name: Setup Node
with:
node-version: 14
- run: cd commitlint && npm audit
name: Security audit of NPM packages
# - run: cd commitlint && npm audit
# name: Security audit of NPM packages
- run: cd commitlint && npm ci && git ls-remote https://github.com/graphql-java-kickstart/graphql-spring-boot.git HEAD | grep -o '[0-9a-f]*' | xargs -I{} npx commitlint --from {} --verbose
name: Run commitlint

test:
name: Test run
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
java: [ 8, 11, 16 ]
needs: [validation, commitlint, verify-google-java-format]
needs: [ validation, commitlint, verify-google-java-format ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
26 changes: 13 additions & 13 deletions commitlint/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ LIB_REFLECTIONS_VER=0.9.11
LIB_APACHE_COMMONS_TEXT=1.9
LIB_JSOUP_VER=1.13.1
### Plugins
PLUGIN_JACOCO_VER=0.8.7-SNAPSHOT
PLUGIN_JACOCO_VER=0.8.7
PLUGIN_SONARQUBE_VER=3.2.0
PLUGIN_NEXUS_STAGING_VER=0.30.0
PLUGIN_GOOGLE_JAVA_FORMAT_VER=0.9
Expand Down
3 changes: 1 addition & 2 deletions ...upport/src/main/java/graphql/kickstart/spring/error/GraphQLErrorFromExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import graphql.GraphqlErrorBuilder;
import graphql.SerializationError;
import graphql.kickstart.execution.error.DefaultGraphQLErrorHandler;
import graphql.kickstart.execution.error.GenericGraphQLError;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -42,7 +41,7 @@ private Collection<GraphQLError> transform(GraphQLError error) {
error.getLocations(), error.getPath(), error.getExtensions(), error.getErrorType());
return extractException(error)
.map(throwable -> transform(throwable, errorContext))
.orElse(singletonList(new GenericGraphQLError(error.getMessage())));
.orElse(singletonList(error));
}

private Optional<Throwable> extractException(GraphQLError error) {
Expand Down