Skip to content
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.

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

Change {@literal null} to {@code null} #1424

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Conversation

mernst
Copy link
Contributor

@mernst mernst commented Apr 11, 2023

In the formatted API documentation, both null and {@literal null} format identically, so there is no need for the latter. @literal is for literal text, not for Java manifest literals such as null. This pull request changes {@literal null} to {@code null}, which is used elsewhere and is probably what was intended.

@vy vy merged commit e6a89c0 into apache:2.x Apr 12, 2023
vy pushed a commit that referenced this pull request Apr 12, 2023
@mernst mernst deleted the javadoc-literal-null branch May 5, 2023 16:26
rgoers pushed a commit that referenced this pull request May 7, 2023
rgoers added a commit that referenced this pull request May 16, 2023
* Interim commit

* More fixes

* Everything builds

* Fix `PatternLayout.Builder#withHeader()` javadoc (#1411)

* Fix `SimpleDateFormat`-related JDK bug URL in `FastDateParser` javadoc (#1404)

* Ensure `FileOutputStream` is closed in `CommonsCompressAction.execute()` (#1415)

* Fix nullability docs in `StrSubstitutor` (#1422)

* Change `{@literal null}` to `{@code null}` (#1424)

* Remove deprecated docs from `PatternParser#extractConverter()` (#1423)

* Bump actions/checkout from 3.4.0 to 3.5.2 (#1434)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.4.0 to 3.5.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@24cb908...8e5e7e5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/setup-python from 4.3.0 to 4.6.0 (#1440)

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.3.0 to 4.6.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@13ae5bb...57ded4d)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* LOG4J2-3660 Fix `%notEmpty` for empty MDC/NDC inputs

* LOG4J2-3660 Add `MdcPatternConverter` fixes missing from the cherry-pick

* Prepare for formatting of all files

Sometimes Spotless will not detect that a header already exists, e.g. if
it is after a package declaration.

* Apply Spotless

* Bump github/codeql-action from 2.1.28 to 2.3.1 (#1452)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.28 to 2.3.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@cc7986c...8662eab)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump github/codeql-action from 2.3.1 to 2.3.2 (#1455)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@8662eab...f3feb00)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add Log4j Transform documentation

Adds a documentation page that forwards the user to Github.

* Fix license header

* Fix typo in `SECURITY.md` (#1457)

* Bump logging-parent from 8 to 9

By bumping to logging-parent 9, we remove the explicit Spotless
configuration.

* Rebase with main

* Trying to rebase from main

* Provide LoggerContext properties during configuration

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Michael Ernst <mernst@cs.washington.edu>
Co-authored-by: Michael Ernst <mernst@alum.mit.edu>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org>
Co-authored-by: spotless[bot] <robots@logging.apache.org>
Co-authored-by: Michael Scovetta <michael.scovetta@gmail.com>
theit pushed a commit to theit/logging-log4j2 that referenced this pull request May 30, 2023
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants