libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

When ternary conditional operator uses primitive type it could throw NPE in some cases

Browse source 
Closes #9137
This commit is contained in:
vramik 2021-12-14 17:16:01 +01:00 committed by Hynek Mlnařík
parent afeaa6f593
commit e61da278ba
15 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java vendored
View file

@ -725,17 +725,17 @@ public class CachedRealm extends AbstractExtendableRevisioned {
public Integer getAttribute(String name, Integer defaultValue) {
String v = getAttribute(name);
return v != null ? Integer.parseInt(v) : defaultValue;
return v != null ? Integer.valueOf(v) : defaultValue;
}
public Long getAttribute(String name, Long defaultValue) {
String v = getAttribute(name);
return v != null ? Long.parseLong(v) : defaultValue;
return v != null ? Long.valueOf(v) : defaultValue;
}
public Boolean getAttribute(String name, Boolean defaultValue) {
String v = getAttribute(name);
return v != null ? Boolean.parseBoolean(v) : defaultValue;
return v != null ? Boolean.valueOf(v) : defaultValue;
}
public Map<String, String> getAttributes() {

2
model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java
View file

@ -112,7 +112,7 @@ public class SessionEntityWrapper<S extends SessionEntity> {
public Integer getLocalMetadataNoteInt(String key) {
String note = getLocalMetadataNote(key);
return note==null ? null : Integer.parseInt(note);
return note==null ? null : Integer.valueOf(note);
}
public void putLocalMetadataNoteInt(String key, int value) {

2
model/infinispan/src/test/java/org/keycloak/cluster/infinispan/ConcurrencyJDGCachePutTest.java
View file

@ -165,7 +165,7 @@ public class ConcurrencyJDGCachePutTest {
}
public static int getClusterStartupTime(Cache<String, Integer> cache, String cacheKey, EntryInfo wrapper, int myThreadId) {
Integer startupTime = myThreadId==1 ? Integer.parseInt(cacheKey.substring(4)) : Integer.parseInt(cacheKey.substring(4)) * 2;
Integer startupTime = myThreadId==1 ? Integer.valueOf(cacheKey.substring(4)) : Integer.valueOf(cacheKey.substring(4)) * 2;
// Concurrency doesn't work correctly with this
//Integer existingClusterStartTime = (Integer) cache.putIfAbsent(cacheKey, startupTime);

6
server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java
View file

@ -84,7 +84,7 @@ public class ComponentModelScope implements Scope {
@Override
public Integer getInt(String key, Integer defaultValue) {
final String res = componentConfig.get(prefix + key, null);
return (res == null) ? origScope.getInt(key, defaultValue) : Integer.parseInt(res);
return (res == null) ? origScope.getInt(key, defaultValue) : Integer.valueOf(res);
}
@Override
@ -95,7 +95,7 @@ public class ComponentModelScope implements Scope {
@Override
public Long getLong(String key, Long defaultValue) {
final String res = componentConfig.get(prefix + key, null);
return (res == null) ? origScope.getLong(key, defaultValue) : Long.parseLong(res);
return (res == null) ? origScope.getLong(key, defaultValue) : Long.valueOf(res);
}
@Override
@ -106,7 +106,7 @@ public class ComponentModelScope implements Scope {
@Override
public Boolean getBoolean(String key, Boolean defaultValue) {
final String res = componentConfig.get(prefix + key, null);
return (res == null) ? origScope.getBoolean(key, defaultValue) : Boolean.parseBoolean(res);
return (res == null) ? origScope.getBoolean(key, defaultValue) : Boolean.valueOf(res);
}
@Override

2
server-spi-private/src/main/java/org/keycloak/policy/DigitsPasswordPolicyProvider.java
View file

@ -53,7 +53,7 @@ public class DigitsPasswordPolicyProvider implements PasswordPolicyProvider {
@Override
public Object parseConfig(String value) {
return value != null ? Integer.parseInt(value) : 1;
return value != null ? Integer.valueOf(value) : Integer.valueOf(1);
}
@Override

4
server-spi-private/src/main/java/org/keycloak/policy/ForceExpiredPasswordPolicyProviderFactory.java
View file

@ -29,7 +29,7 @@ import org.keycloak.models.UserModel;
*/
public class ForceExpiredPasswordPolicyProviderFactory implements PasswordPolicyProviderFactory, PasswordPolicyProvider {
public static final int DEFAULT_VALUE = 365;
public static final Integer DEFAULT_VALUE = 365;
@Override
public PasswordPolicyProvider create(KeycloakSession session) {
@ -85,7 +85,7 @@ public class ForceExpiredPasswordPolicyProviderFactory implements PasswordPolicy
@Override
public Object parseConfig(String value) {
return value != null ? Integer.parseInt(value) : DEFAULT_VALUE;
return value != null ? Integer.valueOf(value) : DEFAULT_VALUE;
}
}

6
server-spi/src/main/java/org/keycloak/component/ComponentModel.java
View file

@ -91,17 +91,17 @@ public class ComponentModel implements Serializable {
public int get(String key, int defaultValue) {
String s = get(key);
return s != null ? Integer.parseInt(s) : defaultValue;
return s != null ? Integer.valueOf(s) : defaultValue;
}
public long get(String key, long defaultValue) {
String s = get(key);
return s != null ? Long.parseLong(s) : defaultValue;
return s != null ? Long.valueOf(s) : defaultValue;
}
public boolean get(String key, boolean defaultValue) {
String s = get(key);
return s != null ? Boolean.parseBoolean(s) : defaultValue;
return s != null ? Boolean.valueOf(s) : defaultValue;
}
public void put(String key, String value) {

6
server-spi/src/main/java/org/keycloak/models/RealmModel.java
View file

@ -143,15 +143,15 @@ public interface RealmModel extends RoleContainerModel {
String getAttribute(String name);
default Integer getAttribute(String name, Integer defaultValue) {
String v = getAttribute(name);
return v != null ? Integer.parseInt(v) : defaultValue;
return v != null ? Integer.valueOf(v) : defaultValue;
}
default Long getAttribute(String name, Long defaultValue) {
String v = getAttribute(name);
return v != null ? Long.parseLong(v) : defaultValue;
return v != null ? Long.valueOf(v) : defaultValue;
}
default Boolean getAttribute(String name, Boolean defaultValue) {
String v = getAttribute(name);
return v != null ? Boolean.parseBoolean(v) : defaultValue;
return v != null ? Boolean.valueOf(v) : defaultValue;
}
Map<String, String> getAttributes();

2
server-spi/src/main/java/org/keycloak/policy/PasswordPolicyProvider.java
View file

@ -35,7 +35,7 @@ public interface PasswordPolicyProvider extends Provider {
default Integer parseInteger(String value, Integer defaultValue) {
try {
return value != null ? Integer.parseInt(value) : defaultValue;
return value != null ? Integer.valueOf(value) : defaultValue;
} catch (NumberFormatException e) {
throw new PasswordPolicyConfigException("Not a valid number");
}

2
services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java
View file

@ -46,7 +46,7 @@ class AuthzEndpointQueryStringParser extends AuthzEndpointRequestParser {
protected Integer getIntParameter(String paramName) {
checkDuplicated(requestParams, paramName);
String paramVal = requestParams.getFirst(paramName);
return paramVal==null ? null : Integer.parseInt(paramVal);
return paramVal==null ? null : Integer.valueOf(paramVal);
}
public String getInvalidRequestMessage() {

2
services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestObjectParser.java
View file

@ -81,7 +81,7 @@ public class AuthzEndpointRequestObjectParser extends AuthzEndpointRequestParser
@Override
protected Integer getIntParameter(String paramName) {
Object val = this.requestParams.get(paramName);
return val==null ? null : Integer.parseInt(getParameter(paramName));
return val==null ? null : Integer.valueOf(getParameter(paramName));
}
@Override

2
services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java
View file

@ -46,7 +46,7 @@ class BackchannelAuthenticationEndpointRequestBodyParser extends BackchannelAuth
protected Integer getIntParameter(String paramName) {
checkDuplicated(requestParams, paramName);
String paramVal = requestParams.getFirst(paramName);
return paramVal==null ? null : Integer.parseInt(paramVal);
return paramVal==null ? null : Integer.valueOf(paramVal);
}
public String getInvalidRequestMessage() {

2
services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointSignedRequestParser.java
View file

@ -95,7 +95,7 @@ class BackchannelAuthenticationEndpointSignedRequestParser extends BackchannelAu
@Override
protected Integer getIntParameter(String paramName) {
Object val = this.requestParams.get(paramName);
return val==null ? null : Integer.parseInt(getParameter(paramName));
return val==null ? null : Integer.valueOf(getParameter(paramName));
}
@Override

2
services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/AuthzEndpointParParser.java
View file

@ -95,7 +95,7 @@ public class AuthzEndpointParParser extends AuthzEndpointRequestParser {
@Override
protected Integer getIntParameter(String paramName) {
String paramVal = requestParams.get(paramName);
return paramVal == null ? null : Integer.parseInt(paramVal);
return paramVal == null ? null : Integer.valueOf(paramVal);
}
public String getInvalidRequestMessage() {

6
services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java
View file

@ -129,7 +129,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {
}
if (n.isTextual()) {
String v = replaceProperties(n.textValue());
return !v.isEmpty() ? Integer.parseInt(v) : defaultValue;
return !v.isEmpty() ? Integer.valueOf(v) : defaultValue;
} else {
return n.intValue();
}
@ -151,7 +151,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {
}
if (n.isTextual()) {
String v = replaceProperties(n.textValue());
return !v.isEmpty() ? Long.parseLong(v) : defaultValue;
return !v.isEmpty() ? Long.valueOf(v) : defaultValue;
} else {
return n.longValue();
}
@ -173,7 +173,7 @@ public class JsonConfigProvider implements Config.ConfigProvider {
}
if (n.isTextual()) {
String v = replaceProperties(n.textValue());
return !v.isEmpty() ? Boolean.parseBoolean(v) : defaultValue;
return !v.isEmpty() ? Boolean.valueOf(v) : defaultValue;
} else {
return n.booleanValue();
}