Skip to content

Commit 485ef8b

Browse files
cowtowncodercowtowncoder
authored
Fix #322: rename "com.fasterxml.jackson.dataformat" -> "tools.jackson.dataformat" (#333)
1 parent 045193f commit 485ef8b

File tree

498 files changed

+2277
-2288
lines changed

Some content is hidden

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

498 files changed

+2277
-2288
lines changed

‎avro/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- do_not_remove: published-with-gradle-metadata -->
88
<modelVersion>4.0.0</modelVersion>
99
<parent>
10-
<groupId>com.fasterxml.jackson.dataformat</groupId>
10+
<groupId>tools.jackson.dataformat</groupId>
1111
<artifactId>jackson-dataformats-binary</artifactId>
1212
<version>3.0.0-SNAPSHOT</version>
1313
</parent>
@@ -21,7 +21,7 @@ abstractions.
2121

2222
<properties>
2323
<!-- Generate PackageVersion.java into this directory. -->
24-
<packageVersion.dir>com/fasterxml/jackson/dataformat/avro</packageVersion.dir>
24+
<packageVersion.dir>tools/jackson/dataformat/avro</packageVersion.dir>
2525
<packageVersion.package>${project.groupId}.avro</packageVersion.package>
2626
</properties>
2727

@@ -33,7 +33,7 @@ abstractions.
3333
</dependency>
3434
<!-- and databind for Avro Schema generation... -->
3535
<dependency>
36-
<groupId>com.fasterxml.jackson.core</groupId>
36+
<groupId>tools.jackson.core</groupId>
3737
<artifactId>jackson-databind</artifactId>
3838
</dependency>
3939
<dependency>

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroAnnotationIntrospector.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroAnnotationIntrospector.java

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

33
import java.util.ArrayList;
44
import java.util.Collections;
@@ -7,21 +7,21 @@
77
import org.apache.avro.reflect.*;
88

99
import com.fasterxml.jackson.annotation.JsonCreator;
10-
import com.fasterxml.jackson.core.Version;
11-
12-
import com.fasterxml.jackson.databind.AnnotationIntrospector;
13-
import com.fasterxml.jackson.databind.PropertyName;
14-
import com.fasterxml.jackson.databind.cfg.MapperConfig;
15-
import com.fasterxml.jackson.databind.introspect.Annotated;
16-
import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor;
17-
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
18-
import com.fasterxml.jackson.databind.jsontype.NamedType;
19-
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
20-
import com.fasterxml.jackson.databind.util.ClassUtil;
21-
22-
import com.fasterxml.jackson.dataformat.avro.apacheimpl.CustomEncodingDeserializer;
23-
import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaHelper;
24-
import com.fasterxml.jackson.dataformat.avro.ser.CustomEncodingSerializer;
10+
11+
import tools.jackson.core.Version;
12+
13+
import tools.jackson.databind.AnnotationIntrospector;
14+
import tools.jackson.databind.PropertyName;
15+
import tools.jackson.databind.cfg.MapperConfig;
16+
import tools.jackson.databind.introspect.Annotated;
17+
import tools.jackson.databind.introspect.AnnotatedConstructor;
18+
import tools.jackson.databind.introspect.AnnotatedMember;
19+
import tools.jackson.databind.jsontype.NamedType;
20+
import tools.jackson.databind.ser.std.ToStringSerializer;
21+
import tools.jackson.databind.util.ClassUtil;
22+
import tools.jackson.dataformat.avro.apacheimpl.CustomEncodingDeserializer;
23+
import tools.jackson.dataformat.avro.schema.AvroSchemaHelper;
24+
import tools.jackson.dataformat.avro.ser.CustomEncodingSerializer;
2525

