Compare `d63cef0 ... +249 ... 4d8a310`

 * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
 */

package com.fasterxml.jackson.core;
package tools.jackson.core;

import com.fasterxml.jackson.core.io.ContentReference;
import tools.jackson.core.io.ContentReference;

/**
 * Object that encapsulates Location information used for reporting

@@ -22,22 +22,15 @@

{
    private static final long serialVersionUID = 2L; // in 2.13

    /**
     * @deprecated Since 2.13 use {@link ContentReference#DEFAULT_MAX_CONTENT_SNIPPET} instead
     */
    @Deprecated
    public static final int MAX_CONTENT_SNIPPET = 500;

    /**
     * Shared immutable "N/A location" that can be returned to indicate
     * that no location information is available.
     *<p>
     * NOTE: before 2.9, Location was given as String "N/A"; with 2.9 it was
     * removed so that source should be indicated as "UNKNOWN".
     */
    public final static JsonLocation NA = new JsonLocation(ContentReference.unknown(),
            -1L, -1L, -1, -1);

    private final static String NO_LOCATION_DESC = "[No location information]";

    protected final long _totalBytes;
    protected final long _totalChars;


@@ -47,8 +40,6 @@

    /**
     * Reference to input source; never null (but may be that of
     * {@link ContentReference#unknown()}).
     *
     * @since 2.13 (before we have {@code _sourceRef} (Object-valued)
     */
    protected final ContentReference _contentReference;


@@ -86,24 +77,6 @@

        _columnNr = columnNr;
    }

    @Deprecated // since 2.13
    public JsonLocation(Object srcRef, long totalChars, int lineNr, int columnNr) {
        this(_wrap(srcRef), totalChars, lineNr, columnNr);
    }

    @Deprecated // since 2.13
    public JsonLocation(Object srcRef, long totalBytes, long totalChars,
            int lineNr, int columnNr) {
        this(_wrap(srcRef), totalBytes, totalChars, lineNr, columnNr);
    }

    protected static ContentReference _wrap(Object srcRef) {
        if (srcRef instanceof ContentReference) {
            return (ContentReference) srcRef;
        }
        return ContentReference.construct(false, srcRef);
    }

    /*
    /**********************************************************************
    /* Simple accessors

@@ -115,34 +88,15 @@

     * read from. Returned reference is never {@code null} but may not contain
     * useful information.
     *<p>
     * NOTE: not getter, on purpose, to avoid inlusion if serialized using
     * NOTE: not getter, on purpose, to avoid inclusion if serialized using
     * default Jackson serializer.
     *
     * @return Object with information about input source.
     *
     * @since 2.13 (to replace {@code getSourceRef})
     */
    public ContentReference contentReference() {
        return _contentReference;
    }

    /**
     * Reference to the original resource being read, if one available.
     * For example, when a parser has been constructed by passing
     * a {@link java.io.File} instance, this method would return
     * that File. Will return null if no such reference is available,
     * for example when {@link java.io.InputStream} was used to
     * construct the parser instance.
     *
     * @return Source reference this location was constructed with, if any; {@code null} if none
     *
     * @deprecated Since 2.13 Use {@link #contentReference} instead
     */
    @Deprecated
    public Object getSourceRef() {
        return _contentReference.getRawContent();
    }

    /**
     * Access for getting line number of this location, if available.
     * Note that line number is typically not available for binary formats.

@@ -173,17 +127,15 @@


    /**
     * Accessor for getting a textual description of source reference
     * (Object returned by {@link #getSourceRef()}), as included in
     * (Object returned by {@link #contentReference()}), as included in
     * description returned by {@link #toString()}.
     *<p>
     * Note: implementation will simply call
     * {@link ContentReference#buildSourceDescription()})
     *<p>
     * NOTE: not added as a "getter" to prevent it from getting serialized.
     *
     * @return Description of the source reference (see {@link #getSourceRef()}
     *
     * @since 2.9
     * @return Description of the source reference (see {@link #contentReference()}
     */
    public String sourceDescription() {
        // 04-Apr-2021, tatu: Construct lazily but retain

@@ -199,8 +151,6 @@

     *
     * @return Description of available relevant location offsets; combination of
     *    line number and column position or byte offset
     *
     * @since 2.13
     */
    public String offsetDescription() {
        return appendOffsetDescription(new StringBuilder(40)).toString();

@@ -228,24 +178,15 @@

                sb.append("UNKNOWN");
            }
        } else {
            // 04-Apr-2021, tatu: Ideally byte formats would not need line/column
            //    info, but for backwards-compatibility purposes (Jackson 2.x),
            //    will leave logic here
            if (_lineNr > 0) { // yes, require 1-based in case of allegedly binary content
                sb.append("line: ").append(_lineNr);
                if (_columnNr > 0) {
                    sb.append(", column: ");
                    sb.append(_columnNr);
                }
            // 04-Apr-2021, tatu: Jackson 2.x had compatibility checks here; 3.x
            //    assumes binary content always implies byte offsets
            sb.append("byte offset: #");
            // For binary formats, total bytes should be the canonical offset
            // for token/current location
            if (_totalBytes >= 0) {
                sb.append(_totalBytes);
            } else {
                sb.append("byte offset: #");
                // For binary formats, total bytes should be the canonical offset
                // for token/current location
                if (_totalBytes >= 0) {
                    sb.append(_totalBytes);
                } else {
                    sb.append("UNKNOWN");
                }
                sb.append("UNKNOWN");
            }
        }
        return sb;

@@ -292,6 +233,9 @@

    @Override
    public String toString()
    {
        if (this == NA) {
            return NO_LOCATION_DESC;
        }
        final String srcDesc = sourceDescription();
        StringBuilder sb = new StringBuilder(40 + srcDesc.length())
                .append("[Source: ")

@@ -301,4 +245,16 @@

301	245		.append(']')
302	246		.toString();
303	247		}
	248	+
	249	+	public StringBuilder toString(StringBuilder sb)
	250	+	{
	251	+	if (this == NA) {
	252	+	return sb.append(NO_LOCATION_DESC);
	253	+	}
	254	+	sb.append("[Source: ")
	255	+	.append(sourceDescription())
	256	+	.append("; ");
	257	+	return appendOffsetDescription(sb)
	258	+	.append(']');
	259	+	}
304	260		}

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Learn more Showing 86 files with coverage changes found.

