Skip to content

Commit 1642ac2

Browse files
stianststianst
committed
KEYCLOAK-1385 Introduce end-of-line normalization
1 parent be8aa93 commit 1642ac2

File tree

888 files changed

+110680
-110660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

888 files changed

+110680
-110660
lines changed

‎.gitattributes

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
* text=auto
2+
3+
*.html text eol=lf
4+
*.java text eol=lf
5+
*.js text eol=lf
6+
*.json text eol=lf
7+
*.jsp text eol=lf
8+
*.md text eol=lf
9+
*.properties text eol=lf
10+
*.svg text auto
11+
*.xml text eol=lf
12+
*.xsl text eol=lf
13+
14+
*.png binary
15+
*.jpg binary
16+
*.gif binary
17+
*.ttf binary
18+
*.eot binary
19+
*.otf binary
20+
*.woff binary

‎broker/core/pom.xml

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
<?xml version="1.0"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4-
<parent>
5-
<artifactId>keycloak-parent</artifactId>
6-
<groupId>org.keycloak</groupId>
7-
<version>1.4.0.Final-SNAPSHOT</version>
8-
<relativePath>../../pom.xml</relativePath>
9-
</parent>
10-
<modelVersion>4.0.0</modelVersion>
11-
12-
<artifactId>keycloak-broker-core</artifactId>
13-
<name>Keycloak Broker Core</name>
14-
<description/>
15-
<packaging>jar</packaging>
16-
17-
<dependencies>
18-
<dependency>
19-
<groupId>org.keycloak</groupId>
20-
<artifactId>keycloak-core</artifactId>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.keycloak</groupId>
24-
<artifactId>keycloak-model-api</artifactId>
25-
</dependency>
26-
<dependency>
27-
<groupId>org.keycloak</groupId>
28-
<artifactId>keycloak-events-api</artifactId>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.jboss.resteasy</groupId>
32-
<artifactId>resteasy-jaxrs</artifactId>
33-
<exclusions>
34-
<exclusion>
35-
<groupId>log4j</groupId>
36-
<artifactId>log4j</artifactId>
37-
</exclusion>
38-
<exclusion>
39-
<groupId>org.slf4j</groupId>
40-
<artifactId>slf4j-api</artifactId>
41-
</exclusion>
42-
<exclusion>
43-
<groupId>org.slf4j</groupId>
44-
<artifactId>slf4j-simple</artifactId>
45-
</exclusion>
46-
</exclusions>
47-
</dependency>
48-
</dependencies>
49-
50-
</project>
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<parent>
5+
<artifactId>keycloak-parent</artifactId>
6+
<groupId>org.keycloak</groupId>
7+
<version>1.4.0.Final-SNAPSHOT</version>
8+
<relativePath>../../pom.xml</relativePath>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>keycloak-broker-core</artifactId>
13+
<name>Keycloak Broker Core</name>
14+
<description/>
15+
<packaging>jar</packaging>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.keycloak</groupId>
20+
<artifactId>keycloak-core</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.keycloak</groupId>
24+
<artifactId>keycloak-model-api</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.keycloak</groupId>
28+
<artifactId>keycloak-events-api</artifactId>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.jboss.resteasy</groupId>
32+
<artifactId>resteasy-jaxrs</artifactId>
33+
<exclusions>
34+
<exclusion>
35+
<groupId>log4j</groupId>
36+
<artifactId>log4j</artifactId>
37+
</exclusion>
38+
<exclusion>
39+
<groupId>org.slf4j</groupId>
40+
<artifactId>slf4j-api</artifactId>
41+
</exclusion>
42+
<exclusion>
43+
<groupId>org.slf4j</groupId>
44+
<artifactId>slf4j-simple</artifactId>
45+
</exclusion>
46+
</exclusions>
47+
</dependency>
48+
</dependencies>
49+
50+
</project>

‎broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderMapper.java

+38-38
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
package org.keycloak.broker.provider;
2-
3-
import org.keycloak.broker.provider.IdentityProviderMapper;
4-
import org.keycloak.models.IdentityProviderMapperModel;
5-
import org.keycloak.models.KeycloakSession;
6-
import org.keycloak.models.KeycloakSessionFactory;
7-
import org.keycloak.models.RealmModel;
8-
9-
/**
10-
* @author <a href="mailto:[email protected]">Bill Burke</a>
11-
* @version $Revision: 1 $
12-
*/
13-
public abstract class AbstractIdentityProviderMapper implements IdentityProviderMapper {
14-
@Override
15-
public void close() {
16-
17-
}
18-
19-
@Override
20-
public IdentityProviderMapper create(KeycloakSession session) {
21-
return null;
22-
}
23-
24-
@Override
25-
public void init(org.keycloak.Config.Scope config) {
26-
27-
}
28-
29-
@Override
30-
public void postInit(KeycloakSessionFactory factory) {
31-
32-
}
33-
34-
@Override
35-
public void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
36-
37-
}
38-
}
1+
package org.keycloak.broker.provider;
2+
3+
import org.keycloak.broker.provider.IdentityProviderMapper;
4+
import org.keycloak.models.IdentityProviderMapperModel;
5+
import org.keycloak.models.KeycloakSession;
6+
import org.keycloak.models.KeycloakSessionFactory;
7+
import org.keycloak.models.RealmModel;
8+
9+
/**
10+
* @author <a href="mailto:[email protected]">Bill Burke</a>
11+
* @version $Revision: 1 $
12+
*/
13+
public abstract class AbstractIdentityProviderMapper implements IdentityProviderMapper {
14+
@Override
15+
public void close() {
16+
17+
}
18+
19+
@Override
20+
public IdentityProviderMapper create(KeycloakSession session) {
21+
return null;
22+
}
23+
24+
@Override
25+
public void init(org.keycloak.Config.Scope config) {
26+
27+
}
28+
29+
@Override
30+
public void postInit(KeycloakSessionFactory factory) {
31+
32+
}
33+
34+
@Override
35+
public void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
36+
37+
}
38+
}

0 commit comments

Comments
 (0)