diff options
| author | 2016-09-01 18:03:15 +0100 | |
|---|---|---|
| committer | 2016-09-01 18:19:50 +0100 | |
| commit | 94adef75afd07441610f12c20b507bfab5b50ea7 (patch) | |
| tree | 467dca38c85f42d2ed820ccb95284417a2a7a71b | |
| parent | 47784a790bca4cb9744cfcb9df0da5e38f5cbbf1 (diff) | |
java.security.Provider: port to jdk8u60 (second part)
- Add overridings for HashMap operations
Provider is a subclass of HashMap. When operations are on
Strings, they must be processed as part of the
algorithm->implementation mapping of the provider, and
so these methods must be overriden accordingly.
Newly overridden Methods added are:
compute, computeIfAbsent, computeIfPresent, getOrDefault,
merge, putIfAbsent, replace, replaceAll.
- Check that classes and constructors are public when
creating instances of services.
- Cosmetic changes like use of {@code} instead of <code>
Bug: 29631070
Test: make droid docs; vogar ProviderTest
Change-Id: I0238f4a48f31ddc50a3f18c27515023940d9ba02
| -rw-r--r-- | api/current.txt | 9 | ||||
| -rw-r--r-- | api/system-current.txt | 9 | ||||
| -rw-r--r-- | api/test-current.txt | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1effb419f1d7..6c22355fcea3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -55181,16 +55181,25 @@ package java.security { public abstract class Provider extends java.util.Properties { ctor protected Provider(java.lang.String, double, java.lang.String); + method public synchronized java.lang.Object compute(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); + method public synchronized java.lang.Object computeIfAbsent(java.lang.Object, java.util.function.Function<? super java.lang.Object, ? extends java.lang.Object>); + method public synchronized java.lang.Object computeIfPresent(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); method public synchronized void forEach(java.util.function.BiConsumer<? super java.lang.Object, ? super java.lang.Object>); method public java.lang.String getInfo(); method public java.lang.String getName(); + method public synchronized java.lang.Object getOrDefault(java.lang.Object, java.lang.Object); method public synchronized java.security.Provider.Service getService(java.lang.String, java.lang.String); method public synchronized java.util.Set<java.security.Provider.Service> getServices(); method public double getVersion(); + method public synchronized java.lang.Object merge(java.lang.Object, java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); method public synchronized java.lang.Object put(java.lang.Object, java.lang.Object); method public synchronized void putAll(java.util.Map<?, ?>); + method public synchronized java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object); method protected synchronized void putService(java.security.Provider.Service); method protected synchronized void removeService(java.security.Provider.Service); + method public synchronized boolean replace(java.lang.Object, java.lang.Object, java.lang.Object); + method public synchronized java.lang.Object replace(java.lang.Object, java.lang.Object); + method public synchronized void replaceAll(java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); } public static class Provider.Service { diff --git a/api/system-current.txt b/api/system-current.txt index 6f9b6795b01c..58514cdba3d7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -58537,16 +58537,25 @@ package java.security { public abstract class Provider extends java.util.Properties { ctor protected Provider(java.lang.String, double, java.lang.String); + method public synchronized java.lang.Object compute(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); + method public synchronized java.lang.Object computeIfAbsent(java.lang.Object, java.util.function.Function<? super java.lang.Object, ? extends java.lang.Object>); + method public synchronized java.lang.Object computeIfPresent(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); method public synchronized void forEach(java.util.function.BiConsumer<? super java.lang.Object, ? super java.lang.Object>); method public java.lang.String getInfo(); method public java.lang.String getName(); + method public synchronized java.lang.Object getOrDefault(java.lang.Object, java.lang.Object); method public synchronized java.security.Provider.Service getService(java.lang.String, java.lang.String); method public synchronized java.util.Set<java.security.Provider.Service> getServices(); method public double getVersion(); + method public synchronized java.lang.Object merge(java.lang.Object, java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); method public synchronized java.lang.Object put(java.lang.Object, java.lang.Object); method public synchronized void putAll(java.util.Map<?, ?>); + method public synchronized java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object); method protected synchronized void putService(java.security.Provider.Service); method protected synchronized void removeService(java.security.Provider.Service); + method public synchronized boolean replace(java.lang.Object, java.lang.Object, java.lang.Object); + method public synchronized java.lang.Object replace(java.lang.Object, java.lang.Object); + method public synchronized void replaceAll(java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); } public static class Provider.Service { diff --git a/api/test-current.txt b/api/test-current.txt index 2d146f82069b..3fa0ced81328 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -55261,16 +55261,25 @@ package java.security { public abstract class Provider extends java.util.Properties { ctor protected Provider(java.lang.String, double, java.lang.String); + method public synchronized java.lang.Object compute(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); + method public synchronized java.lang.Object computeIfAbsent(java.lang.Object, java.util.function.Function<? super java.lang.Object, ? extends java.lang.Object>); + method public synchronized java.lang.Object computeIfPresent(java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); method public synchronized void forEach(java.util.function.BiConsumer<? super java.lang.Object, ? super java.lang.Object>); method public java.lang.String getInfo(); method public java.lang.String getName(); + method public synchronized java.lang.Object getOrDefault(java.lang.Object, java.lang.Object); method public synchronized java.security.Provider.Service getService(java.lang.String, java.lang.String); method public synchronized java.util.Set<java.security.Provider.Service> getServices(); method public double getVersion(); + method public synchronized java.lang.Object merge(java.lang.Object, java.lang.Object, java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); method public synchronized java.lang.Object put(java.lang.Object, java.lang.Object); method public synchronized void putAll(java.util.Map<?, ?>); + method public synchronized java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object); method protected synchronized void putService(java.security.Provider.Service); method protected synchronized void removeService(java.security.Provider.Service); + method public synchronized boolean replace(java.lang.Object, java.lang.Object, java.lang.Object); + method public synchronized java.lang.Object replace(java.lang.Object, java.lang.Object); + method public synchronized void replaceAll(java.util.function.BiFunction<? super java.lang.Object, ? super java.lang.Object, ? extends java.lang.Object>); } public static class Provider.Service { |