Changes in src/main/java/tools/jackson/core/json/async/NonBlockingByteBufferJsonParser.java

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/async/NonBlockingByteArrayJsonParser.java

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/JsonReadContext.java

-3

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/WriterBasedJsonGenerator.java

→

+19

+51

Loading file...

Changes in src/main/java/tools/jackson/core/JsonLocation.java

-2

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/UTF8StreamJsonParser.java

→

+73

+17

+84

Loading file...

Changes in src/main/java/tools/jackson/core/io/NumberInput.java

-5

→

Loading file...

Changes in src/main/java/tools/jackson/core/Version.java

-1

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/MergedStream.java

-1

→

Loading file...

Changes in src/main/java/tools/jackson/core/filter/FilteringParserDelegate.java

-19

-1

-5

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/UTF8DataInputJsonParser.java

-9

-3

→

+15

Loading file...

Changes in src/main/java/tools/jackson/core/json/ReaderBasedJsonParser.java

-8

-2

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/UTF8JsonGenerator.java

-1

→

+13

+14

Loading file...

Changes in src/main/java/tools/jackson/core/io/UTF32Reader.java

→

Loading file...

Changes in src/main/java/tools/jackson/core/base/ParserBase.java

-2

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/async/NonBlockingJsonParserBase.java

-5

-2

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/async/NonBlockingUtf8JsonParserBase.java

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/NumberOutput.java

-11

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/schubfach/FloatToDecimal.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/util/BufferRecycler.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/io/OutputDecorator.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/sym/CharsToNameCanonicalizer.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/io/InputDecorator.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/io/BigIntegerParser.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/util/DefaultIndenter.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/util/MinimalPrettyPrinter.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/filter/TokenFilter.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/io/DataOutputAsStream.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/io/SerializedString.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/io/schubfach/DoubleToDecimal.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/util/JsonpCharacterEscapes.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/json/DupDetector.java

New

Loading file...

New file src/main/java/tools/jackson/core/json/JsonParserBase.java

New

Loading file...

New file src/main/java/tools/jackson/core/JsonParser.java

New

Loading file...

New file src/main/java/tools/jackson/core/util/Separators.java

New

Loading file...

New file src/main/java/tools/jackson/core/json/JsonGeneratorBase.java

New

Loading file...

New file src/main/java/tools/jackson/core/ObjectWriteContext.java

New

Loading file...

New file src/main/java/tools/jackson/core/exc/WrappedIOException.java

New

Loading file...

New file src/main/java/tools/jackson/core/util/JsonParserDelegate.java

New

Loading file...

