use java 17 features (#747)

Author: pjfanning

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

@@ -81,7 +81,7 @@ public List<PropertyName> findPropertyAliases(MapperConfig<?> config, Annotated
         if (ann == null) {
             return null;
         }
-        return Collections.singletonList(PropertyName.construct(ann.alias()));
+        return List.of(PropertyName.construct(ann.alias()));
     }
 
     protected PropertyName _findName(Annotated a)
@@ -100,8 +100,7 @@ public Boolean hasRequiredMarker(MapperConfig<?> config, AnnotatedMember m) {
 
     @Override
     public JsonCreator.Mode findCreatorAnnotation(MapperConfig<?> config, Annotated a) {
-        if (a instanceof AnnotatedConstructor) {
-            AnnotatedConstructor constructor = (AnnotatedConstructor) a;
+        if (a instanceof AnnotatedConstructor constructor) {
             // 09-Mar-2017, tatu: Ideally would allow mix-ins etc, but for now let's take
             //   a short-cut here:
             Class<?> declClass = constructor.getDeclaringClass();

avro/src/main/java/tools/jackson/dataformat/avro/schema/AvroSchemaHelper.java

@@ -59,11 +59,11 @@ public abstract class AvroSchemaHelper
     /**
      * Default stringable classes
      */
-    protected static final Set<Class<?>> STRINGABLE_CLASSES = new HashSet<>(Arrays.asList(
+    protected static final Set<Class<?>> STRINGABLE_CLASSES = Set.of(
             URI.class, URL.class, File.class,
             BigInteger.class, BigDecimal.class,
             String.class
-    ));
+    );
 
     /**
      * Checks if a given type is "Stringable", that is one of the default
@@ -206,7 +206,7 @@ public static Schema typedSchema(Schema.Type nativeType, JavaType javaType) {
 
     public static Schema anyNumberSchema()
     {
-        return Schema.createUnion(Arrays.asList(
+        return Schema.createUnion(List.of(
                 Schema.create(Schema.Type.INT),
                 Schema.create(Schema.Type.LONG),
                 Schema.create(Schema.Type.DOUBLE)

avro/src/main/java/tools/jackson/dataformat/avro/schema/RecordVisitor.java

@@ -254,8 +254,7 @@ protected Schema.Field schemaFieldForWriter(BeanProperty prop, boolean optional)
                 ValueSerializer<?> ser = null;
 
                 // 23-Nov-2012, tatu: Ideally shouldn't need to do this but...
-                if (prop instanceof BeanPropertyWriter) {
-                    BeanPropertyWriter bpw = (BeanPropertyWriter) prop;
+                if (prop instanceof BeanPropertyWriter bpw) {
                     ser = bpw.getSerializer();
                     // 2-Mar-2017, bryan: AvroEncode annotation expects to have the schema used directly
                     optional = optional && !(ser instanceof CustomEncodingSerializer); // Don't modify schema

avro/src/main/java/tools/jackson/dataformat/avro/ser/CustomEncodingSerializer.java

@@ -37,8 +37,8 @@ public void serialize(T t, JsonGenerator jsonGenerator, SerializationContext ctx
     @Override
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType type)
     {
-        if (visitor instanceof VisitorFormatWrapperImpl) {
-            ((VisitorFormatWrapperImpl) visitor).expectAvroFormat(new AvroSchema(encoding.getSchema()));
+        if (visitor instanceof VisitorFormatWrapperImpl wrapper) {
+            wrapper.expectAvroFormat(new AvroSchema(encoding.getSchema()));
         } else {
             super.acceptJsonFormatVisitor(visitor, type);
         }

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

@@ -806,8 +806,8 @@ protected String _numberToName(int ch, boolean neg, TagList tags) throws Jackson
             }
 
             Object str = stringRefs.stringRefs.get(i);
-            if (str instanceof String) {
-                return (String) str;
+            if (str instanceof String s) {
+                return s;
             }
             return new String((byte[]) str, UTF8);
         }
@@ -833,8 +833,8 @@ protected JsonToken _handleTaggedInt(TagList tags) throws JacksonException {
         }
 
         Object str = stringRefs.stringRefs.get(_numberInt);
-        if (str instanceof String) {
-            _sharedString = (String) str;
+        if (str instanceof String s) {
+            _sharedString = s;
             return _updateToken(JsonToken.VALUE_STRING);
         }
         _binaryValue = (byte[]) str;

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

@@ -53,8 +53,7 @@ public String toString() {
     public boolean equals(Object o)
     {
         if (o == this) return true;
-        if (o instanceof CBORSimpleValue) {
-            CBORSimpleValue other = (CBORSimpleValue) o;
+        if (o instanceof CBORSimpleValue other) {
             return _value == other._value;
         }
         return false;

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

@@ -42,12 +42,12 @@ public EnumAsIonSymbolSerializer() {
 
     @Override
     public void serialize(Enum<?> value, JsonGenerator g, SerializationContext provider) {
-        if (g instanceof IonGenerator) {
+        if (g instanceof IonGenerator ionGenerator) {
             String valueString = provider.isEnabled(EnumFeature.WRITE_ENUMS_USING_TO_STRING)
                 ? value.toString()
                 : value.name();
 
-            ((IonGenerator) g).writeSymbol(valueString);
+            ionGenerator.writeSymbol(valueString);
         } else {
             throw new StreamWriteException(g, "Can only use EnumAsIonSymbolSerializer with IonGenerator");
         }

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

@@ -148,8 +148,8 @@ protected void _closeInput() throws IOException
             _destination.close();
         } else {
             if (isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM)) {
-                if (_destination instanceof Flushable) {
-                    ((Flushable) _destination).flush();
+                if (_destination instanceof Flushable flushable) {
+                    flushable.flush();
                 }
             }
         }
@@ -692,8 +692,7 @@ public JsonGenerator writeStartSexp() throws JacksonException {
 
     @Override
     public JsonGenerator writeTypeId(Object rawId) throws JacksonException {
-        if (rawId instanceof String[]) {
-            String[] ids = (String[]) rawId;
+        if (rawId instanceof String[] ids) {
             for (String id : ids) {
                 annotateNextValue(id);
             }

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

@@ -166,9 +166,9 @@ protected void _closeInput() throws IOException {
         // should only close if manage the resource
         if (_ioContext.isResourceManaged()) {
             Object src = _ioContext.contentReference().getRawContent();
-            if (src instanceof Closeable) {
+            if (src instanceof Closeable closeable) {
                 try {
-                    ((Closeable) src).close();
+                    closeable.close();
                 } catch (IOException e) {
                     throw _wrapIOFailure(e);
                 }

ion/src/main/java/tools/jackson/dataformat/ion/ionvalue/IonValueDeserializer.java

@@ -48,8 +48,8 @@ public ValueDeserializer<?> createContextual(DeserializationContext ctxt, BeanPr
     public IonValue deserialize(JsonParser jp, DeserializationContext ctxt) throws JacksonException
     {
         Object embeddedObject = jp.getEmbeddedObject();
-        if (embeddedObject instanceof IonValue) {
-            return (IonValue) embeddedObject;
+        if (embeddedObject instanceof IonValue ionValue) {
+            return ionValue;
         }
         // We rely on the IonParser's IonSystem to wrap supported types into an IonValue
         if (!(jp instanceof IonParser)) {
@@ -58,8 +58,8 @@ public IonValue deserialize(JsonParser jp, DeserializationContext ctxt) throws J
         }
 
         IonSystem ionSystem = ((IonParser) jp).getIonSystem();
-        if (embeddedObject instanceof Timestamp) {
-            return ionSystem.newTimestamp((Timestamp) embeddedObject);
+        if (embeddedObject instanceof Timestamp timestamp) {
+            return ionSystem.newTimestamp(timestamp);
         }
         if (embeddedObject instanceof byte[]) {
             // The parser provides no distinction between BLOB and CLOB, deserializing to a BLOB is the safest choice.
@@ -74,8 +74,7 @@ public Object getNullValue(DeserializationContext ctxt) throws JacksonException
         final JsonParser parser = ctxt.getParser();
         if (parser != null && parser.currentToken() != JsonToken.END_OBJECT) {
             final Object embeddedObj = parser.getEmbeddedObject();
-            if (embeddedObj instanceof IonValue) {
-                IonValue iv = (IonValue) embeddedObj;
+            if (embeddedObj instanceof IonValue iv) {
                 if (iv.isNullValue()) {
                     if (IonType.isContainer(iv.getType())) {
                         return iv;