KEYCLOAK-12317 Fix minor warnings with modificators in packages: authentication, authorization, keys, partialimport, protocol from module "services"

This commit is contained in:
Andrei Arlou 2019-12-01 23:14:32 +03:00 committed by Stian Thorgersen
parent c61cc1a493
commit bb156fb2fd
8 changed files with 17 additions and 17 deletions

View file

@ -137,13 +137,13 @@ public abstract class AbstractX509ClientCertificateAuthenticator implements Auth
return null;
};
private static final Function<X509Certificate[], String> getSerialnumberFunc(X509AuthenticatorConfigModel config) {
private static Function<X509Certificate[], String> getSerialnumberFunc(X509AuthenticatorConfigModel config) {
return config.isSerialnumberHex() ?
certs -> Hex.toHexString(certs[0].getSerialNumber().toByteArray()) :
certs -> certs[0].getSerialNumber().toString();
}
private static final Function<X509Certificate[], String> getIssuerDNFunc(X509AuthenticatorConfigModel config) {
private static Function<X509Certificate[], String> getIssuerDNFunc(X509AuthenticatorConfigModel config) {
return config.isCanonicalDnEnabled() ?
certs -> certs[0].getIssuerX500Principal().getName(X500Principal.CANONICAL) :
certs -> certs[0].getIssuerDN().getName();

View file

@ -136,7 +136,7 @@ public class CertificateValidator {
}
}
public static abstract class OCSPChecker {
public abstract static class OCSPChecker {
/**
* Requests certificate revocation status using OCSP. The OCSP responder URI
* is obtained from the certificate's AIA extension.
@ -147,7 +147,7 @@ public class CertificateValidator {
public abstract OCSPUtils.OCSPRevocationStatus check(X509Certificate cert, X509Certificate issuerCertificate) throws CertPathValidatorException;
}
public static abstract class CRLLoaderImpl {
public abstract static class CRLLoaderImpl {
/**
* Returns a collection of {@link X509CRL}
* @return

View file

@ -70,7 +70,7 @@ public class X509AuthenticatorConfigModel extends AuthenticatorConfigModel {
this.name = name;
}
public String getName() { return this.name; }
static public MappingSourceType parse(String name) throws IllegalArgumentException, IndexOutOfBoundsException {
public static MappingSourceType parse(String name) throws IllegalArgumentException, IndexOutOfBoundsException {
if (name == null || name.trim().length() == 0)
throw new IllegalArgumentException("name");

View file

@ -38,9 +38,9 @@ public interface PartialImport<T> {
* @throws ErrorResponseException If the PartialImport can not be performed,
* throw this exception.
*/
public void prepare(PartialImportRepresentation rep,
RealmModel realm,
KeycloakSession session) throws ErrorResponseException;
void prepare(PartialImportRepresentation rep,
RealmModel realm,
KeycloakSession session) throws ErrorResponseException;
/**
* Delete resources that will be overwritten. This is done separately so
@ -52,7 +52,7 @@ public interface PartialImport<T> {
* @param realm Realm to be imported into.
* @param session The KeycloakSession
*/
public void removeOverwrites(RealmModel realm, KeycloakSession session);
void removeOverwrites(RealmModel realm, KeycloakSession session);
/**
* Create (or re-create) all the imported resources.
@ -63,7 +63,7 @@ public interface PartialImport<T> {
* @return The final results of the PartialImport request.
* @throws ErrorResponseException if an error was detected trying to doImport a resource.
*/
public PartialImportResults doImport(PartialImportRepresentation rep,
RealmModel realm,
KeycloakSession session) throws ErrorResponseException;
PartialImportResults doImport(PartialImportRepresentation rep,
RealmModel realm,
KeycloakSession session) throws ErrorResponseException;
}

View file

@ -11,7 +11,7 @@ public final class DockerCertFileUtils {
public static final String END_CERT = "-----END CERTIFICATE-----";
public static final String BEGIN_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----";
public static final String END_PRIVATE_KEY = "-----END PRIVATE KEY-----";
public final static String LINE_SEPERATOR = System.getProperty("line.separator");
public static final String LINE_SEPERATOR = System.getProperty("line.separator");
private DockerCertFileUtils() {
}

View file

@ -509,8 +509,8 @@ public class SamlProtocol implements LoginProtocol {
}
public static class ProtocolMapperProcessor<T> {
final public T mapper;
final public ProtocolMapperModel model;
public final T mapper;
public final ProtocolMapperModel model;
public ProtocolMapperProcessor(T mapper, ProtocolMapperModel model) {
this.mapper = mapper;

View file

@ -25,5 +25,5 @@ import org.keycloak.models.ProtocolMapperModel;
* @version $Revision: 1 $
*/
public interface SAMLGroupNameMapper {
public String mapName(ProtocolMapperModel model, GroupModel group);
String mapName(ProtocolMapperModel model, GroupModel group);
}

View file

@ -25,5 +25,5 @@ import org.keycloak.models.RoleModel;
* @version $Revision: 1 $
*/
public interface SAMLRoleNameMapper {
public String mapName(ProtocolMapperModel model, RoleModel role);
String mapName(ProtocolMapperModel model, RoleModel role);
}