New file src/main/java/tools/jackson/core/TokenStreamFactory.java

New

Loading file...

New file src/main/java/tools/jackson/core/util/SimpleStreamWriteContext.java

New

Loading file...

New file src/main/java/tools/jackson/core/base/DecorableTSFactory.java

New

Loading file...

New file src/main/java/tools/jackson/core/JacksonException.java

New

Loading file...

New file src/main/java/tools/jackson/core/JsonGenerator.java

New

Loading file...

New file src/main/java/tools/jackson/core/sym/BinaryNameMatcher.java

New

Loading file...

New file src/main/java/tools/jackson/core/base/TextualTSFactory.java

New

Loading file...

New file src/main/java/tools/jackson/core/util/SimpleStreamReadContext.java

New

Loading file...

New file src/main/java/tools/jackson/core/exc/UnexpectedEndOfInputException.java

New

Loading file...

New file src/main/java/tools/jackson/core/sym/HashedMatcherBase.java

New

Loading file...

New file src/main/java/tools/jackson/core/TSFBuilder.java

New

Loading file...

New file src/main/java/tools/jackson/core/exc/StreamReadException.java

New

Loading file...

New file src/main/java/tools/jackson/core/base/BinaryTSFactory.java

New

Loading file...

New file src/main/java/tools/jackson/core/sym/PropertyNameMatcher.java

New

Loading file...

New file src/main/java/tools/jackson/core/ObjectReadContext.java

New

Loading file...

New file src/main/java/tools/jackson/core/util/Named.java

New

Loading file...

New file src/main/java/tools/jackson/core/sym/SimpleNameMatcher.java

New

Loading file...

New file src/main/java/tools/jackson/core/util/JsonGeneratorDelegate.java

New

Loading file...

New file src/main/java/tools/jackson/core/util/Snapshottable.java

New

Loading file...

New file src/main/java/tools/jackson/core/base/GeneratorBase.java

New

Loading file...

New file src/main/java/tools/jackson/core/exc/StreamWriteException.java

New

Loading file...

New file src/main/java/tools/jackson/core/json/JsonFactory.java

New

Loading file...

New file src/main/java/tools/jackson/core/base/ParserMinimalBase.java

New

Loading file...

Changes in src/main/java/tools/jackson/core/util/DefaultPrettyPrinter.java

→

Loading file...

Changes in src/main/java/tools/jackson/core/filter/TokenFilterContext.java

→

Loading file...

Changes in src/main/java/tools/jackson/core/sym/ByteQuadsCanonicalizer.java

-1

-2

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/BigDecimalParser.java

-1

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/JsonWriteContext.java

-23

-4

→

Loading file...

Changes in src/main/java/tools/jackson/core/util/TextBuffer.java

-6

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/ContentReference.java

-1

→

Loading file...

Changes in src/main/java/tools/jackson/core/filter/FilteringGeneratorDelegate.java

-4

-5

-13

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/CharTypes.java

-1

-2

→

Loading file...

Changes in src/main/java/tools/jackson/core/Base64Variant.java

-4

-2

→

Loading file...

Changes in src/main/java/tools/jackson/core/util/JsonParserSequence.java

→

Loading file...

Changes in src/main/java/tools/jackson/core/StreamReadConstraints.java

-1

→

Loading file...

Changes in src/main/java/tools/jackson/core/util/VersionUtil.java

-12

-1

-4

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/JsonStringEncoder.java

-58

-9

-43

→

Loading file...

Changes in src/main/java/tools/jackson/core/io/IOContext.java

-1

-7

→

Loading file...

Changes in src/main/java/tools/jackson/core/util/ByteArrayBuilder.java

-1

-10

→

+10

Loading file...

Changes in src/main/java/tools/jackson/core/json/JsonFactoryBuilder.java

-1

-5

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/ByteSourceJsonBootstrapper.java

-11

-15

-28

→

Loading file...

Changes in src/main/java/tools/jackson/core/util/BufferRecyclers.java

-6

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/JsonReadFeature.java

-7

→

Loading file...

Changes in src/main/java/tools/jackson/core/StreamWriteFeature.java

-6

→

Loading file...

Changes in src/main/java/tools/jackson/core/StreamReadFeature.java

-6

→

Loading file...

Changes in src/main/java/tools/jackson/core/type/ResolvedType.java

-1

→

Loading file...

Changes in src/main/java/tools/jackson/core/json/JsonWriteFeature.java

-8

→

Loading file...

72.58% ø +0.58% 66.93% +1.79%