2626
/**
2727
* Adds support for the following annotations from the Apache Avro implementation:

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactory.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroFactory.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.io.*;
44

5-
import com.fasterxml.jackson.core.*;
6-
import com.fasterxml.jackson.core.base.BinaryTSFactory;
7-
import com.fasterxml.jackson.core.io.IOContext;
8-
import com.fasterxml.jackson.dataformat.avro.apacheimpl.ApacheAvroParserImpl;
9-
import com.fasterxml.jackson.dataformat.avro.deser.*;
5+
import tools.jackson.core.*;
6+
import tools.jackson.core.base.BinaryTSFactory;
7+
import tools.jackson.core.io.IOContext;
8+
import tools.jackson.dataformat.avro.apacheimpl.ApacheAvroParserImpl;
9+
import tools.jackson.dataformat.avro.deser.*;
1010

1111
/**
1212
* Default {@link TokenStreamFactory} implementation for encoding/decoding Avro

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactoryBuilder.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroFactoryBuilder.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

3-
import com.fasterxml.jackson.core.StreamWriteFeature;
4-
import com.fasterxml.jackson.core.base.DecorableTSFactory.DecorableTSFBuilder;
5-
import com.fasterxml.jackson.dataformat.avro.AvroFactoryBuilder;
3+
import tools.jackson.core.StreamWriteFeature;
4+
import tools.jackson.core.base.DecorableTSFactory.DecorableTSFBuilder;
5+
import tools.jackson.dataformat.avro.AvroFactoryBuilder;
66

77
/**
8-
* {@link com.fasterxml.jackson.core.TokenStreamFactory.TSFBuilder}
8+
* {@link tools.jackson.core.TokenStreamFactory.TSFBuilder}
99
* implementation for constructing {@link AvroFactory}
1010
* instances.
1111
*<p>

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFixedSize.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroFixedSize.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.lang.annotation.*;
44

55
/**
66
* Only used during Avro schema generation; has no effect on data (de)serialization.
77
* <p>
8-
* Instructs the {@link com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator AvroSchemaGenerator}
8+
* Instructs the {@link tools.jackson.dataformat.avro.schema.AvroSchemaGenerator AvroSchemaGenerator}
99
* to declare the annotated property as type "fixed" ({@link org.apache.avro.Schema.Type#FIXED Schema.Type.FIXED}).
1010
*/
1111
@Retention(RetentionPolicy.RUNTIME)

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroGenerator.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroGenerator.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.io.IOException;
44
import java.io.OutputStream;
@@ -9,14 +9,13 @@
99

1010
import org.apache.avro.io.BinaryEncoder;
1111

12-
import com.fasterxml.jackson.core.*;
13-
import com.fasterxml.jackson.core.base.GeneratorBase;
14-
import com.fasterxml.jackson.core.io.IOContext;
15-
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
16-
17-
import com.fasterxml.jackson.dataformat.avro.apacheimpl.ApacheCodecRecycler;
18-
import com.fasterxml.jackson.dataformat.avro.ser.AvroWriteContext;
19-
import com.fasterxml.jackson.dataformat.avro.ser.EncodedDatum;
12+
import tools.jackson.core.*;
13+
import tools.jackson.core.base.GeneratorBase;
14+
import tools.jackson.core.io.IOContext;
15+
import tools.jackson.core.util.JacksonFeatureSet;
16+
import tools.jackson.dataformat.avro.apacheimpl.ApacheCodecRecycler;
17+
import tools.jackson.dataformat.avro.ser.AvroWriteContext;
18+
import tools.jackson.dataformat.avro.ser.EncodedDatum;
2019

