Skip to content

Commit f6a796b

Browse files
committed
Fix compilation issues wrt core#1480
1 parent 1303723 commit f6a796b

File tree

5 files changed

+43
-17
lines changed

5 files changed

+43
-17
lines changed

avro/src/main/java/tools/jackson/dataformat/avro/AvroGenerator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,13 @@ public int streamWriteOutputBuffered() {
153153
return -1;
154154
}
155155

156-
@Override public AvroSchema getSchema() {
156+
@Override
157+
public PrettyPrinter getPrettyPrinter() {
158+
return null;
159+
}
160+
161+
@Override
162+
public AvroSchema getSchema() {
157163
return _rootSchema;
158164
}
159165

cbor/src/main/java/tools/jackson/dataformat/cbor/CBORGenerator.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,11 @@ public int streamWriteOutputBuffered() {
275275
return _outputTail;
276276
}
277277

278+
@Override
279+
public PrettyPrinter getPrettyPrinter() {
280+
return null;
281+
}
282+
278283
/*
279284
/**********************************************************************
280285
/* Overridden methods, output context (and related)

ion/src/main/java/tools/jackson/dataformat/ion/IonGenerator.java

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ public class IonGenerator
6464
*/
6565
protected final Closeable _destination;
6666

67-
/**
68-
* Object that handles pretty-printing (usually additional
69-
* white space to make results more human-readable) during
70-
* output. If null, no pretty-printing is done.
71-
*/
72-
protected PrettyPrinter _cfgPrettyPrinter;
73-
7467
/*
7568
/**********************************************************************
7669
/* State
@@ -195,6 +188,17 @@ public JacksonFeatureSet<StreamWriteCapability> streamWriteCapabilities() {
195188
return DEFAULT_BINARY_WRITE_CAPABILITIES;
196189
}
197190

191+
/*
192+
/**********************************************************************
193+
/* Config access
194+
/**********************************************************************
195+
*/
196+
197+
@Override
198+
public PrettyPrinter getPrettyPrinter() {
199+
return null;
200+
}
201+
198202
/*
199203
/**********************************************************************
200204
/* JsonGenerator implementation: write numeric values
@@ -520,32 +524,32 @@ protected void _verifyValueWrite(String msg) throws JacksonException
520524
// (Ion impl must do pretty-printing), so
521525
/*
522526
// Only additional work needed if we are pretty-printing
523-
if (_cfgPrettyPrinter != null) {
527+
if (_prettyPrinter != null) {
524528
// If we have a pretty printer, it knows what to do:
525529
switch (status) {
526530
case JsonWriteContext.STATUS_OK_AFTER_COMMA: // array
527-
_cfgPrettyPrinter.writeArrayValueSeparator(this);
531+
_prettyPrinter.writeArrayValueSeparator(this);
528532
break;
529533
case JsonWriteContext.STATUS_OK_AFTER_COLON:
530-
_cfgPrettyPrinter.writeObjectFieldValueSeparator(this);
534+
_prettyPrinter.writeObjectFieldValueSeparator(this);
531535
break;
532536
case JsonWriteContext.STATUS_OK_AFTER_SPACE:
533-
_cfgPrettyPrinter.writeRootValueSeparator(this);
537+
_prettyPrinter.writeRootValueSeparator(this);
534538
break;
535539
case IonWriteContext.STATUS_OK_AFTER_SEXP_SEPARATOR:
536540
// Special handling of sexp value separators can be added later. Root value
537541
// separator will be whitespace which is sufficient to separate sexp values
538-
_cfgPrettyPrinter.writeRootValueSeparator(this);
542+
_prettyPrinter.writeRootValueSeparator(this);
539543
break;
540544
case JsonWriteContext.STATUS_OK_AS_IS:
541545
// First entry, but of which context?
542546
if (_outputContext.inArray()) {
543-
_cfgPrettyPrinter.beforeArrayValues(this);
547+
_prettyPrinter.beforeArrayValues(this);
544548
} else if (_outputContext.inObject()) {
545-
_cfgPrettyPrinter.beforeObjectEntries(this);
549+
_prettyPrinter.beforeObjectEntries(this);
546550
} else if(((IonWriteContext) _writeContext).inSexp()) {
547551
// Format sexps like arrays
548-
_cfgPrettyPrinter.beforeArrayValues(this);
552+
_prettyPrinter.beforeArrayValues(this);
549553
}
550554
break;
551555
default:

protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufGenerator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,13 @@ public int streamWriteOutputBuffered() {
193193
return -1;
194194
}
195195

196-
@Override public ProtobufSchema getSchema() {
196+
@Override
197+
public PrettyPrinter getPrettyPrinter() {
198+
return null;
199+
}
200+
201+
@Override
202+
public ProtobufSchema getSchema() {
197203
return _schema;
198204
}
199205

smile/src/main/java/tools/jackson/dataformat/smile/SmileGenerator.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,11 @@ public int streamWriteOutputBuffered() {
306306
return _outputTail;
307307
}
308308

309+
@Override
310+
public PrettyPrinter getPrettyPrinter() {
311+
return null;
312+
}
313+
309314
/*
310315
/**********************************************************************
311316
/* Overridden methods, output context (and related)

0 commit comments

Comments
 (0)