Skip to content

LogstashMarker refactoring #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 10, 2021
Merged

LogstashMarker refactoring #636

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7def5b9
Lazy creation of Marker referenceList
brenuart Sep 8, 2021
91b1fa9
Remove copyright from original SLF4J implementation
brenuart Sep 8, 2021
eab26c6
Reduce visibility of LogstashBasicMarker
brenuart Sep 8, 2021
f29bb2c
Code cleanup and additional javadoc
brenuart Sep 8, 2021
29b1ba6
Be consistent in usage of `this` to reference instance fields
brenuart Sep 9, 2021
61e99a0
Review equals/hashCode on EmptyLogstashMarker
brenuart Sep 9, 2021
7d692d3
Standardize on Objects.requireNonNull() instead of custom IllegalArgu…
brenuart Sep 9, 2021
7eba1b6
Accept `null` value in contains()
brenuart Sep 9, 2021
8060418
Add test cases for LogsatshBasicMarker
brenuart Sep 9, 2021
699d919
Restore equals() implementation
brenuart Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Standardize on Objects.requireNonNull() instead of custom IllegalArgu… 
…mentException
  • Loading branch information
@brenuart
brenuart committed Sep 9, 2021
commit 7d692d3b955bcfe789970f6cb54455ae0cda84e2
10 changes: 3 additions & 7 deletions src/main/java/net/logstash/logback/marker/LogstashBasicMarker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;

import org.slf4j.Marker;
Expand All @@ -39,10 +40,7 @@ class LogstashBasicMarker implements Marker {
private volatile List<Marker> referenceList;

LogstashBasicMarker(String name) {
if (name == null) {
throw new IllegalArgumentException("A marker name cannot be null");
}
this.name = name;
this.name = Objects.requireNonNull(name);
}

/**
Expand All @@ -58,9 +56,7 @@ public String getName() {
*/
@Override
public void add(Marker reference) {
if (reference == null) {
throw new IllegalArgumentException("A null value cannot be added to a Marker as reference.");
}
Objects.requireNonNull(reference);

// no point in adding the reference multiple times
if (this.contains(reference)) {
Expand Down