Merge branch '2.15'

cowtowncoder

4d8a310

CI Passed

Hiding 1 contexual commits

-1

72.58% ø -0.01% 66.90% -0.03%

Merge branch '2.15'

tatu-at-datastax

2560cbd

CI Passed

-1

72.59% ø +0.01% 66.93% +0.03%

Uhh. Fix return type of `getNumberValueDeferred()` impl

cowtowncoder

7ac9009

CI Passed

Hiding 1 contexual commits

-1

72.58% 70.83% -0.01% 66.90% -0.01%

Merge branch '2.15'

cowtowncoder

bf0134e

CI Passed

+24

+16

72.59% 100.00% -0.01% 66.91% -0.03%

4e075e3

-1

677bc11

72.60% 32.79% +0.48% 66.93% +1.67%

Merge branch '2.15'

cowtowncoder

0a794b1

CI Passed

Hiding 3 contexual commits

+38

+27

72.73% 100.00% +0.61% 67.00% +1.73%

Merge branch '2.15'

cowtowncoder

a57d53a

CI Passed

-1

-3

-1

72.74% 33.33% -0.01% 67.05% ø

Merge branch '2.15'

cowtowncoder

4d74c26

CI Passed

-1

72.75% ø +0.63% 67.05% +1.79%

Manual merge of pom changes in #889 into 3.0

cowtowncoder

abd9d25

CI Passed

Hiding 1 contexual commits

-3

72.73% 100.00% +0.03% 67.01% +0.05%

Merge branch '2.15'

cowtowncoder

e7ba1fc

CI Passed

-3

-1

72.71% 90.00% +0.63% 66.96% +1.78%

Merge branch '2.15'

cowtowncoder

02e7405

CI Passed

Hiding 1 contexual commits

+10

-2

72.69% ø +0.60% 66.94% +1.74%

Merge branch '2.15'

cowtowncoder

7bfc36a

CI Passed

Hiding 2 contexual commits

-2

72.70% ø ø 66.97% ø

Merge branch '2.15'

cowtowncoder

1531fac

Hiding 1 contexual commits

-3

72.71% ø ø 66.99% ø

Unable to find commit in GitHub

Unknown

b036827

Hiding 3 contexual commits

-1

-3

72.69% 95.83% +0.62% 66.95% +1.77%

Merge branch '2.15'

cowtowncoder

744e6ab

CI Passed

72.69% ø ø 66.95% ø

Unable to find commit in GitHub

Unknown

836b2be

Hiding 1 contexual commits

-5

72.68% 78.57% +0.05% 66.95% +0.07%

Merge branch '2.15'

cowtowncoder

a311484

CI Passed

-9

-1

-11

72.62% ø +0.56% 66.88% +1.69%

Merge branch '2.15'

cowtowncoder

deac1d4

CI Passed

-1

72.62% ø ø 66.88% ø

Unable to find commit in GitHub

Unknown

b935a50

Hiding 1 contexual commits

-5

72.59% 100.00% +0.56% 66.83% +1.73%

Merge branch '2.15'

cowtowncoder

d411884

CI Passed

72.60% 100.00% -0.01% 66.83% -0.04%

Remove use of deprecated methods

cowtowncoder

2cd2fe5

CI Passed

-1

72.61% 100.00% +0.01% 66.87% ø

Add one missing constraints check

cowtowncoder

1058ad5

CI Passed

-1

72.60% 100.00% +0.56% 66.87% +1.75%

Merge branch '2.15'

cowtowncoder

0403bff

CI Passed

+11

-8

72.55% ø ø 66.83% ø

Merge branch '2.15'

cowtowncoder

1541687

-2

72.56% 100.00% -0.03% 66.84% -0.07%

Minor sync of BigDecimal parsing from 2.x (defer decoding)

cowtowncoder

2b08659

CI Passed

Hiding 1 contexual commits

-5

-3

72.60% ø +0.55% 66.91% +1.77%

Merge branch '2.15'

cowtowncoder

ebb2264

CI Passed

-3

-1

72.57% 0.00% +<.01% 66.87% -0.01%

Warnings cleanup

cowtowncoder

f1e3809

CI Passed

-1

72.57% 0.00% ø 66.88% +0.03%

...

cowtowncoder

5cdd529

CI Passed

72.57% 0.00% -<.01% 66.85% -0.03%

Add streamReadConstraints() to ObjectReadContext

cowtowncoder

a0c84d6

CI Passed

