Skip to content

Commit a8273ea

Browse files
dondonzdondonz
committed
Merge branch 'master' into slf4j-removal
2 parents cbf2aca + c5cc9d8 commit a8273ea

23 files changed

+155
-568
lines changed

‎blog/2021-02-12-spec-releases-are-not-important.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,3 @@ It is better to think about certain features you want to discuss instead referri
5050

5151
# Feedback or questions
5252
We use [GitHub Discussions](https://github.com/graphql-java/graphql-java/discussions) for general feedback and questions.
53-
54-
You can also contact us on Twitter: [@graphql_java](https://twitter.com/graphql_java)

‎blog/2021-08-03-17-released-and-lts.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Going forward we decided to no offer any LTS versions anymore. We will only acti
1717
the latest version (currently 17). We may backport critical bugfixes, but we are not committed to it.
1818

1919
If this is a huge problem for you or your Company and you are willing to help us with maintaining a LTS
20-
version you can reach us at Twitter [GraphQL Java](https://twitter.com/graphql_java) or per mail at
20+
version you can reach us via email at
2121
hello at graphql-java dot com.

‎documentation/execution.md‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,28 @@ Here is the code for the standard behaviour.
7373

7474
```java
7575
public class SimpleDataFetcherExceptionHandler implements DataFetcherExceptionHandler {
76-
private static final Logger log = LoggerFactory.getLogger(SimpleDataFetcherExceptionHandler.class);
7776

78-
@Override
79-
public void accept(DataFetcherExceptionHandlerParameters handlerParameters) {
80-
Throwable exception = handlerParameters.getException();
81-
SourceLocation sourceLocation = handlerParameters.getField().getSourceLocation();
82-
ExecutionPath path = handlerParameters.getPath();
77+
private static final Logger logNotSafe = LogKit.getNotPrivacySafeLogger(SimpleDataFetcherExceptionHandler.class);
78+
79+
static final SimpleDataFetcherExceptionHandler defaultImpl = new SimpleDataFetcherExceptionHandler();
80+
81+
private DataFetcherExceptionHandlerResult handleExceptionImpl(DataFetcherExceptionHandlerParameters handlerParameters) {
82+
Throwable exception = unwrap(handlerParameters.getException());
83+
SourceLocation sourceLocation = handlerParameters.getSourceLocation();
84+
ResultPath path = handlerParameters.getPath();
8385

8486
ExceptionWhileDataFetching error = new ExceptionWhileDataFetching(path, exception, sourceLocation);
85-
handlerParameters.getExecutionContext().addError(error);
86-
log.warn(error.getMessage(), exception);
87+
logException(error, exception);
88+
89+
return DataFetcherExceptionHandlerResult.newResult().error(error).build();
8790
}
91+
92+
@Override
93+
public CompletableFuture<DataFetcherExceptionHandlerResult> handleException(DataFetcherExceptionHandlerParameters handlerParameters) {
94+
return CompletableFuture.completedFuture(handleExceptionImpl(handlerParameters));
95+
}
96+
97+
// See class for other methods
8898
}
8999
```
90100

@@ -127,8 +137,7 @@ behaviour.
127137
```java
128138
DataFetcherExceptionHandler handler = new DataFetcherExceptionHandler() {
129139
@Override
130-
public void accept(DataFetcherExceptionHandlerParameters handlerParameters) {
131-
//
140+
public CompletableFuture<DataFetcherExceptionHandlerResult> handleException(DataFetcherExceptionHandlerParameters handlerParameters) {
132141
// do your custom handling here. The parameters have all you need
133142
}
134143
};

‎documentation/scalars.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Scalars"
3-
date: 2018-09-09T12:52:46+10:00
3+
date: 2024-01-11
44
description: How scalar types work in graphql and how to write your own scalars
55
---
66
# Scalars in GraphQL
@@ -21,20 +21,22 @@ The [GraphQL specification](https://spec.graphql.org/draft/#sec-Scalars) states
2121

2222
The class ``graphql.Scalars`` contains singleton instances of the provided scalar types.
2323

24-
[graphql-java-extended-scalars](https://github.com/graphql-java/graphql-java-extended-scalars) adds the following scalar types which are useful in Java based systems:
24+
[graphql-java-extended-scalars](https://github.com/graphql-java/graphql-java-extended-scalars) adds many more scalars, including the following which are useful in Java based systems:
2525

2626
* Long aka ``GraphQLLong`` - a java.lang.Long based scalar
2727
* Short aka ``GraphQLShort`` - a java.lang.Short based scalar
2828
* Byte aka ``GraphQLByte`` - a java.lang.Byte based scalar
2929
* BigDecimal aka ``GraphQLBigDecimal`` - a java.math.BigDecimal based scalar
3030
* BigInteger aka ``GraphQLBigInteger`` - a java.math.BigInteger based scalar
3131

32+
See the [documentation](https://github.com/graphql-java/graphql-java-extended-scalars) for how to use Extended Scalars.
33+
3234
## Writing your own Custom Scalars
3335

34-
You can write your own custom scalar implementations. In doing so you take on the responsibility for coercing values
36+
If the scalar you want isn't in a library, you can also write your own custom scalar implementation. In doing so you take on the responsibility for coercing values
3537
at runtime, which we will explain in a moment.
3638

37-
Imagine we decide we need to have an email scalar type. It will take email addresses as input and output.
39+
Imagine we decide we need to have an email scalar type. It will take email addresses as input and output.
3840

3941
We would create a singleton ``graphql.schema.GraphQLScalarType`` instance for this.
4042

@@ -44,17 +46,17 @@ public static final GraphQLScalarType EMAIL = GraphQLScalarType.newScalar()
4446
.description("A custom scalar that handles emails")
4547
.coercing(new Coercing() {
4648
@Override
47-
public Object serialize(Object dataFetcherResult) {
49+
public Object serialize(Object dataFetcherResult, GraphQLContext graphQLContext, Locale locale) {
4850
return serializeEmail(dataFetcherResult);
4951
}
5052

5153
@Override
52-
public Object parseValue(Object input) {
54+
public Object parseValue(Object input, GraphQLContext graphQLContext, Locale locale) {
5355
return parseEmailFromVariable(input);
5456
}
5557

5658
@Override
57-
public Object parseLiteral(Object input) {
59+
public Object parseLiteral(Value input, CoercedVariables variables, GraphQLContext graphQLContext, Locale locale) {
5860
return parseEmailFromAstLiteral(input);
5961
}
6062
})
@@ -122,17 +124,17 @@ public static class EmailScalar {
122124
.description("A custom scalar that handles emails")
123125
.coercing(new Coercing() {
124126
@Override
125-
public Object serialize(Object dataFetcherResult) {
127+
public Object serialize(Object dataFetcherResult, GraphQLContext graphQLContext, Locale locale) {
126128
return serializeEmail(dataFetcherResult);
127129
}
128130

129131
@Override
130-
public Object parseValue(Object input) {
132+
public Object parseValue(Object input, GraphQLContext graphQLContext, Locale locale) {
131133
return parseEmailFromVariable(input);
132134
}
133135

134136
@Override
135-
public Object parseLiteral(Object input) {
137+
public Object parseLiteral(Value input, CoercedVariables variables, GraphQLContext graphQLContext, Locale locale) {
136138
return parseEmailFromAstLiteral(input);
137139
}
138140
})

‎docusaurus.config.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ const config = {
103103
label: 'GitHub Discussions',
104104
href: 'https://github.com/graphql-java/graphql-java/discussions',
105105
},
106-
{
107-
label: 'Twitter',
108-
href: 'https://twitter.com/graphql_java',
109-
},
110106
],
111107
},
112108
{

‎src/components/HomepageFeatures.js‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎src/components/HomepageFeatures.module.css‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/pages/about.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ hide_table_of_contents: true
66

77
# About
88

9-
The GraphQL Java project is run by [Andreas Marek](https://twitter.com/andimarek) and [Brad Baker](https://github.com/bbakerman).
9+
The GraphQL Java project is run by [Andreas Marek](https://github.com/andimarek), [Brad Baker](https://github.com/bbakerman), and [Donna Zhou](https://github.com/dondonz).
1010

1111
Andreas Marek is responsible for the content of this website.
12-
13-
You can also follow [GraphQL Java on Twitter](https://twitter.com/graphql_java).

‎src/pages/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Layout from '@theme/Layout';
44
import Link from '@docusaurus/Link';
55
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
66
import styles from './index.module.css';
7-
import HomepageFeatures from '../components/HomepageFeatures';
87

98
function HomepageHeader() {
109
const {siteConfig} = useDocusaurusContext();
@@ -32,9 +31,6 @@ export default function Home() {
3231
title={`Hello from ${siteConfig.title}`}
3332
description="GraphQL Java home page">
3433
<HomepageHeader />
35-
{/*<main>*/}
36-
{/*<HomepageFeatures />*/}
37-
{/*</main>*/}
3834
</Layout>
3935
);
4036
}

0 commit comments

Comments
 (0)