1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8155575: Provider.java contains very long lines because of lambda

Browse Source 
Reviewed-by: ascarpino
This commit is contained in:
Svetlana Nikandrova 2016-05-20 11:12:02 -07:00
parent ea82a852dd
commit d90c351322
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jdk/src/java.base/share/classes/java/security/Provider.java
View File

@ -569,7 +569,8 @@ public abstract class Provider extends Properties {
* @since 1.8 * @since 1.8
*/ */
@Override @Override
public synchronized void replaceAll(BiFunction<? super Object, ? super Object, ? extends Object> function) { public synchronized void replaceAll(BiFunction<? super Object,
? super Object, ? extends Object> function) {
check("putProviderProperty." + name); check("putProviderProperty." + name);
if (debug != null) { if (debug != null) {
@ -597,8 +598,8 @@ public abstract class Provider extends Properties {
* @since 1.8 * @since 1.8
*/ */
@Override @Override
public synchronized Object compute(Object key, public synchronized Object compute(Object key, BiFunction<? super Object,
BiFunction<? super Object, ? super Object, ? extends Object> remappingFunction) { ? super Object, ? extends Object> remappingFunction) {
check("putProviderProperty." + name); check("putProviderProperty." + name);
check("removeProviderProperty" + name); check("removeProviderProperty" + name);
@ -628,7 +629,8 @@ public abstract class Provider extends Properties {
* @since 1.8 * @since 1.8
*/ */
@Override @Override
public synchronized Object computeIfAbsent(Object key, Function<? super Object, ? extends Object> mappingFunction) { public synchronized Object computeIfAbsent(Object key, Function<? super Object,
? extends Object> mappingFunction) {
check("putProviderProperty." + name); check("putProviderProperty." + name);
check("removeProviderProperty" + name); check("removeProviderProperty" + name);
@ -657,7 +659,8 @@ public abstract class Provider extends Properties {
* @since 1.8 * @since 1.8
*/ */
@Override @Override
public synchronized Object computeIfPresent(Object key, BiFunction<? super Object, ? super Object, ? extends Object> remappingFunction) { public synchronized Object computeIfPresent(Object key, BiFunction<? super Object,
? super Object, ? extends Object> remappingFunction) {
check("putProviderProperty." + name); check("putProviderProperty." + name);
check("removeProviderProperty" + name); check("removeProviderProperty" + name);
@ -689,7 +692,8 @@ public abstract class Provider extends Properties {
* @since 1.8 * @since 1.8
*/ */
@Override @Override
public synchronized Object merge(Object key, Object value, BiFunction<? super Object, ? super Object, ? extends Object> remappingFunction) { public synchronized Object merge(Object key, Object value, BiFunction<? super Object,
? super Object, ? extends Object> remappingFunction) {
check("putProviderProperty." + name); check("putProviderProperty." + name);
check("removeProviderProperty" + name); check("removeProviderProperty" + name);
@ -868,18 +872,21 @@ public abstract class Provider extends Properties {
} }
@SuppressWarnings("unchecked") // Function must actually operate over strings @SuppressWarnings("unchecked") // Function must actually operate over strings
private void implReplaceAll(BiFunction<? super Object, ? super Object, ? extends Object> function) { private void implReplaceAll(BiFunction<? super Object, ? super Object,
? extends Object> function) {
legacyChanged = true; legacyChanged = true;
if (legacyStrings == null) { if (legacyStrings == null) {
legacyStrings = new LinkedHashMap<>(); legacyStrings = new LinkedHashMap<>();
} else { } else {
legacyStrings.replaceAll((BiFunction<? super String, ? super String, ? extends String>) function); legacyStrings.replaceAll((BiFunction<? super String, ? super String,
? extends String>) function);
} }
super.replaceAll(function); super.replaceAll(function);
} }
@SuppressWarnings("unchecked") // Function must actually operate over strings @SuppressWarnings("unchecked") // Function must actually operate over strings
private Object implMerge(Object key, Object value, BiFunction<? super Object, ? super Object, ? extends Object> remappingFunction) { private Object implMerge(Object key, Object value, BiFunction<? super Object,
? super Object, ? extends Object> remappingFunction) {
if ((key instanceof String) && (value instanceof String)) { if ((key instanceof String) && (value instanceof String)) {
if (!checkLegacy(key)) { if (!checkLegacy(key)) {
return null; return null;
@ -891,7 +898,8 @@ public abstract class Provider extends Properties {
} }
@SuppressWarnings("unchecked") // Function must actually operate over strings @SuppressWarnings("unchecked") // Function must actually operate over strings
private Object implCompute(Object key, BiFunction<? super Object, ? super Object, ? extends Object> remappingFunction) { private Object implCompute(Object key, BiFunction<? super Object,
? super Object, ? extends Object> remappingFunction) {
if (key instanceof String) { if (key instanceof String) {
if (!checkLegacy(key)) { if (!checkLegacy(key)) {
return null; return null;
@ -903,7 +911,8 @@ public abstract class Provider extends Properties {
} }
@SuppressWarnings("unchecked") // Function must actually operate over strings @SuppressWarnings("unchecked") // Function must actually operate over strings
private Object implComputeIfAbsent(Object key, Function<? super Object, ? extends Object> mappingFunction) { private Object implComputeIfAbsent(Object key, Function<? super Object,
? extends Object> mappingFunction) {
if (key instanceof String) { if (key instanceof String) {
if (!checkLegacy(key)) { if (!checkLegacy(key)) {
return null; return null;
@ -915,7 +924,8 @@ public abstract class Provider extends Properties {
} }
@SuppressWarnings("unchecked") // Function must actually operate over strings @SuppressWarnings("unchecked") // Function must actually operate over strings
private Object implComputeIfPresent(Object key, BiFunction<? super Object, ? super Object, ? extends Object> remappingFunction) { private Object implComputeIfPresent(Object key, BiFunction<? super Object,
? super Object, ? extends Object> remappingFunction) {
if (key instanceof String) { if (key instanceof String) {
if (!checkLegacy(key)) { if (!checkLegacy(key)) {
return null; return null;