Split between Type and Codec #46

RainWarrior · 2020-03-15T16:26:51Z

Split off types and codecs
Replaced Optional with DataResult to better track errors and allow recovery
Moved serialization-related classes to s separate package
Bunch of helpers for Applicative syntax
Applicative codec builder for named fields

…taResult for keeping track of serialization errors and to allow partial recovery; made Type.write use it.

… Dynamic

…rimitive.

…ethod references.

…ad of building a new map.

…ift-based to apply-based

RainWarrior · 2020-05-11T16:08:01Z

That's expected since EMPTY is a MapCodec (returns a map); on decoding JsonOps.INSTANCE.empty() will get expanded to empty map too iirc since the typing is not that strict

boq

More review

src/main/java/com/mojang/datafixers/kinds/Applicative.java

src/main/java/com/mojang/serialization/RecordBuilder.java

src/main/java/com/mojang/serialization/codecs/ListCodec.java

src/main/java/com/mojang/serialization/MapCodec.java

slicedlime

Nitpicks about code ordering.

Also really missing tests for this like we discussed, but leaving that for later.

src/main/java/com/mojang/serialization/Codec.java

src/main/java/com/mojang/serialization/DynamicOps.java

src/main/java/com/mojang/serialization/codecs/EitherMapCodec.java

RainWarrior added 30 commits March 15, 2020 17:16

Version bump

bd067a6

Posfix function application helper for Dynamic

86514dc

Moved dynamic-related code to a separate package

83fc8f7

Renamed NilSave to EmptyPartSaving and NilDrop to EmptyPart; Added Da…

e188d4b

…taResult for keeping track of serialization errors and to allow partial recovery; made Type.write use it.

Replaced read with a version that returns DataResult.

1701c43

Convert EmptyPartSaving instead of only casting.

1b44126

Added a Codec interface

165b35c

Changed error handling functions slightly

d6b5502

Added list and map builder helpers to DynamicOps.

00331a2

Re-added empty as a valid input for mergeInto methods.

3ae1c19

Applicative syntax helpers, decoder helpers, decoder-based helpers in…

6378f3d

… Dynamic

Replaced remaining usages of Optional in Dynamic API with DataResult.

cd0da20

Pair map collector

a84c574

Java boilerplate for DataResult

ffbd838

Decoder factories improvements

4f838a6

Renamed mergeInto to either mergeToList or mergeToMap, added mergeToP…

f7f6224

…rimitive.

Made ListBox invariant, added a bunch of dynamic helpers.

70f54be

Split off codecs and types.

7ababc2

Split off primitive codecs, removed NamespacedString.

0ca3396

Fixed early initialization of codec field.

8fcfa8c

builder.add overload

8f216b5

Moved input to a first argument of Encoder.encode to allow instance m…

ae6eedd

…ethod references.

Lazy unit decoder

b15d114

Fixed error in JsonOps list builder override

ca9885c

Replaced Type with Codec in DynamicOps

77be75c

Better map interface for DynamicOps, allows returning a wrapper inste…

1e8fe07

…ad of building a new map.

Applicative codec builder; switched applicative implementation from l…

6bde925

…ift-based to apply-based

Couple more overrides in DataResult.Instance for less recursion.

26fdeff

Added OptionalFieldCodec

3773900

8-arg applicative boilerplate.

ccea94f

RainWarrior added 8 commits May 11, 2020 17:03

Removed useless stream collect

ae27361

List variable type

afb8369

Saving -> Passthrough

061642a

Replaced getType with ops-based dispatch

d4a1dba

Fixed copypaste error

47bfac1

Extracted CompressorHolder from Map*.Implementation

330d3ea

Inlined redundant self constants

ca21051

MapCompressor -> KeyCompressor

5d34fe8

RainWarrior added 2 commits May 12, 2020 09:24

Cleaned up RecordBuilder hierarchy

99b0497

Use Stream.reduce in BaseMapCodec

45a1715

RainWarrior requested a review from boq May 12, 2020 08:01

AtomicReference -> MutableObject

5fdd984

boq requested changes May 12, 2020

View reviewed changes

Fixed extraneous field

56fdd77

slicedlime previously approved these changes May 12, 2020

View reviewed changes

src/main/java/com/mojang/serialization/Codec.java Outdated Show resolved Hide resolved

boq previously approved these changes May 12, 2020

View reviewed changes

grum reviewed May 12, 2020

View reviewed changes

src/main/java/com/mojang/serialization/DynamicOps.java Outdated Show resolved Hide resolved

RainWarrior added 4 commits May 12, 2020 16:52

Added roundrip codec test

d612243

Reordered primitive codec definitions

ce9ec60

ImmutableList.Builder -> Stream.Builder

dab00f1

Small cleanup of byte buffer stream creation

aef2853

RainWarrior dismissed stale reviews from boq and slicedlime via aef2853 May 12, 2020 15:00

grum reviewed May 12, 2020

View reviewed changes

src/main/java/com/mojang/serialization/codecs/EitherMapCodec.java Outdated Show resolved Hide resolved

RainWarrior and others added 2 commits May 12, 2020 17:04

Fixed implementation of keys in EitherMapCodec

a1f4543

Style/import stuff.

4b40983

grum force-pushed the codecs branch from 261e3d7 to 4b40983 Compare May 12, 2020 15:11

grum approved these changes May 12, 2020

View reviewed changes

RainWarrior merged commit 41d097a into master May 13, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Split between Type and Codec #46

Split between Type and Codec #46

Uh oh!

RainWarrior commented Mar 15, 2020

Uh oh!

RainWarrior commented May 11, 2020

Uh oh!

boq left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

slicedlime left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Split between Type and Codec #46

Split between Type and Codec #46

Uh oh!

Conversation

RainWarrior commented Mar 15, 2020

Uh oh!

RainWarrior commented May 11, 2020

Uh oh!

boq left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

slicedlime left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants