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.

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

Fix #322: rename "com.fasterxml.jackson.dataformat" -> "tools.jackson.dataformat" #333

Merged
merged 10 commits into from
Jul 15, 2022
Merged

Fix #322: rename "com.fasterxml.jackson.dataformat" -> "tools.jackson.dataformat" #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9b62403
Start work on #332, first CBOR
cowtowncoder Jul 15, 2022
dd0e620
Convert Smile module
cowtowncoder Jul 15, 2022
2ff68cc
Then avro
cowtowncoder Jul 15, 2022
a31b695
Then Ion, Protobuf. Core, databind deps converted.
cowtowncoder Jul 15, 2022
0f5ede2
Remove last refs to old core, databind, from non-import usage
cowtowncoder Jul 15, 2022
39194c3
Update SPI metadata with new packages too
cowtowncoder Jul 15, 2022
b25aaa4
Convert AVro to new package
cowtowncoder Jul 15, 2022
2db4156
Convert cbor
cowtowncoder Jul 15, 2022
2ce928f
Complete renaming
cowtowncoder Jul 15, 2022
fe3ee39
Fix test failures
cowtowncoder Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions avro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- do_not_remove: published-with-gradle-metadata -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<groupId>tools.jackson.dataformat</groupId>
<artifactId>jackson-dataformats-binary</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
Expand All @@ -21,7 +21,7 @@ abstractions.

<properties>
<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>com/fasterxml/jackson/dataformat/avro</packageVersion.dir>
<packageVersion.dir>tools/jackson/dataformat/avro</packageVersion.dir>
<packageVersion.package>${project.groupId}.avro</packageVersion.package>
</properties>

Expand All @@ -33,7 +33,7 @@ abstractions.
</dependency>
<!-- and databind for Avro Schema generation... -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
Expand Down
32 changes: 16 additions & 16 deletions ...rmat/avro/AvroAnnotationIntrospector.java → ...rmat/avro/AvroAnnotationIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -7,21 +7,21 @@
import org.apache.avro.reflect.*;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.core.Version;

import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.PropertyName;
import com.fasterxml.jackson.databind.cfg.MapperConfig;
import com.fasterxml.jackson.databind.introspect.Annotated;
import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor;
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.databind.util.ClassUtil;

import com.fasterxml.jackson.dataformat.avro.apacheimpl.CustomEncodingDeserializer;
import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaHelper;
import com.fasterxml.jackson.dataformat.avro.ser.CustomEncodingSerializer;

import tools.jackson.core.Version;

import tools.jackson.databind.AnnotationIntrospector;
import tools.jackson.databind.PropertyName;
import tools.jackson.databind.cfg.MapperConfig;
import tools.jackson.databind.introspect.Annotated;
import tools.jackson.databind.introspect.AnnotatedConstructor;
import tools.jackson.databind.introspect.AnnotatedMember;
import tools.jackson.databind.jsontype.NamedType;
import tools.jackson.databind.ser.std.ToStringSerializer;
import tools.jackson.databind.util.ClassUtil;
import tools.jackson.dataformat.avro.apacheimpl.CustomEncodingDeserializer;
import tools.jackson.dataformat.avro.schema.AvroSchemaHelper;
import tools.jackson.dataformat.avro.ser.CustomEncodingSerializer;

/**
* Adds support for the following annotations from the Apache Avro implementation:
Expand Down
12 changes: 6 additions & 6 deletions .../jackson/dataformat/avro/AvroFactory.java → .../jackson/dataformat/avro/AvroFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.io.*;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.base.BinaryTSFactory;
import com.fasterxml.jackson.core.io.IOContext;
import com.fasterxml.jackson.dataformat.avro.apacheimpl.ApacheAvroParserImpl;
import com.fasterxml.jackson.dataformat.avro.deser.*;
import tools.jackson.core.*;
import tools.jackson.core.base.BinaryTSFactory;
import tools.jackson.core.io.IOContext;
import tools.jackson.dataformat.avro.apacheimpl.ApacheAvroParserImpl;
import tools.jackson.dataformat.avro.deser.*;

/**
* Default {@link TokenStreamFactory} implementation for encoding/decoding Avro
Expand Down
10 changes: 5 additions & 5 deletions ...n/dataformat/avro/AvroFactoryBuilder.java → ...n/dataformat/avro/AvroFactoryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import com.fasterxml.jackson.core.StreamWriteFeature;
import com.fasterxml.jackson.core.base.DecorableTSFactory.DecorableTSFBuilder;
import com.fasterxml.jackson.dataformat.avro.AvroFactoryBuilder;
import tools.jackson.core.StreamWriteFeature;
import tools.jackson.core.base.DecorableTSFactory.DecorableTSFBuilder;
import tools.jackson.dataformat.avro.AvroFactoryBuilder;

/**
* {@link com.fasterxml.jackson.core.TokenStreamFactory.TSFBuilder}
* {@link tools.jackson.core.TokenStreamFactory.TSFBuilder}
* implementation for constructing {@link AvroFactory}
* instances.
*<p>
Expand Down
4 changes: 2 additions & 2 deletions ...ackson/dataformat/avro/AvroFixedSize.java → ...ackson/dataformat/avro/AvroFixedSize.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.lang.annotation.*;

/**
* Only used during Avro schema generation; has no effect on data (de)serialization.
* <p>
* Instructs the {@link com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator AvroSchemaGenerator}
* Instructs the {@link tools.jackson.dataformat.avro.schema.AvroSchemaGenerator AvroSchemaGenerator}
* to declare the annotated property as type "fixed" ({@link org.apache.avro.Schema.Type#FIXED Schema.Type.FIXED}).
*/
@Retention(RetentionPolicy.RUNTIME)
Expand Down
17 changes: 8 additions & 9 deletions ...ackson/dataformat/avro/AvroGenerator.java → ...ackson/dataformat/avro/AvroGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.io.IOException;
import java.io.OutputStream;
Expand All @@ -9,14 +9,13 @@