2120
public class AvroGenerator extends GeneratorBase
2221
{

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroMapper.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroMapper.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.io.File;
44
import java.io.IOException;
55
import java.io.InputStream;
66

77
import org.apache.avro.Schema;
88

9-
import com.fasterxml.jackson.core.JacksonException;
10-
import com.fasterxml.jackson.core.JsonGenerator;
11-
import com.fasterxml.jackson.core.Version;
9+
import tools.jackson.core.JacksonException;
10+
import tools.jackson.core.JsonGenerator;
11+
import tools.jackson.core.Version;
1212

13-
import com.fasterxml.jackson.databind.*;
14-
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
15-
import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
16-
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
17-
import com.fasterxml.jackson.databind.util.ClassUtil;
18-
19-
import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
13+
import tools.jackson.databind.*;
14+
import tools.jackson.databind.cfg.MapperBuilder;
15+
import tools.jackson.databind.cfg.MapperBuilderState;
16+
import tools.jackson.databind.exc.InvalidDefinitionException;
17+
import tools.jackson.databind.util.ClassUtil;
18+
import tools.jackson.dataformat.avro.schema.AvroSchemaGenerator;
2019

2120
/**
2221
* Convenience {@link AvroMapper}, which is mostly similar to simply

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroModule.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroModule.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.io.File;
44

55
import org.apache.avro.Schema;
66

7-
import com.fasterxml.jackson.core.JacksonException;
8-
import com.fasterxml.jackson.core.JsonGenerator;
9-
import com.fasterxml.jackson.core.Version;
10-
11-
import com.fasterxml.jackson.databind.AnnotationIntrospector;
12-
import com.fasterxml.jackson.databind.JacksonModule;
13-
import com.fasterxml.jackson.databind.SerializerProvider;
14-
import com.fasterxml.jackson.databind.module.SimpleDeserializers;
15-
import com.fasterxml.jackson.databind.module.SimpleSerializers;
16-
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
17-
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
18-
import com.fasterxml.jackson.dataformat.avro.deser.AvroUntypedDeserializer;
7+
import tools.jackson.core.JacksonException;
8+
import tools.jackson.core.JsonGenerator;
9+
import tools.jackson.core.Version;
10+
11+
import tools.jackson.databind.AnnotationIntrospector;
12+
import tools.jackson.databind.JacksonModule;
13+
import tools.jackson.databind.SerializerProvider;
14+
import tools.jackson.databind.module.SimpleDeserializers;
15+
import tools.jackson.databind.module.SimpleSerializers;
16+
import tools.jackson.databind.ser.std.StdSerializer;
17+
import tools.jackson.databind.ser.std.ToStringSerializer;
18+
import tools.jackson.dataformat.avro.deser.AvroUntypedDeserializer;
1919

2020
/**
2121
* Module that adds support for handling datatypes specific to the standard

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroParser.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroParser.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.io.IOException;
44
import java.io.Writer;
55

6-
import com.fasterxml.jackson.core.*;
7-
import com.fasterxml.jackson.core.base.ParserBase;
8-
import com.fasterxml.jackson.core.io.IOContext;
9-
import com.fasterxml.jackson.core.util.ByteArrayBuilder;
10-
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
11-
import com.fasterxml.jackson.core.util.SimpleStreamReadContext;
12-
import com.fasterxml.jackson.core.util.VersionUtil;
13-
14-
import com.fasterxml.jackson.dataformat.avro.deser.AvroReadContext;
15-
import com.fasterxml.jackson.dataformat.avro.deser.MissingReader;
6+
import tools.jackson.core.*;
7+
import tools.jackson.core.base.ParserBase;
8+
import tools.jackson.core.io.IOContext;
9+
import tools.jackson.core.util.ByteArrayBuilder;
10+
import tools.jackson.core.util.JacksonFeatureSet;
11+
import tools.jackson.core.util.SimpleStreamReadContext;
12+
import tools.jackson.core.util.VersionUtil;
13+
import tools.jackson.dataformat.avro.deser.AvroReadContext;
14+
import tools.jackson.dataformat.avro.deser.MissingReader;
1615

1716
/**
1817
* {@link JsonParser} implementation for decoding Avro content and

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroSchema.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroSchema.java

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

33
import java.util.Set;
44
import java.util.concurrent.atomic.AtomicReference;
@@ -8,11 +8,11 @@
88
import org.apache.avro.SchemaCompatibility.SchemaCompatibilityType;
99
import org.apache.avro.SchemaCompatibility.SchemaPairCompatibility;
1010

11-
import com.fasterxml.jackson.core.FormatSchema;
12-
import com.fasterxml.jackson.core.JsonParser;
13-
import com.fasterxml.jackson.databind.DatabindException;
14-
import com.fasterxml.jackson.dataformat.avro.deser.AvroReaderFactory;
15-
import com.fasterxml.jackson.dataformat.avro.deser.AvroStructureReader;
11+
import tools.jackson.core.FormatSchema;
12+
import tools.jackson.core.JsonParser;
13+
import tools.jackson.databind.DatabindException;
14+
import tools.jackson.dataformat.avro.deser.AvroReaderFactory;
15+
import tools.jackson.dataformat.avro.deser.AvroStructureReader;
1616

1717
/**
1818
* Wrapper for Schema information needed to encode and decode Avro-format

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroSerializerModifier.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroSerializerModifier.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.util.*;
44

55
import org.apache.avro.specific.SpecificRecordBase;
66

7-
import com.fasterxml.jackson.databind.BeanDescription;
8-
import com.fasterxml.jackson.databind.SerializationConfig;
9-
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
10-
import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
11-
import com.fasterxml.jackson.databind.ser.ValueSerializerModifier;
7+
import tools.jackson.databind.BeanDescription;
8+
import tools.jackson.databind.SerializationConfig;
9+
import tools.jackson.databind.introspect.AnnotatedClass;
10+
import tools.jackson.databind.ser.BeanPropertyWriter;
11+
import tools.jackson.databind.ser.ValueSerializerModifier;
1212

1313
/**
1414
* Serializer modifier used to suppress serialization of "schema"

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroSubTypeValidator.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroSubTypeValidator.java

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

3-
import com.fasterxml.jackson.databind.DatabindContext;
4-
import com.fasterxml.jackson.databind.JavaType;
5-
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
3+
import tools.jackson.databind.DatabindContext;
4+
import tools.jackson.databind.JavaType;
5+
import tools.jackson.databind.jsontype.PolymorphicTypeValidator;
66

77
/**
88
* Simple {@link PolymorphicTypeValidator} implementation used by with Avro's

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeDeserializer.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroTypeDeserializer.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import com.fasterxml.jackson.annotation.JsonTypeInfo;
44

5-
import com.fasterxml.jackson.core.JacksonException;
6-
import com.fasterxml.jackson.core.JsonParser;
5+
import tools.jackson.core.JacksonException;
6+
import tools.jackson.core.JsonParser;
77

8-
import com.fasterxml.jackson.databind.*;
9-
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
10-
import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
11-
import com.fasterxml.jackson.databind.jsontype.impl.TypeDeserializerBase;
12-
import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaHelper;
8+
import tools.jackson.databind.*;
9+
import tools.jackson.databind.jsontype.TypeDeserializer;
10+
import tools.jackson.databind.jsontype.TypeIdResolver;
11+
import tools.jackson.databind.jsontype.impl.TypeDeserializerBase;
12+
import tools.jackson.dataformat.avro.schema.AvroSchemaHelper;
1313

1414
public class AvroTypeDeserializer extends TypeDeserializerBase
1515
{

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroTypeIdResolver.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.util.Collection;
44
import java.util.HashMap;
55
import java.util.Map;
66

7-
import com.fasterxml.jackson.databind.DatabindContext;
8-
import com.fasterxml.jackson.databind.JavaType;
9-
import com.fasterxml.jackson.databind.jsontype.NamedType;
10-
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
11-
import com.fasterxml.jackson.databind.jsontype.impl.ClassNameIdResolver;
7+
import tools.jackson.databind.DatabindContext;
8+
import tools.jackson.databind.JavaType;
9+
import tools.jackson.databind.jsontype.NamedType;
10+
import tools.jackson.databind.jsontype.PolymorphicTypeValidator;
11+
import tools.jackson.databind.jsontype.impl.ClassNameIdResolver;
1212

1313
/**
14-
* {@link com.fasterxml.jackson.databind.jsontype.TypeIdResolver} for Avro type IDs embedded in schemas. Avro generally uses class names,
15-
* but we want to also support named subtypes so that developers can easily remap the embedded type IDs to a different runtime class.
14+
* {@link tools.jackson.databind.jsontype.TypeIdResolver} for Avro type IDs embedded in schemas.
15+
* Avro generally uses class names, but we want to also support named subtypes so that developers
16+
* can easily remap the embedded type IDs to a different runtime class.
1617
*/
1718
public class AvroTypeIdResolver extends ClassNameIdResolver
1819
{

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeResolverBuilder.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/AvroTypeResolverBuilder.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package com.fasterxml.jackson.dataformat.avro;
1+
package tools.jackson.dataformat.avro;
22

33
import java.util.Collection;
44

55
import com.fasterxml.jackson.annotation.JsonTypeInfo;
66

7-
import com.fasterxml.jackson.databind.DatabindContext;
8-
import com.fasterxml.jackson.databind.DeserializationContext;
9-
import com.fasterxml.jackson.databind.JavaType;
10-
import com.fasterxml.jackson.databind.SerializerProvider;
11-
import com.fasterxml.jackson.databind.jsontype.NamedType;
12-
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
13-
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
14-
import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
15-
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
16-
import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
7+
import tools.jackson.databind.DatabindContext;
8+
import tools.jackson.databind.DeserializationContext;
9+
import tools.jackson.databind.JavaType;
10+
import tools.jackson.databind.SerializerProvider;
11+
import tools.jackson.databind.jsontype.NamedType;
12+
import tools.jackson.databind.jsontype.PolymorphicTypeValidator;
13+
import tools.jackson.databind.jsontype.TypeDeserializer;
14+
import tools.jackson.databind.jsontype.TypeIdResolver;
15+
import tools.jackson.databind.jsontype.TypeSerializer;
16+
import tools.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
1717

1818
/**
1919
* @since 2.9

‎avro/src/main/java/com/fasterxml/jackson/dataformat/avro/CustomEncodingWrapper.java renamed to ‎avro/src/main/java/tools/jackson/dataformat/avro/CustomEncodingWrapper.java

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

33
import java.io.IOException;
44
import java.lang.reflect.InvocationTargetException;

0 commit comments

Comments
 (0)