diff options
| author | Jesse Wilson <jesse@swank.ca> | 2015-07-13 13:47:37 -0400 |
|---|---|---|
| committer | Jesse Wilson <jesse@swank.ca> | 2015-07-13 13:47:37 -0400 |
| commit | bb34247cc4283b91ed657238a37744eaa1b0f3e9 (patch) | |
| tree | 2a316bc0159fa2fe9903c0fa60e8b9ce91354038 | |
| parent | fcfd397d6fcbd4dd056625a0200ac6b2190520e6 (diff) | |
| parent | 82edd57205fe48015f81b2986f27856cb9f7fb29 (diff) | |
| download | android_external_gson-bb34247cc4283b91ed657238a37744eaa1b0f3e9.tar.gz android_external_gson-bb34247cc4283b91ed657238a37744eaa1b0f3e9.tar.bz2 android_external_gson-bb34247cc4283b91ed657238a37744eaa1b0f3e9.zip | |
Merge pull request #664 from ferstl/issue-613
Add a JSR-305 @ThreadSafe annotation to the Gson class
| -rw-r--r-- | gson/pom.xml | 6 | ||||
| -rw-r--r-- | gson/src/main/java/com/google/gson/Gson.java | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gson/pom.xml b/gson/pom.xml index 66c302b5..3b1190d3 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -50,6 +50,12 @@ </organization> <dependencies> <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>3.0.0</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java index 844188ac..9d5d6ffd 100644 --- a/gson/src/main/java/com/google/gson/Gson.java +++ b/gson/src/main/java/com/google/gson/Gson.java @@ -31,6 +31,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.concurrent.ThreadSafe; + import com.google.gson.internal.ConstructorConstructor; import com.google.gson.internal.Excluder; import com.google.gson.internal.Primitives; @@ -96,6 +98,7 @@ import com.google.gson.stream.MalformedJsonException; * @author Joel Leitch * @author Jesse Wilson */ +@ThreadSafe public final class Gson { static final boolean DEFAULT_JSON_NON_EXECUTABLE = false; |