import org.apache.avro.io.BinaryEncoder;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.base.GeneratorBase;
import com.fasterxml.jackson.core.io.IOContext;
import com.fasterxml.jackson.core.util.JacksonFeatureSet;

import com.fasterxml.jackson.dataformat.avro.apacheimpl.ApacheCodecRecycler;
import com.fasterxml.jackson.dataformat.avro.ser.AvroWriteContext;
import com.fasterxml.jackson.dataformat.avro.ser.EncodedDatum;
import tools.jackson.core.*;
import tools.jackson.core.base.GeneratorBase;
import tools.jackson.core.io.IOContext;
import tools.jackson.core.util.JacksonFeatureSet;
import tools.jackson.dataformat.avro.apacheimpl.ApacheCodecRecycler;
import tools.jackson.dataformat.avro.ser.AvroWriteContext;
import tools.jackson.dataformat.avro.ser.EncodedDatum;

public class AvroGenerator extends GeneratorBase
{
Expand Down
21 changes: 10 additions & 11 deletions ...l/jackson/dataformat/avro/AvroMapper.java → ...s/jackson/dataformat/avro/AvroMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;

import org.apache.avro.Schema;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.Version;
import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonGenerator;
import tools.jackson.core.Version;

import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
import com.fasterxml.jackson.databind.util.ClassUtil;

import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
import tools.jackson.databind.*;
import tools.jackson.databind.cfg.MapperBuilder;
import tools.jackson.databind.cfg.MapperBuilderState;
import tools.jackson.databind.exc.InvalidDefinitionException;
import tools.jackson.databind.util.ClassUtil;
import tools.jackson.dataformat.avro.schema.AvroSchemaGenerator;

/**
* Convenience {@link AvroMapper}, which is mostly similar to simply
Expand Down
26 changes: 13 additions & 13 deletions ...l/jackson/dataformat/avro/AvroModule.java → ...s/jackson/dataformat/avro/AvroModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.io.File;

import org.apache.avro.Schema;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.Version;

import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.JacksonModule;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleDeserializers;
import com.fasterxml.jackson.databind.module.SimpleSerializers;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.dataformat.avro.deser.AvroUntypedDeserializer;
import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonGenerator;
import tools.jackson.core.Version;

import tools.jackson.databind.AnnotationIntrospector;
import tools.jackson.databind.JacksonModule;
import tools.jackson.databind.SerializerProvider;
import tools.jackson.databind.module.SimpleDeserializers;
import tools.jackson.databind.module.SimpleSerializers;
import tools.jackson.databind.ser.std.StdSerializer;
import tools.jackson.databind.ser.std.ToStringSerializer;
import tools.jackson.dataformat.avro.deser.AvroUntypedDeserializer;

/**
* Module that adds support for handling datatypes specific to the standard
Expand Down
21 changes: 10 additions & 11 deletions ...l/jackson/dataformat/avro/AvroParser.java → ...s/jackson/dataformat/avro/AvroParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.io.IOException;
import java.io.Writer;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.base.ParserBase;
import com.fasterxml.jackson.core.io.IOContext;
import com.fasterxml.jackson.core.util.ByteArrayBuilder;
import com.fasterxml.jackson.core.util.JacksonFeatureSet;
import com.fasterxml.jackson.core.util.SimpleStreamReadContext;
import com.fasterxml.jackson.core.util.VersionUtil;

import com.fasterxml.jackson.dataformat.avro.deser.AvroReadContext;
import com.fasterxml.jackson.dataformat.avro.deser.MissingReader;
import tools.jackson.core.*;
import tools.jackson.core.base.ParserBase;
import tools.jackson.core.io.IOContext;
import tools.jackson.core.util.ByteArrayBuilder;
import tools.jackson.core.util.JacksonFeatureSet;
import tools.jackson.core.util.SimpleStreamReadContext;
import tools.jackson.core.util.VersionUtil;
import tools.jackson.dataformat.avro.deser.AvroReadContext;
import tools.jackson.dataformat.avro.deser.MissingReader;

/**
* {@link JsonParser} implementation for decoding Avro content and
Expand Down
12 changes: 6 additions & 6 deletions ...l/jackson/dataformat/avro/AvroSchema.java → ...s/jackson/dataformat/avro/AvroSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
Expand All @@ -8,11 +8,11 @@
import org.apache.avro.SchemaCompatibility.SchemaCompatibilityType;
import org.apache.avro.SchemaCompatibility.SchemaPairCompatibility;

import com.fasterxml.jackson.core.FormatSchema;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DatabindException;
import com.fasterxml.jackson.dataformat.avro.deser.AvroReaderFactory;
import com.fasterxml.jackson.dataformat.avro.deser.AvroStructureReader;
import tools.jackson.core.FormatSchema;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DatabindException;
import tools.jackson.dataformat.avro.deser.AvroReaderFactory;
import tools.jackson.dataformat.avro.deser.AvroStructureReader;

/**
* Wrapper for Schema information needed to encode and decode Avro-format
Expand Down
12 changes: 6 additions & 6 deletions ...taformat/avro/AvroSerializerModifier.java → ...taformat/avro/AvroSerializerModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.util.*;

import org.apache.avro.specific.SpecificRecordBase;

import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.SerializationConfig;
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
import com.fasterxml.jackson.databind.ser.ValueSerializerModifier;
import tools.jackson.databind.BeanDescription;
import tools.jackson.databind.SerializationConfig;
import tools.jackson.databind.introspect.AnnotatedClass;
import tools.jackson.databind.ser.BeanPropertyWriter;
import tools.jackson.databind.ser.ValueSerializerModifier;

/**
* Serializer modifier used to suppress serialization of "schema"
Expand Down
8 changes: 4 additions & 4 deletions ...dataformat/avro/AvroSubTypeValidator.java → ...dataformat/avro/AvroSubTypeValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import com.fasterxml.jackson.databind.DatabindContext;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
import tools.jackson.databind.DatabindContext;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.jsontype.PolymorphicTypeValidator;

/**
* Simple {@link PolymorphicTypeValidator} implementation used by with Avro's
Expand Down
16 changes: 8 additions & 8 deletions ...dataformat/avro/AvroTypeDeserializer.java → ...dataformat/avro/AvroTypeDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import com.fasterxml.jackson.annotation.JsonTypeInfo;

import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonParser;

import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
import com.fasterxml.jackson.databind.jsontype.impl.TypeDeserializerBase;
import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaHelper;
import tools.jackson.databind.*;
import tools.jackson.databind.jsontype.TypeDeserializer;
import tools.jackson.databind.jsontype.TypeIdResolver;
import tools.jackson.databind.jsontype.impl.TypeDeserializerBase;
import tools.jackson.dataformat.avro.schema.AvroSchemaHelper;

public class AvroTypeDeserializer extends TypeDeserializerBase
{
Expand Down
17 changes: 9 additions & 8 deletions ...n/dataformat/avro/AvroTypeIdResolver.java → ...n/dataformat/avro/AvroTypeIdResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.util.Collection;
import java.util.HashMap;
import java.util.Map;

import com.fasterxml.jackson.databind.DatabindContext;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
import com.fasterxml.jackson.databind.jsontype.impl.ClassNameIdResolver;
import tools.jackson.databind.DatabindContext;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.jsontype.NamedType;
import tools.jackson.databind.jsontype.PolymorphicTypeValidator;
import tools.jackson.databind.jsontype.impl.ClassNameIdResolver;

/**
* {@link com.fasterxml.jackson.databind.jsontype.TypeIdResolver} for Avro type IDs embedded in schemas. Avro generally uses class names,
* but we want to also support named subtypes so that developers can easily remap the embedded type IDs to a different runtime class.
* {@link tools.jackson.databind.jsontype.TypeIdResolver} for Avro type IDs embedded in schemas.
* Avro generally uses class names, but we want to also support named subtypes so that developers
* can easily remap the embedded type IDs to a different runtime class.
*/
public class AvroTypeIdResolver extends ClassNameIdResolver
{
Expand Down
22 changes: 11 additions & 11 deletions ...aformat/avro/AvroTypeResolverBuilder.java → ...aformat/avro/AvroTypeResolverBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.util.Collection;

import com.fasterxml.jackson.annotation.JsonTypeInfo;

import com.fasterxml.jackson.databind.DatabindContext;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
import tools.jackson.databind.DatabindContext;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.SerializerProvider;
import tools.jackson.databind.jsontype.NamedType;
import tools.jackson.databind.jsontype.PolymorphicTypeValidator;
import tools.jackson.databind.jsontype.TypeDeserializer;
import tools.jackson.databind.jsontype.TypeIdResolver;
import tools.jackson.databind.jsontype.TypeSerializer;
import tools.jackson.databind.jsontype.impl.StdTypeResolverBuilder;

/**
* @since 2.9
Expand Down
2 changes: 1 addition & 1 deletion ...ataformat/avro/CustomEncodingWrapper.java → ...ataformat/avro/CustomEncodingWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fasterxml.jackson.dataformat.avro;
package tools.jackson.dataformat.avro;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
Expand Down
Loading