Skip to content

Commit 108361a

Browse files
ppkarwaszppkarwasz
committed
Renormalize Java file line endings
This also runs `spotless:apply` on the modified files.
1 parent 219ef8a commit 108361a

File tree

20 files changed

+1668
-1666
lines changed

20 files changed

+1668
-1666
lines changed

‎.gitattributes

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15+
16+
# All text files with LF line endings
17+
* text=auto eol=lf
18+
# Maven Wrapper cmd script
1519
/mvnw.cmd eol=crlf
1620
# Maven Wrapper need LF line endings
1721
/.mvn/wrapper/maven-wrapper.properties eol=lf

‎log4j-1.2-api/src/test/java/org/apache/log4j/CallerInformationTest.java

+65-65
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache license, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the license for the specific language governing permissions and
15-
* limitations under the license.
16-
*/
17-
package org.apache.log4j;
18-
19-
import static org.junit.Assert.assertEquals;
20-
21-
import java.util.List;
22-
23-
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
24-
import org.apache.logging.log4j.core.test.appender.ListAppender;
25-
import org.junit.ClassRule;
26-
import org.junit.Test;
27-
28-
public class CallerInformationTest {
29-
30-
// config from log4j-core test-jar
31-
private static final String CONFIG = "log4j2-calling-class.xml";
32-
33-
@ClassRule
34-
public static final LoggerContextRule ctx = new LoggerContextRule(CONFIG);
35-
36-
@Test
37-
public void testClassLogger() {
38-
final ListAppender app = ctx.getListAppender("Class").clear();
39-
final Logger logger = Logger.getLogger("ClassLogger");
40-
logger.info("Ignored message contents.");
41-
logger.warn("Verifying the caller class is still correct.");
42-
logger.error("Hopefully nobody breaks me!");
43-
final List<String> messages = app.getMessages();
44-
assertEquals("Incorrect number of messages.", 3, messages.size());
45-
for (final String message : messages) {
46-
assertEquals("Incorrect caller class name.", this.getClass().getName(), message);
47-
}
48-
}
49-
50-
@Test
51-
public void testMethodLogger() {
52-
final ListAppender app = ctx.getListAppender("Method").clear();
53-
final Logger logger = Logger.getLogger("MethodLogger");
54-
logger.info("More messages.");
55-
logger.warn("CATASTROPHE INCOMING!");
56-
logger.error("ZOMBIES!!!");
57-
logger.warn("brains~~~");
58-
logger.info("Itchy. Tasty.");
59-
final List<String> messages = app.getMessages();
60-
assertEquals("Incorrect number of messages.", 5, messages.size());
61-
for (final String message : messages) {
62-
assertEquals("Incorrect caller method name.", "testMethodLogger", message);
63-
}
64-
}
65-
}
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache license, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the license for the specific language governing permissions and
15+
* limitations under the license.
16+
*/
17+
package org.apache.log4j;
18+
19+
import java.util.List;
20+
21+
import org.apache.logging.log4j.core.test.appender.ListAppender;
22+
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
23+
import org.junit.ClassRule;
24+
import org.junit.Test;
25+
26+
import static org.junit.Assert.assertEquals;
27+
28+
public class CallerInformationTest {
29+
30+
// config from log4j-core test-jar
31+
private static final String CONFIG = "log4j2-calling-class.xml";
32+
33+
@ClassRule
34+
public static final LoggerContextRule ctx = new LoggerContextRule(CONFIG);
35+
36+
@Test
37+
public void testClassLogger() {
38+
final ListAppender app = ctx.getListAppender("Class").clear();
39+
final Logger logger = Logger.getLogger("ClassLogger");
40+
logger.info("Ignored message contents.");
41+
logger.warn("Verifying the caller class is still correct.");
42+
logger.error("Hopefully nobody breaks me!");
43+
final List<String> messages = app.getMessages();
44+
assertEquals("Incorrect number of messages.", 3, messages.size());
45+
for (final String message : messages) {
46+
assertEquals("Incorrect caller class name.", this.getClass().getName(), message);
47+
}
48+
}
49+
50+
@Test
51+
public void testMethodLogger() {
52+
final ListAppender app = ctx.getListAppender("Method").clear();
53+
final Logger logger = Logger.getLogger("MethodLogger");
54+
logger.info("More messages.");
55+
logger.warn("CATASTROPHE INCOMING!");
56+
logger.error("ZOMBIES!!!");
57+
logger.warn("brains~~~");
58+
logger.info("Itchy. Tasty.");
59+
final List<String> messages = app.getMessages();
60+
assertEquals("Incorrect number of messages.", 5, messages.size());
61+
for (final String message : messages) {
62+
assertEquals("Incorrect caller method name.", "testMethodLogger", message);
63+
}
64+
}
65+
}