72.57% 50.00% +0.01% 66.88% +0.03%

Add `streamReadConstraints()` impl in `ParserMinimalBase`

cowtowncoder

5a51a46

CI Passed

Hiding 1 contexual commits

-1

72.57% 0.00% -0.03% 66.85% -0.07%

...

cowtowncoder

685b057

CI Passed

-5

72.60% 29.41% -<.01% 66.92% +0.05%

Refactoring wrt streamReadConstraints()

cowtowncoder

54dea3e

CI Passed

Hiding 1 contexual commits

-3

72.60% 100.00% +0.02% 66.87% +0.02%

Merge branch '2.15'

cowtowncoder

966f106

CI Passed

-1

-4

72.58% 66.67% +0.70% 66.85% +1.85%

Merge branch '2.15'

cowtowncoder

90fc806

CI Passed

72.58% 40.48% +0.73% 66.85% +1.87%

Merge branch '2.15'

cowtowncoder

5f1b31a

CI Passed

Hiding 1 contexual commits

+1 Files

+34

+10

+19

72.67% ø ø 66.94% ø

Unable to find commit in GitHub

Unknown

f668a63

-20

-9

-2

-9

72.64% 37.50% -0.06% 66.93% -0.01%

Merge branch '2.15'

cowtowncoder

035d8d0

CI Passed

+14

-1

+15

72.70% ø ø 66.94% -0.03%

Manual merge of pom.xml changes

cowtowncoder

154b204

CI Passed

Hiding 2 contexual commits

72.70% ø -0.01% 66.97% +0.01%

Merge branch '2.15'

cowtowncoder

f45221b

CI Passed

-1

72.71% ø +2.82% 66.96% +3.42%

Merge branch '2.15'

cowtowncoder

2999c93

CI Passed

-22 Files

-1735

-855

-94

-786

