From f6a796bb7b1db959a6a9921579a7cd06d85339a1 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Fri, 3 Oct 2025 11:32:05 -0700 Subject: [PATCH] Fix compilation issues wrt core#1480 --- .../dataformat/avro/AvroGenerator.java | 8 ++++- .../dataformat/cbor/CBORGenerator.java | 5 +++ .../jackson/dataformat/ion/IonGenerator.java | 34 +++++++++++-------- .../protobuf/ProtobufGenerator.java | 8 ++++- .../dataformat/smile/SmileGenerator.java | 5 +++ 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/avro/src/main/java/tools/jackson/dataformat/avro/AvroGenerator.java b/avro/src/main/java/tools/jackson/dataformat/avro/AvroGenerator.java index f32458330..d2657b2da 100644 --- a/avro/src/main/java/tools/jackson/dataformat/avro/AvroGenerator.java +++ b/avro/src/main/java/tools/jackson/dataformat/avro/AvroGenerator.java @@ -153,7 +153,13 @@ public int streamWriteOutputBuffered() { return -1; } - @Override public AvroSchema getSchema() { + @Override + public PrettyPrinter getPrettyPrinter() { + return null; + } + + @Override + public AvroSchema getSchema() { return _rootSchema; } diff --git a/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORGenerator.java b/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORGenerator.java index 3320af7da..04880c037 100644 --- a/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORGenerator.java +++ b/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORGenerator.java @@ -275,6 +275,11 @@ public int streamWriteOutputBuffered() { return _outputTail; } + @Override + public PrettyPrinter getPrettyPrinter() { + return null; + } + /* /********************************************************************** /* Overridden methods, output context (and related) diff --git a/ion/src/main/java/tools/jackson/dataformat/ion/IonGenerator.java b/ion/src/main/java/tools/jackson/dataformat/ion/IonGenerator.java index 04b050b91..69a041985 100644 --- a/ion/src/main/java/tools/jackson/dataformat/ion/IonGenerator.java +++ b/ion/src/main/java/tools/jackson/dataformat/ion/IonGenerator.java @@ -64,13 +64,6 @@ public class IonGenerator */ protected final Closeable _destination; - /** - * Object that handles pretty-printing (usually additional - * white space to make results more human-readable) during - * output. If null, no pretty-printing is done. - */ - protected PrettyPrinter _cfgPrettyPrinter; - /* /********************************************************************** /* State @@ -195,6 +188,17 @@ public JacksonFeatureSet streamWriteCapabilities() { return DEFAULT_BINARY_WRITE_CAPABILITIES; } + /* + /********************************************************************** + /* Config access + /********************************************************************** + */ + + @Override + public PrettyPrinter getPrettyPrinter() { + return null; + } + /* /********************************************************************** /* JsonGenerator implementation: write numeric values @@ -520,32 +524,32 @@ protected void _verifyValueWrite(String msg) throws JacksonException // (Ion impl must do pretty-printing), so /* // Only additional work needed if we are pretty-printing - if (_cfgPrettyPrinter != null) { + if (_prettyPrinter != null) { // If we have a pretty printer, it knows what to do: switch (status) { case JsonWriteContext.STATUS_OK_AFTER_COMMA: // array - _cfgPrettyPrinter.writeArrayValueSeparator(this); + _prettyPrinter.writeArrayValueSeparator(this); break; case JsonWriteContext.STATUS_OK_AFTER_COLON: - _cfgPrettyPrinter.writeObjectFieldValueSeparator(this); + _prettyPrinter.writeObjectFieldValueSeparator(this); break; case JsonWriteContext.STATUS_OK_AFTER_SPACE: - _cfgPrettyPrinter.writeRootValueSeparator(this); + _prettyPrinter.writeRootValueSeparator(this); break; case IonWriteContext.STATUS_OK_AFTER_SEXP_SEPARATOR: // Special handling of sexp value separators can be added later. Root value // separator will be whitespace which is sufficient to separate sexp values - _cfgPrettyPrinter.writeRootValueSeparator(this); + _prettyPrinter.writeRootValueSeparator(this); break; case JsonWriteContext.STATUS_OK_AS_IS: // First entry, but of which context? if (_outputContext.inArray()) { - _cfgPrettyPrinter.beforeArrayValues(this); + _prettyPrinter.beforeArrayValues(this); } else if (_outputContext.inObject()) { - _cfgPrettyPrinter.beforeObjectEntries(this); + _prettyPrinter.beforeObjectEntries(this); } else if(((IonWriteContext) _writeContext).inSexp()) { // Format sexps like arrays - _cfgPrettyPrinter.beforeArrayValues(this); + _prettyPrinter.beforeArrayValues(this); } break; default: diff --git a/protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufGenerator.java b/protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufGenerator.java index d2662d1bb..2eb50e22f 100644 --- a/protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufGenerator.java +++ b/protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufGenerator.java @@ -193,7 +193,13 @@ public int streamWriteOutputBuffered() { return -1; } - @Override public ProtobufSchema getSchema() { + @Override + public PrettyPrinter getPrettyPrinter() { + return null; + } + + @Override + public ProtobufSchema getSchema() { return _schema; } diff --git a/smile/src/main/java/tools/jackson/dataformat/smile/SmileGenerator.java b/smile/src/main/java/tools/jackson/dataformat/smile/SmileGenerator.java index 156edcf84..1ace9edf4 100644 --- a/smile/src/main/java/tools/jackson/dataformat/smile/SmileGenerator.java +++ b/smile/src/main/java/tools/jackson/dataformat/smile/SmileGenerator.java @@ -306,6 +306,11 @@ public int streamWriteOutputBuffered() { return _outputTail; } + @Override + public PrettyPrinter getPrettyPrinter() { + return null; + } + /* /********************************************************************** /* Overridden methods, output context (and related)