‎log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache license, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the license for the specific language governing permissions and
15-
* limitations under the license.
16-
*/
17-
package org.apache.log4j;
18-
19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertNotNull;
21-
22-
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
23-
import org.junit.jupiter.api.Test;
24-
25-
/**
26-
*
27-
*/
28-
public class LoggingTest {
29-
30-
private static final String CONFIG = "log4j2-config.xml";
31-
32-
@Test
33-
@LoggerContextSource(CONFIG)
34-
public void testParent() {
35-
final Logger logger = Logger.getLogger("org.apache.test.logging.Test");
36-
final Category parent = logger.getParent();
37-
assertNotNull(parent, "No parent Logger");
38-
assertEquals("org.apache.test.logging", parent.getName(), "Incorrect parent logger");
39-
}
40-
41-
}
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache license, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the license for the specific language governing permissions and
15+
* limitations under the license.
16+
*/
17+
package org.apache.log4j;
18+
19+
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
20+
import org.junit.jupiter.api.Test;
21+
22+
import static org.junit.jupiter.api.Assertions.assertEquals;
23+
import static org.junit.jupiter.api.Assertions.assertNotNull;
24+
25+
/**
26+
*
27+
*/
28+
public class LoggingTest {
29+
30+
private static final String CONFIG = "log4j2-config.xml";
31+
32+
@Test
33+
@LoggerContextSource(CONFIG)
34+
public void testParent() {
35+
final Logger logger = Logger.getLogger("org.apache.test.logging.Test");
36+
final Category parent = logger.getParent();
37+
assertNotNull(parent, "No parent Logger");
38+
assertEquals("org.apache.test.logging", parent.getName(), "Incorrect parent logger");
39+
}
40+
41+
}

‎log4j-1.2-api/src/test/java/org/apache/log4j/config/StartsWithFilter.java

+38-38
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache license, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the license for the specific language governing permissions and
15-
* limitations under the license.
16-
*/
17-
package org.apache.log4j.config;
18-
19-
import org.apache.log4j.spi.Filter;
20-
import org.apache.log4j.spi.LoggingEvent;
21-
22-
/**
23-
* A Filter used in tests.
24-
*/
25-
public class StartsWithFilter extends Filter {
26-
27-
@Override
28-
public int decide(LoggingEvent event) {
29-
String message = String.valueOf(event.getMessage());
30-
if (message.startsWith("DENY")) {
31-
return DENY;
32-
} else if (message.startsWith("ACCEPT")) {
33-
return ACCEPT;
34-
}
35-
return NEUTRAL;
36-
}
37-
38-
}
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache license, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the license for the specific language governing permissions and
15+
* limitations under the license.
16+
*/
17+
package org.apache.log4j.config;
18+
19+
import org.apache.log4j.spi.Filter;
20+
import org.apache.log4j.spi.LoggingEvent;
21+
22+
/**
23+
* A Filter used in tests.
24+
*/
25+
public class StartsWithFilter extends Filter {
26+
27+
@Override
28+
public int decide(LoggingEvent event) {
29+
String message = String.valueOf(event.getMessage());
30+
if (message.startsWith("DENY")) {
31+
return DENY;
32+
} else if (message.startsWith("ACCEPT")) {
33+
return ACCEPT;
34+
}
35+
return NEUTRAL;
36+
}
37+
38+
}

‎log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache license, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the license for the specific language governing permissions and
15-
* limitations under the license.
16-
*/
17-
package org.apache.logging.log4j.message;
18-
19-
/**
20-
* Entry flow messages
21-
*
22-
* @since 2.6
23-
*/
24-
public interface EntryMessage extends FlowMessage {
25-
// empty
26-
}
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache license, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the license for the specific language governing permissions and
15+
* limitations under the license.
16+
*/
17+
package org.apache.logging.log4j.message;
18+
19+
/**
20+
* Entry flow messages
21+
*
22+
* @since 2.6
23+
*/
24+
public interface EntryMessage extends FlowMessage {
25+
// empty
26+
}

0 commit comments

Comments
 (0)