Skip to content

Commit e9845d3

Browse files
cowtowncodercowtowncoder
committed
Fix #793: start the Big Jackson 3.0 Renaming
1 parent 0bb7a23 commit e9845d3

File tree

346 files changed

+1393
-1404
lines changed

Some content is hidden

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

346 files changed

+1393
-1404
lines changed

‎pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<version>3.0.0-SNAPSHOT</version>
1212
</parent>
1313

14-
<groupId>com.fasterxml.jackson.core</groupId>
14+
<groupId>tools.jackson.core</groupId>
1515
<artifactId>jackson-core</artifactId>
1616
<name>Jackson-core</name>
1717
<version>3.0.0-SNAPSHOT</version>
@@ -35,11 +35,11 @@
3535
</scm>
3636

3737
<properties>
38-
<osgi.export>com.fasterxml.jackson.core;version=${project.version},
39-
com.fasterxml.jackson.core.*;version=${project.version}
38+
<osgi.export>tools.jackson.core;version=${project.version},
39+
tools.jackson.core.*;version=${project.version}
4040
</osgi.export>
4141
<!-- Generate PackageVersion.java into this directory. -->
42-
<packageVersion.dir>com/fasterxml/jackson/core/json</packageVersion.dir>
42+
<packageVersion.dir>tools/jackson/core/json</packageVersion.dir>
4343
<packageVersion.package>${project.groupId}.json</packageVersion.package>
4444
</properties>
4545