173	127
174	128		/**
175	129		* Accessor for getting a textual description of source reference
176		-	* (Object returned by {@link #getSourceRef()}), as included in
	130	+	* (Object returned by {@link #contentReference()}), as included in
177	131		* description returned by {@link #toString()}.
178	132		*<p>
179	133		* Note: implementation will simply call
180	134		* {@link ContentReference#buildSourceDescription()})
181	135		*<p>
182	136		* NOTE: not added as a "getter" to prevent it from getting serialized.
183	137		*
184		-	* @return Description of the source reference (see {@link #getSourceRef()}
185		-	*
186		-	* @since 2.9
	138	+	* @return Description of the source reference (see {@link #contentReference()}
187	139		*/
188	140		public String sourceDescription() {
189	141		// 04-Apr-2021, tatu: Construct lazily but retain

292	233		@Override
293	234		public String toString()
294	235		{
	236	+	if (this == NA) {
	237	+	return NO_LOCATION_DESC;
	238	+	}
295	239		final String srcDesc = sourceDescription();
296	240		StringBuilder sb = new StringBuilder(40 + srcDesc.length())
297	241		.append("[Source: ")

Compare `d63cef0 ... +249 ... 4d8a310`

Flags

Show failed CI and contexual commits `c`

251 Commits

3	3		* Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
4	4		*/
5	5
6		-	package com.fasterxml.jackson.core;
	6	+	package tools.jackson.core;
7	7
8		-	import com.fasterxml.jackson.core.io.ContentReference;
	8	+	import tools.jackson.core.io.ContentReference;
9	9
10	10		/**
11	11		* Object that encapsulates Location information used for reporting

22	22		{
23	23		private static final long serialVersionUID = 2L; // in 2.13
24	24
25		-	/**
26		-	* @deprecated Since 2.13 use {@link ContentReference#DEFAULT_MAX_CONTENT_SNIPPET} instead
27		-	*/
28		-	@Deprecated
29		-	public static final int MAX_CONTENT_SNIPPET = 500;
30		-
31	25		/**
32	26		* Shared immutable "N/A location" that can be returned to indicate
33	27		* that no location information is available.
34		-	*<p>
35		-	* NOTE: before 2.9, Location was given as String "N/A"; with 2.9 it was
36		-	* removed so that source should be indicated as "UNKNOWN".
37	28		*/
38	29		public final static JsonLocation NA = new JsonLocation(ContentReference.unknown(),
39	30		-1L, -1L, -1, -1);
40	31
	32	+	private final static String NO_LOCATION_DESC = "[No location information]";
	33	+
41	34		protected final long _totalBytes;
42	35		protected final long _totalChars;
43	36

47	40		/**
48	41		* Reference to input source; never null (but may be that of
49	42		* {@link ContentReference#unknown()}).
50		-	*
51		-	* @since 2.13 (before we have {@code _sourceRef} (Object-valued)
52	43		*/
53	44		protected final ContentReference _contentReference;
54	45

86	77		_columnNr = columnNr;
87	78		}
88	79
89		-	@Deprecated // since 2.13
90		-	public JsonLocation(Object srcRef, long totalChars, int lineNr, int columnNr) {
91		-	this(_wrap(srcRef), totalChars, lineNr, columnNr);
92		-	}
93		-
94		-	@Deprecated // since 2.13
95		-	public JsonLocation(Object srcRef, long totalBytes, long totalChars,
96		-	int lineNr, int columnNr) {
97		-	this(_wrap(srcRef), totalBytes, totalChars, lineNr, columnNr);
98		-	}
99		-
100		-	protected static ContentReference _wrap(Object srcRef) {
101		-	if (srcRef instanceof ContentReference) {
102		-	return (ContentReference) srcRef;
103		-	}
104		-	return ContentReference.construct(false, srcRef);
105		-	}
106		-
107	80		/*
108	81		/**********************************************************************
109	82		/* Simple accessors

115	88		* read from. Returned reference is never {@code null} but may not contain
116	89		* useful information.
117	90		*<p>
118		-	* NOTE: not getter, on purpose, to avoid inlusion if serialized using
	91	+	* NOTE: not getter, on purpose, to avoid inclusion if serialized using
119	92		* default Jackson serializer.
120	93		*
121	94		* @return Object with information about input source.
122		-	*
123		-	* @since 2.13 (to replace {@code getSourceRef})
124	95		*/
125	96		public ContentReference contentReference() {
126	97		return _contentReference;
127	98		}
128	99
129		-	/**
130		-	* Reference to the original resource being read, if one available.
131		-	* For example, when a parser has been constructed by passing
132		-	* a {@link java.io.File} instance, this method would return
133		-	* that File. Will return null if no such reference is available,
134		-	* for example when {@link java.io.InputStream} was used to
135		-	* construct the parser instance.
136		-	*
137		-	* @return Source reference this location was constructed with, if any; {@code null} if none
138		-	*
139		-	* @deprecated Since 2.13 Use {@link #contentReference} instead
140		-	*/
141		-	@Deprecated
142		-	public Object getSourceRef() {
143		-	return _contentReference.getRawContent();
144		-	}
145		-
146	100		/**
147	101		* Access for getting line number of this location, if available.
148	102		* Note that line number is typically not available for binary formats.

199	151		*
200	152		* @return Description of available relevant location offsets; combination of
201	153		* line number and column position or byte offset
202		-	*
203		-	* @since 2.13
204	154		*/
205	155		public String offsetDescription() {
206	156		return appendOffsetDescription(new StringBuilder(40)).toString();

228	178		sb.append("UNKNOWN");
229	179		}
230	180		} else {
231		-	// 04-Apr-2021, tatu: Ideally byte formats would not need line/column
232		-	// info, but for backwards-compatibility purposes (Jackson 2.x),
233		-	// will leave logic here
234		-	if (_lineNr > 0) { // yes, require 1-based in case of allegedly binary content
235		-	sb.append("line: ").append(_lineNr);
236		-	if (_columnNr > 0) {
237		-	sb.append(", column: ");
238		-	sb.append(_columnNr);
239		-	}
	181	+	// 04-Apr-2021, tatu: Jackson 2.x had compatibility checks here; 3.x
	182	+	// assumes binary content always implies byte offsets
	183	+	sb.append("byte offset: #");
	184	+	// For binary formats, total bytes should be the canonical offset
	185	+	// for token/current location
	186	+	if (_totalBytes >= 0) {
	187	+	sb.append(_totalBytes);
240	188		} else {
241		-	sb.append("byte offset: #");
242		-	// For binary formats, total bytes should be the canonical offset
243		-	// for token/current location
244		-	if (_totalBytes >= 0) {
245		-	sb.append(_totalBytes);
246		-	} else {
247		-	sb.append("UNKNOWN");
248		-	}
	189	+	sb.append("UNKNOWN");
249	190		}
250	191		}
251	192		return sb;

Compare d63cef0 ... +249 ... 4d8a310

Flags

Show failed CI and contexual commits c 251 Commits

Compare `d63cef0 ... +249 ... 4d8a310`

Show failed CI and contexual commits `c`

251 Commits