Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d5f098b
Add support for ImmutableIntArray / ImmutableDoubleArray
kilink Aug 22, 2024
41a9105
Increase Guava min supported level to 22.0 (from 20.0) for CI
cowtowncoder Aug 27, 2024
38f7cb5
Update release notes
cowtowncoder Aug 27, 2024
c0ae7c2
Start 2.19 branch
cowtowncoder Sep 27, 2024
c636142
Bump the github-actions group with 2 updates (#162)
dependabot[bot] Sep 28, 2024
3de91bd
Reduce usage of TypeFactory.defaultInstance(), streamlining
cowtowncoder Oct 13, 2024
0d07209
Merge branch '2.19' of github.com:FasterXML/jackson-datatypes-collect…
cowtowncoder Oct 13, 2024
3dff78f
Merge branch '2.18' into 2.19
cowtowncoder Oct 29, 2024
4e746a8
Cosmetic cleanup
cowtowncoder Oct 30, 2024
89f1c52
Bump the github-actions group with 3 updates (#164)
dependabot[bot] Nov 1, 2024
b9adb6d
Merge branch '2.18' into 2.19
cowtowncoder Nov 1, 2024
cb84017
Merge branch '2.18' into immutable-int-double-array-support
cowtowncoder Nov 5, 2024
a29cda6
Add deserialization support for Table<R, C, V> (#163)
Abhishekkr3003 Nov 5, 2024
9b704f7
Merge branch '2.18' into 2.19
cowtowncoder Nov 12, 2024
294d3df
More test fixes wrt 2.18/2.19 differences
cowtowncoder Nov 12, 2024
238dd0e
Merge branch '2.18' into 2.19
cowtowncoder Nov 28, 2024
d57fc17
Merge branch '2.18' into 2.19
cowtowncoder Nov 30, 2024
04a9b89
Bump codecov/codecov-action in the github-actions group (#168)
dependabot[bot] Dec 1, 2024
8cc5574
Minor updates to CI, maven wrapper
cowtowncoder Dec 3, 2024
fe2b13a
Remove pre-JDK17 targets from v3 rebuild
cowtowncoder Dec 4, 2024
9c2af6f
Delete .travis.yml (#170)
pjfanning Dec 12, 2024
717f37b
Bump the github-actions group with 2 updates (#173)
dependabot[bot] Jan 1, 2025
45724d5
Update Maven wrapper
cowtowncoder Jan 19, 2025
14d1ffb
[JSTEP-10] migrate `hppc`, `eclipse-collections`, `pcollections` to J…
JooHyukKim Jan 22, 2025
91090a7
Merge branch '2.19' into immutable-int-double-array-support
cowtowncoder Jan 22, 2025
bcd0897
Merge branch '2.18' into immutable-int-double-array-support
cowtowncoder Jul 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dep_build_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up JDK
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dep_build_v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
strategy:
fail-fast: false
matrix:
java_version: ['8', '17', '21']
java_version: ['17', '21']
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: master
- name: Set up JDK
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:

env:
GUAVA_DEFAULT: '25.1-jre'
GUAVA_MIN: '20.0'
GUAVA_MIN: '22.0'
GUAVA_MAX: '33.1.0-jre'
jobs:
build:
Expand All @@ -32,9 +32,9 @@ jobs:
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set up JDK
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
run: ./mvnw -B -q -ff -ntp test
- name: Publish code coverage
if: ${{ github.event_name != 'pull_request' && matrix.snapshot && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./target/site/jacoco/jacoco.xml
Expand Down
20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion eclipse-collections/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatypes-collections</artifactId>
<version>2.18.5-SNAPSHOT</version>
<version>2.19.0-SNAPSHOT</version>
</parent>
<artifactId>jackson-datatype-eclipse-collections</artifactId>
<name>Jackson datatype: eclipse-collections</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package com.fasterxml.jackson.datatype.eclipsecollections.ser;

import java.io.IOException;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import java.io.IOException;

import org.eclipse.collections.api.BooleanIterable;
import org.eclipse.collections.api.iterator.BooleanIterator;

public final class BooleanIterableSerializer extends PrimitiveIterableSerializer<BooleanIterable> {
private static final long serialVersionUID = 1L;

private static final JavaType ELEMENT_TYPE = TypeFactory.defaultInstance().constructType(boolean.class);

public BooleanIterableSerializer(BeanProperty property, Boolean unwrapSingle) {
super(BooleanIterable.class, ELEMENT_TYPE, property, unwrapSingle);
}

@Override
protected BooleanIterableSerializer withResolved(BeanProperty property, Boolean unwrapSingle) {
return new BooleanIterableSerializer(property, unwrapSingle);
super(BooleanIterable.class, elementType(boolean.class), property, unwrapSingle);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package com.fasterxml.jackson.datatype.eclipsecollections.ser;

import java.io.IOException;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import java.io.IOException;

import org.eclipse.collections.api.DoubleIterable;
import org.eclipse.collections.api.iterator.DoubleIterator;

public final class DoubleIterableSerializer extends PrimitiveIterableSerializer<DoubleIterable> {
private static final long serialVersionUID = 1L;

private static final JavaType ELEMENT_TYPE = TypeFactory.defaultInstance().constructType(double.class);

public DoubleIterableSerializer(BeanProperty property, Boolean unwrapSingle) {
super(DoubleIterable.class, ELEMENT_TYPE, property, unwrapSingle);
}

@Override
protected DoubleIterableSerializer withResolved(BeanProperty property, Boolean unwrapSingle) {
return new DoubleIterableSerializer(property, unwrapSingle);
super(DoubleIterable.class, elementType(double.class), property, unwrapSingle);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package com.fasterxml.jackson.datatype.eclipsecollections.ser;

import java.io.IOException;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import java.io.IOException;

import org.eclipse.collections.api.FloatIterable;
import org.eclipse.collections.api.iterator.FloatIterator;

public final class FloatIterableSerializer extends PrimitiveIterableSerializer<FloatIterable> {
private static final long serialVersionUID = 1L;

private static final JavaType ELEMENT_TYPE = TypeFactory.defaultInstance().constructType(float.class);

public FloatIterableSerializer(BeanProperty property, Boolean unwrapSingle) {
super(FloatIterable.class, ELEMENT_TYPE, property, unwrapSingle);
}

@Override
protected FloatIterableSerializer withResolved(BeanProperty property, Boolean unwrapSingle) {
return new FloatIterableSerializer(property, unwrapSingle);
super(FloatIterable.class, elementType(float.class), property, unwrapSingle);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package com.fasterxml.jackson.datatype.eclipsecollections.ser;

import java.io.IOException;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import java.io.IOException;

import org.eclipse.collections.api.IntIterable;
import org.eclipse.collections.api.iterator.IntIterator;

public final class IntIterableSerializer extends PrimitiveIterableSerializer<IntIterable> {
private static final long serialVersionUID = 1L;

private static final JavaType ELEMENT_TYPE = TypeFactory.defaultInstance().constructType(int.class);

public IntIterableSerializer(BeanProperty property, Boolean unwrapSingle) {
super(IntIterable.class, ELEMENT_TYPE, property, unwrapSingle);
}

@Override
protected IntIterableSerializer withResolved(BeanProperty property, Boolean unwrapSingle) {
return new IntIterableSerializer(property, unwrapSingle);
super(IntIterable.class, elementType(int.class), property, unwrapSingle);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package com.fasterxml.jackson.datatype.eclipsecollections.ser;

import java.io.IOException;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import java.io.IOException;

import org.eclipse.collections.api.LongIterable;
import org.eclipse.collections.api.iterator.LongIterator;

public final class LongIterableSerializer extends PrimitiveIterableSerializer<LongIterable> {
private static final long serialVersionUID = 1L;

private static final JavaType ELEMENT_TYPE = TypeFactory.defaultInstance().constructType(long.class);

public LongIterableSerializer(BeanProperty property, Boolean unwrapSingle) {
super(LongIterable.class, ELEMENT_TYPE, property, unwrapSingle);
}

@Override
protected LongIterableSerializer withResolved(BeanProperty property, Boolean unwrapSingle) {
return new LongIterableSerializer(property, unwrapSingle);
super(LongIterable.class, elementType(long.class), property, unwrapSingle);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.ser.ContainerSerializer;
import com.fasterxml.jackson.databind.type.TypeFactory;

import java.io.IOException;
import org.eclipse.collections.api.PrimitiveIterable;

Expand All @@ -31,8 +33,6 @@ public PrimitiveIterableSerializer(
_unwrapSingle = unwrapSingle;
}

protected abstract PrimitiveIterableSerializer<C> withResolved(BeanProperty property, Boolean unwrapSingle);

@Override
public boolean isEmpty(SerializerProvider prov, C value) {
return value.isEmpty();
Expand Down Expand Up @@ -87,4 +87,9 @@ public void serializeWithType(C value, JsonGenerator g, SerializerProvider provi
}

protected abstract void serializeContents(C value, JsonGenerator gen) throws IOException;

// @since 2.19
protected static JavaType elementType(Class<?> rawElementType) {
return TypeFactory.defaultInstance().constructType(rawElementType);
}
}
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package com.fasterxml.jackson.datatype.eclipsecollections.ser;

import java.io.IOException;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
import java.io.IOException;

import org.eclipse.collections.api.ShortIterable;
import org.eclipse.collections.api.iterator.ShortIterator;

public final class ShortIterableSerializer extends PrimitiveIterableSerializer<ShortIterable> {
private static final long serialVersionUID = 1L;

private static final JavaType ELEMENT_TYPE = TypeFactory.defaultInstance().constructType(short.class);

public ShortIterableSerializer(BeanProperty property, Boolean unwrapSingle) {
super(ShortIterable.class, ELEMENT_TYPE, property, unwrapSingle);
}

@Override
protected ShortIterableSerializer withResolved(BeanProperty property, Boolean unwrapSingle) {
return new ShortIterableSerializer(property, unwrapSingle);
super(ShortIterable.class, elementType(short.class), property, unwrapSingle);
}

@Override
Expand Down
Loading