@@ -91,7 +91,7 @@ com.fasterxml.jackson.core.*;version=${project.version}
9191
</excludes>
9292
<!-- 13-Apr-2018, tatu: for debugging [core#400]
9393
<systemPropertyVariables>
94-
<com.fasterxml.jackson.core.util.BufferRecyclers.trackReusableBuffers>true</com.fasterxml.jackson.core.util.BufferRecyclers.trackReusableBuffers>
94+
<tools.jackson.core.util.BufferRecyclers.trackReusableBuffers>true</tools.jackson.core.util.BufferRecyclers.trackReusableBuffers>
9595
</systemPropertyVariables>
9696
-->
9797
</configuration>

‎release-notes/VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ JSON library.
3636
#680: Allow use of `java.nio.file.Path` as parser source, generator target
3737
(contributed by Sven D)
3838
#689: Remove existing "request payload" functionality
39+
#793: Rename "com.fasterxml.jackson" -> "tools.jackson"
3940
- Rename `JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT` as `AUTO_CLOSE_CONTENT`
4041
- Add `TreeCodec.nullNode()`, `TreeNode.isNull()` methods
4142
- Change the way `JsonLocation.NA` is included in exception messages

‎src/main/java/com/fasterxml/jackson/core/exc/package-info.java

-5
This file was deleted.

‎src/main/java/com/fasterxml/jackson/core/Base64Variant.java renamed to ‎src/main/java/tools/jackson/core/Base64Variant.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
*
33
* Copyright (c) 2007- Tatu Saloranta, [email protected]
44
*/
5-
package com.fasterxml.jackson.core;
5+
package tools.jackson.core;
66

77
import java.util.Arrays;
88

9-
import com.fasterxml.jackson.core.util.ByteArrayBuilder;
10-
import com.fasterxml.jackson.core.util.Named;
9+
import tools.jackson.core.util.ByteArrayBuilder;
10+
import tools.jackson.core.util.Named;
1111

1212
/**
1313
* Class used to define specific details of which

‎src/main/java/com/fasterxml/jackson/core/Base64Variants.java renamed to ‎src/main/java/tools/jackson/core/Base64Variants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* Copyright (c) 2007- Tatu Saloranta, [email protected]
44
*/
5-
package com.fasterxml.jackson.core;
5+
package tools.jackson.core;
66

77
/**
88
* Container for commonly used Base64 variants:

‎src/main/java/com/fasterxml/jackson/core/FormatFeature.java renamed to ‎src/main/java/tools/jackson/core/FormatFeature.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.fasterxml.jackson.core;
1+
package tools.jackson.core;
22

3-
import com.fasterxml.jackson.core.util.JacksonFeature;
3+
import tools.jackson.core.util.JacksonFeature;
44

55
/**
66
* Marker interface that is to be implemented by data format - specific features.

‎src/main/java/com/fasterxml/jackson/core/FormatSchema.java renamed to ‎src/main/java/tools/jackson/core/FormatSchema.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2007- Tatu Saloranta, [email protected]
44
*/
55

6-
package com.fasterxml.jackson.core;
6+
package tools.jackson.core;
77

88
/**
99
* Simple tag interface used to mark schema objects that are used by some

‎src/main/java/com/fasterxml/jackson/core/JacksonException.java renamed to ‎src/main/java/tools/jackson/core/JacksonException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.core;
1+
package tools.jackson.core;
22

33
/**
44
* Base class for all Jackson-produced checked exceptions.

‎src/main/java/com/fasterxml/jackson/core/JsonEncoding.java renamed to ‎src/main/java/tools/jackson/core/JsonEncoding.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2007- Tatu Saloranta, [email protected]
44
*/
55

6-
package com.fasterxml.jackson.core;
6+
package tools.jackson.core;
77

88
/**
99
* Enumeration that defines legal encodings that can be used

‎src/main/java/com/fasterxml/jackson/core/JsonGenerator.java renamed to ‎src/main/java/tools/jackson/core/JsonGenerator.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
*
33
* Copyright (c) 2007- Tatu Saloranta, [email protected]
44
*/
5-
package com.fasterxml.jackson.core;
5+
package tools.jackson.core;
6+
7+
import static tools.jackson.core.JsonTokenId.*;
68

79
import java.io.Closeable;
810
import java.io.Flushable;
@@ -13,16 +15,14 @@
1315
import java.math.BigInteger;
1416
import java.util.Objects;
1517

16-
import com.fasterxml.jackson.core.JsonParser.NumberType;
17-
import com.fasterxml.jackson.core.exc.StreamReadException;
18-
import com.fasterxml.jackson.core.exc.StreamWriteException;
19-
import com.fasterxml.jackson.core.exc.WrappedIOException;
20-
import com.fasterxml.jackson.core.io.CharacterEscapes;
21-
import com.fasterxml.jackson.core.type.WritableTypeId;
22-
import com.fasterxml.jackson.core.type.WritableTypeId.Inclusion;
23-
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
24-
25-
import static com.fasterxml.jackson.core.JsonTokenId.*;
18+
import tools.jackson.core.JsonParser.NumberType;
19+
import tools.jackson.core.exc.StreamReadException;
20+
import tools.jackson.core.exc.StreamWriteException;
21+
import tools.jackson.core.exc.WrappedIOException;
22+
import tools.jackson.core.io.CharacterEscapes;
23+
import tools.jackson.core.type.WritableTypeId;
24+
import tools.jackson.core.type.WritableTypeId.Inclusion;
25+
import tools.jackson.core.util.JacksonFeatureSet;
2626

2727
/**
2828
* Base class that defines public API for writing JSON content.

‎src/main/java/com/fasterxml/jackson/core/JsonLocation.java renamed to ‎src/main/java/tools/jackson/core/JsonLocation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Copyright (c) 2007- Tatu Saloranta, [email protected]
44
*/
55

6-
package com.fasterxml.jackson.core;
6+
package tools.jackson.core;
77

8-
import com.fasterxml.jackson.core.io.ContentReference;
8+
import tools.jackson.core.io.ContentReference;
99

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

‎src/main/java/com/fasterxml/jackson/core/JsonParser.java renamed to ‎src/main/java/tools/jackson/core/JsonParser.java

+33-33
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
* Copyright (c) 2007- Tatu Saloranta, [email protected]
44
*/
55

6-
package com.fasterxml.jackson.core;
6+
package tools.jackson.core;
77

88
import java.io.*;
99
import java.math.BigDecimal;
1010
import java.math.BigInteger;
1111

12-
import com.fasterxml.jackson.core.async.NonBlockingInputFeeder;
13-
import com.fasterxml.jackson.core.exc.InputCoercionException;
14-
import com.fasterxml.jackson.core.exc.StreamReadException;
15-
import com.fasterxml.jackson.core.exc.WrappedIOException;
16-
import com.fasterxml.jackson.core.json.JsonFactory;
17-
import com.fasterxml.jackson.core.sym.PropertyNameMatcher;
18-
import com.fasterxml.jackson.core.type.ResolvedType;
19-
import com.fasterxml.jackson.core.type.TypeReference;
20-
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
12+
import tools.jackson.core.async.NonBlockingInputFeeder;
13+
import tools.jackson.core.exc.InputCoercionException;
14+
import tools.jackson.core.exc.StreamReadException;
15+
import tools.jackson.core.exc.WrappedIOException;
16+
import tools.jackson.core.json.JsonFactory;
17+
import tools.jackson.core.sym.PropertyNameMatcher;
18+
import tools.jackson.core.type.ResolvedType;
19+
import tools.jackson.core.type.TypeReference;
20+
import tools.jackson.core.util.JacksonFeatureSet;
2121

2222
/**
2323
* Base class that defines public API for reading JSON content.
@@ -245,7 +245,7 @@ public JacksonFeatureSet<StreamReadCapability> streamReadCapabilities() {
245245
* {@link StreamReadFeature#AUTO_CLOSE_SOURCE} is enabled.
246246
* Whether parser owns the input source depends on factory
247247
* method that was used to construct instance (so check
248-
* {@link com.fasterxml.jackson.core.json.JsonFactory} for details,
248+
* {@link tools.jackson.core.json.JsonFactory} for details,
249249
* but the general
250250
* idea is that if caller passes in closable resource (such
251251
* as {@link InputStream} or {@link Reader}) parser does NOT
@@ -367,7 +367,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
367367
* to indicate end-of-input
368368
*
369369
* @throws JacksonException for low-level read issues
370-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
370+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
371371
*/
372372
public abstract JsonToken nextToken() throws JacksonException;
373373

@@ -390,7 +390,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
390390
*
391391
*
392392
* @throws JacksonException for low-level read issues
393-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
393+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
394394
*/
395395
public abstract JsonToken nextValue() throws JacksonException;
396396

@@ -411,7 +411,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
411411
* @return This parser, to allow call chaining
412412
*
413413
* @throws JacksonException for low-level read issues
414-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
414+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
415415
*/
416416
public abstract JsonParser skipChildren() throws JacksonException;
417417

@@ -428,7 +428,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
428428
* overridden by sub-classes.
429429
*
430430
* @throws JacksonException for low-level read issues
431-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
431+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
432432
*/
433433
public abstract void finishToken() throws JacksonException;
434434

@@ -449,7 +449,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
449449
* {@code null} if next token is of some other type
450450
*
451451
* @throws JacksonException for low-level read issues
452-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
452+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
453453
*/
454454
public abstract String nextName() throws JacksonException;
455455

@@ -473,7 +473,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
473473
* specified name; {@code false} otherwise (different token or non-matching name)
474474
*
475475
* @throws JacksonException for low-level read issues
476-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
476+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
477477
*/
478478
public abstract boolean nextName(SerializableString str) throws JacksonException;
479479

@@ -489,7 +489,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
489489
* code otherwise (see {@link PropertyNameMatcher} for details)
490490
*
491491
* @throws WrappedIOException for low-level read issues
492-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
492+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
493493
*
494494
* @since 3.0
495495
*/
@@ -532,7 +532,7 @@ public int releaseBuffered(OutputStream out) throws JacksonException {
532532
* to; or {@code null} if next token is of some other type
533533
*
534534
* @throws WrappedIOException for low-level read issues
535-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
535+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
536536
*/
537537
public String nextTextValue() throws JacksonException {
538538
return (nextToken() == JsonToken.VALUE_STRING) ? getText() : null;
@@ -557,8 +557,8 @@ public String nextTextValue() throws JacksonException {
557557
* to; or {@code defaultValue} if next token is of some other type
558558
*
559559
* @throws JacksonException for low-level read issues
560-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
561-
* @throws com.fasterxml.jackson.core.exc.InputCoercionException if integer number does not fit in Java {@code int}
560+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
561+
* @throws tools.jackson.core.exc.InputCoercionException if integer number does not fit in Java {@code int}
562562
*/
563563
public int nextIntValue(int defaultValue) throws JacksonException {
564564
return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getIntValue() : defaultValue;
@@ -583,8 +583,8 @@ public int nextIntValue(int defaultValue) throws JacksonException {
583583
* to; or {@code defaultValue} if next token is of some other type
584584
*
585585
* @throws WrappedIOException for low-level read issues
586-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
587-
* @throws com.fasterxml.jackson.core.exc.InputCoercionException if integer number does not fit in Java {@code long}
586+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
587+
* @throws tools.jackson.core.exc.InputCoercionException if integer number does not fit in Java {@code long}
588588
*/
589589
public long nextLongValue(long defaultValue) throws JacksonException {
590590
return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getLongValue() : defaultValue;
@@ -608,7 +608,7 @@ public long nextLongValue(long defaultValue) throws JacksonException {
608608
* token parser advanced to; or {@code null} if next token is of some other type
609609
*
610610
* @throws WrappedIOException for low-level read issues
611-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
611+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
612612
*/
613613
public Boolean nextBooleanValue() throws JacksonException {
614614
JsonToken t = nextToken();
@@ -812,7 +812,7 @@ public Boolean nextBooleanValue() throws JacksonException {
812812
* by {@link #nextToken()} or other iteration methods)
813813
*
814814
* @throws WrappedIOException for low-level read issues
815-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
815+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
816816
*/
817817
public abstract String getText() throws JacksonException;
818818

@@ -832,7 +832,7 @@ public Boolean nextBooleanValue() throws JacksonException {
832832
* @return The number of characters written to the Writer
833833
*
834834
* @throws WrappedIOException for low-level read issues, or failed write using {@link Writer}
835-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
835+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
836836
*/
837837
public abstract int getText(Writer writer) throws JacksonException;
838838

@@ -865,7 +865,7 @@ public Boolean nextBooleanValue() throws JacksonException {
865865
* at offset 0, and not necessarily until the end of buffer)
866866
*
867867
* @throws WrappedIOException for low-level read issues
868-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
868+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
869869
*/
870870
public abstract char[] getTextCharacters() throws JacksonException;
871871

@@ -878,7 +878,7 @@ public Boolean nextBooleanValue() throws JacksonException {
878878
* textual content of the current token.
879879
*
880880
* @throws WrappedIOException for low-level read issues
881-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
881+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
882882
*/
883883
public abstract int getTextLength() throws JacksonException;
884884

@@ -891,7 +891,7 @@ public Boolean nextBooleanValue() throws JacksonException {
891891
* textual content of the current token.
892892
*
893893
* @throws WrappedIOException for low-level read issues
894-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
894+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
895895
*/
896896
public abstract int getTextOffset() throws JacksonException;
897897

@@ -1188,7 +1188,7 @@ public Boolean nextBooleanValue() throws JacksonException {
11881188
* @return Decoded binary data
11891189
*
11901190
* @throws WrappedIOException for low-level read issues
1191-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
1191+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
11921192
*/
11931193
public abstract byte[] getBinaryValue(Base64Variant bv) throws JacksonException;
11941194

@@ -1200,7 +1200,7 @@ public Boolean nextBooleanValue() throws JacksonException {
12001200
* @return Decoded binary data
12011201
*
12021202
* @throws WrappedIOException for low-level read issues
1203-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
1203+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
12041204
*/
12051205
public byte[] getBinaryValue() throws JacksonException {
12061206
return getBinaryValue(Base64Variants.getDefaultVariant());
@@ -1219,7 +1219,7 @@ public byte[] getBinaryValue() throws JacksonException {
12191219
* @return Number of bytes that were decoded and written via {@link OutputStream}
12201220
*
12211221
* @throws WrappedIOException for low-level read issues
1222-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
1222+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
12231223
*/
12241224
public int readBinaryValue(OutputStream out) throws JacksonException {
12251225
return readBinaryValue(Base64Variants.getDefaultVariant(), out);
@@ -1235,7 +1235,7 @@ public int readBinaryValue(OutputStream out) throws JacksonException {
12351235
* @return Number of bytes that were decoded and written via {@link OutputStream}
12361236
*
12371237
* @throws WrappedIOException for low-level read issues
1238-
* @throws com.fasterxml.jackson.core.exc.StreamReadException for decoding problems
1238+
* @throws tools.jackson.core.exc.StreamReadException for decoding problems
12391239
*/
12401240
public int readBinaryValue(Base64Variant bv, OutputStream out) throws JacksonException {
12411241
_reportUnsupportedOperation();

‎src/main/java/com/fasterxml/jackson/core/JsonPointer.java renamed to ‎src/main/java/tools/jackson/core/JsonPointer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package com.fasterxml.jackson.core;
1+
package tools.jackson.core;
22

3-
import com.fasterxml.jackson.core.io.NumberInput;
43
import java.io.Externalizable;
54
import java.io.IOException;
65
import java.io.ObjectInput;
76
import java.io.ObjectOutput;
87
import java.io.ObjectStreamException;
98
import java.io.Serializable;
109

10+
import tools.jackson.core.io.NumberInput;
11+
1112
/**
1213
* Implementation of
1314
* <a href="http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-03">JSON Pointer</a>

0 commit comments

Comments
 (0)