From ce697d215d6035a40904c74db8bb9515177e4870 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 21 May 2026 17:56:10 +0200 Subject: [PATCH 01/41] chore(QTDI-2893): use pattern matching for instanceof (S6201) Replace `instanceof` + manual cast patterns with Java 17 pattern matching for instanceof to reduce Sonar warnings (java:S6201). Both `(X) value` and `X.class.cast(value)` cast forms are handled. Excluded cases: - Conditions combined with `||` (pattern matching incompatible with alternation): AvroSchemaCache, SchemaConverter (Double||Float). - ParameterSetter#set: target variable declared outside the `if` block (would require restructuring). - Casts to a type different from the `instanceof` check (not S6201). --- .../beam/spi/record/AvroEntryBuilder.java | 3 +- .../runtime/beam/spi/record/AvroRecord.java | 46 +++++++++---------- .../beam/spi/record/AvroSchemaCache.java | 3 +- .../component/runtime/record/RecordImpl.java | 20 ++++---- .../runtime/manager/ComponentManager.java | 6 +-- .../manager/service/ServiceHelper.java | 4 +- .../xbean/converter/SchemaConverter.java | 32 ++++++------- .../service/ProducerFinderImplTest.java | 4 +- .../internal/impl/DefaultResponseLocator.java | 3 +- .../component/runtime/di/OutputsHandler.java | 8 ++-- .../runtime/di/schema/TaCoKitGuessSchema.java | 40 ++++++++-------- .../di/studio/AfterVariableExtracter.java | 4 +- .../runtime/di/studio/ParameterSetter.java | 4 +- .../di/studio/RuntimeContextInjector.java | 4 +- .../tools/validator/ActionValidator.java | 4 +- 15 files changed, 89 insertions(+), 96 deletions(-) diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroEntryBuilder.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroEntryBuilder.java index 64eaee291f903..69e96ba8792ab 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroEntryBuilder.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroEntryBuilder.java @@ -22,8 +22,7 @@ public class AvroEntryBuilder extends SchemaImpl.EntryImpl.BuilderImpl { @Override public Schema.Entry.Builder withElementSchema(final Schema schema) { - if (schema instanceof AvroSchema) { - final AvroSchema innerSchema = (AvroSchema) schema; + if (schema instanceof AvroSchema innerSchema) { AvroSchema avroSchema = this.authorizeNull(innerSchema); return super.withElementSchema(avroSchema); } diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java index 40fda0d05c3cc..14958d3ffe2f1 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java @@ -74,8 +74,7 @@ public AvroRecord(final IndexedRecord record) { } public AvroRecord(final Record record) { - if (record instanceof AvroRecord) { - final AvroRecord avr = (AvroRecord) record; + if (record instanceof AvroRecord avr) { this.delegate = avr.delegate; this.schema = avr.schema; return; @@ -105,12 +104,12 @@ private Object directMapping(final Object value, final Schema.Entry entry) { // RecordImpl store BigDecimal directly, no any convert as not necessary, so here need to convert to string for // beam's AvroCoder which cloud platform use // also here for any Collection as Array type - if (value instanceof BigDecimal) { - return BigDecimal.class.cast(value).toString(); + if (value instanceof BigDecimal bigDecimal) { + return bigDecimal.toString(); } - if (value instanceof Collection) { - return Collection.class.cast(value).stream().map(v -> this.directMapping(v, entry)).collect(toList()); + if (value instanceof Collection collection) { + return collection.stream().map(v -> this.directMapping(v, entry)).collect(toList()); } if (value instanceof RecordImpl) { return new AvroRecord((Record) value).delegate; @@ -118,28 +117,28 @@ private Object directMapping(final Object value, final Schema.Entry entry) { if (value instanceof Record) { return Unwrappable.class.cast(value).unwrap(IndexedRecord.class); } - if (value instanceof ZonedDateTime) { - return ZonedDateTime.class.cast(value).toInstant().toEpochMilli(); + if (value instanceof ZonedDateTime zonedDateTime) { + return zonedDateTime.toInstant().toEpochMilli(); } - if (value instanceof Date) { - return Date.class.cast(value).getTime(); + if (value instanceof Date date) { + return date.getTime(); } - if (value instanceof byte[]) { - return ByteBuffer.wrap(byte[].class.cast(value)); + if (value instanceof byte[] bytes) { + return ByteBuffer.wrap(bytes); } - if (value instanceof Long) { + if (value instanceof Long longValue) { String logicalType = entry.getLogicalType(); if (logicalType != null) { if (SchemaProperty.LogicalType.DATE.key().equals(logicalType)) { return Math.toIntExact( - Instant.ofEpochMilli((Long) value) + Instant.ofEpochMilli(longValue) .atZone(UTC) .toLocalDate() .toEpochDay()); // Avro stores dates as int } else if (LogicalType.TIME.key().equals(logicalType)) { // QTDI-1252: Avro time-millis logical type stores int milliseconds from 0:00:00 not from Unix Epoch - final Instant instant = Instant.ofEpochMilli((Long) value); + final Instant instant = Instant.ofEpochMilli(longValue); final ZonedDateTime zonedDateTime = instant.atZone(UTC); return Math.toIntExact(zonedDateTime.toLocalTime().toNanoOfDay() / 1_000_000); } @@ -245,12 +244,13 @@ private T doMap(final Class expectedType, final org.apache.avro.Schema fi return expectedType.cast(value); } - if (value instanceof IndexedRecord && (Record.class == expectedType || Object.class == expectedType)) { - return expectedType.cast(new AvroRecord(IndexedRecord.class.cast(value))); + if (value instanceof IndexedRecord indexedRecord + && (Record.class == expectedType || Object.class == expectedType)) { + return expectedType.cast(new AvroRecord(indexedRecord)); } - if (value instanceof ByteBuffer && byte[].class == expectedType) { - return expectedType.cast(ByteBuffer.class.cast(value).array()); + if (value instanceof ByteBuffer byteBuffer && byte[].class == expectedType) { + return expectedType.cast(byteBuffer.array()); } final org.apache.avro.Schema fieldSchema = unwrapUnion(fieldSchemaRaw); @@ -311,8 +311,8 @@ private T doMap(final Class expectedType, final org.apache.avro.Schema fi .cast(doMapCollection(itemType, Collection.class.cast(value), fieldSchema.getElementType())); } - if (value instanceof org.joda.time.DateTime && ZonedDateTime.class == expectedType) { - final long epochMilli = org.joda.time.DateTime.class.cast(value).getMillis(); + if (value instanceof org.joda.time.DateTime dateTime && ZonedDateTime.class == expectedType) { + final long epochMilli = dateTime.getMillis(); return expectedType.cast(ZonedDateTime.ofInstant(java.time.Instant.ofEpochMilli(epochMilli), UTC)); } @@ -338,7 +338,7 @@ private T doMap(final Class expectedType, final org.apache.avro.Schema fi if (value instanceof Utf8 && Object.class == expectedType) { return expectedType.cast(value.toString()); } - if (Collection.class.isAssignableFrom(expectedType) && value instanceof Collection) { + if (Collection.class.isAssignableFrom(expectedType) && value instanceof Collection collection) { final org.apache.avro.Schema elementType = fieldSchema.getElementType(); final org.apache.avro.Schema elementSchema = unwrapUnion(elementType); Class toType = Object.class; @@ -347,7 +347,7 @@ private T doMap(final Class expectedType, final org.apache.avro.Schema fi } else if (elementSchema.getType() == org.apache.avro.Schema.Type.ARRAY) { toType = Collection.class; } - final Collection objects = this.doMapCollection(toType, Collection.class.cast(value), elementSchema); + final Collection objects = this.doMapCollection(toType, collection, elementSchema); return expectedType.cast(objects); } return expectedType.cast(value); diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCache.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCache.java index 965e7611fd08a..14eaaadf53664 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCache.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCache.java @@ -42,8 +42,7 @@ public AvroSchema find(final Schema schema) { if (schema == null || schema instanceof AvroSchema) { return (AvroSchema) schema; } - if (schema instanceof SchemaImpl) { - final SchemaImpl realSchema = (SchemaImpl) schema; + if (schema instanceof SchemaImpl realSchema) { if ((!this.cache.containsKey(realSchema)) && this.cache.size() >= AvroSchemaCache.MAX_SIZE) { this.removeOldest(); diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java index f56961dfca2ff..1602d11f66641 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java @@ -193,16 +193,16 @@ public Builder with(final Entry entry, final Object value) { if (entry.getType() == Schema.Type.DATETIME) { if (value == null) { withDateTime(entry, (ZonedDateTime) value); - } else if (value instanceof Long) { - withTimestamp(entry, (Long) value); - } else if (value instanceof Date) { - withDateTime(entry, (Date) value); - } else if (value instanceof ZonedDateTime) { - withDateTime(entry, (ZonedDateTime) value); - } else if (value instanceof Instant) { - withInstant(entry, (Instant) value); - } else if (value instanceof Temporal) { - withTimestamp(entry, ((Temporal) value).get(ChronoField.INSTANT_SECONDS) * 1000L); + } else if (value instanceof Long longValue) { + withTimestamp(entry, longValue); + } else if (value instanceof Date date) { + withDateTime(entry, date); + } else if (value instanceof ZonedDateTime zonedDateTime) { + withDateTime(entry, zonedDateTime); + } else if (value instanceof Instant instant) { + withInstant(entry, instant); + } else if (value instanceof Temporal temporal) { + withTimestamp(entry, temporal.get(ChronoField.INSTANT_SECONDS) * 1000L); } return this; } else { diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java index b510ffffd1ecb..5f718f65c919b 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java @@ -781,14 +781,12 @@ public ParameterMeta findDatastoreParameterMeta(final String plugin, final Strin */ public static Map jsonToMap(final JsonValue jsonValue, final String path) { final Map result = new HashMap<>(); - if (jsonValue instanceof JsonObject) { - JsonObject jsonObj = (JsonObject) jsonValue; + if (jsonValue instanceof JsonObject jsonObj) { for (String key : jsonObj.keySet()) { String newPath = path.isEmpty() ? key : path + "." + key; result.putAll(jsonToMap(jsonObj.get(key), newPath)); } - } else if (jsonValue instanceof JsonArray) { - JsonArray jsonArray = (JsonArray) jsonValue; + } else if (jsonValue instanceof JsonArray jsonArray) { for (int i = 0; i < jsonArray.size(); i++) { String newPath = path + "[" + i + "]"; result.putAll(jsonToMap(jsonArray.get(i), newPath)); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ServiceHelper.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ServiceHelper.java index df71b68221c60..0afa6685d1bca 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ServiceHelper.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ServiceHelper.java @@ -57,8 +57,8 @@ public Object createServiceInstance(final ClassLoader loader, final String conta .initialize(instance, new InterceptorHandlerFacade(serviceClass.getConstructor().newInstance(), allServices)); } - if (instance instanceof BaseService) { - this.updateService((BaseService) instance, containerId, serviceClass.getName()); + if (instance instanceof BaseService baseService) { + this.updateService(baseService, containerId, serviceClass.getName()); } return instance; } catch (final InstantiationException | IllegalAccessException e) { diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/SchemaConverter.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/SchemaConverter.java index 8f51b1dc4fd2a..c6231dc3a4179 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/SchemaConverter.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/SchemaConverter.java @@ -98,8 +98,8 @@ private Schema toSchema(final JsonObject json) { this.addProps(builder::withProp, json); final JsonValue orderValue = json.get("order"); - if (orderValue instanceof JsonString) { - final Schema.EntriesOrder order = Schema.EntriesOrder.of(((JsonString) orderValue).getString()); + if (orderValue instanceof JsonString jsonString) { + final Schema.EntriesOrder order = Schema.EntriesOrder.of(jsonString.getString()); return builder.build(order); } else { return builder.build(); @@ -109,11 +109,11 @@ private Schema toSchema(final JsonObject json) { private void treatElementSchema(final JsonObject json, final Consumer setter) { final JsonValue elementSchema = json.get(ELEMENT_SCHEMA); - if (elementSchema instanceof JsonObject) { - final Schema schema = this.toSchema((JsonObject) elementSchema); + if (elementSchema instanceof JsonObject jsonObject) { + final Schema schema = this.toSchema(jsonObject); setter.accept(schema); - } else if (elementSchema instanceof JsonString) { - final Schema.Type innerType = Schema.Type.valueOf(((JsonString) elementSchema).getString()); + } else if (elementSchema instanceof JsonString jsonString) { + final Schema.Type innerType = Schema.Type.valueOf(jsonString.getString()); setter.accept(this.factory.newSchemaBuilder(innerType).build()); } } @@ -276,17 +276,17 @@ private JsonValue toValue(final Object object) { if (object == null) { return JsonValue.NULL; } - if (object instanceof Integer) { - return Json.createValue((Integer) object); + if (object instanceof Integer i) { + return Json.createValue(i); } - if (object instanceof Long) { - return Json.createValue((Long) object); + if (object instanceof Long l) { + return Json.createValue(l); } if (object instanceof Double || object instanceof Float) { return Json.createValue((Double) object); } - if (object instanceof BigInteger) { - return Json.createValue((BigInteger) object); + if (object instanceof BigInteger bi) { + return Json.createValue(bi); } if (object instanceof Boolean) { if (object == Boolean.TRUE) { @@ -294,11 +294,11 @@ private JsonValue toValue(final Object object) { } return JsonValue.FALSE; } - if (object instanceof BigDecimal) { - return Json.createValue((BigDecimal) object); + if (object instanceof BigDecimal bd) { + return Json.createValue(bd); } - if (object instanceof String) { - return Json.createValue((String) object); + if (object instanceof String s) { + return Json.createValue(s); } return null; diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/ProducerFinderImplTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/ProducerFinderImplTest.java index 79034d8e80770..6b229189412f6 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/ProducerFinderImplTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/ProducerFinderImplTest.java @@ -77,8 +77,8 @@ void findException() { } private Record toRecord(final Object object) { - if (object instanceof Record) { - return (Record) object; + if (object instanceof Record rcd) { + return rcd; } return null; } diff --git a/component-runtime-testing/component-runtime-http-junit/src/main/java/org/talend/sdk/component/junit/http/internal/impl/DefaultResponseLocator.java b/component-runtime-testing/component-runtime-http-junit/src/main/java/org/talend/sdk/component/junit/http/internal/impl/DefaultResponseLocator.java index 8b4a82dd85e6c..e0481145dbdf3 100644 --- a/component-runtime-testing/component-runtime-http-junit/src/main/java/org/talend/sdk/component/junit/http/internal/impl/DefaultResponseLocator.java +++ b/component-runtime-testing/component-runtime-http-junit/src/main/java/org/talend/sdk/component/junit/http/internal/impl/DefaultResponseLocator.java @@ -254,8 +254,7 @@ public int hashCode() { public boolean equals(final Object obj) { if (this == obj) { return true; - } else if (obj instanceof ParameterizedType) { - final ParameterizedType that = (ParameterizedType) obj; + } else if (obj instanceof ParameterizedType that) { final Type thatRawType = that.getRawType(); return that.getOwnerType() == null && (rawType == null ? thatRawType == null : rawType.equals(thatRawType)) diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java index 5d9a30e1c07d4..1f49e1554244d 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java @@ -46,8 +46,8 @@ public OutputFactory asOutputFactory() { if (ref != null && value != null) { if (value instanceof javax.json.JsonValue) { ref.add(jsonb.fromJson(value.toString(), ref.getType())); - } else if (value instanceof Record) { - ref.add(registry.find(ref.getType()).newInstance(Record.class.cast(value))); + } else if (value instanceof Record rcd) { + ref.add(registry.find(ref.getType()).newInstance(rcd)); } else { ref.add(jsonb.fromJson(jsonb.toJson(value), ref.getType())); } @@ -67,8 +67,8 @@ public OutputFactory asOutputFactoryForGuessSchema() { if (ref != null && value != null) { if (value instanceof javax.json.JsonValue) { ref.add(jsonb.fromJson(value.toString(), ref.getType())); - } else if (value instanceof Record) { - ref.add(((Record) value).getSchema()); + } else if (value instanceof Record rcd) { + ref.add(rcd.getSchema()); } else if (value instanceof Schema) { ref.add(value); } else { diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java index 9c72735b566d5..6e36e7afea1dd 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java @@ -174,10 +174,10 @@ private void initClass2JavaTypeMap() { private DiscoverSchemaException transformException(final Exception e) { DiscoverSchemaException discoverSchemaException; - if (e instanceof DiscoverSchemaException) { - discoverSchemaException = DiscoverSchemaException.class.cast(e); - } else if (e instanceof ComponentException) { - discoverSchemaException = new DiscoverSchemaException((ComponentException) e); + if (e instanceof DiscoverSchemaException dse) { + discoverSchemaException = dse; + } else if (e instanceof ComponentException ce) { + discoverSchemaException = new DiscoverSchemaException(ce); } else { discoverSchemaException = new DiscoverSchemaException(e.getMessage(), e.getStackTrace(), EXCEPTION); } @@ -253,12 +253,11 @@ private void executeDiscoverSchemaExtendedAction(final Schema schema, final Stri } final Object schemaResult = actionRef.getInvoker().apply(buildActionConfig(actionRef, configuration, schema, branch)); - if (schemaResult instanceof Schema) { - final Schema result = (Schema) schemaResult; + if (schemaResult instanceof Schema result) { if (result.getEntries().isEmpty()) { throw new DiscoverSchemaException(ERROR_NO_AVAILABLE_SCHEMA_FOUND, EXCEPTION); } else { - fromSchema(Schema.class.cast(schemaResult)); + fromSchema(result); } } } @@ -468,8 +467,8 @@ public boolean guessSchemaThroughAction(final Schema schema) { : buildActionConfig(actionRef, configuration, schema, "INPUT"); final Object schemaResult = actionRef.getInvoker().apply(actionConfiguration); - if (schemaResult instanceof Schema) { - return fromSchema(Schema.class.cast(schemaResult)); + if (schemaResult instanceof Schema resultSchema) { + return fromSchema(resultSchema); } else { log.error(ERROR_INSTANCE_SCHEMA); @@ -501,8 +500,7 @@ private boolean fromSchema(final Schema schema) { public Collection getFixedSchema(final String execute) { SchemaConverter sc = new SchemaConverter(); Object o = sc.toObjectImpl(execute); - if (o instanceof Schema) { - final Schema schema = Schema.class.cast(o); + if (o instanceof Schema schema) { final Collection entries = schema.getEntries(); if (entries == null || entries.isEmpty()) { log.info(NO_COLUMN_FOUND_BY_GUESS_SCHEMA); @@ -675,10 +673,10 @@ private boolean guessInputComponentSchemaThroughResult() throws Exception { if (rowObject == null) { return false; } - if (rowObject instanceof Record) { - return fromSchema(Record.class.cast(rowObject).getSchema()); - } else if (rowObject instanceof java.util.Map) { - return guessInputSchemaThroughResults(input, (java.util.Map) rowObject); + if (rowObject instanceof Record record) { + return fromSchema(record.getSchema()); + } else if (rowObject instanceof java.util.Map map) { + return guessInputSchemaThroughResults(input, map); } else if (rowObject instanceof java.util.Collection) { throw new Exception("Can't guess schema from a Collection"); } else { @@ -707,12 +705,12 @@ private boolean guessInputComponentSchemaThroughResult() throws Exception { * @return true if completed; false if one more result row is needed. */ public boolean guessSchemaThroughResult(final Object rowObject) throws Exception { - if (rowObject instanceof java.util.Map) { - return guessSchemaThroughResult((java.util.Map) rowObject); - } else if (rowObject instanceof Schema) { - return fromSchema(Schema.class.cast(rowObject)); - } else if (rowObject instanceof Record) { - return fromSchema(Record.class.cast(rowObject).getSchema()); + if (rowObject instanceof java.util.Map map) { + return guessSchemaThroughResult(map); + } else if (rowObject instanceof Schema schema) { + return fromSchema(schema); + } else if (rowObject instanceof Record record) { + return fromSchema(record.getSchema()); } else if (rowObject instanceof java.util.Collection) { throw new Exception("Can't guess schema from a Collection"); } else { diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/AfterVariableExtracter.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/AfterVariableExtracter.java index 37f2e428857fb..8062b181e84ee 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/AfterVariableExtracter.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/AfterVariableExtracter.java @@ -40,8 +40,8 @@ public class AfterVariableExtracter { * @return map with after variables. */ public static Map extractAfterVariables(final Lifecycle lifecycle) { - if (lifecycle instanceof Delegated) { - final Object delegate = ((Delegated) lifecycle).getDelegate(); + if (lifecycle instanceof Delegated delegated) { + final Object delegate = delegated.getDelegate(); final ClassLoader classloader = ReflectionUtils.getClassLoader(lifecycle); diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/ParameterSetter.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/ParameterSetter.java index b0461c4ed8757..adc60ff9c15d2 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/ParameterSetter.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/ParameterSetter.java @@ -92,8 +92,8 @@ public void change(final String path, final Object value) { try { target = field.get(target); if (arrayLocation > -1) { - if (target instanceof List) { - target = List.class.cast(target).get(arrayLocation); + if (target instanceof List list) { + target = list.get(arrayLocation); } else { log.warn("expect a list, but not"); return; diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/RuntimeContextInjector.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/RuntimeContextInjector.java index 9370724f2b2ac..cace2e87e06b0 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/RuntimeContextInjector.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/RuntimeContextInjector.java @@ -35,8 +35,8 @@ public class RuntimeContextInjector { * @see Lifecycle */ public static void injectLifecycle(final Lifecycle lifecycle, final RuntimeContextHolder runtimeContext) { - if (lifecycle instanceof Delegated) { - final Object delegate = ((Delegated) lifecycle).getDelegate(); + if (lifecycle instanceof Delegated delegated) { + final Object delegate = delegated.getDelegate(); Class currentClass = delegate.getClass(); while (currentClass != null && currentClass != Object.class) { diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/ActionValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/ActionValidator.java index ef20ebc84b7fa..a6abe6bb6f84f 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/ActionValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/ActionValidator.java @@ -470,8 +470,8 @@ private boolean hasCorrectReturnType(final Method method) { private boolean hasStringInList(final Method method) { if (List.class.isAssignableFrom(method.getReturnType()) - && method.getGenericReturnType() instanceof ParameterizedType) { - Type[] actualTypeArguments = ((ParameterizedType) method.getGenericReturnType()).getActualTypeArguments(); + && method.getGenericReturnType() instanceof ParameterizedType parameterizedType) { + Type[] actualTypeArguments = parameterizedType.getActualTypeArguments(); if (actualTypeArguments.length > 0) { return "java.lang.String".equals(actualTypeArguments[0].getTypeName()); } From e6240c614ee7dd746fa217526956d5719c096835 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 21 May 2026 18:40:56 +0200 Subject: [PATCH 02/41] chore(QTDI-2893): rename pattern match --- .../component/runtime/di/schema/TaCoKitGuessSchema.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java index 6e36e7afea1dd..4783e851def3b 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java @@ -673,8 +673,8 @@ private boolean guessInputComponentSchemaThroughResult() throws Exception { if (rowObject == null) { return false; } - if (rowObject instanceof Record record) { - return fromSchema(record.getSchema()); + if (rowObject instanceof Record rcd) { + return fromSchema(rcd.getSchema()); } else if (rowObject instanceof java.util.Map map) { return guessInputSchemaThroughResults(input, map); } else if (rowObject instanceof java.util.Collection) { @@ -709,8 +709,8 @@ public boolean guessSchemaThroughResult(final Object rowObject) throws Exception return guessSchemaThroughResult(map); } else if (rowObject instanceof Schema schema) { return fromSchema(schema); - } else if (rowObject instanceof Record record) { - return fromSchema(record.getSchema()); + } else if (rowObject instanceof Record rcd) { + return fromSchema(rcd.getSchema()); } else if (rowObject instanceof java.util.Collection) { throw new Exception("Can't guess schema from a Collection"); } else { From ffe2f537c839efe985b87f922ccccdd965d55df8 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 14:12:34 +0200 Subject: [PATCH 03/41] chore(QTDI-2894): S6204 Stream.toList() (cherry picked from commit c8777245663ae6fee18ce55d2844eec44f2f901a) --- .../sdk/component/api/record/Schema.java | 4 +- .../component/api/record/OrderedMapTest.java | 4 +- .../sdk/component/form/api/UiSpecService.java | 3 +- .../converter/impl/UiSchemaConverter.java | 3 +- .../impl/schema/ArrayPropertyConverter.java | 3 +- .../impl/widget/AbstractWidgetConverter.java | 6 +-- .../impl/widget/DataListWidgetConverter.java | 2 +- .../widget/GridLayoutWidgetConverter.java | 2 +- .../widget/MultiSelectWidgetConverter.java | 3 +- .../validation/spi/ext/TypeValidation.java | 3 +- .../component/form/api/UiSpecServiceTest.java | 14 +++-- .../validation/ValidationServiceTest.java | 3 +- .../form/model/uischema/UiSchema.java | 3 +- .../uispec/mapper/impl/UiSpecMapperImpl.java | 5 +- .../runtime/beam/chain/impl/BeamExecutor.java | 3 +- .../runtime/beam/customizer/Indices.java | 3 +- .../runtime/beam/spi/record/AvroRecord.java | 10 ++-- .../runtime/beam/spi/record/AvroSchema.java | 5 +- .../beam/spi/record/AvroSchemaBuilder.java | 3 +- .../beam/spi/record/AvroSchemaConverter.java | 5 +- .../beam/spi/record/SchemaIdGenerator.java | 3 +- .../avro/SchemalessJsonToIndexedRecord.java | 3 +- .../runtime/beam/NativeWrappedIOTest.java | 3 +- .../component/runtime/beam/TalendIOTest.java | 2 +- .../beam/coder/JsonpJsonObjectCoderTest.java | 3 +- .../beam/spi/record/AvroRecordTest.java | 3 +- .../beam/spi/record/AvroSchemaCacheTest.java | 3 +- .../beam/transform/AutoKVWrapperTest.java | 5 +- .../transform/RecordBranchFilterTest.java | 3 +- .../transform/RecordBranchMapperTest.java | 3 +- .../transform/RecordBranchUnwrapperTest.java | 3 +- .../avro/IndexedRecordToJsonTest.java | 3 +- .../avro/JsonToIndexedRecordTest.java | 3 +- .../SchemalessJsonToIndexedRecordTest.java | 3 +- .../flows/ProcessorFlowsFactory.java | 5 +- .../repository/RepositoryModelBuilder.java | 5 +- .../RepositoryModelBuilderTest.java | 3 +- .../runtime/output/ProcessorImpl.java | 9 ++-- .../component/runtime/record/RecordImpl.java | 13 +++-- .../component/runtime/record/SchemaImpl.java | 7 ++- .../record/json/RecordJsonGenerator.java | 6 +-- .../EnhancedObjectInputStream.java | 3 +- .../runtime/visitor/ModelVisitor.java | 16 +++--- .../input/PartitionMapperImplTest.java | 3 +- .../runtime/output/ProcessorImplTest.java | 3 +- .../runtime/record/OrderedMapTest.java | 4 +- .../runtime/record/RecordBuilderImplTest.java | 6 +-- .../runtime/record/RecordConvertersTest.java | 12 ++--- .../runtime/record/SchemaImplTest.java | 3 +- .../runtime/manager/ComponentManager.java | 22 ++++---- .../runtime/manager/asm/ProxyGenerator.java | 3 +- .../manager/chain/internal/JobImpl.java | 7 ++- .../configuration/ConfigurationMapper.java | 3 +- .../interceptor/InterceptorHandlerFacade.java | 9 ++-- .../reflect/ComponentMetadataService.java | 3 +- .../reflect/ParameterModelService.java | 4 +- .../manager/reflect/ReflectionService.java | 2 +- .../UiParameterEnricher.java | 3 +- .../reflect/visibility/VisibilityService.java | 2 +- .../manager/service/LocalCacheService.java | 9 ++-- .../service/RecordPointerFactoryImpl.java | 4 +- .../runtime/manager/service/ResolverImpl.java | 3 +- .../service/http/HttpClientFactoryImpl.java | 5 +- .../manager/service/http/RequestParser.java | 2 +- .../runtime/manager/ComponentManagerTest.java | 7 ++- .../manager/ReflectionServiceTest.java | 2 +- .../runtime/manager/chain/JobTest.java | 3 +- .../manager/interceptor/InterceptorTest.java | 3 +- .../service/RecordServiceImplTest.java | 3 +- .../java/org/talend/test/CheckpointInput.java | 4 +- .../talend/sdk/component/junit/beam/Data.java | 3 +- .../component/junit/beam/ProcessorTest.java | 3 +- .../beam/ProducerFinderEnvironmentTest.java | 5 +- .../junit/BaseComponentsHandler.java | 7 ++- .../environment/BaseEnvironmentProvider.java | 4 +- .../sdk/component/maven/MavenDecrypter.java | 5 +- .../junit/SimpleComponentRuleTest.java | 3 +- .../junit5/ComponentExtensionTest.java | 3 +- .../testing/spark/internal/BaseSpark.java | 5 +- .../server/front/ActionResourceImpl.java | 5 +- .../server/front/BulkReadResourceImpl.java | 5 +- .../server/front/ComponentResourceImpl.java | 13 +++-- .../front/ConfigurationTypeResourceImpl.java | 3 +- .../front/DocumentationResourceImpl.java | 2 +- .../server/front/security/SecurityUtils.java | 5 +- .../server/service/ActionsService.java | 5 +- .../service/ComponentManagerService.java | 8 +-- .../ExtensionComponentMetadataManager.java | 3 +- .../service/PropertyValidationService.java | 5 +- .../service/VirtualDependenciesService.java | 3 +- .../server/service/PropertiesServiceTest.java | 6 +-- .../server/test/custom/CustomService.java | 4 +- ...nerateCertificateAndActivateHttpsTest.java | 3 +- .../starter/server/front/RRDEndpoint.java | 3 +- .../facet/component/ComponentGenerator.java | 4 +- .../service/openapi/OpenAPIGenerator.java | 4 +- .../component/service/MockTableService.java | 2 +- .../component/source/MockTableMapper.java | 3 +- .../ComponentGeneratorConfigurationTest.java | 3 +- .../di/beam/DelegatingBoundedSource.java | 4 +- .../di/beam/DelegatingUnBoundedSource.java | 4 +- .../runtime/di/schema/TaCoKitGuessSchema.java | 3 +- .../components/DIBatchSimulationTest.java | 3 +- .../di/record/DiRecordVisitorTest.java | 3 +- .../runtime/di/studio/DynamicColumnsTest.java | 5 +- .../generator/StaticResourceGenerator.java | 26 +++++----- .../generator/StaticUiSpecGenerator.java | 3 +- .../component/tools/AsciidoctorExecutor.java | 3 +- .../component/tools/ComponentValidator.java | 9 ++-- .../tools/DitaDocumentationGenerator.java | 3 +- .../sdk/component/tools/DocBaseGenerator.java | 12 ++--- .../sdk/component/tools/StudioInstaller.java | 3 +- .../tools/validator/DataStoreValidator.java | 9 ++-- .../tools/validator/DatasetValidator.java | 5 +- .../tools/validator/FixedSchemaValidator.java | 7 ++- .../tools/validator/HttpValidator.java | 5 +- .../InternationalizationValidator.java | 9 ++-- .../sdk/component/tools/CarBundlerTest.java | 5 +- .../sdk/component/tools/SvgValidatorTest.java | 3 +- .../tools/validator/ActionValidatorTest.java | 6 +-- .../validator/ExceptionValidatorTest.java | 3 +- .../classloader/ConfigurableClassLoader.java | 5 +- .../sdk/component/container/Container.java | 3 +- .../component/container/ContainerManager.java | 2 +- .../sdk/component/ContainerManagerTest.java | 3 +- .../talend/sdk/component/ContainerTest.java | 3 +- .../ConfigurableClassLoaderTest.java | 5 +- ...ndencyListLocalRepositoryResolverTest.java | 5 +- .../maven/shade/ArtifactTransformer.java | 2 +- .../_partials/generated_contributors.adoc | 52 ++++++++++++------- .../_partials/generated_rest-resources.adoc | 2 +- .../runtime/documentation/Generator.java | 4 +- .../talend/runtime/documentation/Github.java | 2 +- .../documentation/SearchIndexation.java | 3 +- .../component/service/MockTableService.java | 5 +- .../component/source/MockTableMapper.java | 3 +- .../remoteengine/customizer/lang/IO.java | 3 +- .../task/RemoteEngineCustomizer.java | 7 ++- .../connectors/service/ActionsServices.java | 3 +- .../checkpoint/IncrementalSequenceInput.java | 4 +- .../sample/other/ComplexComponent.java | 4 +- .../sdk/component/singer/kitap/Kitap.java | 3 +- .../sdk/component/singer/kitap/KitapTest.java | 5 +- .../sdk/component/maven/AsciidocMojo.java | 3 +- .../component/maven/ClasspathMojoBase.java | 5 +- .../maven/ComponentDependenciesBase.java | 3 +- .../maven/ComponentMetadataMojo.java | 3 +- .../DependencyConflictsReporterMojo.java | 6 +-- .../sdk/component/maven/IconReporterMojo.java | 3 +- .../component/maven/ScanDescriptorMojo.java | 3 +- .../component/maven/WebsiteBuilderMojo.java | 3 +- .../components/vault/client/VaultClient.java | 12 ++--- 152 files changed, 320 insertions(+), 440 deletions(-) diff --git a/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java b/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java index 3614fee11a25e..5f75c7b1376a6 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java @@ -104,7 +104,7 @@ default List getEntriesOrdered() { */ @JsonbTransient default List getEntriesOrdered(final Comparator comparator) { - return getAllEntries().sorted(comparator).collect(Collectors.toList()); + return getAllEntries().sorted(comparator).toList(); } /** @@ -532,7 +532,7 @@ public EntriesOrder(final String fields) { if (fields == null || fields.isEmpty()) { fieldsOrder = new OrderedMap<>(Function.identity()); } else { - final List fieldList = Arrays.stream(fields.split(",")).collect(Collectors.toList()); + final List fieldList = Arrays.stream(fields.split(",")).toList(); fieldsOrder = new OrderedMap<>(Function.identity(), fieldList); } } diff --git a/component-api/src/test/java/org/talend/sdk/component/api/record/OrderedMapTest.java b/component-api/src/test/java/org/talend/sdk/component/api/record/OrderedMapTest.java index 50d42eb7e212d..c266e0bee926e 100644 --- a/component-api/src/test/java/org/talend/sdk/component/api/record/OrderedMapTest.java +++ b/component-api/src/test/java/org/talend/sdk/component/api/record/OrderedMapTest.java @@ -40,12 +40,12 @@ void orderedMapTest() { container.addValue(f1); container.addValue(f2); - List entries = container.streams().collect(Collectors.toList()); + List entries = container.streams().toList(); Assertions.assertSame("f1", entries.get(0)); Assertions.assertSame("f2", entries.get(1)); container.swap("f1", "f2"); - List entries2 = container.streams().collect(Collectors.toList()); + List entries2 = container.streams().toList(); Assertions.assertSame("f2", entries2.get(0)); Assertions.assertSame("f1", entries2.get(1)); diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/api/UiSpecService.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/api/UiSpecService.java index be6aaeb82d390..29f6ab3d73b61 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/api/UiSpecService.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/api/UiSpecService.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.form.api; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import java.util.ArrayList; @@ -113,7 +112,7 @@ public CompletionStage convert(final String family, final String lang, final prop.getName(), prop.getDisplayName(), prop.getType(), prop.getDefaultValue(), prop.getValidation(), prop.getMetadata(), prop.getPlaceholder(), prop.getProposalDisplayNames())) - .collect(toList()); + .toList(); isRootProperty = p -> p.getPath().equals(def.getName()); } else { props = node.getProperties(); diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/UiSchemaConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/UiSchemaConverter.java index 62c8cf1a64c0f..53a6a0145fd22 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/UiSchemaConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/UiSchemaConverter.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.form.internal.converter.impl; import static java.util.Collections.singletonMap; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.util.Collection; @@ -115,7 +114,7 @@ public CompletionStage> convert(final CompletionStage prop.getPath().startsWith(nestedPrefix) && prop.getPath().indexOf('.', from) < 0) - .collect(toList()); + .toList(); if (!nested.isEmpty()) { return new ObjectArrayWidgetConverter(schemas, properties, actions, family, client, gridLayoutFilter, jsonSchema, lang, customConverters, metadata, diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/schema/ArrayPropertyConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/schema/ArrayPropertyConverter.java index a436dbcfd4e73..e480507356519 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/schema/ArrayPropertyConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/schema/ArrayPropertyConverter.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.form.internal.converter.impl.schema; import static java.util.Locale.ROOT; -import static java.util.stream.Collectors.toList; import java.util.Collection; import java.util.List; @@ -50,7 +49,7 @@ public CompletionStage> convert(final CompletionStage arrayElements = - properties.stream().filter(child -> child.getPath().startsWith(prefix)).collect(toList()); + properties.stream().filter(child -> child.getPath().startsWith(prefix)).toList(); if (arrayElements.stream().anyMatch(e -> e.getPath().startsWith(prefix + '.'))) { // complex object final JsonSchema items = new JsonSchema(); diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java index 793d6f1dfb168..5b889c92f4f57 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java @@ -86,7 +86,7 @@ protected CompletionStage> loadDynamicValues(final val.setValue(String.class.cast(entry.get("id"))); return val; }) - .collect(toList()); + .toList(); }) .orElse(emptyList())); } @@ -140,7 +140,7 @@ protected List toParams(final Collection toParams(final Collection ctx) { diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DataListWidgetConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DataListWidgetConverter.java index 0c505de61c982..cc619a0fecf06 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DataListWidgetConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DataListWidgetConverter.java @@ -90,7 +90,7 @@ protected CompletionStage> fillProposalsAndReturn(final Prope return pairs.thenApply(namedValues -> { schema.setTitleMap(namedValues); schema.setRestricted(true); - jsonSchema.setEnumValues(namedValues.stream().map(UiSchema.NameValue::getValue).collect(toList())); + jsonSchema.setEnumValues(namedValues.stream().map(UiSchema.NameValue::getValue).toList()); return context; }); } else { diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/GridLayoutWidgetConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/GridLayoutWidgetConverter.java index 1f1a6df5085f6..33ef251e67c55 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/GridLayoutWidgetConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/GridLayoutWidgetConverter.java @@ -82,7 +82,7 @@ public CompletionStage> convert(final CompletionStage tabs = (layouts.containsKey("Main") ? Stream.of("Main", "Advanced") - : layouts.keySet().stream().sorted(String::compareToIgnoreCase)).collect(toList()); + : layouts.keySet().stream().sorted(String::compareToIgnoreCase)).toList(); final UiSchema schema = newUiSchema(context); schema.setTitle(null); diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/MultiSelectWidgetConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/MultiSelectWidgetConverter.java index 637f8fb5ec493..d4f43c17d9131 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/MultiSelectWidgetConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/MultiSelectWidgetConverter.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.form.internal.converter.impl.widget; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toList; import java.util.Collection; import java.util.List; @@ -69,7 +68,7 @@ public CompletionStage> convert(final CompletionStage { schema.setTitleMap(namedValues); - jsonSchema.setEnumValues(namedValues.stream().map(UiSchema.NameValue::getValue).collect(toList())); + jsonSchema.setEnumValues(namedValues.stream().map(UiSchema.NameValue::getValue).toList()); return context; }); } else { diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/TypeValidation.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/TypeValidation.java index 33c201aea8edc..202d6b8a1090b 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/TypeValidation.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/TypeValidation.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.form.internal.validation.spi.ext; import static java.util.Comparator.comparing; -import static java.util.stream.Collectors.toList; import java.util.Collection; import java.util.Optional; @@ -83,7 +82,7 @@ private Impl(final String pointer, final Function extracto .concat(Stream.of(types), Stream.of(JsonValue.ValueType.NULL)) .distinct() .sorted(comparing(JsonValue.ValueType::name)) - .collect(toList()); + .toList(); } @Override diff --git a/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java b/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java index 8023cdbd6b3c0..7d75c5fa6f1d2 100644 --- a/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java +++ b/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java @@ -23,7 +23,6 @@ import static java.util.Optional.ofNullable; import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -48,7 +47,6 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.json.bind.Jsonb; @@ -288,7 +286,7 @@ void optionsOrderInArray() throws Exception { .getItems() .stream() .map(UiSchema::getTitle) - .collect(toList())); + .toList()); } @Test @@ -327,7 +325,7 @@ void optionsOrder() throws Exception { .map(UiSchema::getKey) .filter(Objects::nonNull) .map(s -> s.substring(s.lastIndexOf('.') + 1)) - .collect(toList()); + .toList(); assertEquals(asList("region", "unknownRegion", "bucket", "object", "encryptDataAtRest", "kmsForDataAtRest", "format", "recordDelimiter", "specificRecordDelimiter", "fieldDelimiter", "specificFieldDelimiter", "limit"), actualOrder); @@ -462,7 +460,7 @@ void gridLayout() throws Exception { assertEquals(5, tableDataSetMain.getItems().size()); assertEquals(asList("dataStore", "commonConfig", "Query", "Ordered", "Order"), - tableDataSetMain.getItems().stream().map(UiSchema::getTitle).collect(toList())); + tableDataSetMain.getItems().stream().map(UiSchema::getTitle).toList()); final Iterator mainIt = tableDataSetMain.getItems().iterator(); final UiSchema dataStore = mainIt.next(); @@ -471,7 +469,7 @@ void gridLayout() throws Exception { final UiSchema credentials = dataStoreIt.next(); assertEquals("columns", credentials.getWidget()); assertEquals(asList("Username", "Password"), - credentials.getItems().stream().map(UiSchema::getTitle).collect(toList())); + credentials.getItems().stream().map(UiSchema::getTitle).toList()); final UiSchema tableDataSetAdvanced = tableDataSetIt.next(); assertEquals("Advanced", tableDataSetAdvanced.getTitle()); @@ -539,7 +537,7 @@ void suggestions() throws Exception { assertEquals("SuggestionForJdbcDrivers", driverTrigger.getAction()); assertNull(driverTrigger.getRemote()); assertEquals(singletonList("currentValue/configuration.driver"), - driverTrigger.getParameters().stream().map(it -> it.getKey() + '/' + it.getPath()).collect(toList())); + driverTrigger.getParameters().stream().map(it -> it.getKey() + '/' + it.getPath()).toList()); assertEquals("change", triggers.next().getOnEvent()); } @@ -658,7 +656,7 @@ void uiSchema() throws Exception { .getTitleMap() .stream() .map(UiSchema.NameValue.class::cast) - .collect(Collectors.toList()); + .toList(); assertEquals(1, titleMap.size()); final UiSchema.NameValue firstTitleMap = titleMap.iterator().next(); assertEquals("some.driver.Jdbc", firstTitleMap.getValue()); diff --git a/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/internal/validation/ValidationServiceTest.java b/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/internal/validation/ValidationServiceTest.java index 9d08afdd2efec..0103a23d423ad 100644 --- a/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/internal/validation/ValidationServiceTest.java +++ b/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/internal/validation/ValidationServiceTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.form.internal.validation; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; @@ -61,7 +60,7 @@ public CompletionStage> validate(final ConfigTypeNod .getErrors() .stream() .map(e -> new ValidationError(e.getField(), e.getMessage())) - .collect(toList())); + .toList()); } public CompletionStage getValidator(final ConfigTypeNode config) { diff --git a/component-form/component-form-model/src/main/java/org/talend/sdk/component/form/model/uischema/UiSchema.java b/component-form/component-form-model/src/main/java/org/talend/sdk/component/form/model/uischema/UiSchema.java index 2c5c84fbc68a7..e6a88ff4fdcb7 100644 --- a/component-form/component-form-model/src/main/java/org/talend/sdk/component/form/model/uischema/UiSchema.java +++ b/component-form/component-form-model/src/main/java/org/talend/sdk/component/form/model/uischema/UiSchema.java @@ -18,7 +18,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonMap; import static java.util.Collections.unmodifiableMap; -import static java.util.stream.Collectors.toList; import java.util.ArrayList; import java.util.Collection; @@ -95,7 +94,7 @@ public UiSchema copy(final boolean frozenStructure) { .withWidget(widget) .withItemWidget(itemWidget) .withType(type) - .withItems(items == null ? null : items.stream().map(it -> it.copy(frozenStructure)).collect(toList())) + .withItems(items == null ? null : items.stream().map(it -> it.copy(frozenStructure)).toList()) .withOptions(options) .withAutoFocus(autoFocus) .withDisabled(disabled) diff --git a/component-form/component-uispec-mapper/src/main/java/org/talend/sdk/component/form/uispec/mapper/impl/UiSpecMapperImpl.java b/component-form/component-uispec-mapper/src/main/java/org/talend/sdk/component/form/uispec/mapper/impl/UiSpecMapperImpl.java index 247486d143fb5..e9e7ff187c368 100644 --- a/component-form/component-uispec-mapper/src/main/java/org/talend/sdk/component/form/uispec/mapper/impl/UiSpecMapperImpl.java +++ b/component-form/component-uispec-mapper/src/main/java/org/talend/sdk/component/form/uispec/mapper/impl/UiSpecMapperImpl.java @@ -22,7 +22,6 @@ import static java.util.Comparator.comparing; import static java.util.Comparator.comparingInt; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.lang.reflect.AnnotatedElement; @@ -81,7 +80,7 @@ private Supplier doCreateForm(final Class clazz) { return () -> Ui .ui() .withJsonSchema(ui.getJsonSchema()) - .withUiSchema(ui.getUiSchema().stream().map(it -> it.copy(true)).collect(toList())) + .withUiSchema(ui.getUiSchema().stream().map(it -> it.copy(true)).toList()) .withProperties(emptyMap()) .build(); } @@ -136,7 +135,7 @@ private UiSchema generateUiSchemas(final String keyPrefix, final AnnotatedElemen final int pos = ofNullable(it.getAnnotation(View.Schema.class)).map(View.Schema::position).orElse(-1); positions.put(it.getName(), pos < 0 ? Integer.MAX_VALUE : pos); return generateUiSchemas(nextKey, it, it.getType(), isDynamic); - }).collect(toList())); + }).toList()); current = current.getSuperclass(); } return applyConfig(element, builder, isDynamic) diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/chain/impl/BeamExecutor.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/chain/impl/BeamExecutor.java index d6688a385c395..13b5c95f357e7 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/chain/impl/BeamExecutor.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/chain/impl/BeamExecutor.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.chain.impl; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.util.Collection; @@ -209,7 +208,7 @@ private String toName(final String transform, final Job.Component component) { private List getEdges(final List edges, final Job.Component step, final Function componentMapper) { - return edges.stream().filter(edge -> componentMapper.apply(edge).equals(step)).collect(toList()); + return edges.stream().filter(edge -> componentMapper.apply(edge).equals(step)).toList(); } private PipelineOptions createPipelineOptions() { diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/customizer/Indices.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/customizer/Indices.java index 42658f1349f59..926f0380044e0 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/customizer/Indices.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/customizer/Indices.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.beam.customizer; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -115,7 +114,7 @@ Stream getClasses() { .lines() .map(String::trim) .filter(it -> !it.startsWith("#") && !it.isEmpty()) - .collect(toList())).stream(); + .toList()).stream(); } catch (final IOException e) { throw new IllegalStateException(e); } diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java index 40fda0d05c3cc..30b0eee8d6e88 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.beam.spi.record; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static org.talend.sdk.component.api.record.SchemaCompanionUtil.sanitizeName; import static org.talend.sdk.component.runtime.beam.avro.AvroSchemas.unwrapUnion; @@ -31,7 +30,6 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; import javax.json.bind.annotation.JsonbTransient; @@ -110,7 +108,7 @@ private Object directMapping(final Object value, final Schema.Entry entry) { } if (value instanceof Collection) { - return Collection.class.cast(value).stream().map(v -> this.directMapping(v, entry)).collect(toList()); + return Collection.class.cast(value).stream().map(v -> this.directMapping(v, entry)).toList(); } if (value instanceof RecordImpl) { return new AvroRecord((Record) value).delegate; @@ -225,7 +223,7 @@ public int hashCode() { private Collection doMapCollection(final Class type, final Collection collection, final org.apache.avro.Schema elementType) { return ofNullable(collection) - .map(c -> c.stream().map(item -> doMap(type, elementType, item)).collect(toList())) + .map(c -> c.stream().map(item -> doMap(type, elementType, item)).toList()) .orElse(null); } @@ -297,12 +295,12 @@ private T doMap(final Class expectedType, final org.apache.avro.Schema fi if (value instanceof GenericArray && !GenericArray.class.isAssignableFrom(expectedType)) { if (ZonedDateTime.class == expectedType) { - List longs = (List) Collection.class.cast(value).stream().collect(Collectors.toList()); + List longs = (List) Collection.class.cast(value).stream().toList(); final Instant instant = Instant.ofEpochSecond(longs.get(0), longs.get(1)); return expectedType.cast(ZonedDateTime.ofInstant(instant, UTC)); } if (Instant.class == expectedType) { - List longs = (List) Collection.class.cast(value).stream().collect(Collectors.toList()); + List longs = (List) Collection.class.cast(value).stream().toList(); final Instant instant = Instant.ofEpochSecond(longs.get(0), longs.get(1)); return expectedType.cast(instant); } diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java index de0cb340fb38a..e0af3b8b519ac 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java @@ -17,7 +17,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static org.apache.avro.Schema.Type.NULL; import static org.apache.avro.Schema.Type.UNION; @@ -145,7 +144,7 @@ public List getEntries() { .getNonNullFields() // .filter(f -> !AvroSchema.isMetadata(f)) // only data fields .map(this::fromAvro) // - .collect(toList()); + .toList(); } return entries; } @@ -165,7 +164,7 @@ public List getMetadata() { .getNonNullFields() // .filter(AvroSchema::isMetadata) // only metadata fields .map(this::fromAvro) // - .collect(Collectors.toList()); + .toList(); } } diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaBuilder.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaBuilder.java index a713018de07f6..c4808b55984c2 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaBuilder.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaBuilder.java @@ -26,7 +26,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.apache.avro.AvroTypeException; import org.apache.avro.LogicalTypes; @@ -407,7 +406,7 @@ public Schema build(final Comparator order) { return new AvroSchema(AvroSchemas.getEmptySchema()); } final List avroFields = - this.fields.streams().map(this::entryToAvroField).collect(Collectors.toList()); + this.fields.streams().map(this::entryToAvroField).toList(); final org.apache.avro.Schema record = org.apache.avro.Schema .createRecord(SchemaIdGenerator.generateRecordName(avroFields), null, "talend.component.schema", false); diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaConverter.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaConverter.java index 0e73851723fda..e9a35543bde93 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaConverter.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaConverter.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static org.apache.avro.Schema.Type.NULL; import static org.apache.avro.Schema.Type.UNION; import static org.talend.sdk.component.runtime.beam.spi.record.SchemaIdGenerator.generateRecordName; @@ -42,7 +41,7 @@ public AvroSchema convert(final SchemaImpl schema) { final org.apache.avro.Schema avroSchema = toSchema(entry); final org.apache.avro.Schema.Field f = AvroSchemaBuilder.AvroHelper.toField(avroSchema, entry); return f; - }).collect(toList()); + }).toList(); final org.apache.avro.Schema avroSchema = org.apache.avro.Schema.createRecord(generateRecordName(fields), null, null, false); schema.getProps().forEach(avroSchema::addProp); @@ -57,7 +56,7 @@ private org.apache.avro.Schema toSchema(final Schema.Entry entry) { } if (!entry.isNullable() && schema.getType() == UNION) { return org.apache.avro.Schema - .createUnion(schema.getTypes().stream().filter(it -> it.getType() != NULL).collect(toList())); + .createUnion(schema.getTypes().stream().filter(it -> it.getType() != NULL).toList()); } return schema; } diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/SchemaIdGenerator.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/SchemaIdGenerator.java index b7ae0523b8fa8..3024aa040b27b 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/SchemaIdGenerator.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/SchemaIdGenerator.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.spi.record; -import static java.util.stream.Collectors.toList; import static lombok.AccessLevel.PRIVATE; import java.util.List; @@ -41,6 +40,6 @@ private static long fingerprint(final List fields) { .stream() .map(it -> new Schema.Field(it.name(), it.schema(), it.doc(), it.defaultVal(), it.order())) - .collect(toList()))); + .toList())); } } diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecord.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecord.java index aa28a4759493b..5c6b04be4a2ab 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecord.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecord.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.beam.transform.avro; import static java.util.Arrays.asList; -import static java.util.stream.Collectors.toList; import javax.json.JsonArray; import javax.json.JsonNumber; @@ -98,7 +97,7 @@ private Schema guessSchema(final String recordName, final JsonValue element) { .stream() .map(it -> new Schema.Field(it.getKey(), guessSchema(buildNextName(recordName, it.getKey()), it.getValue()), null, null)) - .collect(toList())); + .toList()); return record; case ARRAY: final JsonArray array = element.asJsonArray(); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/NativeWrappedIOTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/NativeWrappedIOTest.java index 9b70eb5b54580..a536ae4fd5ca6 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/NativeWrappedIOTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/NativeWrappedIOTest.java @@ -18,7 +18,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; -import static java.util.stream.Collectors.toList; import static lombok.AccessLevel.PRIVATE; import static org.junit.Assert.assertEquals; @@ -141,7 +140,7 @@ private SimpleComponentRule withIsolatedPackage(final String packageName, final isolatedPackages = Stream .concat(Stream.of(packageName), Stream.of(packages)) .filter(Objects::nonNull) - .collect(toList()); + .toList(); if (isolatedPackages.isEmpty()) { isolatedPackages = null; } diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java index 99814e5df26b5..d7f3954aba4cc 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java @@ -245,7 +245,7 @@ public void onNext(final InputFactory input, final OutputFactory factory) { final List expected = data.stream().map(Sample::getData).map(String::length).collect(toList()); PAssert.that(out).satisfies((SerializableFunction, Void>) input -> { - final List actual = StreamSupport.stream(input.spliterator(), false).sorted().collect(toList()); + final List actual = StreamSupport.stream(input.spliterator(), false).sorted().toList(); assertEquals(expected, actual); return null; }); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/coder/JsonpJsonObjectCoderTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/coder/JsonpJsonObjectCoderTest.java index 69a3f1741fe9c..7bb2977af55ab 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/coder/JsonpJsonObjectCoderTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/coder/JsonpJsonObjectCoderTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.coder; -import static java.util.stream.Collectors.toList; import static org.apache.ziplock.JarLocation.jarLocation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -67,7 +66,7 @@ void iterable() throws IOException { final ByteArrayOutputStream out = new ByteArrayOutputStream(); coder.encode(() -> iterator, out); final Iterable decode = coder.decode(new ByteArrayInputStream(out.toByteArray())); - final Collection result = StreamSupport.stream(decode.spliterator(), false).collect(toList()); + final Collection result = StreamSupport.stream(decode.spliterator(), false).toList(); assertEquals(1, result.size()); assertEquals("value", result.iterator().next().getString("test")); } diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java index 514c2150b2538..ec49338029fe7 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java @@ -54,7 +54,6 @@ import java.util.Objects; import java.util.TimeZone; import java.util.function.Supplier; -import java.util.stream.Collectors; import javax.json.Json; import javax.json.JsonArray; @@ -846,7 +845,7 @@ void testUnmappedTypes() throws Exception { avro.put(4, myMap); final Record record = new AvroRecord(avro); // check avro schema mappings - final List entries = record.getSchema().getAllEntries().collect(Collectors.toList()); + final List entries = record.getSchema().getAllEntries().toList(); assertEquals(Schema.Type.BYTES, entries.get(0).getType()); assertEquals(Schema.Type.DECIMAL, entries.get(1).getType()); assertEquals(Schema.Type.STRING, entries.get(2).getType()); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCacheTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCacheTest.java index efa1a588bda6f..3e3585d052ea8 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCacheTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaCacheTest.java @@ -17,7 +17,6 @@ import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -37,7 +36,7 @@ void find() { final List threads = schemas.stream() // .map((SchemaImpl s) -> new Thread(() -> this.treat(s))) // - .collect(Collectors.toList()); // + .toList(); // threads.forEach(Thread::start); threads.forEach((Thread t) -> { try { diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/AutoKVWrapperTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/AutoKVWrapperTest.java index 556ffc0d7f487..048b10f678feb 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/AutoKVWrapperTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/AutoKVWrapperTest.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.Comparator.comparing; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.talend.sdk.component.runtime.beam.transform.Pipelines.buildBasePipeline; @@ -52,13 +51,13 @@ public void test() { .stream(values.spliterator(), false) .sorted(comparing( k -> k.getValue().getArray(Record.class, "b1").iterator().next().getString("foo"))) - .collect(toList()); + .toList(); assertEquals(2, items.size()); assertEquals(2, new HashSet<>(items).size()); // ensure we got 2 ids assertEquals(asList("a", "b"), items .stream() .map(k -> k.getValue().getArray(Record.class, "b1").iterator().next().getString("foo")) - .collect(toList())); + .toList()); return null; }); assertEquals(PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchFilterTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchFilterTest.java index 0fd14f1612cca..2ae8ef0233a0b 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchFilterTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchFilterTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.transform; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -41,7 +40,7 @@ public class RecordBranchFilterTest implements Serializable { @Test public void test() { PAssert.that(buildBasePipeline(pipeline).apply(RecordBranchFilter.of(null, "b1"))).satisfies(values -> { - final List items = StreamSupport.stream(values.spliterator(), false).collect(toList()); + final List items = StreamSupport.stream(values.spliterator(), false).toList(); assertEquals(2, items.size()); items.forEach(item -> { assertNull(item.get(Object.class, "b2")); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchMapperTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchMapperTest.java index 8e6b96c732480..4fe5530750cef 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchMapperTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchMapperTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.transform; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -43,7 +42,7 @@ public void test() { PAssert .that(buildBasePipeline(pipeline).apply(RecordBranchMapper.of(null, "b1", "other"))) .satisfies(values -> { - final List items = StreamSupport.stream(values.spliterator(), false).collect(toList()); + final List items = StreamSupport.stream(values.spliterator(), false).toList(); assertEquals(2, items.size()); items.forEach(item -> { final Collection other = Collection.class.cast(item.get(Object.class, "other")); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchUnwrapperTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchUnwrapperTest.java index 9153f969f798d..7d3f63eaba3eb 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchUnwrapperTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/RecordBranchUnwrapperTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.transform; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -43,7 +42,7 @@ public void test() { PAssert .that(buildBasePipeline(pipeline).apply(RecordBranchMapper.of(null, "b1", "other"))) .satisfies(values -> { - final List items = StreamSupport.stream(values.spliterator(), false).collect(toList()); + final List items = StreamSupport.stream(values.spliterator(), false).toList(); assertEquals(2, items.size()); items.forEach(item -> { final Collection other = item.getArray(Record.class, "other"); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/IndexedRecordToJsonTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/IndexedRecordToJsonTest.java index aafc805d9a6db..91e54cd459d8e 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/IndexedRecordToJsonTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/IndexedRecordToJsonTest.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.beam.transform.avro; import static java.util.Arrays.asList; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import java.util.stream.StreamSupport; @@ -52,7 +51,7 @@ public void test() { .stream(values.spliterator(), false) .map(k -> k.getString("name")) .sorted() - .collect(toList())); + .toList()); return null; }); assertEquals(PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/JsonToIndexedRecordTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/JsonToIndexedRecordTest.java index 4e650b8c3e0e4..c3dcd22e5a270 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/JsonToIndexedRecordTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/JsonToIndexedRecordTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.transform.avro; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import java.util.List; @@ -60,7 +59,7 @@ public void test() { .apply(new JsonToIndexedRecord(createSchema()))) .satisfies(values -> { final List records = - StreamSupport.stream(values.spliterator(), false).collect(toList()); + StreamSupport.stream(values.spliterator(), false).toList(); assertEquals(2, records.size()); return null; }); diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecordTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecordTest.java index aacaf79e0c294..51b38ffbd0f23 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecordTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/transform/avro/SchemalessJsonToIndexedRecordTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.beam.transform.avro; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -64,7 +63,7 @@ public void test() { .setCoder(AvroCoder.of(IndexedRecord.class, createSchema()))) .satisfies(values -> { final List records = - StreamSupport.stream(values.spliterator(), false).collect(toList()); + StreamSupport.stream(values.spliterator(), false).toList(); assertEquals(2, records.size()); records.forEach(it -> assertTrue(it.toString().startsWith("{\"name\":"))); records.forEach(it -> assertTrue(it.toString().contains("\"foo\": {\"age\":"))); diff --git a/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/flows/ProcessorFlowsFactory.java b/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/flows/ProcessorFlowsFactory.java index fd0fabbc8d028..37ddce11cf0b8 100644 --- a/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/flows/ProcessorFlowsFactory.java +++ b/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/flows/ProcessorFlowsFactory.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.design.extension.flows; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.concat; import static java.util.stream.Stream.of; @@ -49,7 +48,7 @@ public Collection getInputFlows() { .orElseGet(() -> getAfterGroup().map(it -> Stream.of(it.getParameters())).orElseGet(Stream::empty)) .filter(this::isInput) .map(this::mapInputName) - .collect(toList()); + .toList(); } @Override @@ -58,7 +57,7 @@ public Collection getOutputFlows() { getListener() .map(listener -> concat(getReturnedBranches(listener), getOutputParameters(listener))) .orElseGet(Stream::empty), - getAfterGroup().map(this::getOutputParameters).orElseGet(Stream::empty)).distinct().collect(toList()); + getAfterGroup().map(this::getOutputParameters).orElseGet(Stream::empty)).distinct().toList(); } private Optional getAfterGroup() { diff --git a/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilder.java b/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilder.java index cdcddc8cb5e76..3646727bf5003 100644 --- a/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilder.java +++ b/component-runtime-design-extension/src/main/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilder.java @@ -17,7 +17,6 @@ import static java.util.Collections.singletonList; import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static org.talend.sdk.component.runtime.manager.util.Lazy.lazy; @@ -60,7 +59,7 @@ public RepositoryModel create(final ComponentManager.AllServices services, final List families = familyMetas .stream() .map(familyMeta -> createConfigForFamily(services, migrationHandlerFactory, familyMeta)) - .collect(toList()); + .toList(); return new RepositoryModel(families); } @@ -169,7 +168,7 @@ private ParameterMeta translate(final ParameterMeta config, final int replacedPr .getNestedParameters() .stream() .map(it -> translate(it, replacedPrefixLen, newPrefix)) - .collect(toList()), + .toList(), config.getProposals(), config.getMetadata(), config.isLogMissingResourceBundle()); } } diff --git a/component-runtime-design-extension/src/test/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilderTest.java b/component-runtime-design-extension/src/test/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilderTest.java index 64917d63dd266..6c011036ca1fb 100644 --- a/component-runtime-design-extension/src/test/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilderTest.java +++ b/component-runtime-design-extension/src/test/java/org/talend/sdk/component/design/extension/repository/RepositoryModelBuilderTest.java @@ -21,7 +21,6 @@ import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static org.apache.xbean.asm9.ClassReader.EXPAND_FRAMES; import static org.apache.xbean.asm9.ClassWriter.COMPUTE_FRAMES; import static org.apache.ziplock.JarLocation.jarLocation; @@ -124,7 +123,7 @@ void notRootConfig() { }), new MigrationHandlerFactory( new ReflectionService(new ParameterModelService(registry), registry))); final List configs = - model.getFamilies().stream().flatMap(f -> f.getConfigs().get().stream()).collect(toList()); + model.getFamilies().stream().flatMap(f -> f.getConfigs().get().stream()).toList(); assertEquals(1, configs.size()); } diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/output/ProcessorImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/output/ProcessorImpl.java index a256476350c5a..dc6d657c1e590 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/output/ProcessorImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/output/ProcessorImpl.java @@ -18,7 +18,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static org.talend.sdk.component.runtime.reflect.Parameters.isGroupBuffer; @@ -116,13 +115,13 @@ public Map getInternalConfiguration() { @Override public void beforeGroup() { if (beforeGroup == null) { - beforeGroup = findMethods(BeforeGroup.class).collect(toList()); - afterGroup = findMethods(AfterGroup.class).collect(toList()); + beforeGroup = findMethods(BeforeGroup.class).toList(); + afterGroup = findMethods(AfterGroup.class).toList(); process = findMethods(ElementListener.class).findFirst().orElse(null); // IMPORTANT: ensure you call only once the create(....), see studio integration (mojo) parameterBuilderProcess = process == null ? emptyList() - : Stream.of(process.getParameters()).map(this::buildProcessParamBuilder).collect(toList()); + : Stream.of(process.getParameters()).map(this::buildProcessParamBuilder).toList(); parameterBuilderAfterGroup = afterGroup .stream() .map(after -> new AbstractMap.SimpleEntry<>(after, Stream.of(after.getParameters()) @@ -136,7 +135,7 @@ public void beforeGroup() { } return toOutputParamBuilder(param); }) - .collect(toList()))) + .toList())) .collect(toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue)); forwardReturn = process != null && process.getReturnType() != void.class; diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java index f56961dfca2ff..ee4af70fad5b3 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java @@ -45,7 +45,6 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Function; -import java.util.stream.Collectors; import javax.json.Json; import javax.json.JsonObject; @@ -158,7 +157,7 @@ private void initOrderState() { final List fields = this.providedSchema.naturalOrder() .getFieldsOrder() .map(n -> this.getEntryWithErrorIfAny(this.providedSchema.getEntry(n))) - .collect(Collectors.toList()); + .toList(); this.orderState = new OrderState(fields); } } @@ -222,9 +221,9 @@ public Entry getEntry(final String name) { @Override public List getCurrentEntries() { if (this.providedSchema != null) { - return Collections.unmodifiableList(this.providedSchema.getAllEntries().collect(Collectors.toList())); + return Collections.unmodifiableList(this.providedSchema.getAllEntries().toList()); } - return this.entries.streams().collect(Collectors.toList()); + return this.entries.streams().toList(); } @Override @@ -236,7 +235,7 @@ public Builder removeEntry(final Schema.Entry schemaEntry) { } final BuilderImpl builder = - new BuilderImpl(this.providedSchema.getAllEntries().collect(Collectors.toList()), this.values); + new BuilderImpl(this.providedSchema.getAllEntries().toList(), this.values); return builder.removeEntry(schemaEntry); } @@ -267,7 +266,7 @@ public Builder updateEntryByName(final String name, final Schema.Entry schemaEnt } final BuilderImpl builder = - new BuilderImpl(this.providedSchema.getAllEntries().collect(Collectors.toList()), + new BuilderImpl(this.providedSchema.getAllEntries().toList(), this.values); return builder.updateEntryByName(name, schemaEntry); } @@ -698,7 +697,7 @@ public void update(final Schema.Entry entry) { public Comparator buildComparator() { final List orderedFields = - this.orderedEntries.streams().map(Entry::getName).collect(Collectors.toList()); + this.orderedEntries.streams().map(Entry::getName).toList(); return EntriesOrder.of(orderedFields); } } diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java index 665b30d5a4cbd..6f36cc2ab752d 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java @@ -17,7 +17,6 @@ import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.util.ArrayList; @@ -71,8 +70,8 @@ public class SchemaImpl implements Schema { SchemaImpl(final SchemaImpl.BuilderImpl builder) { this.type = builder.type; this.elementSchema = builder.elementSchema; - this.entries = unmodifiableList(builder.entries.streams().collect(toList())); - this.metadataEntries = unmodifiableList(builder.metadataEntries.streams().collect(toList())); + this.entries = unmodifiableList(builder.entries.streams().toList()); + this.metadataEntries = unmodifiableList(builder.metadataEntries.streams().toList()); this.props = builder.props; entriesOrder = EntriesOrder.of(getFieldsOrder()); getAllEntries().forEach(e -> entryMap.put(e.getName(), e)); @@ -149,7 +148,7 @@ public Builder toBuilder() { @Override @JsonbTransient public List getEntriesOrdered() { - return getAllEntries().sorted(entriesOrder).collect(toList()); + return getAllEntries().sorted(entriesOrder).toList(); } @Override diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/json/RecordJsonGenerator.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/json/RecordJsonGenerator.java index 6dd40ef8058bd..9f287666e8809 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/json/RecordJsonGenerator.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/json/RecordJsonGenerator.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.runtime.record.json; -import static java.util.stream.Collectors.toList; - import java.io.OutputStream; import java.io.Writer; import java.lang.reflect.Field; @@ -155,7 +153,7 @@ public JsonGenerator write(final String name, final JsonValue value) { .map(v -> JsonValue.class.cast(v) .getValueType() .equals(ValueType.TRUE)) - .collect(toList()))); + .toList())); } else { objectBuilder .withArray(createEntryForJsonArray(name, Collection.class.cast(value)), @@ -387,7 +385,7 @@ private List prepareArray(final List array) { return ((Collection) array) .stream() .map(it -> Record.Builder.class.isInstance(it) ? Record.Builder.class.cast(it).build() : it) - .collect(toList()); + .toList(); } private Schema.Entry createEntryForJsonArray(final String name, final Collection array) { diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/serialization/EnhancedObjectInputStream.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/serialization/EnhancedObjectInputStream.java index 2e2a1884ab8d6..f2b35784ba5f6 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/serialization/EnhancedObjectInputStream.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/serialization/EnhancedObjectInputStream.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.serialization; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static lombok.AccessLevel.PRIVATE; @@ -128,7 +127,7 @@ static class Defaults { .of(s.split(",")) .map(String::trim) .filter(it -> !it.isEmpty()) - .collect(toList())) + .toList()) .map(l -> (Predicate) name -> l.stream().anyMatch(name::startsWith)) .orElseGet(() -> { final Collection blacklist = Stream diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/visitor/ModelVisitor.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/visitor/ModelVisitor.java index 2a8d602e65d9b..478e374da9a99 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/visitor/ModelVisitor.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/visitor/ModelVisitor.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.runtime.visitor; -import static java.util.stream.Collectors.toList; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Parameter; @@ -162,7 +160,7 @@ private void validatePartitionMapper(final Class type) { private void validateEmitter(final Class input) { final List producers = - Stream.of(input.getMethods()).filter(m -> m.isAnnotationPresent(Producer.class)).collect(toList()); + Stream.of(input.getMethods()).filter(m -> m.isAnnotationPresent(Producer.class)).toList(); if (producers.size() != 1) { throw new IllegalArgumentException(input + " must have a single @Producer method"); } @@ -179,7 +177,7 @@ private void validateDriverRunner(final Class standalone) { final List driverRunners = Stream .of(standalone.getMethods()) .filter(m -> m.isAnnotationPresent(RunAtDriver.class)) - .collect(toList()); + .toList(); if (driverRunners.size() != 1) { throw new IllegalArgumentException(standalone + " must have a single @RunAtDriver method"); } @@ -194,7 +192,7 @@ private void validateDriverRunner(final Class standalone) { private void validateProcessor(final Class input) { final List afterGroups = - Stream.of(input.getMethods()).filter(m -> m.isAnnotationPresent(AfterGroup.class)).collect(toList()); + Stream.of(input.getMethods()).filter(m -> m.isAnnotationPresent(AfterGroup.class)).toList(); afterGroups.forEach(m -> { final List invalidParams = Stream.of(m.getParameters()).peek(p -> { if (p.isAnnotationPresent(Output.class) && !validOutputParam(p)) { @@ -204,7 +202,7 @@ private void validateProcessor(final Class input) { .filter(p -> !p.isAnnotationPresent(Output.class)) .filter(p -> !p.isAnnotationPresent(LastGroup.class)) .filter(p -> !Parameters.isGroupBuffer(p.getParameterizedType())) - .collect(toList()); + .toList(); if (!invalidParams.isEmpty()) { throw new IllegalArgumentException("Parameter of AfterGroup method need to be annotated with Output"); } @@ -233,7 +231,7 @@ private void validateProducer(final Class input, final List afterGrou final List producers = Stream .of(input.getMethods()) .filter(m -> m.isAnnotationPresent(ElementListener.class)) - .collect(toList()); + .toList(); if (producers.size() > 1) { throw new IllegalArgumentException(input + " must have a single @ElementListener method"); } @@ -274,7 +272,7 @@ private void validateAfterVariableContainer(final Class type) { List markedMethods = Stream .of(type.getMethods()) .filter(m -> m.isAnnotationPresent(AfterVariableContainer.class)) - .collect(toList()); + .toList(); if (markedMethods.size() > 1) { String methods = markedMethods.stream().map(Method::toGenericString).collect(Collectors.joining(",")); throw new IllegalArgumentException("The methods can't have more than 1 after variable container. " @@ -334,7 +332,7 @@ private static void validateAfterVariableAnnotationDeclaration(final Class ty .filter(annotation -> !SUPPORTED_AFTER_VARIABLES_TYPES.contains(annotation.type())) .map(annotation -> "The after variable with name '" + annotation.value() + "' has incorrect type: '" + annotation.type() + "'") - .collect(toList()); + .toList(); if (!incorrectDeclarations.isEmpty()) { String message = incorrectDeclarations .stream() diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/input/PartitionMapperImplTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/input/PartitionMapperImplTest.java index 358b383b4f414..0fbff04df9c4c 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/input/PartitionMapperImplTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/input/PartitionMapperImplTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.input; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -94,7 +93,7 @@ public long assess() { @Split public Collection split(@PartitionSize final int partitions) { - return IntStream.range(0, partitions).mapToObj(i -> new SampleMapper()).collect(toList()); + return IntStream.range(0, partitions).mapToObj(i -> new SampleMapper()).toList(); } @Emitter diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/output/ProcessorImplTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/output/ProcessorImplTest.java index 54be8bb93ed75..7e5f40e418d64 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/output/ProcessorImplTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/output/ProcessorImplTest.java @@ -19,7 +19,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; @@ -64,7 +63,7 @@ void bulkGroup() { final Collection data = IntStream .rangeClosed(1, 3) .mapToObj(idx -> new RecordImpl.BuilderImpl().withInt("value", idx).build()) - .collect(toList()); + .toList(); processor.beforeGroup(); data.forEach(it -> processor.onNext(n -> it, null)); assertNull(Bufferized.RECORDS); diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/OrderedMapTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/OrderedMapTest.java index d7c61fd93006b..e0b5247ba2c22 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/OrderedMapTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/OrderedMapTest.java @@ -40,12 +40,12 @@ void t1() { container.addValue(f1); container.addValue(f2); - List entries = container.streams().collect(Collectors.toList()); + List entries = container.streams().toList(); Assertions.assertEquals("f1", entries.get(0).getName()); Assertions.assertEquals("f2", entries.get(1).getName()); container.swap("f1", "f2"); - List entries2 = container.streams().collect(Collectors.toList()); + List entries2 = container.streams().toList(); Assertions.assertEquals("f2", entries2.get(0).getName()); Assertions.assertEquals("f1", entries2.get(1).getName()); diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java index f8b35e2f5c40d..d233ae8a5194a 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java @@ -72,7 +72,7 @@ void providedSchemaGetSchema() { Schema.EntriesOrder e = Schema.EntriesOrder.of(new RecordImpl.BuilderImpl().getCurrentEntries() .stream() .map(Schema.Entry::getName) - .collect(Collectors.toList())); + .toList()); } @Test @@ -862,14 +862,14 @@ void updateEntryByName_preservesOrder() { // Then order is preserved in the builder Assertions.assertEquals(3, builder.getCurrentEntries().size()); final List builderEntriesName = - builder.getCurrentEntries().stream().map(Entry::getName).collect(Collectors.toList()); + builder.getCurrentEntries().stream().map(Entry::getName).toList(); assertEquals(Arrays.asList("firstColumn_renamed", "secondColumn", "thirdColumn"), builderEntriesName); // Then order is also preserved in the built Record final Record outputRecord = builder.build(); final Schema outputRecordSchema = outputRecord.getSchema(); final List outputEntriesName = - outputRecordSchema.getEntriesOrdered().stream().map(Schema.Entry::getName).collect(Collectors.toList()); + outputRecordSchema.getEntriesOrdered().stream().map(Schema.Entry::getName).toList(); assertEquals(Arrays.asList("firstColumn_renamed", "secondColumn", "thirdColumn"), outputEntriesName); } diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java index d56ee25312dfc..49ce3f2622ad4 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java @@ -353,7 +353,7 @@ void convertListObject(final JsonBuilderFactory jsonBuilderFactory, final JsonPr .build(), () -> jsonb, () -> new RecordBuilderFactoryImpl("test")); final Collection list = record.getArray(Record.class, "list"); - assertEquals(asList("a", "b"), list.stream().map(it -> it.getString("name")).collect(toList())); + assertEquals(asList("a", "b"), list.stream().map(it -> it.getString("name")).toList()); } } @@ -377,7 +377,7 @@ void convertListVaryingObject(final JsonBuilderFactory jsonBuilderFactory, final // // FIXME: 7/9/21 : TCOMP-1956 Assertions.assertNotNull(schema.getEntry("name1")); Assertions.assertNotNull(schema.getEntry("name2")); - assertEquals(asList("a", "b"), list.stream().map(it -> it.getString("name")).collect(toList())); + assertEquals(asList("a", "b"), list.stream().map(it -> it.getString("name")).toList()); } } @@ -424,7 +424,7 @@ void bigDecimalsInArrays(final JsonBuilderFactory jsonBuilderFactory, final Json .stream() .flatMap(a -> a.stream()) .flatMap(bd -> Stream.of(bd)) - .collect(toList())); + .toList()); } } @@ -462,8 +462,8 @@ void pojoRoundTrip(final JsonBuilderFactory jsonBuilderFactory, final JsonProvid Iterator itBool = record.getArray(Boolean.class, "jsonBoolValue").iterator(); assertTrue(itBool.next()); assertFalse(itBool.next()); - assertEquals(Arrays.stream(intAry).collect(toList()), - record.getArray(Integer.class, "intAryValue").stream().collect(toList())); + assertEquals(Arrays.stream(intAry).toList(), + record.getArray(Integer.class, "intAryValue").stream().toList()); // final PojoWrapper wrapper = PojoWrapper.class .cast(converter @@ -485,7 +485,7 @@ void pojoRoundTrip(final JsonBuilderFactory jsonBuilderFactory, final JsonProvid JsonObject.class.cast(wrapper.getJsonAryValue()[0]).getString("string")); assertEquals(jsonObj1.getJsonNumber("number").doubleValue(), JsonObject.class.cast(wrapper.getJsonAryValue()[0]).getJsonNumber("number").doubleValue()); - assertEquals(Arrays.stream(intAry).collect(toList()), + assertEquals(Arrays.stream(intAry).toList(), Arrays.stream(wrapper.getIntAryValue()).collect(toList())); } diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java index f9e314dfe06b0..fcaae9b3e6975 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import java.util.stream.IntStream; import javax.json.Json; @@ -115,7 +114,7 @@ void getAllEntries() { Assertions.assertTrue(entries.contains(this.data2)); Assertions.assertEquals(4, schema.getAllEntries().count()); - final List metaEntries = schema.getAllEntries().filter(Entry::isMetadata).collect(Collectors.toList()); + final List metaEntries = schema.getAllEntries().filter(Entry::isMetadata).toList(); Assertions.assertEquals(2, metaEntries.size()); Assertions.assertTrue(metaEntries.contains(this.meta1)); Assertions.assertTrue(metaEntries.contains(this.meta2)); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java index b510ffffd1ecb..f756408459b67 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java @@ -401,13 +401,13 @@ public ComponentManager(final Path m2, final String dependenciesResource, final final ClassLoader tccl = Thread.currentThread().getContextClassLoader(); internationalizationServiceFactory = new InternationalizationServiceFactory(getLocalSupplier()); - customizers = toStream(loadServiceProviders(Customizer.class, tccl)).collect(toList()); // must stay first + customizers = toStream(loadServiceProviders(Customizer.class, tccl)).toList(); // must stay first if (!customizers.isEmpty()) { customizers.forEach(c -> c.setCustomizers(customizers)); } if (!Boolean.getBoolean("talend.component.manager.classpathcontributor.skip")) { classpathContributors = - toStream(loadServiceProviders(ContainerClasspathContributor.class, tccl)).collect(toList()); + toStream(loadServiceProviders(ContainerClasspathContributor.class, tccl)).toList(); } else { classpathContributors = emptyList(); } @@ -504,8 +504,8 @@ public Path resolve(final String path) { this.extensions = toStream(loadServiceProviders(ComponentExtension.class, tccl)) .filter(ComponentExtension::isActive) .sorted(comparing(ComponentExtension::priority)) - .collect(toList()); - this.transformers = extensions.stream().flatMap(e -> e.getTransformers().stream()).collect(toList()); + .toList(); + this.transformers = extensions.stream().flatMap(e -> e.getTransformers().stream()).toList(); final Iterator recordBuilderFactoryIterator = ServiceLoader.load(RecordBuilderFactoryProvider.class, tccl).iterator(); @@ -711,7 +711,7 @@ protected List addJarContaining(final ClassLoader loader, final String r return id; }) .filter(Objects::nonNull) - .collect(toList()); + .toList(); } return emptyList(); } @@ -1033,7 +1033,7 @@ private Collection findAdditionalClasspathFor(final String pluginId) { .stream() .flatMap(it -> it.findContributions(pluginId).stream()) .distinct() - .collect(toList())/* keep order */; + .toList()/* keep order */; } public void removePlugin(final String id) { @@ -1111,7 +1111,7 @@ protected static Collection createRawLocalConfigurations() { configurations .addAll(toStream( loadServiceProviders(LocalConfiguration.class, LocalConfiguration.class.getClassLoader())) - .collect(toList())); + .toList()); } configurations.addAll(asList(new LocalConfiguration() { @@ -1324,7 +1324,7 @@ public void onCreate(final Container container) { } catch (final ClassNotFoundException e) { throw new IllegalArgumentException(e); } - }).collect(toList()); + }).toList(); if (KnownClassesFilter.INSTANCE == filter) { archive = new ClassesArchive(/* empty */); optimizedFinder = new AnnotationFinder(archive) { @@ -1343,7 +1343,7 @@ public List findAnnotatedMethods(final Class annot .flatMap(client -> Stream .of(client.getMethods()) .filter(m -> m.isAnnotationPresent(annotation))) - .collect(toList()); + .toList(); } return super.findAnnotatedMethods(annotation); } @@ -1481,7 +1481,7 @@ public T findService(final Class key) { .anyMatch(a -> a.annotationType().isAnnotationPresent(ActionType.class))) .map(serviceMethod -> createServiceMeta(container, services, componentDefaults, service, instance, serviceMethod, service)) - .collect(toList()))); + .toList())); info("Added @Service " + service + " for container-id=" + container.getId()); }); @@ -1744,7 +1744,7 @@ private Archive toArchive(final String module, final OriginalId originalId, } catch (final MalformedURLException e) { throw new IllegalStateException(e); } - }).collect(toList())); + }).toList()); } catch (final IOException e) { throw new IllegalArgumentException("Error scanning " + module, e); } diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/asm/ProxyGenerator.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/asm/ProxyGenerator.java index 2737eb75470dc..20947431f1fa0 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/asm/ProxyGenerator.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/asm/ProxyGenerator.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.runtime.manager.asm; -import static java.util.stream.Collectors.toList; import static org.apache.xbean.asm9.ClassReader.SKIP_CODE; import static org.apache.xbean.asm9.ClassReader.SKIP_DEBUG; import static org.apache.xbean.asm9.ClassReader.SKIP_FRAMES; @@ -582,7 +581,7 @@ public Class generateProxy(final ClassLoader loader, final Class classToPr final Method[] interceptedMethods; if (hasInterceptors) { final Collection globalInterceptors = - Stream.of(classToProxy.getAnnotations()).filter(this::isInterceptor).collect(toList()); + Stream.of(classToProxy.getAnnotations()).filter(this::isInterceptor).toList(); final AtomicInteger methodIndex = new AtomicInteger(); interceptedMethods = Stream .of(classToProxy.getMethods()) diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/JobImpl.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/JobImpl.java index 784168f99a939..bde286853b496 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/JobImpl.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/JobImpl.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.manager.chain.internal; import static java.util.Collections.singletonList; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; @@ -149,7 +148,7 @@ public void doBuild() { .filter(n -> edges .stream() .noneMatch(l -> l.getFrom().getNode().equals(n) || l.getTo().getNode().equals(n))) - .collect(toList()); + .toList(); orphans.forEach(o -> log.warn("component '" + o + "' is orphan in this graph. it will be ignored.")); nodes.removeAll(orphans); @@ -182,7 +181,7 @@ private void calculateGraphOrder(final int order, final Set nodes, fi .filter(others -> edge.getTo().getNode().equals(others.getTo().getNode())) .map(others -> others.getFrom().getNode()) .allMatch(startingNodes::contains)) - .collect(toList()); + .toList(); if (level.isEmpty()) { throw new IllegalStateException("the job pipeline has cyclic connection"); } @@ -534,7 +533,7 @@ private Record pollFirst(final Map> data) { private List getConnections(final List edges, final Job.Component step, final Function direction) { - return edges.stream().filter(edge -> direction.apply(edge).equals(step)).collect(toList()); + return edges.stream().filter(edge -> direction.apply(edge).equals(step)).toList(); } public GroupKeyProvider getKeyProvider(final String componentId) { diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/configuration/ConfigurationMapper.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/configuration/ConfigurationMapper.java index ebbe2ac1177e3..ac55c00f14900 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/configuration/ConfigurationMapper.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/configuration/ConfigurationMapper.java @@ -19,7 +19,6 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.lang.reflect.Field; @@ -79,7 +78,7 @@ private Map map(final List nestedParameters, fina param.getNestedParameters() .stream() .filter(p -> !isPrimitive(p)) - .collect(toList()), + .toList(), item, indexes)); return res; }) diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorHandlerFacade.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorHandlerFacade.java index 39d2e241435b3..754c6d2cfe7cd 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorHandlerFacade.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorHandlerFacade.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.manager.interceptor; import static java.util.Comparator.comparing; -import static java.util.stream.Collectors.toList; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -87,17 +86,17 @@ public Object invoke(final Method method, final Object[] args) { } throw new IllegalArgumentException("No handler for " + a); })) - .collect(toList()); + .toList(); if (handlers.isEmpty()) { return (mtd, arguments) -> doInvoke(method, args); } // init all InvokerHandler final List invokerHandlers = - handlers.stream().filter(i -> i.invoker).map(InvokerHandler.class::cast).collect(toList()); + handlers.stream().filter(i -> i.invoker).map(InvokerHandler.class::cast).toList(); if (invokerHandlers.isEmpty() && handlers.size() > 1) { throw new IllegalArgumentException("Interceptors not compatible for " + m + ": " - + handlers.stream().filter(i -> !invokerHandlers.contains(i)).collect(toList())); + + handlers.stream().filter(i -> !invokerHandlers.contains(i)).toList()); } if (invokerHandlers.isEmpty()) { return handlers.iterator().next()::invoke; @@ -105,7 +104,7 @@ public Object invoke(final Method method, final Object[] args) { if (invokerHandlers.size() != handlers.size()) { throw new IllegalArgumentException("Some handlers don't take an invoker as parameter for method " + m - + ": " + handlers.stream().filter(i -> !invokerHandlers.contains(i)).collect(toList())); + + ": " + handlers.stream().filter(i -> !invokerHandlers.contains(i)).toList()); } for (int i = 0; i < invokerHandlers.size(); i++) { final InvokerHandler invokerHandler = invokerHandlers.get(i); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ComponentMetadataService.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ComponentMetadataService.java index ace93e05d6299..19c80f66948d3 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ComponentMetadataService.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ComponentMetadataService.java @@ -17,7 +17,6 @@ import static java.util.Comparator.comparing; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import java.util.Arrays; import java.util.HashMap; @@ -48,7 +47,7 @@ public class ComponentMetadataService { public ComponentMetadataService() { this.enrichers = StreamSupport .stream(ServiceLoader.load(ComponentMetadataEnricher.class).spliterator(), false) - .collect(toList()); + .toList(); } public Map getMetadata(final Class clazz) { diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ParameterModelService.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ParameterModelService.java index 65974a56f34a3..033f43f03fc2a 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ParameterModelService.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ParameterModelService.java @@ -86,7 +86,7 @@ public ParameterModelService(final PropertyEditorRegistry registry) { .spliteratorUnknownSize(ServiceLoader.load(ParameterExtensionEnricher.class).iterator(), Spliterator.IMMUTABLE), false) - .collect(toList()), registry); + .toList(), registry); } public boolean isService(final Param parameter) { @@ -197,7 +197,7 @@ protected ParameterMeta buildParameter(final String name, final String prefix, f .of(((Class>) genericType).getEnumConstants()) .map(Enum::name) // sorted() // don't sort, let the dev use the order he wants - .collect(toList())); + .toList()); break; default: } diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ReflectionService.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ReflectionService.java index cb8b313a95757..9f00f8f2f4e36 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ReflectionService.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ReflectionService.java @@ -204,7 +204,7 @@ public Function, Object[]> parameterFactory(final Executable } throw new IllegalArgumentException("Unsupported type: " + parameterizedType); - }).collect(toList()); + }).toList(); return config -> { final Map notNullConfig = ofNullable(config).orElseGet(Collections::emptyMap); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/parameterenricher/UiParameterEnricher.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/parameterenricher/UiParameterEnricher.java index 2965b3701e9e4..5aab1d0cf12ef 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/parameterenricher/UiParameterEnricher.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/parameterenricher/UiParameterEnricher.java @@ -21,7 +21,6 @@ import static java.util.Locale.ENGLISH; import static java.util.function.Function.identity; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.lang.annotation.Annotation; @@ -130,7 +129,7 @@ private Map toConfig(final Annotation annotation, final String p .of(component.getMethods()) .filter(mtd -> mtd.getDeclaringClass() == component && "value".equals(mtd.getName())) - .collect(toList()); + .toList(); final StringBuilder builder = new StringBuilder(""); for (int i = 0; i < length; i++) { final Object annot = Array.get(invoke, i); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/VisibilityService.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/VisibilityService.java index a45942c8b0950..e3f2e1dc6d1e0 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/VisibilityService.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/VisibilityService.java @@ -218,7 +218,7 @@ private Object extractValue(final JsonObject payload) { private Object mapValue(final JsonValue value) { switch (value.getValueType()) { case ARRAY: - return value.asJsonArray().stream().map(this::mapValue).collect(toList()); + return value.asJsonArray().stream().map(this::mapValue).toList(); case STRING: return JsonString.class.cast(value).getString(); case TRUE: diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/LocalCacheService.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/LocalCacheService.java index 3b802b9326cfc..e437419470b98 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/LocalCacheService.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/LocalCacheService.java @@ -29,7 +29,6 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.PreDestroy; @@ -179,10 +178,10 @@ public void clean() { if (maxEviction > 0) { elements = elements.limit(maxEviction); } - final List removableElements = elements.map(Entry::getKey).collect(Collectors.toList());// materialize - // before - // actually - // removing it + final List removableElements = elements.map(Entry::getKey).toList();// materialize + // before + // actually + // removing it removableElements.forEach(this.cache::remove); } diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/RecordPointerFactoryImpl.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/RecordPointerFactoryImpl.java index 9dda5549e7e3c..921e30ef77455 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/RecordPointerFactoryImpl.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/RecordPointerFactoryImpl.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.runtime.manager.service; -import static java.util.stream.Collectors.toList; - import java.io.ObjectStreamException; import java.io.Serializable; import java.util.ArrayList; @@ -67,7 +65,7 @@ private RecordPointerImpl(final String pointer) { return s; } return s.replace("~1", "/").replace("~0", "~"); - }).collect(toList()); + }).toList(); } @Override diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ResolverImpl.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ResolverImpl.java index 4f0d48b785bf5..846cc604d65ca 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ResolverImpl.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/ResolverImpl.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.manager.service; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import java.io.File; import java.io.IOException; @@ -91,7 +90,7 @@ public Collection resolveFromDescriptor(final InputStream descriptor) { .map(Artifact::toPath) .map(fileResolver) .map(Path::toFile) - .collect(toList()); + .toList(); } catch (final IOException e) { throw new IllegalArgumentException(e); } diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/HttpClientFactoryImpl.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/HttpClientFactoryImpl.java index 1ce3aeab0612d..ce8408ee11b6b 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/HttpClientFactoryImpl.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/HttpClientFactoryImpl.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.manager.service.http; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.of; import static org.talend.sdk.component.runtime.base.lang.exception.InvocationExceptionWrapper.toRuntimeException; @@ -62,7 +61,7 @@ public class HttpClientFactoryImpl implements HttpClientFactory, Serializable { public static Collection createErrors(final Class api) { final Collection errors = new ArrayList<>(); final Collection methods = - of(api.getMethods()).filter(m -> m.getDeclaringClass() == api && !m.isDefault()).collect(toList()); + of(api.getMethods()).filter(m -> m.getDeclaringClass() == api && !m.isDefault()).toList(); if (!HttpClient.class.isAssignableFrom(api)) { errors.add(api.getCanonicalName() + " should extends HttpClient"); @@ -72,7 +71,7 @@ public static Collection createErrors(final Class api) { .stream() .filter(m -> !m.isAnnotationPresent(Request.class)) .map(m -> "No @Request on " + m) - .collect(toList())); + .toList()); return errors; } diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/RequestParser.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/RequestParser.java index c65a7cad9a4ed..6c96880442dde 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/RequestParser.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/service/http/RequestParser.java @@ -422,7 +422,7 @@ private Stream> mapValues(final QueryEnc case MULTI: return collection.map(q -> new AbstractMap.SimpleEntry<>(key, q)); case CSV: - return of(new AbstractMap.SimpleEntry<>(key, String.join(",", collection.collect(toList())))); + return of(new AbstractMap.SimpleEntry<>(key, String.join(",", collection.toList()))); default: throw new IllegalArgumentException("Unsupported formatting: " + config); } diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ComponentManagerTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ComponentManagerTest.java index 8e7af554e63a6..0b5ec92925194 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ComponentManagerTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ComponentManagerTest.java @@ -19,7 +19,6 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -465,9 +464,9 @@ private Container validateTransitiveComponent(ComponentManager manager) { .map(ContainerComponentRegistry::getComponents) .flatMap(comps -> comps.values().stream()) .flatMap(family -> family.getProcessors().values().stream()) - .collect(toList()); + .toList(); assertEquals(asList("proc", "second"), - processors.stream().map(ComponentFamilyMeta.ProcessorMeta::getName).sorted().collect(toList())); + processors.stream().map(ComponentFamilyMeta.ProcessorMeta::getName).sorted().toList()); return container; } @@ -500,7 +499,7 @@ private void doCheckRegistry(final File plugin1, final File plugin2, final Compo throws Exception { Stream.of(plugin1, plugin2).map(File::getAbsolutePath).forEach(manager::addPlugin); final List registries = - manager.find(c -> Stream.of(c.get(ContainerComponentRegistry.class))).collect(toList()); + manager.find(c -> Stream.of(c.get(ContainerComponentRegistry.class))).toList(); assertEquals(2, registries.size()); // we saw both plugin registries.forEach(registry -> { diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java index 0e36b168e8124..ac4559ac1ef03 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java @@ -679,7 +679,7 @@ void tables() throws NoSuchMethodException { { assertNotNull(tableOwner.table); assertEquals(2, tableOwner.table.size()); - assertEquals(Stream.of("test1", "test2").collect(toList()), + assertEquals(Stream.of("test1", "test2").toList(), tableOwner.table.stream().map(Column::getValue1).collect(toList())); assertArrayEquals(IntStream.of(12, 22).toArray(), tableOwner.table.stream().mapToInt(Column::getValue2).toArray()); diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/chain/JobTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/chain/JobTest.java index 35fea0b82ad48..ac83881c9a9b5 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/chain/JobTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/chain/JobTest.java @@ -18,7 +18,6 @@ import static java.net.URLEncoder.encode; import static java.util.Arrays.asList; import static java.util.Collections.emptyMap; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -187,7 +186,7 @@ void multipleEmitSupport(final TestInfo info, @TempDir final Path temporaryFolde .build() .run(); // {"cumulatedSize":15}.length x2 - assertEquals(asList(15, 30), outputs.stream().map(json -> json.getInt("cumulatedSize")).collect(toList())); + assertEquals(asList(15, 30), outputs.stream().map(json -> json.getInt("cumulatedSize")).toList()); } } diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorTest.java index e7a7ea4091d58..08da4f7c88da2 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/interceptor/InterceptorTest.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.manager.interceptor; import static java.lang.Thread.sleep; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.talend.sdk.component.runtime.manager.test.Serializer.roundTrip; @@ -49,7 +48,7 @@ void run(@TempDir final File temporaryFolder) throws Exception { final List collect = manager .find(c -> c.get(ComponentManager.AllServices.class).getServices().values().stream()) .filter(c -> c.getClass().getName().endsWith("SuperService$$TalendServiceProxy")) - .collect(toList()); + .toList(); assertEquals(1, collect.size()); final Object instance = collect.iterator().next(); diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/RecordServiceImplTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/RecordServiceImplTest.java index b96b48a29c523..d3e63ec1e7bbd 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/RecordServiceImplTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/RecordServiceImplTest.java @@ -32,7 +32,6 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.json.Json; @@ -115,7 +114,7 @@ void visit() { .of(args) .filter(it -> !Schema.Entry.class .isInstance(it)) - .collect(Collectors.toList()))); + .toList())); switch (method.getName()) { case "get": return out.incrementAndGet(); diff --git a/component-runtime-manager/src/test/java/org/talend/test/CheckpointInput.java b/component-runtime-manager/src/test/java/org/talend/test/CheckpointInput.java index cdebde7f2392d..72e8674ee00ee 100644 --- a/component-runtime-manager/src/test/java/org/talend/test/CheckpointInput.java +++ b/component-runtime-manager/src/test/java/org/talend/test/CheckpointInput.java @@ -15,8 +15,6 @@ */ package org.talend.test; -import static java.util.stream.Collectors.toList; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -68,7 +66,7 @@ public CheckpointInput(final JsonBuilderFactory factory, final Jsonb jsonb, @PostConstruct public void init() { - data = IntStream.range(0, 10).boxed().collect(toList()); + data = IntStream.range(0, 10).boxed().toList(); if (configuration.checkpoint == null) { log.info("[resume] No valid checkpoint configuration found, using start of dataset."); bookmark = 0; diff --git a/component-runtime-testing/component-runtime-beam-junit/src/main/java/org/talend/sdk/component/junit/beam/Data.java b/component-runtime-testing/component-runtime-beam-junit/src/main/java/org/talend/sdk/component/junit/beam/Data.java index c731873282552..47c0e9ce3d691 100644 --- a/component-runtime-testing/component-runtime-beam-junit/src/main/java/org/talend/sdk/component/junit/beam/Data.java +++ b/component-runtime-testing/component-runtime-beam-junit/src/main/java/org/talend/sdk/component/junit/beam/Data.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.junit.beam; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static lombok.AccessLevel.PRIVATE; import static lombok.AccessLevel.PROTECTED; @@ -111,7 +110,7 @@ private Record map(final Map> next) { .cast(converters .toRecord(REGISTRY, it, () -> jsonb, () -> recordBuilderFactory))) - .collect(toList()); + .toList(); aggregator .withArray(recordBuilderFactory .newEntryBuilder() diff --git a/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProcessorTest.java b/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProcessorTest.java index 2dee79552e407..d243128cdf08b 100644 --- a/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProcessorTest.java +++ b/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProcessorTest.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.junit.beam; import static java.util.Arrays.asList; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -67,7 +66,7 @@ public void processor() { inputs.apply(TalendFn.asFn(processor)).apply(Data.map(processor.plugin(), Record.class)); PAssert.that(outputs).satisfies((SerializableFunction>, Void>) input -> { - final List> result = StreamSupport.stream(input.spliterator(), false).collect(toList()); + final List> result = StreamSupport.stream(input.spliterator(), false).toList(); assertEquals(2, result.size()); result.forEach(e -> assertTrue(e.containsKey("__default__") && e.containsKey("reject"))); diff --git a/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProducerFinderEnvironmentTest.java b/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProducerFinderEnvironmentTest.java index c6e263abb0db1..3ff81e4105b16 100644 --- a/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProducerFinderEnvironmentTest.java +++ b/component-runtime-testing/component-runtime-beam-junit/src/test/java/org/talend/sdk/component/junit/beam/ProducerFinderEnvironmentTest.java @@ -17,7 +17,6 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -146,7 +145,7 @@ private void runPipeline(PTransform> transform) { .mapToObj(i -> factory.newRecordBuilder() .withString("id", "id_" + i) .build()) - .collect(toList()); + .toList(); PAssert.that(out).containsInAnyOrder(records); Assertions.assertEquals(PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); } @@ -214,7 +213,7 @@ public PCollection expand(final PBegin input) { .mapToObj(i -> recordBuilderFactory.newRecordBuilder() .withString("id", "id_" + i) .build()) - .collect(toList())) + .toList()) .withCoder(SchemaRegistryCoder.of())); } } diff --git a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/BaseComponentsHandler.java b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/BaseComponentsHandler.java index acd9621fee5cb..ccea0a46cdf6e 100644 --- a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/BaseComponentsHandler.java +++ b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/BaseComponentsHandler.java @@ -22,7 +22,6 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static org.apache.ziplock.JarLocation.jarLocation; import static org.junit.Assert.fail; import static org.talend.sdk.component.junit.SimpleFactory.configurationByExample; @@ -116,7 +115,7 @@ public T injectServices(final T instance) { public BaseComponentsHandler withIsolatedPackage(final String packageName, final String... packages) { isolatedPackages = Stream.concat(Stream.of(packageName), Stream.of(packages)) .filter(Objects::nonNull) - .collect(toList()); + .toList(); if (isolatedPackages.isEmpty()) { isolatedPackages = null; } @@ -371,7 +370,7 @@ public List collectAsList(final Class recordType, final Mapper mapper) @Override public List collectAsList(final Class recordType, final Mapper mapper, final int maxRecords) { - return collect(recordType, mapper, maxRecords).collect(toList()); + return collect(recordType, mapper, maxRecords).toList(); } @Override @@ -501,7 +500,7 @@ public List getCollectedData(final Class recordType) { .stream() .filter(r -> recordType.isInstance(r) || JsonObject.class.isInstance(r) || Record.class.isInstance(r)) .map(r -> mapRecord(state, recordType, r)) - .collect(toList()); + .toList(); } public void resetState() { diff --git a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/environment/BaseEnvironmentProvider.java b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/environment/BaseEnvironmentProvider.java index d5d6f5c5371e7..e10d0aabcbb1d 100644 --- a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/environment/BaseEnvironmentProvider.java +++ b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/environment/BaseEnvironmentProvider.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.junit.environment; -import static java.util.stream.Collectors.toList; - import java.lang.annotation.Annotation; import java.util.Collection; import java.util.stream.Stream; @@ -47,7 +45,7 @@ public final AutoCloseable start(final Class clazz, final Annotation[] annota System.clearProperty(p.value()); } }; - }).collect(toList()); + }).toList(); return (AutoCloseable) () -> releases.forEach(Runnable::run); }) .orElseGet(() -> () -> { diff --git a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/maven/MavenDecrypter.java b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/maven/MavenDecrypter.java index bc5f3dc3f8839..671958e76ffd0 100644 --- a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/maven/MavenDecrypter.java +++ b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/maven/MavenDecrypter.java @@ -29,7 +29,6 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.crypto.Cipher; @@ -77,7 +76,7 @@ public MavenDecrypter(final File settings, final File settingsSecurity) { } public MavenDecrypter(final List settings, final File settingsSecurity) { - this.settings = settings.stream().filter(File::exists).collect(Collectors.toList()); + this.settings = settings.stream().filter(File::exists).toList(); this.settingsSecurity = settingsSecurity; } @@ -156,7 +155,7 @@ private static List findSettingsFiles() { findMavenHome(M2_HOME), findMavenHome(MAVEN_HOME)) .filter(Objects::nonNull) - .collect(Collectors.toList()); + .toList(); } private static File findMavenHome(final String mavenHome) { diff --git a/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit/SimpleComponentRuleTest.java b/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit/SimpleComponentRuleTest.java index be62d062097fb..a12cbac2c6fb3 100644 --- a/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit/SimpleComponentRuleTest.java +++ b/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit/SimpleComponentRuleTest.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.MINUTES; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -209,7 +208,7 @@ protected Stream findMethods(final Class marker) { latch.countDown(); final Stream collect = COMPONENT_FACTORY.collect(String.class, mapper, 2, 2); - final List threads = collect.collect(toList()); + final List threads = collect.toList(); assertEquals(threads.toString(), 2, threads.size()); threads.forEach(n -> assertTrue(n, n.startsWith("SimpleComponentRule-pool-"))); } diff --git a/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit5/ComponentExtensionTest.java b/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit5/ComponentExtensionTest.java index 9163ccf9e82d2..584052325e380 100644 --- a/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit5/ComponentExtensionTest.java +++ b/component-runtime-testing/component-runtime-junit/src/test/java/org/talend/sdk/component/junit5/ComponentExtensionTest.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.MINUTES; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; @@ -140,7 +139,7 @@ protected Stream findMethods(final Class marker) { latch.countDown(); final Stream collect = handler.collect(String.class, mapper, 2, 2); - final List threads = collect.collect(toList()); + final List threads = collect.toList(); assertEquals(2, threads.size(), threads.toString()); threads.forEach(n -> Assertions.assertTrue(n.startsWith("ComponentExtension-pool-"), n)); } diff --git a/component-runtime-testing/component-runtime-testing-spark/src/main/java/org/talend/sdk/component/runtime/testing/spark/internal/BaseSpark.java b/component-runtime-testing/component-runtime-testing-spark/src/main/java/org/talend/sdk/component/runtime/testing/spark/internal/BaseSpark.java index e0e95ee569275..d13eebd28b1f7 100644 --- a/component-runtime-testing/component-runtime-testing-spark/src/main/java/org/talend/sdk/component/runtime/testing/spark/internal/BaseSpark.java +++ b/component-runtime-testing/component-runtime-testing-spark/src/main/java/org/talend/sdk/component/runtime/testing/spark/internal/BaseSpark.java @@ -21,7 +21,6 @@ import static java.util.Optional.of; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static org.apache.ziplock.JarLocation.jarLocation; @@ -196,7 +195,7 @@ protected Instances start() { () -> isOpen(host, slavePort), "org.apache.spark.deploy.worker.Worker", "--host", host, "--port", Integer.toString(slavePort), "--webui-port", Integer.toString(slavePort + 1), getSparkMaster()); - }).collect(toList()); + }).toList(); slaves.stream().peek(s -> closingTasks.add(s::close)).map(m -> new Thread(m::close)).forEach(t -> { Runtime.getRuntime().addShutdownHook(t); closingTasks.add(() -> Runtime.getRuntime().removeShutdownHook(t)); @@ -629,7 +628,7 @@ public synchronized void run() { .of(new File(System.getProperty("java.home"), "bin/java").getAbsolutePath(), "-cp", classpath), Stream.of(mainAndArgs)) - .collect(toList())); + .toList()); final Map environment = builder.environment(); final String jvmVersion = System.getProperty("java.version", "1.8"); // poor check - suppose using at least jvm 8... diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java index 6c387c272d822..3f8d9f345bbe9 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ActionResourceImpl.java @@ -18,7 +18,6 @@ import static java.util.Arrays.asList; import static java.util.Optional.ofNullable; import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toList; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import java.util.Collection; @@ -124,7 +123,7 @@ public boolean test(final String family) { return new ActionList(Stream .concat(findDeployedActions(typeMatcher, componentMatcher, locale), findVirtualActions(typeMatcher, componentMatcher, locale)) - .collect(toList())); + .toList()); } private CompletableFuture doExecuteLocalAction(final String family, final String type, @@ -262,6 +261,6 @@ private Stream findDeployedActions(final Predicate typeMatch .map(s -> new ActionItem(s.getFamily(), s.getType(), s.getAction(), propertiesService .buildProperties(s.getParameters().get(), c.getLoader(), locale, null) - .collect(toList())))); + .toList()))); } } diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java index 62462b5af9021..34b1a14e171ba 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java @@ -19,7 +19,6 @@ import static java.util.Optional.ofNullable; import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import java.io.ByteArrayInputStream; @@ -148,7 +147,7 @@ public CompletionStage bulk(final BulkRequests requests) { return completedFuture(invalidResponse); } return doExecute(request, uriInfo); - }).collect(toList()); + }).toList(); return CompletableFuture .allOf(responses.toArray(EMPTY_PROMISES)) .handle((ignored, error) -> new BulkResponses(responses.stream().map(it -> { @@ -163,7 +162,7 @@ public CompletionStage bulk(final BulkRequests requests) { .entity(new ErrorPayload(ErrorDictionary.UNEXPECTED, e.getMessage())) .build()); } - }).collect(toList()))); + }).toList())); } private boolean isBlacklisted(final BulkRequests.Request request) { diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java index 8e1990c87a52a..5b48b6feddfb1 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java @@ -20,7 +20,6 @@ import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; import static java.util.function.UnaryOperator.identity; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION; @@ -359,7 +358,7 @@ public ComponentIndices getIndex(final String language, final boolean includeIco detail.getLinks(), detail.getMetadata()))) .filter(filter) - .collect(toList())); + .toList()); }); } @@ -640,7 +639,7 @@ public ComponentDetailList getDetail(final String language, final String[] ids) componentDetail.setDisplayName(bundle.displayName().orElse(meta.getName())); componentDetail.setProperties(propertiesService .buildProperties(meta.getParameterMetas().get(), container.getLoader(), locale, null) - .collect(toList())); + .toList()); componentDetail.setActions(actionsService .findActions(meta.getParent().getName(), container, locale, meta, meta.getParent().findBundle(container.getLoader(), locale))); @@ -651,7 +650,7 @@ public ComponentDetailList getDetail(final String language, final String[] ids) errors.put(id, new ErrorPayload(COMPONENT_MISSING, "No component '" + id + "'")); return null; }); - }).filter(Objects::nonNull).collect(toList()); + }).filter(Objects::nonNull).toList(); if (!errors.isEmpty()) { throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST).entity(errors).build()); @@ -743,13 +742,13 @@ private DependencyDefinition getDependenciesFor(final ComponentFamilyMeta.BaseMe final Stream deps = c.findDependencies(); final Stream artifacts; if (configuration.getAddExtensionDependencies() && extension != null) { - final List dependencies = deps.collect(toList()); + final List dependencies = deps.toList(); final Stream addDeps = getExtensionDependencies(extension, dependencies); artifacts = Stream.concat(dependencies.stream(), addDeps); } else { artifacts = deps; } - return artifacts.map(Artifact::toCoordinate).collect(toList()); + return artifacts.map(Artifact::toCoordinate).toList(); }).orElseThrow(() -> new IllegalArgumentException("Can't find container '" + meta.getId() + "'"))); } @@ -794,7 +793,7 @@ private ComponentIndex toComponentIndex(final Container container, final Locale .map(category -> parentBundle.category(category) .orElseGet(() -> category.replace("/" + meta.getParent().getName() + "/", "/" + familyDisplayName + "/"))) - .collect(toList())) + .toList()) .orElseGet(Collections::emptyList); return new ComponentIndex( new ComponentId(meta.getId(), meta.getParent().getId(), plugin, diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java index 85b0329265745..f279a477b7dda 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImpl.java @@ -18,7 +18,6 @@ import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; @@ -245,7 +244,7 @@ private Stream createNode(final String parentId, final String fa forcedPrefix + p.getPath().substring(prefixLen), p.getName(), p.getDisplayName(), p.getType(), p.getDefaultValue(), p.getValidation(), p.getMetadata(), p.getPlaceholder(), p.getProposalDisplayNames())) - .collect(toList())); + .toList()); } node.setEdges(c.getChildConfigs().stream().map(Config::getId).collect(toSet())); diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java index add5d79b91dd8..d02bfc9ec763c 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/DocumentationResourceImpl.java @@ -253,7 +253,7 @@ private static class DocumentationCache { String selectById(final String name, final String value, final DocumentationSegment segment) { final List lines; try (final BufferedReader reader = new BufferedReader(new StringReader(value))) { - lines = reader.lines().collect(toList()); + lines = reader.lines().toList(); } catch (final IOException e) { throw new IllegalArgumentException(e); } diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/SecurityUtils.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/SecurityUtils.java index 72fd6abf0b875..69d6b661a3656 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/SecurityUtils.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/security/SecurityUtils.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.server.front.security; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.util.Collection; @@ -48,7 +47,7 @@ public Map decrypt(final Collection spec, final M .flatMap(s -> flatten(s) .filter(p -> Boolean.parseBoolean(p.getMetadata().getOrDefault(CREDENTIAL, "false")))) .map(m -> m.getPath()) - .collect(toList()); + .toList(); return Stream.concat(vault.decrypt(config.entrySet() .stream() @@ -67,7 +66,7 @@ public List findCipheredKeys(final ParameterMeta meta, final Map Boolean.parseBoolean(p.getMetadata().getOrDefault(CREDENTIAL, "false"))) .map(m -> m.getPath()) - .collect(toList()); + .toList(); } private Stream flatten(final ParameterMeta meta) { diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ActionsService.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ActionsService.java index c23d2dc4f2afb..7d07a0dae1886 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ActionsService.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ActionsService.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.server.service; import static java.util.Collections.singleton; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import java.util.Collection; @@ -94,8 +93,8 @@ private Collection findActions(final String family, final Set toStream(final Collection parameterMetas) { diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java index dee14a3b44c85..c80f4b0c75782 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ComponentManagerService.java @@ -414,7 +414,7 @@ private Runnable postDeploy(final Container plugin) { .stream() .flatMap(c -> c.getActions().stream()) .map(actionDao::createOrUpdate) - .collect(toList()); + .toList(); final Collection families = plugin .get(ContainerComponentRegistry.class) @@ -422,18 +422,18 @@ private Runnable postDeploy(final Container plugin) { .values() .stream() .map(componentFamilyDao::createOrUpdate) - .collect(toList()); + .toList(); final Collection configs = ofNullable(plugin.get(RepositoryModel.class)) .map(r -> r .getFamilies() .stream() .flatMap(f -> configAsStream(f.getConfigs().get().stream())) - .collect(toList())) + .toList()) .orElse(emptyList()) .stream() .map(configurationDao::createOrUpdate) - .collect(toList()); + .toList(); return () -> { virtualDependenciesService.onUnDeploy(plugin); diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java index dd182a43a3d06..2ac6600ba0bbb 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/ExtensionComponentMetadataManager.java @@ -19,7 +19,6 @@ import static java.util.Optional.ofNullable; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.io.BufferedOutputStream; @@ -119,7 +118,7 @@ public void registerComponents(final Collection components) { .concat(createBuiltInLinks(it), it.getLinks() == null ? Stream.empty() : it.getLinks().stream()) .distinct() - .collect(toList()), + .toList(), singletonMap("mapper::infinite", "false"))) .collect(toMap(it -> it.getId().getId(), identity(), (a, b) -> { throw new IllegalArgumentException(a + " and " + b + " are conflicting"); diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/PropertyValidationService.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/PropertyValidationService.java index 007e68d9aca4a..b10b7b7361da8 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/PropertyValidationService.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/PropertyValidationService.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.server.service; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import java.util.Collection; import java.util.Map; @@ -48,7 +47,7 @@ private void initMapper() { } else if (Boolean.class == f.getType()) { valueConverter = Boolean::parseBoolean; } else if (Collection.class == f.getType()) { - valueConverter = s -> Stream.of(s.split(",")).collect(toList()); + valueConverter = s -> Stream.of(s.split(",")).toList(); } else { valueConverter = s -> s; } @@ -67,7 +66,7 @@ private void initMapper() { return true; }) .orElse(false); - }).collect(toList()); + }).toList(); propertyValidationCreator = config -> { final PropertyValidation validation = new PropertyValidation(); if (validationSetters.stream().filter(s -> s.apply(validation, config)).count() == 0) { diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/VirtualDependenciesService.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/VirtualDependenciesService.java index 10b6c8beeeac0..c9d4bde63840a 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/VirtualDependenciesService.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/VirtualDependenciesService.java @@ -22,7 +22,6 @@ import static java.util.Optional.ofNullable; import static java.util.function.Function.identity; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static lombok.AccessLevel.PACKAGE; @@ -421,7 +420,7 @@ public UserContainerClasspathContributor() { @Override public Collection findContributions(final String pluginId) { delegate.onDeploy(pluginId); - return delegate.userArtifactsFor(pluginId).collect(toList()); + return delegate.userArtifactsFor(pluginId).toList(); } @Override diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/PropertiesServiceTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/PropertiesServiceTest.java index 718a3a497a730..e99a1c606b86a 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/PropertiesServiceTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/PropertiesServiceTest.java @@ -72,7 +72,7 @@ void gridLayoutTranslation() throws NoSuchMethodException { new BaseParameterEnricher.Context(new LocalConfigurationService(emptyList(), "test"))); final List props = propertiesService .buildProperties(params, Thread.currentThread().getContextClassLoader(), Locale.ROOT, null) - .collect(toList()); + .toList(); assertEquals(3, props.size()); final Map metadata = props.iterator().next().getMetadata(); @@ -109,7 +109,7 @@ void booleanDefault() throws NoSuchMethodException { new BaseParameterEnricher.Context( new LocalConfigurationService(emptyList(), "tools"))), Thread.currentThread().getContextClassLoader(), Locale.ROOT, null) - .collect(toList()); + .toList(); assertEquals("true", props.stream().filter(p -> p.getName().equals("val")).findFirst().get().getDefaultValue()); } @@ -129,7 +129,7 @@ private List getProperties(final String locale) { return propertiesService .buildProperties(singletonList(config), getClass().getClassLoader(), Locale.forLanguageTag(locale), null) - .collect(toList()); + .toList(); } @Test diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/custom/CustomService.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/custom/CustomService.java index 4a656073b25aa..34423c3afb962 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/custom/CustomService.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/custom/CustomService.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.server.test.custom; -import static java.util.stream.Collectors.toList; - import java.io.IOException; import java.io.InputStream; import java.io.Serializable; @@ -53,7 +51,7 @@ public SuggestionValues get(final LocalConfiguration configuration) throws IOExc .of("i.m.a.virtual.configuration.entry", "i.m.another.virtual.configuration.entry") .map(key -> new SuggestionValues.Item(key, configuration.get(key)))) - .collect(toList())); + .toList()); } @Action("unknownException") diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/GenerateCertificateAndActivateHttpsTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/GenerateCertificateAndActivateHttpsTest.java index 7fd2a7f3e72b0..ca60cd9e1b12f 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/GenerateCertificateAndActivateHttpsTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/tomcat/GenerateCertificateAndActivateHttpsTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.server.tomcat; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -55,7 +54,7 @@ void generate() throws Exception { return (Runnable) () -> System.clearProperty(it.getKey()); } return (Runnable) () -> System.setProperty(it.getKey(), property); - }).collect(toList()); + }).toList(); try { final Meecrowave.Builder builder = new Meecrowave.Builder(); assertTrue(cert.exists()); diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java index d17cf1177b6ae..b910dfcf6a278 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/RRDEndpoint.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.starter.server.front; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; @@ -111,7 +110,7 @@ private Collection mapPoints(final boolean skipNan, final FetchData data, .range(0, timestamps.length) .filter(idx -> !skipNan || !Double.isNaN(values[idx])) .mapToObj(idx -> new Point(timestamps[idx], Double.isNaN(values[idx]) ? 0 : values[idx])) - .collect(toList()); + .toList(); } private String getMetricName(final String it) { diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java index d51c551e324b7..87f3f138d952f 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java @@ -154,7 +154,7 @@ public Stream create(final String tuple, final Buil if (sources != null && !sources.isEmpty()) { files .addAll(createSourceFiles(tuple, iconResourcesDirectory, sources, mainJava, serviceName) - .collect(toList())); + .toList()); messageProperties.put(tuple + ".source", new TreeMap() { @@ -180,7 +180,7 @@ public Stream create(final String tuple, final Buil if (processors != null && !processors.isEmpty()) { files .addAll(createProcessorFiles(tuple, iconResourcesDirectory, processors, mainJava, serviceName) - .collect(toList())); + .toList()); messageProperties.put(tuple + ".output", new TreeMap() { { diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java index fc4e634b24a0e..e02289eb20f39 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java @@ -265,8 +265,8 @@ private List extractOperations(final JsonObject paths) { final String name = it.getString("name"); return mapParameter(it, type, name); })) - .collect(toList())))) - .collect(toList()); + .toList()))) + .toList(); } private Parameter mapParameter(final JsonObject it, final String type, final String name) { diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/service/MockTableService.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/service/MockTableService.java index 9521ec77498f3..6d5a270c821b6 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/service/MockTableService.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/service/MockTableService.java @@ -99,7 +99,7 @@ public Values getTableFields(final Client client) { return new Values(Stream .of(QueryBuilder.Fields.values()) .map(f -> new Values.Item(f.name(), f.name())) - .collect(toList())); + .toList()); } public interface Client extends HttpClient { diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableMapper.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableMapper.java index 4775506281dec..d062406c9c104 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableMapper.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableMapper.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.starter.server.front.apidemo.component.source; -import static java.util.stream.Collectors.toList; import static org.talend.sdk.component.starter.server.front.apidemo.component.configuration.TableDataSet.READ_ALL_RECORD_FROM_SERVER; import static org.talend.sdk.component.starter.server.front.apidemo.component.service.http.TableApiClient.API_BASE; import static org.talend.sdk.component.starter.server.front.apidemo.component.service.http.TableApiClient.API_VERSION; @@ -112,7 +111,7 @@ public List split(@PartitionSize final long bundles) { dataSetChunk.setOffset(from); dataSetChunk.setMaxRecords(to); return new MockTableMapper(dataSetChunk, service, i18n, tableAPI); - }).filter(Objects::nonNull).collect(toList()); + }).filter(Objects::nonNull).toList(); } @Emitter diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGeneratorConfigurationTest.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGeneratorConfigurationTest.java index 2efd18d5b8501..99f2bc038afdd 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGeneratorConfigurationTest.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGeneratorConfigurationTest.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.singleton; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.talend.sdk.component.starter.server.service.Strings.capitalize; @@ -118,7 +117,7 @@ void run(final Scenario scenario) { .stream() .map(e -> new ComponentGenerator.Property(e.getName(), capitalize(e.getName()), e.getType(), false)) - .collect(toList())); + .toList()); } }); assertEquals(scenario.expectedOutput, result); diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingBoundedSource.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingBoundedSource.java index d999b3506b87a..f543bf806404f 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingBoundedSource.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingBoundedSource.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.runtime.di.beam; -import static java.util.stream.Collectors.toList; - import java.io.IOException; import java.util.List; import java.util.NoSuchElementException; @@ -47,7 +45,7 @@ public List> split(final long desiredBundleSizeBytes, final List> sources = delegate.split(desiredBundleSizeBytes, options); listener.onSplit(sources.size()); log.debug("Split {} in {} sources ({})", delegate, sources.size(), sources); - return sources.stream().map(s -> new DelegatingBoundedSource<>(s, listener)).collect(toList()); + return sources.stream().map(s -> new DelegatingBoundedSource<>(s, listener)).toList(); } @Override diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingUnBoundedSource.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingUnBoundedSource.java index 9945fb5d53d04..4320edddc0365 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingUnBoundedSource.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/beam/DelegatingUnBoundedSource.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.runtime.di.beam; -import static java.util.stream.Collectors.toList; - import java.io.IOException; import java.util.List; import java.util.NoSuchElementException; @@ -44,7 +42,7 @@ public List> split(final int desiredNumSplits, f throws Exception { final List> sources = delegate.split(desiredNumSplits, options); listener.onSplit(sources.size()); - return sources.stream().map(s -> new DelegatingUnBoundedSource<>(s, listener)).collect(toList()); + return sources.stream().map(s -> new DelegatingUnBoundedSource<>(s, listener)).toList(); } @Override diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java index 9c72735b566d5..4b164a33f5965 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java @@ -17,7 +17,6 @@ import static java.lang.reflect.Modifier.isStatic; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static org.talend.sdk.component.api.exception.DiscoverSchemaException.HandleErrorWith.EXCEPTION; import static org.talend.sdk.component.api.exception.DiscoverSchemaException.HandleErrorWith.EXECUTE_LIFECYCLE; @@ -353,7 +352,7 @@ private Optional findDataset(final ServiceMeta.ActionMeta action) final ComponentFamilyMeta.BaseMeta componentMeta = findComponent(familyMeta); // dataset name should be the same as DiscoverSchema action name - final Collection metas = toStream(componentMeta.getParameterMetas().get()).collect(toList()); + final Collection metas = toStream(componentMeta.getParameterMetas().get()).toList(); return ofNullable(metas .stream() .filter(p -> DATASET.equals(p.getMetadata().get(TCOMP_CONFIGURATIONTYPE_TYPE)) diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java index 5979bc9277130..0f1fe94b13cb1 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.runtime.di.beam.components; import static java.util.Collections.singletonMap; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -343,7 +342,7 @@ public PCollection expand(final PBegin input) { .of(IntStream .range(0, count) .mapToObj(i -> new Record("id_" + i, "record_" + i)) - .collect(toList())) + .toList()) .withCoder(SerializableCoder.of(Record.class))); } } diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java index a12e19123eb43..bb8c75c22a587 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java @@ -35,7 +35,6 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; import org.dom4j.DocumentException; import org.dom4j.io.SAXReader; @@ -596,7 +595,7 @@ void dynamicValuesArentOverwritten() { final List rows = records.stream() .map(visitor::visit) .map(RowStruct3.class::cast) - .collect(Collectors.toList()); + .toList(); Assertions.assertEquals(2, rows.size()); rows.forEach(Assertions::assertNotNull); Assertions.assertEquals(value1, rows.get(0).dyn.getColumnValue(columnName)); diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java index 63799b53e8e17..a2778dfd49c7b 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java @@ -17,7 +17,6 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -395,7 +394,7 @@ public void onElement(final Record record) { assertEquals(Double.MIN_VALUE, record.getDouble("double_min")); assertEquals(Double.MAX_VALUE, record.getDouble("double_max")); assertEquals(String.format("zorglub-is-still-alive-%05d", counter), new String(record.getBytes("bytes0"))); - assertEquals(IntStream.range(0, counter + 1).boxed().collect(toList()), + assertEquals(IntStream.range(0, counter + 1).boxed().toList(), record.getArray(Integer.class, "array0")); assertEquals(StudioTypes.DATE, record.getSchema().getEntry("date0").getProp(STUDIO_TYPE)); assertTrue(ZonedDateTime.now().toEpochSecond() >= record.getDateTime("date0").toEpochSecond()); @@ -523,7 +522,7 @@ public Record next() { .withName("array0") .withType(Type.ARRAY) .withElementSchema(builderFactory.newSchemaBuilder(Type.INT).build()) - .build(), IntStream.range(0, i + 1).boxed().collect(toList())) + .build(), IntStream.range(0, i + 1).boxed().toList()) .withDateTime("date0", ZonedDateTime.now()) .withString(builderFactory.newEntryBuilder() .withName("dynBigDecimal") diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java index 0e9a0cfe7f98b..f8da2c5bf8dec 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticResourceGenerator.java @@ -92,7 +92,7 @@ public class StaticResourceGenerator implements Runnable { public StaticResourceGenerator(final String[] args) { this(emptyMap(), PathFactory.get(args[0]).resolve("repository"), - PathFactory.get(args[0]).resolve("routes.json"), Stream.of(args[1].split(",")).collect(toList()), + PathFactory.get(args[0]).resolve("routes.json"), Stream.of(args[1].split(",")).toList(), OutputFormatter.JSON, args.length >= 3 && Boolean.parseBoolean(args[2])); } @@ -185,7 +185,7 @@ public Collection collectResources() { .map(lang -> route("component_server_action_index_" + lang, "/api/v1/action/index", MapBuilder.map().with("language", lang).done(), emptyMap(), emptyMap(), jsonb.toJson(actions.getIndex(emptyStringArray, emptyStringArray, lang)))) - .collect(toList())); + .toList()); final ComponentResource components = container.select(ComponentResource.class).get(); routes @@ -209,13 +209,13 @@ public Collection collectResources() { jsonb.toJson( components.getIndex(lang, includeIconContent, "", THEME))))) - .collect(toList())); + .toList()); final List componentIndex = components.getIndex("en", false, "", THEME).getComponents(); final List componentIds = - componentIndex.stream().map(it -> it.getId().getId()).distinct().collect(toList()); + componentIndex.stream().map(it -> it.getId().getId()).distinct().toList(); final List componentFamilyIds = - componentIndex.stream().map(it -> it.getId().getFamilyId()).distinct().collect(toList()); + componentIndex.stream().map(it -> it.getId().getFamilyId()).distinct().toList(); routes .addAll(componentIds .stream() @@ -227,7 +227,7 @@ public Collection collectResources() { MapBuilder.map().with("identifier", componentId).done(), emptyMap(), emptyMap(), jsonb.toJson(components.getDependencies(new String[] { componentId }))))) - .collect(toList())); + .toList()); routes .addAll(componentIds .stream() @@ -242,7 +242,7 @@ public Collection collectResources() { .done(), emptyMap(), emptyMap(), jsonb.toJson(components.getDetail(lang, new String[] { componentId }))))) - .collect(toList())); + .toList()); // this can become huge, maybe we should directly go on the FS for the binary ones if (!skipDependencies) { @@ -264,7 +264,7 @@ public Collection collectResources() { MapBuilder.map().done(), singletonMap(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM), emptyMap(), swallow(() -> components.getDependency(dep)))) - .collect(toList())); + .toList()); } routes.addAll(componentIds.stream().map(componentId -> { final Response response = components.icon(componentId, THEME); @@ -272,14 +272,14 @@ public Collection collectResources() { MapBuilder.map().done(), singletonMap(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM), emptyMap(), response.getStatus(), response::readEntity, jsonb); - }).collect(toList())); + }).toList()); routes.addAll(componentFamilyIds.stream().map(familyId -> { final Response response = components.familyIcon(familyId, THEME); return route("component_server_component_family_icon_" + familyId, "/api/v1/component/icon/family/" + familyId, MapBuilder.map().done(), singletonMap(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM), emptyMap(), response.getStatus(), response::readEntity, jsonb); - }).collect(toList())); + }).toList()); final ConfigurationTypeResource configurations = container.select(ConfigurationTypeResource.class).get(); final ConfigTypeNodes configurationTypes = configurations.getRepositoryModel("en", true, ""); @@ -299,7 +299,7 @@ public Collection collectResources() { .done(), emptyMap(), emptyMap(), jsonb.toJson(configurations.getRepositoryModel(lang, lightPayload, ""))))) - .collect(toList())); + .toList()); routes .addAll(configurationTypes .getNodes() @@ -312,7 +312,7 @@ public Collection collectResources() { MapBuilder.map().with("language", lang).with("identifiers", id).done(), emptyMap(), emptyMap(), jsonb.toJson(configurations.getDetail(lang, new String[] { id }))))) - .collect(toList())); + .toList()); final DocumentationResource documentations = container.select(DocumentationResource.class).get(); routes @@ -334,7 +334,7 @@ public Collection collectResources() { jsonb .toJson(documentations .getDocumentation(componentId, lang, segment)))))) - .collect(toList())); + .toList()); } catch (final Exception e) { throw new IllegalStateException(e); } diff --git a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticUiSpecGenerator.java b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticUiSpecGenerator.java index f81a13200064f..2fc76d787b271 100644 --- a/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticUiSpecGenerator.java +++ b/component-tools-webapp/src/main/java/org/talend/sdk/component/tools/webapp/standalone/generator/StaticUiSpecGenerator.java @@ -17,7 +17,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; -import static java.util.stream.Collectors.toList; import static org.talend.sdk.component.tools.webapp.standalone.generator.StaticResourceGenerator.OutputFormatter.JSON; import java.io.ByteArrayInputStream; @@ -69,7 +68,7 @@ public class StaticUiSpecGenerator implements Runnable { private final Path output; public StaticUiSpecGenerator(final String[] args) { - this(emptyMap(), Stream.of(args[1].split(",")).collect(toList()), PathFactory.get(args[0])); + this(emptyMap(), Stream.of(args[1].split(",")).toList(), PathFactory.get(args[0])); } @Override diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java b/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java index 67872d0d7eab1..5bca55e641460 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java @@ -20,7 +20,6 @@ import static java.util.Collections.list; import static java.util.Locale.ENGLISH; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static org.apache.ziplock.JarLocation.jarLocation; import java.io.BufferedInputStream; @@ -86,7 +85,7 @@ public void doMain(final String[] args) throws IOException { final Path adoc = PathFactory.get(args[0]).toAbsolutePath(); final File output = adoc.getParent().resolve(args.length > 1 ? args[1] : args[0].replace(".adoc", ".pdf")).toFile(); - final List lines = Files.lines(adoc).collect(toList()); + final List lines = Files.lines(adoc).toList(); final String version = lines .stream() .filter(it -> it.startsWith("v")) diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java index 2c4b797eafd06..cd5a3da7b8336 100755 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java @@ -19,7 +19,6 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toCollection; -import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.of; import static org.talend.sdk.component.runtime.manager.reflect.Constructors.findConstructor; @@ -87,7 +86,7 @@ public ComponentValidator(final Configuration configuration, final File[] classe } this.extensions = StreamSupport .stream(ServiceLoader.load(ValidationExtension.class).spliterator(), false) - .collect(toList()); + .toList(); } @Override @@ -96,7 +95,7 @@ public void run() { final List> components = ComponentHelper .componentMarkers() .flatMap(a -> finder.findAnnotatedClasses(a).stream()) - .collect(toList()); + .toList(); components.forEach(c -> log.debug("Found component: " + c)); final Set errors = new LinkedHashSet<>(); @@ -148,7 +147,7 @@ public Stream componentClassFiles() { if (!errors.isEmpty()) { final List preparedErrors = - errors.stream().map(it -> it.replace("java.lang.", "").replace("java.util.", "")).collect(toList()); + errors.stream().map(it -> it.replace("java.lang.", "").replace("java.util.", "")).toList(); preparedErrors.forEach(log::error); throw new IllegalStateException( "Some error were detected:" + preparedErrors.stream().collect(joining("\n- ", "\n- ", ""))); @@ -245,7 +244,7 @@ private String validateFamilyI18nKey(final Class clazz, final String... keys) final Collection missingKeys = of(keys) .map(key -> key.replace("${family}", family)) .filter(k -> !bundle.containsKey(k)) - .collect(toList()); + .toList(); if (!missingKeys.isEmpty()) { return baseName + " is missing the key(s): " + String.join("\n", missingKeys); } diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/DitaDocumentationGenerator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/DitaDocumentationGenerator.java index b15592fe6c94e..70fc166902c88 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/DitaDocumentationGenerator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/DitaDocumentationGenerator.java @@ -34,7 +34,6 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; import java.util.zip.ZipEntry; @@ -217,7 +216,7 @@ private void generateConfigurationArray(final Document xml, final Element sectio boolean arrayIsNeeded = params .stream() .filter(p -> !p.isComplex() || p.isSection()) - .collect(Collectors.toList()) + .toList() .size() > 0; if (!arrayIsNeeded) { return; diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java index 8a7a724287872..196d2e48f813b 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java @@ -20,7 +20,6 @@ import static java.util.Comparator.comparing; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static lombok.AccessLevel.PRIVATE; import java.io.BufferedReader; @@ -47,7 +46,6 @@ import java.util.SortedSet; import java.util.StringTokenizer; import java.util.TreeSet; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.xbean.finder.AnnotationFinder; @@ -153,7 +151,7 @@ private String getDoc(final Class component) { final Collection docKeys = Stream .of(getComponentPrefix(component), component.getSimpleName()) .map(it -> it + "._documentation") - .collect(toList()); + .toList(); return ofNullable(findResourceBundle(component)) .map(bundle -> docKeys .stream() @@ -180,7 +178,7 @@ private String getComponentPrefix(final Class component) { } private Collection sort(final Collection parameterMetas) { - return parameterMetas.stream().sorted(comparing(ParameterMeta::getPath)).collect(toList()); + return parameterMetas.stream().sorted(comparing(ParameterMeta::getPath)).toList(); } protected void write(final File output, final String content) { @@ -398,7 +396,7 @@ private Collection getPropertiesByLayout(final ParameterMeta parent, fin .keySet() .stream() .filter(k -> k.startsWith("tcomp::ui::gridlayout::")) - .collect(Collectors.toList()); + .toList(); if (definedLayouts.isEmpty()) { // If no layout defined, we take main if exists in parent if (parentLayouts.contains("tcomp::ui::gridlayout::Main::value")) { @@ -417,7 +415,7 @@ private Collection getPropertiesByLayout(final ParameterMeta parent, fin .list(new StringTokenizer(layoutConfig, "|")) .stream() .flatMap(p -> Collections.list(new StringTokenizer(p.toString(), ",")).stream()) - .collect(Collectors.toList()) + .toList() .contains(param); if (isInThisLayout) { @@ -588,7 +586,7 @@ private Conditions createConditions(final String path, final Map metadata.get(it.replace("::target", "::value")), Boolean.parseBoolean(metadata.get(it.replace("::target", "::negate"))), metadata.get(it.replace("::target", "::evaluationStrategy"))); - }).collect(toList()); + }).toList(); return new Conditions(path, globalOperator, conditionEntries); } diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/StudioInstaller.java b/component-tools/src/main/java/org/talend/sdk/component/tools/StudioInstaller.java index 42c759f9384f5..ae7723ea6e58d 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/StudioInstaller.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/StudioInstaller.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.tools; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import java.io.BufferedOutputStream; import java.io.File; @@ -73,7 +72,7 @@ public StudioInstaller(final String mainGav, final File studioHome, final Map artifacts = this.artifacts.values().stream().map(File::getName).collect(toList()); + final List artifacts = this.artifacts.values().stream().map(File::getName).toList(); final String mvnMeta[] = mainGav.split(":"); final String artifact = mvnMeta[1]; final String version = mvnMeta[2]; diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/DataStoreValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/DataStoreValidator.java index a6f99915ff8db..a166e81733898 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/DataStoreValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/DataStoreValidator.java @@ -18,7 +18,6 @@ import static java.util.function.Function.identity; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.util.ArrayList; @@ -51,7 +50,7 @@ public Stream validate(final AnnotationFinder finder, final List> datastoreClasses = finder.findAnnotatedClasses(DataStore.class); final List datastores = - datastoreClasses.stream().map(d -> d.getAnnotation(DataStore.class).value()).collect(toList()); + datastoreClasses.stream().map(d -> d.getAnnotation(DataStore.class).value()).toList(); Set uniqueDatastores = new HashSet<>(datastores); if (datastores.size() != uniqueDatastores.size()) { @@ -73,7 +72,7 @@ public Stream validate(final AnnotationFinder finder, final List !d.isAnnotationPresent(DataStore.class)) .map(c -> c.getName() + " has @Checkable but is not a @DataStore") .sorted() - .collect(Collectors.toList())); + .toList()); final Map checkableDataStoresMap = checkableClasses .stream() @@ -95,7 +94,7 @@ public Stream validate(final AnnotationFinder finder, final List "No @HealthCheck for dataStore: '" + e.getKey() + "' with checkable: '" + e.getValue() + "'") .sorted() - .collect(Collectors.toList())); + .toList()); errors .addAll(datastoreClasses @@ -105,7 +104,7 @@ public Stream validate(final AnnotationFinder finder, final List validate(final AnnotationFinder finder, final List inputs.isEmpty() || inputs.entrySet().stream().allMatch(input -> { - final Collection allProps = flatten(input.getValue()).collect(toList()); + final Collection allProps = flatten(input.getValue()).toList(); final Collection datasetProperties = - findNestedDataSets(allProps, dataset.getValue()).collect(toList()); + findNestedDataSets(allProps, dataset.getValue()).toList(); return !datasetProperties.isEmpty() && allProps .stream() // .filter(it -> it.getType() != OBJECT && it.getType() != ARRAY) // should it be diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/FixedSchemaValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/FixedSchemaValidator.java index dc9113bd213b8..3c8750e031343 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/FixedSchemaValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/FixedSchemaValidator.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.xbean.finder.AnnotationFinder; @@ -43,7 +42,7 @@ public Stream validate(final AnnotationFinder finder, final List e.getValue().isEmpty()) .map(e -> String.format("Empty @FixedSchema annotation's value in class %s.", e.getKey().getSimpleName())) - .collect(Collectors.toList())); + .toList()); // search for missing methods final List methods = Stream .concat(finder.findAnnotatedMethods(DiscoverSchema.class) @@ -52,14 +51,14 @@ public Stream validate(final AnnotationFinder finder, final List m.getDeclaredAnnotation(DiscoverSchemaExtended.class).value())) - .collect(Collectors.toList()); + .toList(); errors.addAll(classes.entrySet() .stream() .filter(e -> !e.getValue().isEmpty()) .filter(e -> !methods.contains(e.getValue())) .map(e -> String.format("@FixedSchema '%s' in class %s is not declared anywhere as DiscoverSchema*.", e.getValue(), e.getKey().getSimpleName())) - .collect(Collectors.toList())); + .toList()); return errors.stream(); } diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/HttpValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/HttpValidator.java index 1e4e48cde091b..764a9b0110b66 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/HttpValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/HttpValidator.java @@ -17,7 +17,6 @@ import java.lang.reflect.Method; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.xbean.finder.AnnotationFinder; @@ -34,7 +33,7 @@ public Stream validate(final AnnotationFinder finder, final List HttpClient.class.isAssignableFrom(c) && finder.findAnnotatedMethods(Request.class).isEmpty()) .map(c -> c.getCanonicalName() + " extends HttpClient should use @Request on methods") - .collect(Collectors.toList()); + .toList(); List methodError = finder .findAnnotatedMethods(Request.class) // @@ -43,7 +42,7 @@ public Stream validate(final AnnotationFinder finder, final List HttpClientFactoryImpl.createErrors(c).stream()) .sorted() - .collect(Collectors.toList()); + .toList(); return Stream.concat(classErrors.stream(), methodError.stream()); diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/InternationalizationValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/InternationalizationValidator.java index 5fe40024d61aa..79c5cd5ee6b58 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/validator/InternationalizationValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/validator/InternationalizationValidator.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.of; import java.io.BufferedWriter; @@ -125,7 +124,7 @@ public Stream validate(final AnnotationFinder finder, final List missingPlaceholderTranslations = Collections.emptyList(); if (this.validatePlaceholder) { @@ -144,7 +143,7 @@ public Stream validate(final AnnotationFinder finder, final List " " + f.getDeclaringClass().getSimpleName() + "." + f.getName() + "._placeholder = ") .sorted() .distinct() - .collect(Collectors.toList()); + .toList(); } if (this.autofix && !toFix.isEmpty()) { @@ -207,7 +206,7 @@ public Stream validate(final AnnotationFinder finder, final List forLogs = result.collect(toList()); + List forLogs = result.toList(); String resultAutoFix = forLogs.stream() .collect(Collectors.joining("\n", "Automatically fixed missing labels:\n", "\n\nPlease, check changes and disable '-Dtalend.validation.internationalization.autofix=false' / " @@ -259,7 +258,7 @@ private String validateComponentResourceBundle(final Class component) { final String prefix = this.findPrefix(component); final Collection missingKeys = - of("_displayName").map(n -> prefix + "." + n).filter(k -> !bundle.containsKey(k)).collect(toList()); + of("_displayName").map(n -> prefix + "." + n).filter(k -> !bundle.containsKey(k)).toList(); if (!missingKeys.isEmpty()) { return baseName + " is missing the key(s): " + String.join("\n", missingKeys); } diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/CarBundlerTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/CarBundlerTest.java index d457eb4251cda..4b2b4434bf12b 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/CarBundlerTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/CarBundlerTest.java @@ -20,7 +20,6 @@ import static java.util.Collections.singletonMap; import static java.util.Comparator.comparing; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -267,8 +266,8 @@ private CarBundler.Configuration prepareBundle(final File m2) throws IOException assertTrue(configuration.getOutput().exists()); try (final JarFile jar = new JarFile(configuration.getOutput())) { final List entries = - list(jar.entries()).stream().sorted(comparing(ZipEntry::getName)).collect(toList()); - final List paths = entries.stream().map(ZipEntry::getName).collect(toList()); + list(jar.entries()).stream().sorted(comparing(ZipEntry::getName)).toList(); + final List paths = entries.stream().map(ZipEntry::getName).toList(); assertEquals(asList("MAVEN-INF/", "MAVEN-INF/repository/", "MAVEN-INF/repository/foo/", "MAVEN-INF/repository/foo/bar/", "MAVEN-INF/repository/foo/bar/dummy/", "MAVEN-INF/repository/foo/bar/dummy/1.2/", "MAVEN-INF/repository/foo/bar/dummy/1.2/dummy-1.2.jar", diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java index c6bfe31c74220..e670c61442f59 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.tools; -import static java.util.stream.Collectors.toList; import static org.apache.ziplock.JarLocation.jarLocation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -81,7 +80,7 @@ void noDisplayNone() { } private List doValidate(final String name, final int count, final Boolean legacyMode) { - final List errors = new SvgValidator(legacyMode).validate(icon(name)).collect(toList()); + final List errors = new SvgValidator(legacyMode).validate(icon(name)).toList(); assertEquals(count, errors.size()); return errors; } diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java index a71c2aabb961e..902764bd38f05 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java @@ -99,7 +99,7 @@ void validateDatabaseMapping() { assertEquals(0, noerrors.count()); finder = new AnnotationFinder(new ClassesArchive(ActionDatabaseMappingKO.class)); final List errors = validator.validate(finder, Arrays.asList(ActionDatabaseMappingKO.class)) - .collect(Collectors.toList()); + .toList(); assertEquals(3, errors.size()); assertAll(() -> assertContains(errors, "should return a String"), () -> assertContains(errors, "should have an Object parameter marked with @Option"), @@ -129,13 +129,13 @@ void validate() { new AnnotationFinder(new ClassesArchive(ActionClassOK.class, FakeDataSet.class, FakeDataStore.class)); final Stream errorsStream = validator.validate(finder, Arrays.asList(ActionClassOK.class, FakeDataSet.class, FakeDataStore.class)); - final List errors = errorsStream.collect(Collectors.toList()); + final List errors = errorsStream.toList(); Assertions.assertTrue(errors.isEmpty(), () -> errors.get(0) + " as first error"); AnnotationFinder finderKO = new AnnotationFinder(new ClassesArchive(ActionClassKO.class)); final Stream errorsStreamKO = validator.validate(finderKO, Collections.singletonList(ActionClassKO.class)); - final List errorsKO = errorsStreamKO.collect(Collectors.toList()); + final List errorsKO = errorsStreamKO.toList(); assertEquals(6, errorsKO.size(), () -> errorsKO.get(0) + " as first error"); assertAll(() -> assertContains(errorsKO, diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java index 17d7d17f53336..29b4fd0fd7fe2 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java @@ -18,7 +18,6 @@ import java.io.File; import java.net.URL; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.junit.jupiter.api.Assertions; @@ -46,7 +45,7 @@ public Stream componentClassFiles() { final ExceptionValidator validator = new ExceptionValidator(helper, configuration); final Stream validate = validator.validate(null, null); - final List errors = validate.collect(Collectors.toList()); + final List errors = validate.toList(); Assertions.assertFalse(errors.isEmpty()); } diff --git a/container/container-core/src/main/java/org/talend/sdk/component/classloader/ConfigurableClassLoader.java b/container/container-core/src/main/java/org/talend/sdk/component/classloader/ConfigurableClassLoader.java index 96bd3809e8522..15ef27d6c3f2e 100644 --- a/container/container-core/src/main/java/org/talend/sdk/component/classloader/ConfigurableClassLoader.java +++ b/container/container-core/src/main/java/org/talend/sdk/component/classloader/ConfigurableClassLoader.java @@ -20,7 +20,6 @@ import static java.util.Collections.enumeration; import static java.util.Collections.list; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static lombok.AccessLevel.PRIVATE; import static org.talend.sdk.component.jar.Jars.toPath; @@ -454,7 +453,7 @@ public Enumeration findResources(final String name) throws IOException { return delegates; } final Collection aggregated = new ArrayList<>(list(delegates)); - aggregated.addAll(nested.stream().map(r -> nestedResourceToURL(name, r)).collect(toList())); + aggregated.addAll(nested.stream().map(r -> nestedResourceToURL(name, r)).toList()); return enumeration(aggregated); } @@ -496,7 +495,7 @@ public List findContainedResources(final String name) { .map(ByteArrayInputStream::new) .map(InputStream.class::cast)) .orElseGet(Stream::empty)) - .collect(toList()); + .toList(); } catch (final IOException e) { throw new IllegalStateException(e); } diff --git a/container/container-core/src/main/java/org/talend/sdk/component/container/Container.java b/container/container-core/src/main/java/org/talend/sdk/component/container/Container.java index 5dc5a4e3e5a0d..b63ad7d0be3d5 100644 --- a/container/container-core/src/main/java/org/talend/sdk/component/container/Container.java +++ b/container/container-core/src/main/java/org/talend/sdk/component/container/Container.java @@ -19,7 +19,6 @@ import static java.util.Collections.list; import static java.util.Optional.of; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static org.talend.sdk.component.container.Container.State.CREATED; @@ -105,7 +104,7 @@ public Container(final String id, final String rootModule, final Artifact[] depe ofNullable(initializer).ifPresent(i -> i.accept(this)); this.classloaderProvider = () -> { - final List existingClasspathFiles = findExistingClasspathFiles().collect(toList()); + final List existingClasspathFiles = findExistingClasspathFiles().toList(); final URL[] urls = existingClasspathFiles.stream().peek(this::visitLastModified).map(f -> { try { return f.toUri().toURL(); diff --git a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java index f86b6ebd56dde..f5e5a0f776e19 100644 --- a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java +++ b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java @@ -514,7 +514,7 @@ public void close() { final Collection calledListeners = listeners .stream() .filter(l -> !ofNullable(safeInvoke(() -> l.onCreate(container))).map(re::add).orElse(false)) - .collect(toList()); + .toList(); if (calledListeners.size() == listeners.size()) { if (containers.putIfAbsent(id, container) != null) { container.setState(Container.State.ON_ERROR); diff --git a/container/container-core/src/test/java/org/talend/sdk/component/ContainerManagerTest.java b/container/container-core/src/test/java/org/talend/sdk/component/ContainerManagerTest.java index bd96c1d5ef643..b50e050c6fa2c 100644 --- a/container/container-core/src/test/java/org/talend/sdk/component/ContainerManagerTest.java +++ b/container/container-core/src/test/java/org/talend/sdk/component/ContainerManagerTest.java @@ -28,7 +28,6 @@ import java.util.Collection; import java.util.List; import java.util.logging.Level; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.junit.jupiter.api.Test; @@ -106,7 +105,7 @@ void autoContainerIdWithJiraIssue(final TempJars jars) { final Container container = manager.builder(j.getAbsolutePath()).create(); return container.getId(); } - }).collect(Collectors.toList()); + }).toList(); assertEquals(pluginIds, results); } diff --git a/container/container-core/src/test/java/org/talend/sdk/component/ContainerTest.java b/container/container-core/src/test/java/org/talend/sdk/component/ContainerTest.java index e4f9e5d74acc1..d41393fa6237f 100644 --- a/container/container-core/src/test/java/org/talend/sdk/component/ContainerTest.java +++ b/container/container-core/src/test/java/org/talend/sdk/component/ContainerTest.java @@ -16,7 +16,6 @@ package org.talend.sdk.component; import static java.util.Collections.singletonList; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -54,7 +53,7 @@ void lastTimestamp( void findDependencies( @ContainerProviderRule.Instance("org.apache.xbean:xbean-finder:jar:4.9:runtime") final Container xbeanFinder) { assertEquals(singletonList("org.apache.xbean:xbean-finder:jar:4.9"), - xbeanFinder.findDependencies().map(Artifact::toCoordinate).collect(toList())); + xbeanFinder.findDependencies().map(Artifact::toCoordinate).toList()); } @Test diff --git a/container/container-core/src/test/java/org/talend/sdk/component/classloader/ConfigurableClassLoaderTest.java b/container/container-core/src/test/java/org/talend/sdk/component/classloader/ConfigurableClassLoaderTest.java index 3eca4c0a51ee3..a499330360ae8 100644 --- a/container/container-core/src/test/java/org/talend/sdk/component/classloader/ConfigurableClassLoaderTest.java +++ b/container/container-core/src/test/java/org/talend/sdk/component/classloader/ConfigurableClassLoaderTest.java @@ -18,7 +18,6 @@ import static java.lang.ClassLoader.getSystemClassLoader; import static java.util.Arrays.asList; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -271,7 +270,7 @@ void spi() throws IOException { final List factories = StreamSupport .stream(ServiceLoader.load(XMLOutputFactory.class, loader).spliterator(), false) - .collect(toList()); + .toList(); assertEquals(1, factories.size()); final Class firstClass = factories.iterator().next().getClass(); assertEquals("com.ctc.wstx.stax.WstxOutputFactory", firstClass.getName()); @@ -296,7 +295,7 @@ void jvmOnlyInParentSpi() throws IOException { // this is in the (test) classloader but not available to the classloader final List junitEngines = StreamSupport .stream(ServiceLoader.load(TestEngine.class, loader).spliterator(), false) - .collect(toList()); + .toList(); assertTrue(junitEngines.isEmpty()); } } diff --git a/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java b/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java index f3c66f6cd71ca..1647686e1f0cd 100644 --- a/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java +++ b/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java @@ -17,7 +17,6 @@ import static java.lang.ClassLoader.getSystemClassLoader; import static java.util.Arrays.asList; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; @@ -60,7 +59,7 @@ void nestedDependency(@TempDir final File temporaryFolder) throws IOException { new MvnDependencyListLocalRepositoryResolver("TALEND-INF/dependencies.txt", d -> null) .resolve(tempLoader, "foo/bar/dummy/1.0.0/dummy-1.0.0.jar") .map(Artifact::toPath) - .collect(toList()); + .toList(); assertEquals(asList("org/apache/tomee/ziplock/8.0.14/ziplock-8.0.14.jar", "org/apache/tomee/javaee-api/7.0-1/javaee-api-7.0-1.jar"), toResolve); } @@ -90,7 +89,7 @@ void nestedDependencyWithJira(@TempDir final File temporaryFolder) throws IOExce new MvnDependencyListLocalRepositoryResolver("TALEND-INF/dependencies.txt", d -> null) .resolve(tempLoader, "foo/bar/dummy/1.0.0-TCOMP-2285/dummy-1.0.0-TCOMP-2285.jar") .map(Artifact::toPath) - .collect(toList()); + .toList(); assertEquals(asList("org/apache/tomee/ziplock/8.0.14/ziplock-8.0.14.jar", "org/apache/tomee/javaee-api/7.0-1/javaee-api-7.0-1.jar"), toResolve); } diff --git a/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java b/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java index c31a0e97a5b9f..2a40541dadca8 100644 --- a/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java +++ b/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java @@ -246,7 +246,7 @@ public boolean include(final Artifact artifact) { return !delegate.include(artifact); } } : newScopeFilter(singleScope)) - .collect(toList())); + .toList()); } return new AndArtifactFilter(filters); } diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc index b1325bdfff8ce..303e0ffb9124c 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc @@ -8,7 +8,7 @@ "name":"Romain Manni-Bucau" }, { - "commits":825, + "commits":844, "description":"Software engineer @Talend.\r\n\r\nComponents team member.\n\nBlog: undx.github.io", "gravatar":"https://avatars.githubusercontent.com/u/265575?v=4", "id":"undx", @@ -29,7 +29,7 @@ "name":"Ivan Gonchar" }, { - "commits":78, + "commits":99, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/7742508?v=4", "id":"yyin-talend", @@ -43,7 +43,7 @@ "name":"Christophe Le Saec" }, { - "commits":59, + "commits":68, "description":"QA Automation @ Qlik Talend Nantes", "gravatar":"https://avatars.githubusercontent.com/u/1255625?v=4", "id":"acatoire", @@ -57,14 +57,21 @@ "name":"Jean-Michel FRANCOIS" }, { - "commits":43, + "commits":53, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/29707101?v=4", "id":"ypiel-talend", "name":"ypiel" }, { - "commits":27, + "commits":52, + "description":"", + "gravatar":"https://avatars.githubusercontent.com/u/66320870?v=4", + "id":"ozhelezniak-talend", + "name":"Oleksandr Zhelezniak" + }, + { + "commits":30, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/7802267?v=4", "id":"wwang-talend", @@ -78,21 +85,28 @@ "name":"Chao MENG" }, { - "commits":21, + "commits":16, "description":"", - "gravatar":"https://avatars.githubusercontent.com/u/66320870?v=4", - "id":"ozhelezniak-talend", - "name":"Oleksandr Zhelezniak" + "gravatar":"https://avatars.githubusercontent.com/u/19920586?v=4", + "id":"lxia-talend", + "name":"lxia" }, { - "commits":14, + "commits":15, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/52663885?v=4", "id":"fdesiles", "name":"Fabien Désiles" }, { - "commits":9, + "commits":14, + "description":"", + "gravatar":"https://avatars.githubusercontent.com/u/49395568?v=4", + "id":"hzhao-talendbj", + "name":"hzhao" + }, + { + "commits":12, "description":"Senior principal product security engineer at Qlik, security contributor at @apache.\n\nBlog: http://coheigea.blogspot.com/", "gravatar":"https://avatars.githubusercontent.com/u/472162?v=4", "id":"coheigea", @@ -105,13 +119,6 @@ "id":"bchen-talend", "name":"Chen Bin" }, - { - "commits":9, - "description":"", - "gravatar":"https://avatars.githubusercontent.com/u/19920586?v=4", - "id":"lxia-talend", - "name":"lxia" - }, { "commits":9, "description":"Frontend Architect.\r\nThis is my Talend account. You can check out @jsomsanith for my personal account", @@ -126,6 +133,13 @@ "id":"anicolas", "name":"Antoine Nicolas" }, + { + "commits":6, + "description":"\n\nBlog: https://restlet.com", + "gravatar":"https://avatars.githubusercontent.com/u/1122782?v=4", + "id":"thboileau", + "name":"Thierry Boileau" + }, { "commits":4, "description":"Committer and PMC member of Apache Beam and Apache Avro. Free education and Open Source enthusiast. Distributed Systems practitioner (victim?)\n\nBlog: https://ismaelmejia.com/", @@ -219,7 +233,7 @@ }, { "commits":1, - "description":"Staff Documentation Engineer @ Contentsquare", + "description":"Staff Knowledge Engineer", "gravatar":"https://avatars.githubusercontent.com/u/19730806?v=4", "id":"fviolette", "name":"François Violette" diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc index f6fabd6712c68..69251e1535be8 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc @@ -3,6 +3,6 @@ ++++ +(window.talend = (window.talend || {})).swaggerUi = {"components":{"schemas":{"org_talend_sdk_component_server_front_model_error_ErrorPayload":{"properties":{"code":{"enum":["PLUGIN_MISSING","FAMILY_MISSING","TYPE_MISSING","COMPONENT_MISSING","CONFIGURATION_MISSING","ICON_MISSING","ACTION_MISSING","ACTION_ERROR","BAD_FORMAT","DESIGN_MODEL_MISSING","UNEXPECTED","UNAUTHORIZED"],"nullable":true,"type":"string"},"description":{"type":"string"}},"type":"object"},"org_talend_sdk_component_server_api_ComponentResource_SampleErrorForBulk":{"properties":{},"type":"object"}}},"info":{"description":"UI related component server to provide metadata about component and callback for the forms.","title":"Talend Component Server","version":"1"},"openapi":"3.0.1","paths":{"/api/v1/action/execute":{"post":{"deprecated":false,"description":"This endpoint will execute any UI action and serialize the response as a JSON (pojo model). It takes as input the family, type and name of the related action to identify it and its configuration as a flat key value set using the same kind of mapping than for components (option path as key).","operationId":"execute","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component family.","in":"query","name":"family","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Type of action.","in":"query","name":"type","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Action name.","in":"query","name":"action","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Requested language (as in a Locale) if supported by the action.","in":"query","name":"lang","required":false,"schema":{"type":"string"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Action parameters in key/value flat json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The action payload serialized in JSON."},"520":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action execution failed, payload will be an ErrorPayload with the code ACTION_ERROR."},"400":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action is not set, payload will be an ErrorPayload with the code ACTION_MISSING."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action can't be found, payload will be an ErrorPayload with the code ACTION_MISSING."}},"tags":["Action"]}},"/api/v1/action/index":{"get":{"deprecated":false,"description":"This endpoint returns the list of available actions for a certain family and potentially filters the output limiting it to some families and types of actions.","operationId":"getActionIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Filter the response by type.Repeat this parameter to request more than one type.","in":"query","name":"type","required":false,"schema":{"items":{"type":"string"},"type":"array"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Filter the response by family.Repeat this parameter to request more than one family.","in":"query","name":"family","required":false,"schema":{"items":{"type":"string"},"type":"array"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The action index."}},"tags":["Action"]}},"/api/v1/bulk":{"post":{"deprecated":false,"description":"Takes a request aggregating N other endpoint requests and responds all results in a normalized HTTP response representation.","operationId":"bulk","parameters":[],"requestBody":{"content":{"application/json":{"schema":{}}},"description":"The requests list as json objects containing a list of request objects. \nIf your request contains multiple identifiers, you must use a list of string. \nExample : \n`{ \n\"requests\" : [ \n{ \n \"path\" : \"/api/v1/component/index\", \n \"queryParameters\" : {\"identifiers\" : [\"12345\", \"6789A\"]}, \n \"verb\" : \"GET\", \n \"headers\" : {...}, \n}, \n{ [...]} \n] \n}`","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The request payloads."}},"tags":["Bulk"]}},"/api/v1/component/index":{"get":{"deprecated":false,"description":"Returns the list of available components.","operationId":"getComponentIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Should the icon binary format be included in the payload. Default is `false`.","in":"query","name":"includeIconContent","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Query in simple query language to filter components. It provides access to the component `plugin`, `name`, `id` and `metadata` of the first configuration property. Ex: `(id = AYETAE658349453) AND (metadata[configurationtype::type] = dataset) AND (plugin = jdbc-component) AND (name = input)`.","in":"query","name":"q","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The index of available components."}},"tags":["Component"]}},"/api/v1/component/icon/index":{"get":{"deprecated":false,"description":"Returns list of available svg icons.","operationId":"getIconIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark/all). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"image/svg+xml":{"schema":{}}},"description":"The icon list."},"404":{"content":{"application/json":{"schema":{}}},"description":"No icon found."}},"tags":["Component"]}},"/api/v1/component/icon/custom/{familyId}/{iconKey}":{"get":{"deprecated":false,"description":"Returns a particular key icon in raw bytes.","operationId":"icon","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"family identifier.","in":"path","name":"familyId","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"icon key.","in":"path","name":"iconKey","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The icon in binary form."},"404":{"content":{"application/json":{"schema":{}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/component/icon/{id}":{"get":{"deprecated":false,"description":"Returns a particular component icon in raw bytes.","operationId":"icon_1","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component icon identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The component icon in binary form."},"404":{"content":{"application/json":{"schema":{}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/component/migrate/{id}/{configurationVersion}":{"post":{"deprecated":false,"description":"Allows to migrate a component configuration without calling any component execution.","operationId":"migrateComponent","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Configuration version sent, corresponding to the body content.","in":"path","name":"configurationVersion","required":false,"schema":{"type":"integer"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Actual configuration in key/value json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"New configuration for that component (or the same if no migration was needed)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"The component is not found."}},"tags":["Component"]}},"/api/v1/component/details":{"get":{"deprecated":false,"description":"Returns the set of metadata about one or multiples components identified by their 'id'.","operationId":"getComponentDetail","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifiers","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of details for the requested components."},"400":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_api_ComponentResource_SampleErrorForBulk","type":"object"}}},"description":"Some identifiers were not valid."}},"tags":["Component"]}},"/api/v1/component/dependency/{id}":{"get":{"deprecated":false,"description":"Return a binary of the dependency represented by `id`. It can be maven coordinates for dependencies or a component id.","operationId":"getDependency","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Dependency identifier for component/configurationType or maven coordinate. \nExample: `/api/v1/component/dependency/org.apache.commons:commons-lang3:jar:3.12.0`.","in":"path","name":"id","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The dependency binary (jar)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the plugin is missing, payload will be an ErrorPayload with the code PLUGIN_MISSING."}},"tags":["Component"]}},"/api/v1/component/dependencies":{"get":{"deprecated":false,"description":"Returns a list of dependencies for the given components. IMPORTANT: don't forget to add the component itself since it will not be part of the dependencies.Then you can use /dependency/{id} to download the binary.","operationId":"getDependencies","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifier","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The list of dependencies per component."}},"tags":["Component"]}},"/api/v1/component/icon/family/{id}":{"get":{"deprecated":false,"description":"Returns the icon for a family.","operationId":"familyIcon","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Family identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"Returns a particular family icon in raw bytes."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/configurationtype/index":{"get":{"deprecated":false,"description":"Returns all available configuration type - storable models. Note that the lightPayload flag allows to load all of them at once when you eagerly need to create a client model for all configurations.","operationId":"getRepositoryModel","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Should the payload skip the forms and actions associated to the configuration.Default value is `true`.","in":"query","name":"lightPayload","required":false,"schema":{"type":"boolean"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Query in simple query language to filter configurations. It provides access to the configuration `type`, `name`, `type` and first configuration property `metadata`. See component index endpoint for a syntax example.","in":"query","name":"q","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of available and storable configurations (datastore, dataset, ...)."}},"tags":["Configuration Type"]}},"/api/v1/configurationtype/migrate/{id}/{configurationVersion}":{"post":{"deprecated":false,"description":"Allows to migrate a configuration without calling any component execution.","operationId":"migrateConfiguration","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The configuration identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The configuration version you send in provided body.","in":"path","name":"configurationVersion","required":false,"schema":{"type":"integer"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Configuration to migrate in key/value json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"New values for that configuration (or the same if no migration was needed)."},"520":{"content":{"application/json":{"schema":{}}},"description":"An unexpected error occurred during migration, payload will be an ErrorPayload with the code UNEXPECTED."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the configuration is missing, payload will be an ErrorPayload with the code CONFIGURATION_MISSING."}},"tags":["Configuration Type"]}},"/api/v1/configurationtype/details":{"get":{"deprecated":false,"description":"Returns the set of metadata about one or multiples configuration identified by their 'id'.","operationId":"getConfigurationDetail","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifiers","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of details for the requested configuration."}},"tags":["Configuration Type"]}},"/api/v1/documentation/component/{id}":{"get":{"deprecated":false,"description":"Returns a documentation in asciidoctor format for the given component. The component is represented by its identifier (`id`).","operationId":"getDocumentation","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The component identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The language requested.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The documentation part to extract. Available parts are: `ALL` (default), `DESCRIPTION`, `CONFIGURATION`","in":"query","name":"segment","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The list of available and storable configurations (datastore, dataset, ...)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the component is not found in the server, response will be an ErrorPayload with the code COMPONENT_MISSING."}},"tags":["Documentation"]}},"/api/v1/environment":{"get":{"deprecated":false,"description":"Returns the environment information of this instance. Useful to check the version or configure a healthcheck for the server.","operationId":"getEnvironment","parameters":[],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"Current environment representation."}},"tags":["Environment"]}},"/api/v1/cache/clear":{"get":{"deprecated":false,"description":"Clear all caches.","operationId":"clearCaches","parameters":[],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"Cleared caches."}},"tags":["Cache"]}}},"tags":[{"description":"Endpoints related to callbacks/triggers execution.","name":"Action"},{"description":"Enables to execute multiple requests at once.","name":"Bulk"},{"description":"Endpoints related to component metadata access.","name":"Component"},{"description":"Endpoints related to configuration types (reusable configuration) metadata access.","name":"Configuration Type"},{"description":"Endpoint to retrieve embedded component documentation.","name":"Documentation"},{"description":"Endpoint giving access to versions and last update timestamp of the server.","name":"Environment"},{"description":"Endpoints related to caches management.","name":"Cache"}],"servers":[{"url":"https://starter-toolkit.talend.io/api/demo/1.92.0"}]};
++++ diff --git a/documentation/src/main/java/org/talend/runtime/documentation/Generator.java b/documentation/src/main/java/org/talend/runtime/documentation/Generator.java index c8467778cc3ae..ce8af9c1df536 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/Generator.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/Generator.java @@ -475,7 +475,7 @@ private static void generatedJira(final File generatedDir, final String username final List jiraLoggedVersions = versions .stream() .filter(v -> (v.isReleased() || jiraVersionMatches(version, v.getName()))) - .collect(toList()); + .toList(); if (jiraLoggedVersions.isEmpty()) { try (final PrintStream stream = new PrintStream(new WriteIfDifferentStream(file))) { stream.println("No version found."); @@ -536,7 +536,7 @@ public Stream apply(final String jql, final JiraIssues issues) { final List queriedVersion = jiraLoggedVersions .stream() .filter(it -> !changelogPerVersion.containsKey(it.getName()) || version.equals(it.getName())) - .collect(toList()); + .toList(); final Map>> issues = IntStream .range(0, (queriedVersion.size() + maxVersionPerQuery - 1) / maxVersionPerQuery) .mapToObj(pageIdx -> queriedVersion diff --git a/documentation/src/main/java/org/talend/runtime/documentation/Github.java b/documentation/src/main/java/org/talend/runtime/documentation/Github.java index 7623b32a022d5..1669e8feb968d 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/Github.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/Github.java @@ -89,7 +89,7 @@ public Collection load() { .map(repo -> toStage(pool, () -> contributors(client, token, "https://api.github.com/repos/talend/" + repo + "/contributors") - .collect(toList())))); + .toList()))); return allOf(contributorLookups) .thenApply(ignored -> toArray(Stream diff --git a/documentation/src/main/java/org/talend/runtime/documentation/SearchIndexation.java b/documentation/src/main/java/org/talend/runtime/documentation/SearchIndexation.java index 990c573894f3a..d66d381a545cf 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/SearchIndexation.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/SearchIndexation.java @@ -21,7 +21,6 @@ import static java.util.Optional.of; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.groupingBy; -import static java.util.stream.Collectors.toList; import static lombok.AccessLevel.PRIVATE; import java.io.File; @@ -160,7 +159,7 @@ public static void main(final String[] args) throws Exception { log.warn(target + ": " + e.getMessage()); return Collections. emptyList(); } - })).collect(toList()); + })).toList(); pool.shutdown(); // await diff --git a/documentation/src/main/java/org/talend/runtime/documentation/component/service/MockTableService.java b/documentation/src/main/java/org/talend/runtime/documentation/component/service/MockTableService.java index a73607122b8da..6872db72d69c8 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/component/service/MockTableService.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/component/service/MockTableService.java @@ -16,7 +16,6 @@ package org.talend.runtime.documentation.component.service; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toList; import static org.talend.runtime.documentation.component.configuration.BasicAuthConfig.NAME; import static org.talend.runtime.documentation.component.service.http.TableApiClient.API_BASE; import static org.talend.runtime.documentation.component.service.http.TableApiClient.API_VERSION; @@ -99,7 +98,7 @@ public Values getTableFields(final Client client) { return new Values(Stream .of(QueryBuilder.Fields.values()) .map(f -> new Values.Item(f.name(), f.name())) - .collect(toList())); + .toList()); } public interface Client extends HttpClient { @@ -122,7 +121,7 @@ public Schema guessTableSchema(final TableDataSet dataSet, final TableApiClient return new Schema(emptyList()); } - return new Schema(record.keySet().stream().map(this::buildStringEntry).collect(toList())); + return new Schema(record.keySet().stream().map(this::buildStringEntry).toList()); } private org.talend.sdk.component.api.record.Schema.Entry buildStringEntry(final String name) { diff --git a/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableMapper.java b/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableMapper.java index a6023287b689b..a08c83b31f4fc 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableMapper.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableMapper.java @@ -15,7 +15,6 @@ */ package org.talend.runtime.documentation.component.source; -import static java.util.stream.Collectors.toList; import static org.talend.runtime.documentation.component.configuration.TableDataSet.READ_ALL_RECORD_FROM_SERVER; import static org.talend.runtime.documentation.component.service.http.TableApiClient.API_BASE; import static org.talend.runtime.documentation.component.service.http.TableApiClient.API_VERSION; @@ -112,7 +111,7 @@ public List split(@PartitionSize final long bundles) { dataSetChunk.setOffset(from); dataSetChunk.setMaxRecords(to); return new MockTableMapper(dataSetChunk, service, i18n, tableAPI); - }).filter(Objects::nonNull).collect(toList()); + }).filter(Objects::nonNull).toList(); } @Emitter diff --git a/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/lang/IO.java b/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/lang/IO.java index 53e1f1c9b78cb..f7d550024467c 100644 --- a/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/lang/IO.java +++ b/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/lang/IO.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.remoteengine.customizer.lang; -import static java.util.stream.Collectors.toList; import static lombok.AccessLevel.PRIVATE; import java.io.BufferedReader; @@ -63,7 +62,7 @@ public static List readFile(final Path dockerCompose) throws IOException throw new IllegalArgumentException("Missing file: " + dockerCompose); } try (final BufferedReader reader = Files.newBufferedReader(dockerCompose)) { - return reader.lines().collect(toList()); + return reader.lines().toList(); } } diff --git a/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/task/RemoteEngineCustomizer.java b/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/task/RemoteEngineCustomizer.java index 244c6a0748766..b9cd0ef264c34 100644 --- a/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/task/RemoteEngineCustomizer.java +++ b/remote-engine-customizer/src/main/java/org/talend/sdk/component/remoteengine/customizer/task/RemoteEngineCustomizer.java @@ -18,7 +18,6 @@ import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; import static java.util.concurrent.TimeUnit.SECONDS; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static org.talend.sdk.component.remoteengine.customizer.lang.Reflects.asAccessible; @@ -100,8 +99,8 @@ public void registerComponents(final String remoteEngineDirConf, final String wo final Path cacheDir = cacheDirConf.startsWith("${remote.engine.dir}/") ? remoteEngineDir.resolve(cacheDirConf.substring("${remote.engine.dir}/".length())) : PathFactory.get(cacheDirConf); - final Collection cars = carPaths.stream().map(PathFactory::get).collect(toList()); - final List missingCars = cars.stream().filter(it -> !Files.exists(it)).collect(toList()); + final Collection cars = carPaths.stream().map(PathFactory::get).toList(); + final List missingCars = cars.stream().filter(it -> !Files.exists(it)).toList(); if (!missingCars.isEmpty()) { throw new IllegalArgumentException("Missing component archives: " + missingCars); } @@ -132,7 +131,7 @@ public void registerComponents(final String remoteEngineDirConf, final String wo final Collection connectorsLayer = cars .stream() .map(it -> connectorLoader.createConnectorLayer(rootContainerPath, workDir, it)) - .collect(toList()); + .toList(); final Path baseCache = cacheDir.resolve("base"); final Path appCache = cacheDir.resolve("application"); diff --git a/sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/ActionsServices.java b/sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/ActionsServices.java index 02d165e1f1cdb..cddfe316970c8 100644 --- a/sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/ActionsServices.java +++ b/sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/ActionsServices.java @@ -17,7 +17,6 @@ import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import org.talend.sdk.component.api.configuration.Option; import org.talend.sdk.component.api.service.Service; @@ -66,7 +65,7 @@ public SuggestionValues getListEntities() { .stream() .map(i -> String.valueOf(i)) .map(i -> new Item(i, i18n.entityName(i))) - .collect(Collectors.toList()); + .toList(); return new SuggestionValues(true, entities); } diff --git a/sample-parent/sample-features/checkpoint-runner/src/main/java/org/talend/sdk/component/sample/feature/checkpoint/IncrementalSequenceInput.java b/sample-parent/sample-features/checkpoint-runner/src/main/java/org/talend/sdk/component/sample/feature/checkpoint/IncrementalSequenceInput.java index 4d386ac1f332c..6c2cf355bfb11 100644 --- a/sample-parent/sample-features/checkpoint-runner/src/main/java/org/talend/sdk/component/sample/feature/checkpoint/IncrementalSequenceInput.java +++ b/sample-parent/sample-features/checkpoint-runner/src/main/java/org/talend/sdk/component/sample/feature/checkpoint/IncrementalSequenceInput.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.sample.feature.checkpoint; -import static java.util.stream.Collectors.toList; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -71,7 +69,7 @@ public IncrementalSequenceInput(final JsonBuilderFactory factory, @PostConstruct public void init() { - data = IntStream.range(0, configuration.dataset.maxRecords).boxed().collect(toList()); + data = IntStream.range(0, configuration.dataset.maxRecords).boxed().toList(); if (configuration.checkpoint != null) { bookmark = configuration.checkpoint.sinceId; } diff --git a/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java b/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java index 3d6af83d80385..6f1110b19677e 100644 --- a/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java +++ b/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.sample.other; -import static java.util.stream.Collectors.toList; - import java.io.Serializable; import java.util.stream.IntStream; @@ -81,7 +79,7 @@ public Values find(@Option("value") final String value) { return new Values(IntStream .range(1, 11) .mapToObj(i -> new Values.Item("file_" + i, "/opt/sample/file_" + i + ".txt")) - .collect(toList())); + .toList()); } } } diff --git a/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/Kitap.java b/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/Kitap.java index abacb97018934..6526a096bc915 100644 --- a/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/Kitap.java +++ b/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/Kitap.java @@ -19,7 +19,6 @@ import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; import static java.util.Spliterators.spliteratorUnknownSize; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.io.StringReader; @@ -100,7 +99,7 @@ public void run() { final List missingConfigs = Stream .concat(args.getComponentFamily().isPresent() ? Stream.of("family") : Stream.empty(), Stream.of("name")) .filter(key -> !componentConfig.containsKey(key)) - .collect(toList()); + .toList(); if (!missingConfigs.isEmpty()) { throw new IllegalArgumentException("Missing component configuration entries: " + missingConfigs); } diff --git a/singer-parent/component-kitap/src/test/java/org/talend/sdk/component/singer/kitap/KitapTest.java b/singer-parent/component-kitap/src/test/java/org/talend/sdk/component/singer/kitap/KitapTest.java index 0db4faacf0d82..9892ab1f8895a 100644 --- a/singer-parent/component-kitap/src/test/java/org/talend/sdk/component/singer/kitap/KitapTest.java +++ b/singer-parent/component-kitap/src/test/java/org/talend/sdk/component/singer/kitap/KitapTest.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.singer.kitap; import static java.util.Arrays.asList; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertLinesMatch; import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; @@ -133,7 +132,7 @@ void readAll() throws IOException { try (final BufferedReader reader = new BufferedReader(new StringReader(stdout.toString(StandardCharsets.UTF_8)))) { - final List actuals = reader.lines().collect(toList()); + final List actuals = reader.lines().toList(); assertLinesMatch(asList( "{\"type\":\"SCHEMA\",\"stream\":\"default\",\"schema\":{\"type\":[\"null\",\"object\"],\"additionalProperties\":false,\"properties\":{\"record_number\":{\"type\":[\"integer\"]}}},\"key_properties\":[],\"bookmark_properties\":[]}", "{\"type\":\"RECORD\",\"stream\":\"default\",\"time_extracted\":\"2019-08-23T15:11:00.000000Z\",\"record\":{\"record_number\":1}}", @@ -151,7 +150,7 @@ void readAll() throws IOException { try (final BufferedReader reader = new BufferedReader(new StringReader(stderr.toString(StandardCharsets.UTF_8)))) { List expected = Arrays.asList("log4j error", "logback error", "jul error"); - final List actuals = reader.lines().collect(toList()); + final List actuals = reader.lines().toList(); for (String end : expected) { Optional any = actuals.stream().filter(l -> l.endsWith(end)).findAny(); Assertions.assertTrue(any.isPresent(), String.format("Can't find '%s' in error logs.", end)); diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/AsciidocMojo.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/AsciidocMojo.java index 53db8c48b5e39..15658ea3aa0f7 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/AsciidocMojo.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/AsciidocMojo.java @@ -17,7 +17,6 @@ import static java.util.Locale.ROOT; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static org.apache.maven.plugins.annotations.LifecyclePhase.PROCESS_CLASSES; import static org.apache.maven.plugins.annotations.ResolutionScope.COMPILE_PLUS_RUNTIME; import static org.talend.sdk.component.maven.api.Audience.Type.PUBLIC; @@ -172,7 +171,7 @@ protected Stream> findComponents(final AnnotationFinder finder) { }.run(); return formats == null || formats.isEmpty() ? Stream.of(output) : Stream.concat(Stream.of(output), formats.values().stream().map(File::new)); - }).collect(toList()); + }).toList(); if (attachDocumentations) { adocs.forEach(artifact -> { diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ClasspathMojoBase.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ClasspathMojoBase.java index 5b9af2c7ac6bb..b89b34183d480 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ClasspathMojoBase.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ClasspathMojoBase.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.maven; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import java.io.File; @@ -64,7 +63,7 @@ protected List getExcludes(final Collection excludes, final Coll .of(excludes, sharedExcludes) .filter(Objects::nonNull) .flatMap(Collection::stream) - .collect(toList()); + .toList(); } protected Stream getJarToScan(final Collection deps) { @@ -120,7 +119,7 @@ protected void executeInLoader() throws MojoExecutionException, MojoFailureExcep .filter(a -> !"org.talend.sdk.component".equals(a.getGroupId()) || !excludedArtifacts.contains(a.getArtifactId())) .map(Artifact::getFile)) - .collect(toList()); + .toList(); try (final URLClassLoader loader = new ExecutionClassLoader(classLoaderFiles.stream().map(file -> { try { return file.toURI().toURL(); diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentDependenciesBase.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentDependenciesBase.java index 5f360c6e8b74c..dd6bdf7d4c5c2 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentDependenciesBase.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentDependenciesBase.java @@ -18,7 +18,6 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; import static org.talend.sdk.component.maven.api.Audience.Type.TALEND_INTERNAL; import java.io.File; @@ -178,7 +177,7 @@ protected Artifact resolveArtifactOnRemoteRepositories(final Artifact artifact) .setRepositories(remoteRepositories.stream() .filter(remoteRepository -> remoteRepository.getId() .equals(artifactRepositoryId)) - .collect(toList())); + .toList()); final ArtifactResult result = repositorySystem.resolveArtifact(repositorySystemSession, artifactRequest); if (result.isMissing()) { throw new IllegalStateException("Can't find " + artifact); diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java index 3913b96546dc7..3043f665a40d1 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java @@ -17,7 +17,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static java.util.stream.Collectors.toList; import static org.apache.maven.plugins.annotations.LifecyclePhase.PROCESS_CLASSES; import static org.apache.maven.plugins.annotations.ResolutionScope.COMPILE_PLUS_RUNTIME; @@ -106,7 +105,7 @@ protected void doWork(final ComponentManager manager, final Container container, .orElse(p.getName()), p.getIcon(), emptyList(), emptyList()))) .flatMap(t -> t)) - .collect(toList()); + .toList(); try (final Jsonb mapper = inPluginContext(JsonbBuilder::newBuilder) .withConfig(new JsonbConfig() diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/DependencyConflictsReporterMojo.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/DependencyConflictsReporterMojo.java index c64608daaf6e9..d3bcf7c63e7c8 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/DependencyConflictsReporterMojo.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/DependencyConflictsReporterMojo.java @@ -92,7 +92,7 @@ public void doExecute() throws MojoExecutionException { blacklist = resolver .resolveFromDescriptor(stream) .sorted(comparing(Artifact::toCoordinate)) - .collect(toList()); + .toList(); ignoredDependencies = blacklist::contains; } catch (final IOException e) { throw new IllegalStateException(e); @@ -106,7 +106,7 @@ public void doExecute() throws MojoExecutionException { .resolveFromDescriptor(stream) .filter(ignoredDependencies.negate()) .sorted(comparing(Artifact::toCoordinate)) - .collect(toList())); + .toList()); } catch (final IOException e) { throw new IllegalStateException(e); } @@ -114,7 +114,7 @@ public void doExecute() throws MojoExecutionException { } catch (final IOException e) { throw new IllegalStateException(e); } - }).filter(Objects::nonNull).sorted(comparing(a -> a.componentModule.toCoordinate())).collect(toList()); + }).filter(Objects::nonNull).sorted(comparing(a -> a.componentModule.toCoordinate())).toList(); output.getParentFile().mkdirs(); diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/IconReporterMojo.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/IconReporterMojo.java index c2ab4cac72198..47d71675e29e2 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/IconReporterMojo.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/IconReporterMojo.java @@ -18,7 +18,6 @@ import static java.util.Arrays.asList; import static java.util.Comparator.comparing; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4; import static org.apache.maven.plugins.annotations.LifecyclePhase.PROCESS_CLASSES; import static org.apache.maven.plugins.annotations.ResolutionScope.COMPILE_PLUS_RUNTIME; @@ -164,7 +163,7 @@ protected void doExecute() { final boolean isCustom = iconFinder.isCustom(iconFinder.extractIcon(elt)); final String name = iconFinder.findIcon(elt); return new IconModel(project.getArtifactId(), name, findIcon(name), isCustom); - }).collect(toList()); + }).toList(); final GlobalReporter reporter = getReporter(); synchronized (reporter) { reporter.icons.addAll(foundIcons); diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ScanDescriptorMojo.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ScanDescriptorMojo.java index 0c1f8e1843e79..3292a3e203f2c 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ScanDescriptorMojo.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ScanDescriptorMojo.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.maven; -import static java.util.stream.Collectors.toList; import static org.apache.maven.plugins.annotations.LifecyclePhase.PROCESS_CLASSES; import static org.apache.maven.plugins.annotations.ResolutionScope.COMPILE_PLUS_RUNTIME; import static org.talend.sdk.component.maven.api.Audience.Type.PUBLIC; @@ -62,7 +61,7 @@ public class ScanDescriptorMojo extends ClasspathMojoBase { @Override public void doExecute() { - new ScanTask(Stream.concat(getDirectoriesToScan(), getJarToScan(scannedDependencies)).collect(toList()), + new ScanTask(Stream.concat(getDirectoriesToScan(), getJarToScan(scannedDependencies)).toList(), getExcludes(excludes, sharedExcludes), includes, filterStrategy, output).run(); } diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/WebsiteBuilderMojo.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/WebsiteBuilderMojo.java index d4ca80617014b..30c33cdf13491 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/WebsiteBuilderMojo.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/WebsiteBuilderMojo.java @@ -19,7 +19,6 @@ import static java.util.Collections.singletonMap; import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static org.apache.maven.plugins.annotations.ResolutionScope.COMPILE_PLUS_RUNTIME; import static org.talend.sdk.component.maven.api.Audience.Type.TALEND_INTERNAL; @@ -409,7 +408,7 @@ private List findProjectsWithCar() { .filter(it -> "jar".equals(it.getPackaging())) .map(project -> new Project(project, toCarPath(project))) .filter(p -> Files.exists(p.car)) - .collect(toList()); + .toList(); } private Path mkdirs(final Path root) { diff --git a/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java b/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java index 2d7ab3937f2ed..cd2e947765b1d 100644 --- a/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java +++ b/vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClient.java @@ -216,7 +216,7 @@ public Map decrypt(final Map values, final Strin .stream() .filter(entry -> compiledPassthroughRegex.matcher(entry.getValue()).matches()) .map(cyphered -> cyphered.getKey()) - .collect(toList()); + .toList(); if (cipheredKeys.isEmpty()) { return values; } @@ -226,7 +226,7 @@ public Map decrypt(final Map values, final Strin private CompletableFuture> prepareRequest(final Map values, final List cipheredKeys, final String tenantId) { - return get(cipheredKeys.stream().map(values::get).collect(toList()), clock.millis(), tenantId) + return get(cipheredKeys.stream().map(values::get).toList(), clock.millis(), tenantId) .thenApply(decrypted -> values .entrySet() .stream() @@ -245,13 +245,13 @@ private CompletableFuture> get(final Collection val .stream() .map(it -> new EntryWithIndex<>(index.getAndIncrement(), it)) .filter(it -> it.entry != null && !compiledPassthroughRegex.matcher(it.entry).matches()) - .collect(toList()); + .toList(); if (clearValues.isEmpty()) { return doDecipher(values, currentTime, tenantId).toCompletableFuture(); } if (clearValues.size() == values.size()) { final long now = clock.millis(); - return completedFuture(values.stream().map(it -> new DecryptedValue(it, now)).collect(toList())); + return completedFuture(values.stream().map(it -> new DecryptedValue(it, now)).toList()); } return doDecipher(values, currentTime, tenantId).thenApply(deciphered -> { final long now = clock.millis(); @@ -269,9 +269,9 @@ private CompletionStage> doDecipher(final Collection !it.getValue().isPresent()) .map(Map.Entry::getKey) - .collect(toList()); + .toList(); if (missing.isEmpty()) { // no remote call, yeah - return completedFuture(values.stream().map(alreadyCached::get).map(Optional::get).collect(toList())); + return completedFuture(values.stream().map(alreadyCached::get).map(Optional::get).toList()); } // do request return getOrRequestAuth() From 17159c011ce69ef94a55348577455257f9752ac2 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 15:21:56 +0200 Subject: [PATCH 04/41] chore(QTDI-2894): S6204 Stream.toList() - potential API break --- .../main/java/org/talend/sdk/component/api/record/Schema.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java b/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java index 5f75c7b1376a6..2270a170eeb53 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java @@ -104,7 +104,7 @@ default List getEntriesOrdered() { */ @JsonbTransient default List getEntriesOrdered(final Comparator comparator) { - return getAllEntries().sorted(comparator).toList(); + return getAllEntries().sorted(comparator).collect(Collectors.toList()); } /** From 6d71def09dd1151c581ac5a478375b68aa009645 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 15:26:57 +0200 Subject: [PATCH 05/41] chore(QTDI-2894): S6204 Stream.toList() - restore partials --- .../_partials/generated_contributors.adoc | 52 +++++++------------ .../_partials/generated_rest-resources.adoc | 2 +- 2 files changed, 20 insertions(+), 34 deletions(-) diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc index 303e0ffb9124c..b1325bdfff8ce 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc @@ -8,7 +8,7 @@ "name":"Romain Manni-Bucau" }, { - "commits":844, + "commits":825, "description":"Software engineer @Talend.\r\n\r\nComponents team member.\n\nBlog: undx.github.io", "gravatar":"https://avatars.githubusercontent.com/u/265575?v=4", "id":"undx", @@ -29,7 +29,7 @@ "name":"Ivan Gonchar" }, { - "commits":99, + "commits":78, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/7742508?v=4", "id":"yyin-talend", @@ -43,7 +43,7 @@ "name":"Christophe Le Saec" }, { - "commits":68, + "commits":59, "description":"QA Automation @ Qlik Talend Nantes", "gravatar":"https://avatars.githubusercontent.com/u/1255625?v=4", "id":"acatoire", @@ -57,21 +57,14 @@ "name":"Jean-Michel FRANCOIS" }, { - "commits":53, + "commits":43, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/29707101?v=4", "id":"ypiel-talend", "name":"ypiel" }, { - "commits":52, - "description":"", - "gravatar":"https://avatars.githubusercontent.com/u/66320870?v=4", - "id":"ozhelezniak-talend", - "name":"Oleksandr Zhelezniak" - }, - { - "commits":30, + "commits":27, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/7802267?v=4", "id":"wwang-talend", @@ -85,28 +78,21 @@ "name":"Chao MENG" }, { - "commits":16, + "commits":21, "description":"", - "gravatar":"https://avatars.githubusercontent.com/u/19920586?v=4", - "id":"lxia-talend", - "name":"lxia" + "gravatar":"https://avatars.githubusercontent.com/u/66320870?v=4", + "id":"ozhelezniak-talend", + "name":"Oleksandr Zhelezniak" }, { - "commits":15, + "commits":14, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/52663885?v=4", "id":"fdesiles", "name":"Fabien Désiles" }, { - "commits":14, - "description":"", - "gravatar":"https://avatars.githubusercontent.com/u/49395568?v=4", - "id":"hzhao-talendbj", - "name":"hzhao" - }, - { - "commits":12, + "commits":9, "description":"Senior principal product security engineer at Qlik, security contributor at @apache.\n\nBlog: http://coheigea.blogspot.com/", "gravatar":"https://avatars.githubusercontent.com/u/472162?v=4", "id":"coheigea", @@ -119,6 +105,13 @@ "id":"bchen-talend", "name":"Chen Bin" }, + { + "commits":9, + "description":"", + "gravatar":"https://avatars.githubusercontent.com/u/19920586?v=4", + "id":"lxia-talend", + "name":"lxia" + }, { "commits":9, "description":"Frontend Architect.\r\nThis is my Talend account. You can check out @jsomsanith for my personal account", @@ -133,13 +126,6 @@ "id":"anicolas", "name":"Antoine Nicolas" }, - { - "commits":6, - "description":"\n\nBlog: https://restlet.com", - "gravatar":"https://avatars.githubusercontent.com/u/1122782?v=4", - "id":"thboileau", - "name":"Thierry Boileau" - }, { "commits":4, "description":"Committer and PMC member of Apache Beam and Apache Avro. Free education and Open Source enthusiast. Distributed Systems practitioner (victim?)\n\nBlog: https://ismaelmejia.com/", @@ -233,7 +219,7 @@ }, { "commits":1, - "description":"Staff Knowledge Engineer", + "description":"Staff Documentation Engineer @ Contentsquare", "gravatar":"https://avatars.githubusercontent.com/u/19730806?v=4", "id":"fviolette", "name":"François Violette" diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc index 69251e1535be8..f6fabd6712c68 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc @@ -3,6 +3,6 @@ ++++ +(window.talend = (window.talend || {})).swaggerUi = {"components":{"schemas":{"org_talend_sdk_component_server_front_model_error_ErrorPayload":{"properties":{"code":{"enum":["PLUGIN_MISSING","FAMILY_MISSING","TYPE_MISSING","COMPONENT_MISSING","CONFIGURATION_MISSING","ICON_MISSING","ACTION_MISSING","ACTION_ERROR","BAD_FORMAT","DESIGN_MODEL_MISSING","UNEXPECTED","UNAUTHORIZED"],"nullable":true,"type":"string"},"description":{"type":"string"}},"type":"object"},"org_talend_sdk_component_server_api_ComponentResource_SampleErrorForBulk":{"properties":{},"type":"object"}}},"info":{"description":"UI related component server to provide metadata about component and callback for the forms.","title":"Talend Component Server","version":"1"},"openapi":"3.0.1","paths":{"/api/v1/action/execute":{"post":{"deprecated":false,"description":"This endpoint will execute any UI action and serialize the response as a JSON (pojo model). It takes as input the family, type and name of the related action to identify it and its configuration as a flat key value set using the same kind of mapping than for components (option path as key).","operationId":"execute","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component family.","in":"query","name":"family","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Type of action.","in":"query","name":"type","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Action name.","in":"query","name":"action","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Requested language (as in a Locale) if supported by the action.","in":"query","name":"lang","required":false,"schema":{"type":"string"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Action parameters in key/value flat json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The action payload serialized in JSON."},"520":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action execution failed, payload will be an ErrorPayload with the code ACTION_ERROR."},"400":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action is not set, payload will be an ErrorPayload with the code ACTION_MISSING."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action can't be found, payload will be an ErrorPayload with the code ACTION_MISSING."}},"tags":["Action"]}},"/api/v1/action/index":{"get":{"deprecated":false,"description":"This endpoint returns the list of available actions for a certain family and potentially filters the output limiting it to some families and types of actions.","operationId":"getActionIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Filter the response by type.Repeat this parameter to request more than one type.","in":"query","name":"type","required":false,"schema":{"items":{"type":"string"},"type":"array"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Filter the response by family.Repeat this parameter to request more than one family.","in":"query","name":"family","required":false,"schema":{"items":{"type":"string"},"type":"array"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The action index."}},"tags":["Action"]}},"/api/v1/bulk":{"post":{"deprecated":false,"description":"Takes a request aggregating N other endpoint requests and responds all results in a normalized HTTP response representation.","operationId":"bulk","parameters":[],"requestBody":{"content":{"application/json":{"schema":{}}},"description":"The requests list as json objects containing a list of request objects. \nIf your request contains multiple identifiers, you must use a list of string. \nExample : \n`{ \n\"requests\" : [ \n{ \n \"path\" : \"/api/v1/component/index\", \n \"queryParameters\" : {\"identifiers\" : [\"12345\", \"6789A\"]}, \n \"verb\" : \"GET\", \n \"headers\" : {...}, \n}, \n{ [...]} \n] \n}`","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The request payloads."}},"tags":["Bulk"]}},"/api/v1/component/index":{"get":{"deprecated":false,"description":"Returns the list of available components.","operationId":"getComponentIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Should the icon binary format be included in the payload. Default is `false`.","in":"query","name":"includeIconContent","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Query in simple query language to filter components. It provides access to the component `plugin`, `name`, `id` and `metadata` of the first configuration property. Ex: `(id = AYETAE658349453) AND (metadata[configurationtype::type] = dataset) AND (plugin = jdbc-component) AND (name = input)`.","in":"query","name":"q","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The index of available components."}},"tags":["Component"]}},"/api/v1/component/icon/family/{id}":{"get":{"deprecated":false,"description":"Returns the icon for a family.","operationId":"familyIcon","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Family identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"Returns a particular family icon in raw bytes."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/component/icon/index":{"get":{"deprecated":false,"description":"Returns list of available svg icons.","operationId":"getIconIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark/all). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"image/svg+xml":{"schema":{}}},"description":"The icon list."},"404":{"content":{"application/json":{"schema":{}}},"description":"No icon found."}},"tags":["Component"]}},"/api/v1/component/details":{"get":{"deprecated":false,"description":"Returns the set of metadata about one or multiples components identified by their 'id'.","operationId":"getComponentDetail","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifiers","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of details for the requested components."},"400":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_api_ComponentResource_SampleErrorForBulk","type":"object"}}},"description":"Some identifiers were not valid."}},"tags":["Component"]}},"/api/v1/component/dependencies":{"get":{"deprecated":false,"description":"Returns a list of dependencies for the given components. IMPORTANT: don't forget to add the component itself since it will not be part of the dependencies.Then you can use /dependency/{id} to download the binary.","operationId":"getDependencies","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifier","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The list of dependencies per component."}},"tags":["Component"]}},"/api/v1/component/dependency/{id}":{"get":{"deprecated":false,"description":"Return a binary of the dependency represented by `id`. It can be maven coordinates for dependencies or a component id.","operationId":"getDependency","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Dependency identifier for component/configurationType or maven coordinate. \nExample: `/api/v1/component/dependency/org.apache.commons:commons-lang3:jar:3.12.0`.","in":"path","name":"id","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The dependency binary (jar)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the plugin is missing, payload will be an ErrorPayload with the code PLUGIN_MISSING."}},"tags":["Component"]}},"/api/v1/component/icon/custom/{familyId}/{iconKey}":{"get":{"deprecated":false,"description":"Returns a particular key icon in raw bytes.","operationId":"icon","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"family identifier.","in":"path","name":"familyId","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"icon key.","in":"path","name":"iconKey","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The icon in binary form."},"404":{"content":{"application/json":{"schema":{}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/component/icon/{id}":{"get":{"deprecated":false,"description":"Returns a particular component icon in raw bytes.","operationId":"icon_1","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component icon identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Theme selector (light/dark). Defaults to light.","in":"query","name":"theme","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The component icon in binary form."},"404":{"content":{"application/json":{"schema":{}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/component/migrate/{id}/{configurationVersion}":{"post":{"deprecated":false,"description":"Allows to migrate a component configuration without calling any component execution.","operationId":"migrateComponent","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Configuration version sent, corresponding to the body content.","in":"path","name":"configurationVersion","required":false,"schema":{"type":"integer"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Actual configuration in key/value json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"New configuration for that component (or the same if no migration was needed)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"The component is not found."}},"tags":["Component"]}},"/api/v1/configurationtype/index":{"get":{"deprecated":false,"description":"Returns all available configuration type - storable models. Note that the lightPayload flag allows to load all of them at once when you eagerly need to create a client model for all configurations.","operationId":"getRepositoryModel","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Should the payload skip the forms and actions associated to the configuration.Default value is `true`.","in":"query","name":"lightPayload","required":false,"schema":{"type":"boolean"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Query in simple query language to filter configurations. It provides access to the configuration `type`, `name`, `type` and first configuration property `metadata`. See component index endpoint for a syntax example.","in":"query","name":"q","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of available and storable configurations (datastore, dataset, ...)."}},"tags":["Configuration Type"]}},"/api/v1/configurationtype/details":{"get":{"deprecated":false,"description":"Returns the set of metadata about one or multiples configuration identified by their 'id'.","operationId":"getConfigurationDetail","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifiers","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of details for the requested configuration."}},"tags":["Configuration Type"]}},"/api/v1/configurationtype/migrate/{id}/{configurationVersion}":{"post":{"deprecated":false,"description":"Allows to migrate a configuration without calling any component execution.","operationId":"migrateConfiguration","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The configuration identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The configuration version you send in provided body.","in":"path","name":"configurationVersion","required":false,"schema":{"type":"integer"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Configuration to migrate in key/value json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"New values for that configuration (or the same if no migration was needed)."},"520":{"content":{"application/json":{"schema":{}}},"description":"An unexpected error occurred during migration, payload will be an ErrorPayload with the code UNEXPECTED."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the configuration is missing, payload will be an ErrorPayload with the code CONFIGURATION_MISSING."}},"tags":["Configuration Type"]}},"/api/v1/documentation/component/{id}":{"get":{"deprecated":false,"description":"Returns a documentation in asciidoctor format for the given component. The component is represented by its identifier (`id`).","operationId":"getDocumentation","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The component identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The language requested.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The documentation part to extract. Available parts are: `ALL` (default), `DESCRIPTION`, `CONFIGURATION`","in":"query","name":"segment","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The list of available and storable configurations (datastore, dataset, ...)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the component is not found in the server, response will be an ErrorPayload with the code COMPONENT_MISSING."}},"tags":["Documentation"]}},"/api/v1/environment":{"get":{"deprecated":false,"description":"Returns the environment information of this instance. Useful to check the version or configure a healthcheck for the server.","operationId":"getEnvironment","parameters":[],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"Current environment representation."}},"tags":["Environment"]}},"/api/v1/cache/clear":{"get":{"deprecated":false,"description":"Clear all caches.","operationId":"clearCaches","parameters":[],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"Cleared caches."}},"tags":["Cache"]}}},"tags":[{"description":"Endpoints related to callbacks/triggers execution.","name":"Action"},{"description":"Enables to execute multiple requests at once.","name":"Bulk"},{"description":"Endpoints related to component metadata access.","name":"Component"},{"description":"Endpoints related to configuration types (reusable configuration) metadata access.","name":"Configuration Type"},{"description":"Endpoint to retrieve embedded component documentation.","name":"Documentation"},{"description":"Endpoint giving access to versions and last update timestamp of the server.","name":"Environment"},{"description":"Endpoints related to caches management.","name":"Cache"}],"servers":[{"url":"https://starter-toolkit.talend.io/api/demo/1.92.0"}]};
++++ From 3e5d2fa34b518254e307a3821f43bb4df182aae4 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 15:31:22 +0200 Subject: [PATCH 06/41] chore(QTDI-2894): try-with-resources --- .../org/talend/sdk/component/tools/AsciidoctorExecutor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java b/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java index 5bca55e641460..16eb40b6a3afb 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/AsciidoctorExecutor.java @@ -85,7 +85,10 @@ public void doMain(final String[] args) throws IOException { final Path adoc = PathFactory.get(args[0]).toAbsolutePath(); final File output = adoc.getParent().resolve(args.length > 1 ? args[1] : args[0].replace(".adoc", ".pdf")).toFile(); - final List lines = Files.lines(adoc).toList(); + final List lines; + try (final Stream linesStream = Files.lines(adoc)) { + lines = linesStream.toList(); + } final String version = lines .stream() .filter(it -> it.startsWith("v")) From 9cd070b25788dfa38e93a5d4b64959b3c3e19bc2 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 15:32:48 +0200 Subject: [PATCH 07/41] chore(QTDI-2894): remove compiler level 1.8 --- .../src/it/serialization-over-cluster/pom.xml | 4 ---- .../generated/ProjectResourceTest/emptyProject/pom.xml | 2 -- .../resources/generated/ProjectResourceTest/openapi/pom.xml | 2 -- sample-parent/sample-features/checkpoint-runner/pom.xml | 4 ---- sample-parent/sample-features/entry-with-error/pom.xml | 4 ---- 5 files changed, 16 deletions(-) diff --git a/component-runtime-beam/src/it/serialization-over-cluster/pom.xml b/component-runtime-beam/src/it/serialization-over-cluster/pom.xml index 28aa40ac7bb5a..94e2112e54fd8 100644 --- a/component-runtime-beam/src/it/serialization-over-cluster/pom.xml +++ b/component-runtime-beam/src/it/serialization-over-cluster/pom.xml @@ -82,10 +82,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.14.0 - - 1.8 - 1.8 - org.apache.maven.plugins diff --git a/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml b/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml index 6ca004478684d..4bc2b1ef3614f 100644 --- a/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml +++ b/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml @@ -58,8 +58,6 @@ maven-compiler-plugin 3.14.0 - 1.8 - 1.8 true javac true diff --git a/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml b/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml index 453b6d78e9bd7..c55d8c8168139 100644 --- a/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml +++ b/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml @@ -58,8 +58,6 @@ maven-compiler-plugin 3.14.0 - 1.8 - 1.8 true javac true diff --git a/sample-parent/sample-features/checkpoint-runner/pom.xml b/sample-parent/sample-features/checkpoint-runner/pom.xml index cd1898c251d56..993d21d220238 100644 --- a/sample-parent/sample-features/checkpoint-runner/pom.xml +++ b/sample-parent/sample-features/checkpoint-runner/pom.xml @@ -70,10 +70,6 @@ org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - org.apache.maven.plugins diff --git a/sample-parent/sample-features/entry-with-error/pom.xml b/sample-parent/sample-features/entry-with-error/pom.xml index dbcfafb8d0611..7767958aed428 100644 --- a/sample-parent/sample-features/entry-with-error/pom.xml +++ b/sample-parent/sample-features/entry-with-error/pom.xml @@ -60,10 +60,6 @@ org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - org.talend.sdk.component From c96713ef4bddbfe7ddecdbc44e137f4369763579 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 16:36:34 +0200 Subject: [PATCH 08/41] chore(QTDI-2894): fix compiler level 17 tests --- .../sdk/component/starter/server/front/ProjectResource.java | 2 +- .../component/starter/server/front/ProjectResourceTest.java | 4 ++-- .../generated/ProjectResourceTest/emptyProject/pom.xml | 2 ++ .../resources/generated/ProjectResourceTest/openapi/pom.xml | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java index 6e1c23fbcd32c..535ebd0f565e5 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java @@ -216,7 +216,7 @@ private ProjectRequest toRequest(final ProjectModel model) { ofNullable(model.getDescription()) .orElse("An application generated by the Talend Component Kit Starter"), "jar", group, ofNullable(model.getArtifact()).orElse("application"), - ofNullable(model.getVersion()).orElse("0.0.1-SNAPSHOT"), "1.8"), + ofNullable(model.getVersion()).orElse("0.0.1-SNAPSHOT"), "17"), rootPackage, ofNullable(model.getFacets()).orElse(emptyList()), ofNullable(model.getSources()) .map(s -> s diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java index 1ab68fc8c1e6c..3a71d69a0cfc3 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java @@ -158,7 +158,7 @@ void emptyMavenProject(final WebTarget target) throws IOException { "application/README.adoc") .collect(toSet()), files.keySet()); Stream - .of("component-api", "1.8", "false") + .of("component-api", "17", "false") .forEach(token -> assertTrue(files.get("application/pom.xml").contains(token), token)); assertEquals("= A Talend generated Component Starter Project\n", files.get("application/README.adoc")); final ServerInfo.Snapshot snapshot = versions.getSnapshot(); @@ -333,7 +333,7 @@ void testingProject(final WebTarget target) throws IOException { "application/README.adoc") .collect(toSet()), files.keySet()); Stream - .of("component-api", "1.8", "false") + .of("component-api", "false") .forEach(token -> assertTrue(files.get("application/pom.xml").contains(token), token)); assertEquals("= A Talend generated Component Starter Project\n" + "\n" + "== Test\n" + "\n" + "=== Talend Component Kit Testing\n" + "\n" diff --git a/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml b/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml index 4bc2b1ef3614f..bdc3fc65ee70a 100644 --- a/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml +++ b/component-starter-server/src/test/resources/generated/ProjectResourceTest/emptyProject/pom.xml @@ -58,6 +58,8 @@ maven-compiler-plugin 3.14.0 + 17 + 17 true javac true diff --git a/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml b/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml index c55d8c8168139..8b944951303cd 100644 --- a/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml +++ b/component-starter-server/src/test/resources/generated/ProjectResourceTest/openapi/pom.xml @@ -58,6 +58,8 @@ maven-compiler-plugin 3.14.0 + 17 + 17 true javac true From 01b1ba4463d715a0703e81510d8b634cfffb101e Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 17:16:15 +0200 Subject: [PATCH 09/41] chore(QTDI-2894): add safe S6204 not detected --- .../org/talend/sdk/component/runtime/beam/TalendIOTest.java | 2 +- .../sdk/component/runtime/record/RecordConvertersTest.java | 6 ++---- .../component/runtime/manager/ReflectionServiceTest.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java index d7f3954aba4cc..be06dbbfd8cff 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/TalendIOTest.java @@ -243,7 +243,7 @@ public void onNext(final InputFactory input, final OutputFactory factory) { .apply(UUID.randomUUID().toString(), toSampleLength()) .apply(UUID.randomUUID().toString(), toInt()); - final List expected = data.stream().map(Sample::getData).map(String::length).collect(toList()); + final List expected = data.stream().map(Sample::getData).map(String::length).toList(); PAssert.that(out).satisfies((SerializableFunction, Void>) input -> { final List actual = StreamSupport.stream(input.spliterator(), false).sorted().toList(); assertEquals(expected, actual); diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java index 49ce3f2622ad4..ab1c8bfb8e834 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java @@ -17,7 +17,6 @@ import static java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME; import static java.util.Arrays.asList; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -58,13 +57,12 @@ import org.talend.sdk.component.api.service.record.RecordBuilderFactory; import org.talend.sdk.component.runtime.record.RecordConverters.MappingMetaRegistry; -import routines.system.IPersistableRow; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import routines.system.IPersistableRow; class RecordConvertersTest { @@ -486,7 +484,7 @@ void pojoRoundTrip(final JsonBuilderFactory jsonBuilderFactory, final JsonProvid assertEquals(jsonObj1.getJsonNumber("number").doubleValue(), JsonObject.class.cast(wrapper.getJsonAryValue()[0]).getJsonNumber("number").doubleValue()); assertEquals(Arrays.stream(intAry).toList(), - Arrays.stream(wrapper.getIntAryValue()).collect(toList())); + Arrays.stream(wrapper.getIntAryValue()).toList()); } @Data diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java index ac4559ac1ef03..705c7cf85c840 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/ReflectionServiceTest.java @@ -680,7 +680,7 @@ void tables() throws NoSuchMethodException { assertNotNull(tableOwner.table); assertEquals(2, tableOwner.table.size()); assertEquals(Stream.of("test1", "test2").toList(), - tableOwner.table.stream().map(Column::getValue1).collect(toList())); + tableOwner.table.stream().map(Column::getValue1).toList()); assertArrayEquals(IntStream.of(12, 22).toArray(), tableOwner.table.stream().mapToInt(Column::getValue2).toArray()); assertNotNull(tableOwner.table.get(1).nestedList); From 573bcbb8af165b7dad93f090714e340ccc42d353 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 17:48:54 +0200 Subject: [PATCH 10/41] chore(QTDI-2894): add more S6204 --- .../component/runtime/beam/BeamIOWrappingTest.java | 3 +-- .../runtime/beam/spi/BeamComponentExtensionTest.java | 3 +-- .../runtime/record/RecordConvertersTest.java | 3 ++- .../org/talend/sdk/component/junit/RecordAsserts.java | 3 +-- .../sdk/component/server/service/IconResolver.java | 3 +-- .../starter/server/front/ProjectResource.java | 7 +++---- .../starter/server/service/ProjectGenerator.java | 2 +- .../service/facet/component/ComponentGenerator.java | 11 +++++------ .../starter/server/service/rrd/RRDStorage.java | 3 +-- .../tools/validator/OptionParameterValidatorTest.java | 3 +-- .../sdk/component/container/ContainerManager.java | 2 +- .../container/maven/shade/ArtifactTransformer.java | 5 ++--- .../java/org/talend/runtime/documentation/Github.java | 3 +-- .../sdk/component/feature/form/service/UIService.java | 3 +-- 14 files changed, 22 insertions(+), 32 deletions(-) diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/BeamIOWrappingTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/BeamIOWrappingTest.java index fe3f24fd1b55e..53c2af9151ea2 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/BeamIOWrappingTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/BeamIOWrappingTest.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toList; import static org.apache.ziplock.JarLocation.jarLocation; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; @@ -126,7 +125,7 @@ private String getPlugin() { public static class BeamSource extends DelegatingTransform> { public BeamSource(@Option("values") final Collection values) { - super(Create.of(values.stream().map(Sample::new).collect(toList())).withCoder(new SampleCoder())); + super(Create.of(values.stream().map(Sample::new).toList()).withCoder(new SampleCoder())); } private static class SampleCoder extends Coder { diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/BeamComponentExtensionTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/BeamComponentExtensionTest.java index 173a739645755..5e76a09d95adf 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/BeamComponentExtensionTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/BeamComponentExtensionTest.java @@ -17,7 +17,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toList; import static org.apache.ziplock.JarLocation.jarLocation; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -138,7 +137,7 @@ public static class BeamSource extends PTransform> { private final Create.Values source; public BeamSource(final Collection values) { - this.source = Create.of(values.stream().map(Sample::new).collect(toList())); + this.source = Create.of(values.stream().map(Sample::new).toList()); } @Override diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java index ab1c8bfb8e834..8c0c637708696 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordConvertersTest.java @@ -57,12 +57,13 @@ import org.talend.sdk.component.api.service.record.RecordBuilderFactory; import org.talend.sdk.component.runtime.record.RecordConverters.MappingMetaRegistry; +import routines.system.IPersistableRow; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; -import routines.system.IPersistableRow; class RecordConvertersTest { diff --git a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/RecordAsserts.java b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/RecordAsserts.java index 40cd8b03a0c56..d3b3b11ac30aa 100644 --- a/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/RecordAsserts.java +++ b/component-runtime-testing/component-runtime-junit/src/main/java/org/talend/sdk/component/junit/RecordAsserts.java @@ -15,7 +15,6 @@ */ package org.talend.sdk.component.junit; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.io.Serializable; @@ -50,7 +49,7 @@ public Void apply(final Iterable>> input) { .of(u1, u2) .filter(Objects::nonNull) .flatMap(Collection::stream) - .collect(toList()))); + .toList())); // if we want to validate some outputs which are not here it means the // validation fails diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/IconResolver.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/IconResolver.java index 28a6ebf1c5ffe..d6559b4f654af 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/IconResolver.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/IconResolver.java @@ -19,7 +19,6 @@ import static java.util.Optional.of; import static java.util.Optional.ofNullable; import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toList; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; @@ -70,7 +69,7 @@ protected void init() { .getIconExtensions() .stream() .filter(it -> !it.endsWith(".svg")) - .collect(toList()); + .toList(); log.info("[IconResolver] SVG supported: {}, patterns: {}.", isSupportsSvg(), patterns); } diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java index 535ebd0f565e5..f3bc9d74c2b46 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ProjectResource.java @@ -20,7 +20,6 @@ import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; @@ -226,7 +225,7 @@ rootPackage, ofNullable(model.getFacets()).orElse(emptyList()), .getStructure(), toStructure(i.isGenericOutput(), i.getOutputStructure(), false, reusableConfigs))) - .collect(toList())) + .toList()) .orElse(emptyList()), ofNullable(model.getProcessors()) .map(s -> s @@ -236,7 +235,7 @@ rootPackage, ofNullable(model.getFacets()).orElse(emptyList()), .getStructure(), mapStructures(i.getInputStructures(), reusableConfigs), mapStructures(i.getOutputStructures(), reusableConfigs))) - .collect(toList())) + .toList()) .orElse(emptyList()), reusableConfigs.values(), model.getFamily(), model.getCategory(), model.getOpenapi()); } @@ -303,6 +302,6 @@ private ProjectRequest.StructureConfiguration toStructure(final boolean generic, e.getModel() != null ? toStructure(false, e.getModel(), false, reusableConfigs).getStructure() : null); - }).filter(Objects::nonNull).collect(toList())), generic); + }).filter(Objects::nonNull).toList()), generic); } } diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/ProjectGenerator.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/ProjectGenerator.java index a5c24b22d2300..41b33028498ae 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/ProjectGenerator.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/ProjectGenerator.java @@ -239,7 +239,7 @@ private Map> generateFacetFiles(final ProjectReques versionSnapshot) .peek(file -> files.put(file.getPath(), file.getContent())) .map(FacetGenerator.InMemoryFile::getPath) - .collect(toList()); + .toList(); })); } diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java index 87f3f138d952f..8256f968832e2 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/component/ComponentGenerator.java @@ -18,7 +18,6 @@ import static java.util.Collections.emptyList; import static java.util.Locale.ENGLISH; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static org.talend.sdk.component.starter.server.service.Strings.capitalize; @@ -223,7 +222,7 @@ public Stream create(final String tuple, final Buil } }); } - files.addAll(generateProperties(build.getMainResourcesDirectory(), messageProperties).collect(toList())); + files.addAll(generateProperties(build.getMainResourcesDirectory(), messageProperties).toList()); return files.stream(); } @@ -306,7 +305,7 @@ private Stream createProcessorFiles(final String pa generateModel(null, processorPackage, mainJava, e.getValue().getStructure(), outputClassName, files); return new Connection(e.getKey(), javaName, outputClassName, isDefault(e.getKey())); - }).sorted(connectionComparator).collect(toList()) : emptyList(); + }).sorted(connectionComparator).toList() : emptyList(); final List inputNames = processor.getInputStructures() != null ? processor.getInputStructures().entrySet().stream().map(e -> { @@ -319,7 +318,7 @@ private Stream createProcessorFiles(final String pa generateModel(null, processorPackage, mainJava, e.getValue().getStructure(), inputClassName, files); return new Connection(e.getKey(), javaName, inputClassName, isDefault(e.getKey())); - }).sorted(connectionComparator).collect(toList()) + }).sorted(connectionComparator).toList() : emptyList(); generateConfiguration(null, processorPackage, mainJava, processor.getConfiguration(), @@ -440,7 +439,7 @@ private void generateModel(final String root, final String packageBase, final St generateModel((root == null ? "" : root) + capitalize(cn), pck, mainJava, e.getNestedType(), cn, files); }), false)) - .collect(toList())); + .toList()); } } }))); @@ -485,7 +484,7 @@ private void generateConfiguration(final String root, final String packageBase, } return new Property(name, capitalize(name), javaConfigType, isCredential(name, e.getType())); - }).collect(toList()) : emptyList(); + }).toList() : emptyList(); imports.sort(String::compareTo); put("imports", imports); diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/rrd/RRDStorage.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/rrd/RRDStorage.java index 22f0ccb44e0af..f55b9fb503b79 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/rrd/RRDStorage.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/rrd/RRDStorage.java @@ -16,7 +16,6 @@ package org.talend.sdk.component.starter.server.service.rrd; import static java.util.concurrent.TimeUnit.SECONDS; -import static java.util.stream.Collectors.toList; import static org.rrd4j.ConsolFun.TOTAL; import java.awt.Color; @@ -103,7 +102,7 @@ public void onStart(@Observes @Initialized(ApplicationScoped.class) final Object .stream() .map(this::normalizeFacetName) .sorted() - .collect(toList()); + .toList(); final int syncPeriod = config.getSyncPeriod(); final CompletableFuture rrdFuture = new CompletableFuture<>(); diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/OptionParameterValidatorTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/OptionParameterValidatorTest.java index fd9369e4227ae..53e17b176ad11 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/OptionParameterValidatorTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/OptionParameterValidatorTest.java @@ -19,7 +19,6 @@ import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.PostConstruct; @@ -34,7 +33,7 @@ class OptionParameterValidatorTest { private List validate(final Class testClass) { final OptionParameterValidator validator = new OptionParameterValidator(); final AnnotationFinder finder = new AnnotationFinder(new ClassesArchive(testClass)); - return validator.validate(finder, Arrays.asList(testClass)).collect(Collectors.toUnmodifiableList()); + return validator.validate(finder, Arrays.asList(testClass)).toList(); } @Test diff --git a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java index f5e5a0f776e19..c3cb5cd84de2f 100644 --- a/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java +++ b/container/container-core/src/main/java/org/talend/sdk/component/container/ContainerManager.java @@ -326,7 +326,7 @@ public List getPluginsList() { .stream() .map(Container::getId) .sorted() - .collect(toList()); + .toList(); } public String getPluginsHash() { diff --git a/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java b/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java index 2a40541dadca8..ba165c81f2ada 100644 --- a/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java +++ b/container/nested-maven-repository/src/main/java/org/talend/sdk/component/container/maven/shade/ArtifactTransformer.java @@ -17,7 +17,6 @@ import static java.util.Collections.singletonList; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import static lombok.AccessLevel.NONE; @@ -228,10 +227,10 @@ private ArtifactRepository toArtifactRepo(final Repository repository) { private ArtifactFilter getFilter() { final List filters = new ArrayList<>(2); if (include != null) { - filters.add(new IncludesArtifactFilter(Stream.of(include.split(",")).collect(toList()))); + filters.add(new IncludesArtifactFilter(Stream.of(include.split(",")).toList())); } if (exclude != null) { - filters.add(new ExcludesArtifactFilter(Stream.of(exclude.split(",")).collect(toList()))); + filters.add(new ExcludesArtifactFilter(Stream.of(exclude.split(",")).toList())); } if (scope != null) { filters diff --git a/documentation/src/main/java/org/talend/runtime/documentation/Github.java b/documentation/src/main/java/org/talend/runtime/documentation/Github.java index 1669e8feb968d..7ca14c7156fa4 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/Github.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/Github.java @@ -20,7 +20,6 @@ import static java.util.Optional.ofNullable; import static java.util.concurrent.CompletableFuture.allOf; import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; @@ -109,7 +108,7 @@ public Collection load() { .map(this::getResult) .filter(Objects::nonNull) .sorted(comparing(Contributor::getCommits).reversed()) - .collect(toList()))) + .toList())) .get(); } catch (final ExecutionException ee) { if (WebApplicationException.class.isInstance(ee.getCause())) { diff --git a/sample-parent/sample-features/configuration-form/src/main/java/org/talend/sdk/component/feature/form/service/UIService.java b/sample-parent/sample-features/configuration-form/src/main/java/org/talend/sdk/component/feature/form/service/UIService.java index 004126c7797bf..48af984676be6 100644 --- a/sample-parent/sample-features/configuration-form/src/main/java/org/talend/sdk/component/feature/form/service/UIService.java +++ b/sample-parent/sample-features/configuration-form/src/main/java/org/talend/sdk/component/feature/form/service/UIService.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; import java.util.stream.IntStream; import org.talend.sdk.component.api.configuration.Option; @@ -102,7 +101,7 @@ public SuggestionValues loadSuggestables(final SomeComplexConfig someComplexConf .mapToObj(i -> new SuggestionValues.Item(singleString + "_" + i, singleString + "_" + someComplexConfig.getAString() + "_" + someComplexConfig.isABoolean() + "_" + i)) - .collect(Collectors.toList()); + .toList(); return new SuggestionValues(true, items); } From 1a8b0cb268f47fb7a7eff260a08fdd47f640b0e7 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 22 May 2026 18:00:45 +0200 Subject: [PATCH 11/41] chore(QTDI-2894): fix test for non regression --- .../sdk/component/starter/server/front/ProjectResourceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java index 3a71d69a0cfc3..7adfba4afa7ea 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/ProjectResourceTest.java @@ -333,7 +333,7 @@ void testingProject(final WebTarget target) throws IOException { "application/README.adoc") .collect(toSet()), files.keySet()); Stream - .of("component-api", "false") + .of("component-api", "17", "false") .forEach(token -> assertTrue(files.get("application/pom.xml").contains(token), token)); assertEquals("= A Talend generated Component Starter Project\n" + "\n" + "== Test\n" + "\n" + "=== Talend Component Kit Testing\n" + "\n" From 9d62a6cfb71109e60e1545af1d41f673f3e34530 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 09:25:37 +0200 Subject: [PATCH 12/41] chore(QTDI-2894): fix possible api break --- .../org/talend/sdk/component/runtime/record/RecordImpl.java | 5 +++-- .../org/talend/sdk/component/runtime/record/SchemaImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java index ee4af70fad5b3..3372165e7d6e4 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java @@ -45,6 +45,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Function; +import java.util.stream.Collectors; import javax.json.Json; import javax.json.JsonObject; @@ -221,9 +222,9 @@ public Entry getEntry(final String name) { @Override public List getCurrentEntries() { if (this.providedSchema != null) { - return Collections.unmodifiableList(this.providedSchema.getAllEntries().toList()); + return Collections.unmodifiableList(this.providedSchema.getAllEntries().collect(Collectors.toList())); } - return this.entries.streams().toList(); + return this.entries.streams().collect(Collectors.toList()); } @Override diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java index 6f36cc2ab752d..c0380a6164293 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java @@ -148,7 +148,7 @@ public Builder toBuilder() { @Override @JsonbTransient public List getEntriesOrdered() { - return getAllEntries().sorted(entriesOrder).toList(); + return getAllEntries().sorted(entriesOrder).collect(toList()); } @Override From 8359900d04602dafdf3aef7d78f74caef6ba74ea Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 09:35:56 +0200 Subject: [PATCH 13/41] chore(QTDI-2894): fix possible api break -tests --- .../java/org/talend/sdk/component/runtime/record/SchemaImpl.java | 1 + .../maven/MvnDependencyListLocalRepositoryResolverTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java index c0380a6164293..cd07f2759af45 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java @@ -17,6 +17,7 @@ import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.joining; +import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import java.util.ArrayList; diff --git a/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java b/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java index 55366f74a2c01..eef2366ec334e 100644 --- a/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java +++ b/container/container-core/src/test/java/org/talend/sdk/component/dependencies/maven/MvnDependencyListLocalRepositoryResolverTest.java @@ -17,6 +17,7 @@ import static java.lang.ClassLoader.getSystemClassLoader; import static java.util.Arrays.asList; +import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; From 773745f2abaac58d4a55c7a379c35461c94140cc Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 14:43:42 +0200 Subject: [PATCH 14/41] chore(QTDI-2897): fix S1068 --- .../form/model/jsonschema/PojoJsonSchemaBuilderTest.java | 4 ++++ .../src/test/java/org/talend/test/wrapped/JdbcSource.java | 1 + .../manager/builtinparams/StreamingLongParamBuilder.java | 1 + .../runtime/manager/checkpoint/CheckpointInputTest.java | 4 +--- .../manager/service/MavenRepositoryResolverTest.java | 2 -- .../src/test/java/org/talend/test/DataInput.java | 1 + .../test/java/org/talend/test/MapperWithCheckpoint.java | 1 + .../src/test/java/org/talend/test/ResumeableInput.java | 1 + .../sdk/component/server/api/ComponentResource.java | 2 ++ .../sdk/component/server/front/BulkReadResourceImpl.java | 1 + .../component/server/front/EnvironmentResourceImpl.java | 3 --- .../talend/sdk/component/server/test/jdbc/JdbcOutput.java | 1 + .../component/starter/server/front/ApiDemoEndpoints.java | 2 ++ .../front/apidemo/component/source/MockTableSource.java | 1 + .../genericStreamMapper/MycompSource.java | 1 + .../talend/sdk/component/runtime/di/OutputsHandler.java | 8 -------- .../runtime/di/beam/components/DIBulkAutoChunkTest.java | 4 ---- .../runtime/di/schema/TaCoKitGuessSchemaTest.java | 2 -- .../component/runtime/di/studio/ParameterSetterTest.java | 3 --- .../java/org/talend/sdk/component/tools/SvgValidator.java | 1 + .../component/tools/validator/ActionValidatorTest.java | 1 + .../component/tools/validator/ExceptionValidatorTest.java | 1 + .../action/dynamicvalues/MissingDynamicValues.java | 1 + .../proposal/enumconfig/ComponentConfiguredWithEnum.java | 1 + .../org/talend/test/valid/checkpoint/InputCheckpoint.java | 1 + .../test/valid/structure/MyComponentWithStructure.java | 3 +++ .../documentation/component/source/MockTableSource.java | 1 + .../sdk/component/sample/other/ComplexComponent.java | 1 + 28 files changed, 29 insertions(+), 25 deletions(-) diff --git a/component-form/component-form-model/src/test/java/org/talend/sdk/component/form/model/jsonschema/PojoJsonSchemaBuilderTest.java b/component-form/component-form-model/src/test/java/org/talend/sdk/component/form/model/jsonschema/PojoJsonSchemaBuilderTest.java index 0199722125b04..0223db6be215c 100644 --- a/component-form/component-form-model/src/test/java/org/talend/sdk/component/form/model/jsonschema/PojoJsonSchemaBuilderTest.java +++ b/component-form/component-form-model/src/test/java/org/talend/sdk/component/form/model/jsonschema/PojoJsonSchemaBuilderTest.java @@ -53,15 +53,19 @@ private void assertForm1(final Map properties) { public static class Form1 { + @SuppressWarnings("java:S1068") private String name; + @SuppressWarnings("java:S1068") private int age; } public static class Form2 { + @SuppressWarnings("java:S1068") private String name; + @SuppressWarnings("java:S1068") private Form1 form1; } } diff --git a/component-runtime-beam/src/test/java/org/talend/test/wrapped/JdbcSource.java b/component-runtime-beam/src/test/java/org/talend/test/wrapped/JdbcSource.java index 1ed95f030d1e1..948c8943894fb 100644 --- a/component-runtime-beam/src/test/java/org/talend/test/wrapped/JdbcSource.java +++ b/component-runtime-beam/src/test/java/org/talend/test/wrapped/JdbcSource.java @@ -81,6 +81,7 @@ public static class WorkAroundCoder extends Coder { private static final long serialVersionUID = 1L; + @SuppressWarnings("java:S1068") private transient PCollection collection; private Coder delegate; diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java index 5fd298231546a..f5528654d442c 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java @@ -29,6 +29,7 @@ public class StreamingLongParamBuilder { private final ParameterMeta root; + @SuppressWarnings("java:S1068") private final String componentClassName; private final String name; diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java index 2c08450f24a97..ad78ade8291fb 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java @@ -32,7 +32,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.bind.Jsonb; import javax.json.bind.spi.JsonbProvider; @@ -61,10 +60,9 @@ @Slf4j class CheckpointInputTest { + @SuppressWarnings("java:S1068") private final JsonProvider jsonp = JsonProvider.provider(); - private final JsonBuilderFactory jsonFactory = jsonp.createBuilderFactory(emptyMap()); - private final Jsonb jsonb = JsonbProvider.provider().create().build(); private final PluginGenerator pluginGenerator = new PluginGenerator(); diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java index ae2afe9f5b90d..4f751463a48b6 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java @@ -55,8 +55,6 @@ public Path discover() { }; - private final PathHandler handler = new PathHandlerImpl(); - private final PathHandler handlerNoExistCheck = new PathHandlerImpl() { @Override diff --git a/component-runtime-manager/src/test/java/org/talend/test/DataInput.java b/component-runtime-manager/src/test/java/org/talend/test/DataInput.java index 3bd4329ece799..b49dee029645e 100644 --- a/component-runtime-manager/src/test/java/org/talend/test/DataInput.java +++ b/component-runtime-manager/src/test/java/org/talend/test/DataInput.java @@ -34,6 +34,7 @@ @Emitter(family = "db", name = "input") public class DataInput implements Serializable { + @SuppressWarnings("java:S1068") private final I18nService i18n; private static final Map> data = new HashMap<>(); diff --git a/component-runtime-manager/src/test/java/org/talend/test/MapperWithCheckpoint.java b/component-runtime-manager/src/test/java/org/talend/test/MapperWithCheckpoint.java index 060761ef60c17..286c939e69b43 100644 --- a/component-runtime-manager/src/test/java/org/talend/test/MapperWithCheckpoint.java +++ b/component-runtime-manager/src/test/java/org/talend/test/MapperWithCheckpoint.java @@ -91,6 +91,7 @@ public static class MapperWithCheckpointWorker implements Serializable { private int current = 0; + @SuppressWarnings("java:S1068") private boolean newBookmark = false; public MapperWithCheckpointWorker(final RecordBuilderFactory recordBuilderFactory, int partition, diff --git a/component-runtime-manager/src/test/java/org/talend/test/ResumeableInput.java b/component-runtime-manager/src/test/java/org/talend/test/ResumeableInput.java index 76e7c62e437e5..de6c6ad6e65c9 100644 --- a/component-runtime-manager/src/test/java/org/talend/test/ResumeableInput.java +++ b/component-runtime-manager/src/test/java/org/talend/test/ResumeableInput.java @@ -49,6 +49,7 @@ @Slf4j public class ResumeableInput implements Serializable { + @SuppressWarnings("java:S1068") private final Jsonb jsonb; private final RecordBuilderFactory factory; diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java index 5c9a626c8d155..9922127b9baa2 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/ComponentResource.java @@ -215,8 +215,10 @@ ComponentDetailList getDetail( // @Unused, only for sample class SampleErrorForBulk { + @SuppressWarnings("java:S1068") private ErrorPayload error1; + @SuppressWarnings("java:S1068") private ErrorPayload error2; } } diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java index 62462b5af9021..588bc8c648d85 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/BulkReadResourceImpl.java @@ -116,6 +116,7 @@ public class BulkReadResourceImpl implements BulkReadResource { "{\"code\":\"UNAUTHORIZED\",\"description\":\"Forbidden endpoint in bulk mode.\"}")) .readObject()); + @SuppressWarnings("java:S1068") private final BulkResponses.Result forbiddenResponse = new BulkResponses.Result(Response.Status.FORBIDDEN.getStatusCode(), emptyMap(), Json.createReader(new StringReader( diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java index 50df7a436cba7..60d25d05ed0b5 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/EnvironmentResourceImpl.java @@ -18,7 +18,6 @@ import java.util.Date; import java.util.Spliterator; import java.util.Spliterators; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.StreamSupport; import javax.annotation.PostConstruct; @@ -37,8 +36,6 @@ @ApplicationScoped public class EnvironmentResourceImpl implements EnvironmentResource { - private final AtomicReference environment = new AtomicReference<>(); - @Inject @ConfigProperty(name = "git.build.version") private String version; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/jdbc/JdbcOutput.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/jdbc/JdbcOutput.java index 285bf4ac0f20b..2af3e73c55cbc 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/jdbc/JdbcOutput.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/jdbc/JdbcOutput.java @@ -35,6 +35,7 @@ @FixedSchema(value = "jdbc_discover_schema", flows = { "reject" }) public class JdbcOutput implements Serializable { + @SuppressWarnings("java:S1068") private final ConfigWrapper dataset; public JdbcOutput(@Option("configuration") final ConfigWrapper dataset) { diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java index 0a789fcf3cf76..22eee58850939 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/front/ApiDemoEndpoints.java @@ -88,6 +88,7 @@ public class ApiDemoEndpoints { public static final String VALUE_ACCESS_CONTROL_ALLOW_METHODS = "GET, POST, DELETE, PUT, PATCH, OPTIONS"; + @SuppressWarnings("java:S1068") private final byte[] ENVIRONMENT; private final Object ACTION_INDEX; @@ -100,6 +101,7 @@ public class ApiDemoEndpoints { private final Object COMPONENT_DEPENDENCIES; + @SuppressWarnings("java:S1068") private final Object COMPONENT_DEPENDENCY; private final Object COMPONENT_ICON; diff --git a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableSource.java b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableSource.java index c86e43a1df874..069ae760c5012 100644 --- a/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableSource.java +++ b/component-starter-server/src/test/java/org/talend/sdk/component/starter/server/front/apidemo/component/source/MockTableSource.java @@ -37,6 +37,7 @@ public class MockTableSource implements Serializable { private final TableDataSet ds; + @SuppressWarnings("java:S1068") private final Messages i18n; private BufferizedProducerSupport bufferedReader; diff --git a/component-starter-server/src/test/resources/generated/ComponentGeneratorTest/genericStreamMapper/MycompSource.java b/component-starter-server/src/test/resources/generated/ComponentGeneratorTest/genericStreamMapper/MycompSource.java index 6e5df1dc649be..238e445db9429 100644 --- a/component-starter-server/src/test/resources/generated/ComponentGeneratorTest/genericStreamMapper/MycompSource.java +++ b/component-starter-server/src/test/resources/generated/ComponentGeneratorTest/genericStreamMapper/MycompSource.java @@ -11,6 +11,7 @@ @Documentation("TODO fill the documentation for this source") public class MycompSource implements Serializable { + @SuppressWarnings("java:S1068") private final MycompSourceConfiguration configuration; private final TestService service; diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java index 5d9a30e1c07d4..ec495906e032e 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java @@ -17,9 +17,7 @@ import java.util.Map; -import javax.json.JsonBuilderFactory; import javax.json.bind.Jsonb; -import javax.json.spi.JsonProvider; import org.talend.sdk.component.api.record.Record; import org.talend.sdk.component.api.record.Schema; @@ -28,16 +26,10 @@ public class OutputsHandler extends BaseIOHandler { - private final JsonProvider jsonProvider; - - private final JsonBuilderFactory jsonBuilderFactory; - private final MappingMetaRegistry registry = new MappingMetaRegistry(); public OutputsHandler(final Jsonb jsonb, final Map, Object> servicesMapper) { super(jsonb, servicesMapper); - this.jsonProvider = (JsonProvider) servicesMapper.get(JsonProvider.class); - this.jsonBuilderFactory = (JsonBuilderFactory) servicesMapper.get(JsonBuilderFactory.class); } public OutputFactory asOutputFactory() { diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java index 0fc4d451efa21..4eed927bf1ca9 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java @@ -560,10 +560,6 @@ public void readData(final ObjectInputStream objectInputStream) { } ////////////////////////////////////////// - private static final OutputFactory NO_OUTPUT = name -> value -> { - // no-op - }; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchemaTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchemaTest.java index c5eb29834c5b0..5362b5646596c 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchemaTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchemaTest.java @@ -86,8 +86,6 @@ class TaCoKitGuessSchemaTest { private final Pattern schemaPattern = Pattern.compile("(\\[\\{.*\"talendType\".*\\}])"); - private final Pattern logPattern = Pattern.compile("^\\[\\s*(INFO|WARN|ERROR|DEBUG|TRACE)\\s*]"); - private final static java.io.PrintStream stdout = System.out; @BeforeAll diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/ParameterSetterTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/ParameterSetterTest.java index 0921b03586420..7c2396df0973c 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/ParameterSetterTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/ParameterSetterTest.java @@ -43,9 +43,6 @@ public class ParameterSetterTest { protected static RecordBuilderFactory builderFactory; - // do the same thing with studio - private static final Map globalMap = Collections.synchronizedMap(new HashMap<>()); - @BeforeAll static void forceManagerInit() { final ComponentManager manager = ComponentManager.instance(); diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java index 752d9345f19ca..ec3f30dcf828a 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java @@ -36,6 +36,7 @@ public class SvgValidator { private final SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(XMLResourceDescriptor.getXMLParserClassName()); + @SuppressWarnings("java:S1068") private final Boolean legacy; public SvgValidator(final Boolean legacy) { diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java index a71c2aabb961e..4615590e71fba 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ActionValidatorTest.java @@ -415,6 +415,7 @@ public Set getAvailableOutputs(@Option("configuration") final FakeDataSe @ConditionalOutput("outflow-1") static class AvailableOutputProcessor implements Serializable { + @SuppressWarnings("java:S1068") private ConfigurationAO config; @ElementListener diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java index 17d7d17f53336..a801ed9143850 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/validator/ExceptionValidatorTest.java @@ -28,6 +28,7 @@ class ExceptionValidatorTest { + @SuppressWarnings("java:S1068") private File fileC1; @Test diff --git a/component-tools/src/test/java/org/talend/test/failure/action/dynamicvalues/MissingDynamicValues.java b/component-tools/src/test/java/org/talend/test/failure/action/dynamicvalues/MissingDynamicValues.java index 36346a4ddb0bb..c4914cfd47d4e 100644 --- a/component-tools/src/test/java/org/talend/test/failure/action/dynamicvalues/MissingDynamicValues.java +++ b/component-tools/src/test/java/org/talend/test/failure/action/dynamicvalues/MissingDynamicValues.java @@ -35,6 +35,7 @@ @Processor(family = "test", name = "my") public class MissingDynamicValues implements Serializable { + @SuppressWarnings("java:S1068") private final Foo foo; public MissingDynamicValues(final Foo foo) { diff --git a/component-tools/src/test/java/org/talend/test/failure/proposal/enumconfig/ComponentConfiguredWithEnum.java b/component-tools/src/test/java/org/talend/test/failure/proposal/enumconfig/ComponentConfiguredWithEnum.java index e0c937cb1e06c..3c3259c63b79f 100644 --- a/component-tools/src/test/java/org/talend/test/failure/proposal/enumconfig/ComponentConfiguredWithEnum.java +++ b/component-tools/src/test/java/org/talend/test/failure/proposal/enumconfig/ComponentConfiguredWithEnum.java @@ -38,6 +38,7 @@ @Processor(family = "test", name = "my") public class ComponentConfiguredWithEnum implements Serializable { + @SuppressWarnings("java:S1068") private final Foo foo; public ComponentConfiguredWithEnum(final Foo foo) { diff --git a/component-tools/src/test/java/org/talend/test/valid/checkpoint/InputCheckpoint.java b/component-tools/src/test/java/org/talend/test/valid/checkpoint/InputCheckpoint.java index cb9c8e27e1ad4..8d9775957e7b7 100644 --- a/component-tools/src/test/java/org/talend/test/valid/checkpoint/InputCheckpoint.java +++ b/component-tools/src/test/java/org/talend/test/valid/checkpoint/InputCheckpoint.java @@ -66,6 +66,7 @@ public static class MyConfiguration implements Serializable { @Checkpoint public static class CheckpointConfig implements Serializable { + @SuppressWarnings("java:S1068") private String position; } } diff --git a/component-tools/src/test/java/org/talend/test/valid/structure/MyComponentWithStructure.java b/component-tools/src/test/java/org/talend/test/valid/structure/MyComponentWithStructure.java index 075e816c5d074..e7503d91b9ddf 100644 --- a/component-tools/src/test/java/org/talend/test/valid/structure/MyComponentWithStructure.java +++ b/component-tools/src/test/java/org/talend/test/valid/structure/MyComponentWithStructure.java @@ -75,10 +75,13 @@ public static class MyDataSet implements Serializable { public class MySchema implements Serializable { + @SuppressWarnings("java:S1068") private String label; + @SuppressWarnings("java:S1068") private int length; + @SuppressWarnings("java:S1068") private int precision; } diff --git a/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableSource.java b/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableSource.java index fa0218f5be07d..653574de84c4b 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableSource.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/component/source/MockTableSource.java @@ -37,6 +37,7 @@ public class MockTableSource implements Serializable { private final TableDataSet ds; + @SuppressWarnings("java:S1068") private final Messages i18n; private BufferizedProducerSupport bufferedReader; diff --git a/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java b/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java index 3d6af83d80385..7f7b5227afac2 100644 --- a/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java +++ b/sample-parent/sample/src/main/java/org/talend/sdk/component/sample/other/ComplexComponent.java @@ -37,6 +37,7 @@ @Emitter(family = "complex", name = "demo") public class ComplexComponent implements Serializable { + @SuppressWarnings("java:S1068") private final ComplexDataSet dataset; public ComplexComponent(@Option("dataset") final ComplexDataSet dataset) { From 21bd64c072db10d56bc919f81f14b72dbd4ffb8d Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 15:45:02 +0200 Subject: [PATCH 15/41] chore(QTDI-2897): fix S1481 --- .../impl/widget/AbstractWidgetConverter.java | 1 - .../sdk/component/form/api/UiSpecServiceTest.java | 6 ------ .../runtime/beam/spi/record/AvroRecordTest.java | 12 +++--------- .../runtime/record/RecordBuilderImplTest.java | 7 ------- .../component/runtime/record/SchemaImplTest.java | 1 - .../component/runtime/manager/ComponentManager.java | 2 +- .../builtinparams/StreamingLongParamBuilder.java | 4 ---- .../runtime/manager/asm/PluginGenerator.java | 2 -- .../manager/checkpoint/CheckpointInputTest.java | 13 ++++--------- .../manager/service/InternalizationServiceTest.java | 4 +--- .../service/MavenRepositoryResolverTest.java | 1 - .../manager/service/http/RequestParserTest.java | 3 --- .../server/front/ComponentResourceImpl.java | 11 ----------- .../front/ConfigurationTypeResourceImplTest.java | 7 ------- .../server/service/openapi/OpenAPIGenerator.java | 2 -- .../di/beam/components/DIBatchSimulationTest.java | 7 +------ .../di/beam/components/DIBulkAutoChunkTest.java | 7 ------- .../runtime/di/studio/DynamicColumnsTest.java | 8 -------- .../sdk/component/tools/DocBaseGenerator.java | 3 +-- .../talend/sdk/component/tools/exec/CarMain.java | 2 -- .../service/AbstractDynamicDependenciesService.java | 1 + .../sdk/component/maven/ComponentMetadataMojo.java | 2 -- .../components/vault/client/VaultClientTest.java | 2 +- 23 files changed, 13 insertions(+), 95 deletions(-) diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java index 793d6f1dfb168..849f81a5d806d 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java @@ -330,7 +330,6 @@ protected Map> createCondition(final PropertyContext< .collect(toList()); final Map> condition = values.size() == 1 ? values.iterator().next() : new UiSchema.ConditionBuilder().withOperator("or").withValues(values).build(); - final UiSchema.ConditionValuesBuilder rootBuilder; if (!shouldBe) { // no need to add the wrapper if we test true (default) return new UiSchema.ConditionBuilder() .withOperator("==") diff --git a/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java b/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java index 8023cdbd6b3c0..1de8ef11366b2 100644 --- a/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java +++ b/component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java @@ -311,12 +311,6 @@ void enumAsRestrictedList() throws Exception { @Test void optionsOrder() throws Exception { final ConfigTypeNode node = load("optionsorder.json", ConfigTypeNode.class); - final SimplePropertyDefinition root = node - .getProperties() - .stream() - .filter(it -> it.getPath().equals("configuration")) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("bad config")); final Ui payload = service.convert("FileIO", "en", node, null).toCompletableFuture().get(); final List actualOrder = payload .getUiSchema() diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java index 514c2150b2538..b3f3c5c167c66 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java @@ -675,14 +675,12 @@ void pipelineDateTimeFields() throws Exception { final Date date = new Date(new java.text.SimpleDateFormat("yyyy-MM-dd").parse("2018-12-6").getTime()); final Date datetime = new Date(); final Date time = new Date(1000 * 60 * 60 * 15 + 1000 * 60 * 20 + 39000); // 15:20:39 - final Instant timestamp = java.sql.Timestamp.valueOf("2021-04-19 13:37:07.752345").toInstant(); builder.withDateTime("t_date", date); builder.withDateTime("t_datetime", datetime); builder.withDateTime("t_time", time); final Record rec = builder.build(); final Pipeline pipeline = Pipeline.create(); - final PCollection input = pipeline.apply(Create.of(asList(rec)).withCoder(SchemaRegistryCoder.of())); // - final PCollection output = input.apply(new RecordToRecord()); + pipeline.apply(Create.of(asList(rec)).withCoder(SchemaRegistryCoder.of())); // assertEquals(org.apache.beam.sdk.PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); } @@ -721,9 +719,7 @@ void pipelineDecimalFieldsWithAvroRecord() throws Exception { // should not use ReflectData for any GenericRecord implements // ReflectData.get().addLogicalTypeConversion(new Conversions.DecimalConversion()); - final PCollection input = - pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())); // - final PCollection output = input.apply(new RecordToRecord()); + pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())); // assertEquals(org.apache.beam.sdk.PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); } @@ -751,9 +747,7 @@ void pipelineTimestampFieldsWithAvroRecord() throws Exception { final Pipeline pipeline = Pipeline.create(); - final PCollection input = - pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())); // - final PCollection output = input.apply(new RecordToRecord()); + pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())); // assertEquals(org.apache.beam.sdk.PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); } diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java index f8b35e2f5c40d..400662d4dec30 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/RecordBuilderImplTest.java @@ -68,11 +68,6 @@ void providedSchemaGetSchema() { .build()) .build(); assertEquals(schema, new RecordImpl.BuilderImpl(schema).withString("name", "ok").build().getSchema()); - - Schema.EntriesOrder e = Schema.EntriesOrder.of(new RecordImpl.BuilderImpl().getCurrentEntries() - .stream() - .map(Schema.Entry::getName) - .collect(Collectors.toList())); } @Test @@ -437,11 +432,9 @@ void timestampExceedMillisecond() { assertEquals(time.toInstant(), record.getInstant("time")); int nano = time.toInstant().getNano(); - long natime = time.toInstant().toEpochMilli();/// 1000 * 1000_000_000 +nano; long ntime = time.toInstant().getEpochSecond(); Instant back1 = Instant.ofEpochSecond(ntime, nano); - Instant back2 = Instant.ofEpochSecond(natime, nano); assertEquals(time.toInstant(), back1); } diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java index f9e314dfe06b0..23d6182a6f9a1 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java @@ -460,7 +460,6 @@ void emptyRecord() { final Schema emptySchema = new BuilderImpl() // .withType(Type.RECORD) // .build(); - List ordered = emptySchema.getEntriesOrdered(); RecordBuilderFactory factory = new RecordBuilderFactoryImpl("test"); Record record = factory.newRecordBuilder(emptySchema).build(); Assertions.assertNotNull(record); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java index 70a32144b8ab0..918722384d090 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/ComponentManager.java @@ -295,7 +295,7 @@ public void run() { } static { - ComponentManager manager = SingletonHolder.buildNewComponentManager(); + ComponentManager manager = SingletonHolder.buildNewComponentManager(); // NOSONAR } } diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java index f5528654d442c..76c81e18b9dbe 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/builtinparams/StreamingLongParamBuilder.java @@ -29,9 +29,6 @@ public class StreamingLongParamBuilder { private final ParameterMeta root; - @SuppressWarnings("java:S1068") - private final String componentClassName; - private final String name; private final String layoutType; @@ -43,7 +40,6 @@ public class StreamingLongParamBuilder { public StreamingLongParamBuilder(final ParameterMeta root, final String componentClassName, final String parameterName, final LocalConfiguration configuration) { this.root = root; - this.componentClassName = componentClassName; this.name = parameterName; this.configuration = configuration; this.layoutType = findLayoutType(); diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/asm/PluginGenerator.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/asm/PluginGenerator.java index 09bc562aa8d4b..b09652acbe40d 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/asm/PluginGenerator.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/asm/PluginGenerator.java @@ -33,7 +33,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; @@ -97,7 +96,6 @@ public String map(final String key) { } } else { try { - final FileReader reader = new FileReader(clazz); outputStream.putNextEntry(new JarEntry('/' + clazz.getName())); outputStream.write(Files.readAllBytes(clazz.getAbsoluteFile().toPath())); outputStream.closeEntry(); diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java index ad78ade8291fb..f74776e9bc5f3 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java @@ -205,9 +205,8 @@ void studioLifecycle(@TempDir final Path temporaryFolder) { final Input input = chainedMapper.create(); // ChainedInput input.start(); // - Object rawData; int counted = 0; - while ((rawData = input.next()) != null) { + while (input.next() != null) { // data conversion of rawData to rowStruct and operate on rowStruct... if (input.isCheckpointReady()) { System.err.println(input.getCheckpoint()); @@ -239,10 +238,8 @@ void studioLifecycleWithResume(@TempDir final Path temporaryFolder) { // final Input input = chainedMapper.create(); // ChainedInput input.start((s) -> log.info("[studioLifecycleWithResume] state: {}.", s)); - Object rawData; int counted = 0; - // RowStruct rowStruct = new RowStruct(); // @Data static class RowStruct {Integer data;} - while ((rawData = input.next()) != null) { + while (input.next() != null) { // data conversion of rawData to rowStruct ... // operate on rowStruct... counted++; @@ -293,9 +290,8 @@ void resumeableInputManualUsage(@TempDir final Path temporaryFolder) throws Exce // final Input input = getInput(mgr, "resumeable-input", 1, configuration); input.start(); - Record record; int counted = 0; - while ((record = (Record) input.next()) != null) { + while (input.next() != null) { counted++; if (input.isCheckpointReady()) { assertNotNull(input.getCheckpoint()); @@ -324,9 +320,8 @@ void resumeableInputManualUsageNoCheckpoint(@TempDir final Path temporaryFolder) // final Input input = getInput(mgr, "resumeable-input", 1, configuration); input.start(); - Record record; int counted = 0; - while ((record = (Record) input.next()) != null) { + while (input.next() != null) { counted++; assertFalse(input.isCheckpointReady()); } diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/InternalizationServiceTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/InternalizationServiceTest.java index dd29a7d3e018e..741035c986ad1 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/InternalizationServiceTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/InternalizationServiceTest.java @@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.talend.sdk.component.runtime.input.Mapper; import org.talend.sdk.component.runtime.manager.ComponentManager; import org.talend.sdk.component.runtime.manager.asm.PluginGenerator; @@ -43,8 +42,7 @@ void wrongCL(@TempDir final File temporaryFolder) { try (final ComponentManager manager = new ComponentManager(deps, "META-INF/test/dependencies", null)) { manager.addPlugin(plugin.getAbsolutePath()); try { - final Mapper mapper = - manager.findMapper("db", "input", 1, emptyMap()).orElseThrow(IllegalStateException::new); + manager.findMapper("db", "input", 1, emptyMap()).orElseThrow(IllegalStateException::new); } catch (MissingResourceException e) { fail("Bundle should have been loaded."); } diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java index 4f751463a48b6..b7e234cab8882 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/MavenRepositoryResolverTest.java @@ -268,7 +268,6 @@ void discoverFromRepositoryPropertyAndSettingsKo() { @Test void discoverFromEnvironment() throws IOException { Files.createDirectories(repository.resolve("repository")); - final String vm2 = System.getenv("M2_HOME"); final Path m2 = resolver.discover(); assertNotNull(m2); assertEquals(repository.resolve("repository"), m2); diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/http/RequestParserTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/http/RequestParserTest.java index f83e5bf0f130e..ca9ff86d1316d 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/http/RequestParserTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/http/RequestParserTest.java @@ -15,8 +15,6 @@ */ package org.talend.sdk.component.runtime.manager.service.http; -import static org.junit.jupiter.api.Assertions.*; - import java.lang.reflect.Type; import java.util.Collection; import java.util.HashMap; @@ -95,7 +93,6 @@ public T buildNew(Class realClass) { .getDeclaredMethod("complexe", String.class, String.class, String.class, String.class, Integer.class, Map.class)); { - final Type responseType = complexe.getResponseType(); final HttpRequestCreator creator = complexe.getRequestCreator(); Assertions.assertNotNull(creator); Map queryParams = new HashMap<>(); diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java index 8e1990c87a52a..7617f34ce71cf 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java @@ -33,11 +33,9 @@ import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.AbstractMap.SimpleEntry; -import java.util.Base64; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -549,15 +547,6 @@ public Response getIconIndex(final String theme) { @Override public Map migrate(final String id, final int version, final Map config) { - final Map configuration = config.entrySet().stream().map(e -> { - if (e.getValue().startsWith(BASE64_PREFIX)) { - final String value = new String(Base64 - .getUrlDecoder() - .decode(e.getValue().substring(BASE64_PREFIX.length()).getBytes(StandardCharsets.UTF_8))); - e.setValue(value); - } - return e; - }).collect(toMap(Entry::getKey, Entry::getValue)); if (virtualComponents.isExtensionEntity(id)) { return config; } diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java index e896a26dda780..a2575d0b2cfba 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ConfigurationTypeResourceImplTest.java @@ -128,13 +128,6 @@ void migrateUnexpectedWithNPE() { @Test void migrateWithEncrypted() { - final JsonBuilderFactory factory = JsonProvider.provider().createBuilderFactory(emptyMap()); - final JsonObject json = factory - .createObjectBuilder() - .add("configuration.url", "vault:v1:hcccVPODe9oZpcr/sKam8GUrbacji8VkuDRGfuDt7bg7VA==") - .add("configuration.username", "username0") - .add("configuration.password", "vault:v1:hcccVPODe9oZpcr/sKam8GUrbacji8VkuDRGfuDt7bg7VA==") - .build(); final Map config = base .path("/configurationtype/migrate/amRiYy1jb21wb25lbnQjamRiYyNkYXRhc2V0I2pkYmM/-2") .request(APPLICATION_JSON_TYPE) diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java index fc4e634b24a0e..2a41dd6b7b745 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java @@ -99,8 +99,6 @@ public Collection generate(final String family, fin final ApiModel api = getApiModel(apiType, openapi); log.warn("[generate] {}", api.getInfo()); - final String defaultUrl = api.getDefaultUrl(); - final String pck = '/' + basePackage.replace('.', '/') + '/'; final String javaBase = build.getMainJavaDirectory() + pck; final String resourcesBase = build.getMainResourcesDirectory() + pck; diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java index 5979bc9277130..a5bd8e1439cb5 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java @@ -37,7 +37,6 @@ import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.bind.Jsonb; -import javax.json.spi.JsonProvider; import org.apache.beam.sdk.coders.SerializableCoder; import org.apache.beam.sdk.transforms.Create; @@ -240,15 +239,11 @@ private void doRun(final ComponentManager manager, final Collection sour final Map, Object> servicesMapper = manager.findPlugin(mapperMapper.plugin()).get().get(ComponentManager.AllServices.class).getServices(); final Jsonb jsonbMapper = Jsonb.class.cast(servicesMapper.get(Jsonb.class)); - final JsonProvider jsonProvider = JsonProvider.class.cast(servicesMapper.get(JsonProvider.class)); - final JsonBuilderFactory jsonBuilderFactory = - JsonBuilderFactory.class.cast(servicesMapper.get(JsonBuilderFactory.class)); + JsonBuilderFactory.class.cast(servicesMapper.get(JsonBuilderFactory.class)); final RecordBuilderFactory recordBuilderMapper = RecordBuilderFactory.class.cast(servicesMapper.get(RecordBuilderFactory.class)); final RecordConverters converters = new RecordConverters(); - final RecordConverters.MappingMetaRegistry registry = new RecordConverters.MappingMetaRegistry(); - Object dataMapper; while ((dataMapper = inputMapper.next()) != null) { final String jsonValueMapper; diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java index 4eed927bf1ca9..454b4b8b1e8d4 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBulkAutoChunkTest.java @@ -37,9 +37,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.json.JsonBuilderFactory; import javax.json.bind.Jsonb; -import javax.json.spi.JsonProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -321,14 +319,9 @@ private void doRun(final ComponentManager manager, final Collection sour final Map, Object> servicesMapper = manager.findPlugin(mapperMapper.plugin()).get().get(ComponentManager.AllServices.class).getServices(); - final Jsonb jsonbMapper = Jsonb.class.cast(servicesMapper.get(Jsonb.class)); - final JsonProvider jsonProvider = JsonProvider.class.cast(servicesMapper.get(JsonProvider.class)); - final JsonBuilderFactory jsonBuilderFactory = - JsonBuilderFactory.class.cast(servicesMapper.get(JsonBuilderFactory.class)); final RecordBuilderFactory recordBuilderMapper = RecordBuilderFactory.class.cast(servicesMapper.get(RecordBuilderFactory.class)); builderFactory = recordBuilderMapper; - final RecordConverters converters = new RecordConverters(); final RecordConverters.MappingMetaRegistry registry = new RecordConverters.MappingMetaRegistry(); Object dataMapper; diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java index 63799b53e8e17..91bfb1e423927 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/studio/DynamicColumnsTest.java @@ -42,9 +42,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.json.JsonBuilderFactory; import javax.json.bind.Jsonb; -import javax.json.spi.JsonProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -82,7 +80,6 @@ import org.talend.sdk.component.runtime.output.InputFactory; import org.talend.sdk.component.runtime.output.OutputFactory; import org.talend.sdk.component.runtime.output.Processor; -import org.talend.sdk.component.runtime.record.RecordConverters; import org.talend.sdk.component.runtime.record.RecordConverters.MappingMetaRegistry; import routines.system.Dynamic; @@ -284,14 +281,9 @@ private void doRun(final ComponentManager manager, final Collection sour final Map, Object> servicesMapper = manager.findPlugin(mapperMapper.plugin()).get().get(AllServices.class).getServices(); - final Jsonb jsonbMapper = Jsonb.class.cast(servicesMapper.get(Jsonb.class)); - final JsonProvider jsonProvider = JsonProvider.class.cast(servicesMapper.get(JsonProvider.class)); - final JsonBuilderFactory jsonBuilderFactory = - JsonBuilderFactory.class.cast(servicesMapper.get(JsonBuilderFactory.class)); final RecordBuilderFactory recordBuilderMapper = RecordBuilderFactory.class.cast(servicesMapper.get(RecordBuilderFactory.class)); builderFactory = recordBuilderMapper; - final RecordConverters converters = new RecordConverters(); final MappingMetaRegistry registry = new MappingMetaRegistry(); Object dataMapper; diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java index 8a7a724287872..68c42391b3a4d 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/DocBaseGenerator.java @@ -376,8 +376,7 @@ private Set recurseUIParam(final Collection params, final UIInfo uiInfo = new UIInfo(currentSectionName, paramLayouts); uiparams.put(path, uiInfo); if (param.getNestedParameters().size() > 0) { - Set subLayouts = - recurseUIParam(param.getNestedParameters(), uiparams, sectionType, param, paramLayouts); + recurseUIParam(param.getNestedParameters(), uiparams, sectionType, param, paramLayouts); // uiInfo.addNestedLayouts(subLayouts); } } diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/exec/CarMain.java b/component-tools/src/main/java/org/talend/sdk/component/tools/exec/CarMain.java index b59a6744a2d32..ec9e72e04a0fd 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/exec/CarMain.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/exec/CarMain.java @@ -762,8 +762,6 @@ private static HttpURLConnection prepareGet(final String serverUrl, final String System.out.println("Sending GET request to " + url.getPath()); final HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setDoInput(true); - final String userpass = username + ":" + password; - final String basicAuth = "Basic " + Base64.getEncoder().encodeToString(userpass.getBytes()); conn.setRequestMethod("GET"); if (auth != null) { conn.setRequestProperty("Authorization", auth); diff --git a/sample-parent/sample-features/loading-analysis/loading-dependencies-common/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/service/AbstractDynamicDependenciesService.java b/sample-parent/sample-features/loading-analysis/loading-dependencies-common/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/service/AbstractDynamicDependenciesService.java index 03d1681e63976..99e1fc451c915 100644 --- a/sample-parent/sample-features/loading-analysis/loading-dependencies-common/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/service/AbstractDynamicDependenciesService.java +++ b/sample-parent/sample-features/loading-analysis/loading-dependencies-common/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/service/AbstractDynamicDependenciesService.java @@ -405,6 +405,7 @@ private Stream getConnectorDependencies(final Connector connector) { return result.stream(); } + @SuppressWarnings("java:S1481") private void checkAssignmentFromDynamicDependency() { DefaultArtifact defaultArtifact = new DefaultArtifact("g:a:v"); // Do nothing, just check assignment diff --git a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java index 3913b96546dc7..7c1bd432a0fda 100644 --- a/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java +++ b/talend-component-maven-plugin/src/main/java/org/talend/sdk/component/maven/ComponentMetadataMojo.java @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.lang.reflect.Method; import java.util.Collection; import java.util.Locale; import java.util.stream.Stream; @@ -84,7 +83,6 @@ protected void doWork(final ComponentManager manager, final Container container, .orElse(p.getName()), p.getIcon(), emptyList(), singletonList("MAIN"))), c.getProcessors().values().stream().map(p -> { - final Method listener = p.getListener(); return new Component(p.getParent().getCategories(), p.getParent().getName(), p.getName(), p diff --git a/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java b/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java index 0e7ad456027c5..ba06146b19dd6 100644 --- a/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java +++ b/vault-client/src/test/java/org/talend/sdk/components/vault/client/VaultClientTest.java @@ -321,7 +321,7 @@ void executeWithBadEncrypted() { @Disabled void executeWithRealVault() { // setup.setVaultUrl("http://localhost:8200"); - final Client realClt = setup.vaultClient(setup.vaultExecutorService()); + setup.vaultClient(setup.vaultExecutorService()); // vault.setVault(setup.vaultTarget(realClt)); vault.setAuthEndpoint("/v1/auth/approle/login"); vault.setDecryptEndpoint("/v1/transit/decrypt/{x-talend-tenant-id}"); From 98acc3aa2ef2c52cff0d13c3b83338786edac7c2 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 16:51:33 +0200 Subject: [PATCH 16/41] chore(QTDI-2897): fix copilot comments --- .../beam/spi/record/AvroRecordTest.java | 4 +- .../checkpoint/CheckpointInputTest.java | 4 -- .../server/front/ComponentResourceImpl.java | 37 +++++++++--- .../front/ComponentResourceImplTest.java | 56 +++++++++++++++++++ .../component/tools/ComponentValidator.java | 2 +- .../sdk/component/tools/SvgValidator.java | 7 --- .../sdk/component/tools/SvgValidatorTest.java | 2 +- 7 files changed, 89 insertions(+), 23 deletions(-) diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java index b3f3c5c167c66..95e8ddc5e4363 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java @@ -680,7 +680,7 @@ void pipelineDateTimeFields() throws Exception { builder.withDateTime("t_time", time); final Record rec = builder.build(); final Pipeline pipeline = Pipeline.create(); - pipeline.apply(Create.of(asList(rec)).withCoder(SchemaRegistryCoder.of())); // + pipeline.apply(Create.of(asList(rec)).withCoder(SchemaRegistryCoder.of())).apply(new RecordToRecord()); assertEquals(org.apache.beam.sdk.PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); } @@ -719,7 +719,7 @@ void pipelineDecimalFieldsWithAvroRecord() throws Exception { // should not use ReflectData for any GenericRecord implements // ReflectData.get().addLogicalTypeConversion(new Conversions.DecimalConversion()); - pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())); // + pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())).apply(new RecordToRecord()); assertEquals(org.apache.beam.sdk.PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); } diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java index f74776e9bc5f3..b98b368f35925 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/checkpoint/CheckpointInputTest.java @@ -35,7 +35,6 @@ import javax.json.JsonObject; import javax.json.bind.Jsonb; import javax.json.bind.spi.JsonbProvider; -import javax.json.spi.JsonProvider; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -60,9 +59,6 @@ @Slf4j class CheckpointInputTest { - @SuppressWarnings("java:S1068") - private final JsonProvider jsonp = JsonProvider.provider(); - private final Jsonb jsonb = JsonbProvider.provider().create().build(); private final PluginGenerator pluginGenerator = new PluginGenerator(); diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java index 7617f34ce71cf..e89ea73abe05b 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java @@ -33,9 +33,11 @@ import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.AbstractMap.SimpleEntry; +import java.util.Base64; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -547,6 +549,7 @@ public Response getIconIndex(final String theme) { @Override public Map migrate(final String id, final int version, final Map config) { + decodeBase64Values(config); if (virtualComponents.isExtensionEntity(id)) { return config; } @@ -564,14 +567,32 @@ public Map migrate(final String id, final int version, final Map log.info("[Component#migrate] {}#{} registry version {} - incoming: {}.", comp.getParent().getName(), comp.getName(), comp.getVersion(), version); } - return ofNullable(componentDao.findById(id)) - .orElseThrow(() -> new WebApplicationException(Response - .status(Response.Status.NOT_FOUND) - .entity(new ErrorPayload(COMPONENT_MISSING, "Didn't find component " + id)) - .build())) - .getMigrationHandler() - .get() - .migrate(version, config); + return comp.getMigrationHandler().get().migrate(version, config); + } + + /** + * Decodes in place every value of {@code config} prefixed by {@value #BASE64_PREFIX}. + *

+ * Null values are tolerated, an invalid base64 payload is reported as an HTTP 400 instead of + * propagating an {@link IllegalArgumentException} as an opaque 500. + */ + private void decodeBase64Values(final Map config) { + try { + config.replaceAll((key, value) -> { + if (value == null || !value.startsWith(BASE64_PREFIX)) { + return value; + } + final byte[] decoded = Base64.getUrlDecoder().decode(value.substring(BASE64_PREFIX.length())); + return new String(decoded, StandardCharsets.UTF_8); + }); + } catch (final IllegalArgumentException iae) { + throw new WebApplicationException(Response + .status(Status.BAD_REQUEST) + .type(APPLICATION_JSON_TYPE) + .entity(new ErrorPayload(ErrorDictionary.UNEXPECTED, + "Invalid base64-encoded value in migration config: " + iae.getMessage())) + .build()); + } } @Override diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java index 3989cd76d5bac..09e8b343cd5a0 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java @@ -481,6 +481,62 @@ void migrateFromStudio() { assertEquals("true", migrated.get("migrated")); } + @Test + void migrateToleratesNullValues() { + // Regression: previously a null value triggered NPE on String#startsWith(BASE64_PREFIX) + // before the migration handler could run. + final HashMap body = new HashMap<>(); + body.put("going", "nowhere"); + body.put("nullable", null); + body.put("configuration.dataSet.connection.authMethod", "base64://QWN0aXZlRGlyZWN0b3J5"); + final Map migrated = base + .path("component/migrate/{id}/{version}") + .resolveTemplate("id", client.getJdbcId()) + .resolveTemplate("version", 1) + .request(APPLICATION_JSON_TYPE) + .post(entity(body, APPLICATION_JSON_TYPE), new GenericType>() { + }); + assertEquals("ActiveDirectory", migrated.get("configuration.dataSet.connection.authMethod")); + assertEquals("nowhere", migrated.get("going")); + } + + @Test + void migrateToleratesEmptyAndPrefixOnlyValues() { + // Empty strings ("") must be left untouched (no prefix match) and a payload reduced to + // the prefix only ("base64://") must decode to an empty string without throwing. + final HashMap body = new HashMap<>(); + body.put("empty", ""); + body.put("prefixOnly", "base64://"); + body.put("going", "nowhere"); + body.put("configuration.dataSet.connection.authMethod", "base64://QWN0aXZlRGlyZWN0b3J5"); + final Map migrated = base + .path("component/migrate/{id}/{version}") + .resolveTemplate("id", client.getJdbcId()) + .resolveTemplate("version", 1) + .request(APPLICATION_JSON_TYPE) + .post(entity(body, APPLICATION_JSON_TYPE), new GenericType>() { + }); + assertEquals("", migrated.get("empty")); + assertEquals("", migrated.get("prefixOnly")); + assertEquals("ActiveDirectory", migrated.get("configuration.dataSet.connection.authMethod")); + assertEquals("nowhere", migrated.get("going")); + } + + @Test + void migrateInvalidBase64Returns400() { + // Regression: an invalid base64 payload used to bubble up as an opaque 500. + // It should be reported as a 400 Bad Request. + final HashMap body = new HashMap<>(); + body.put("configuration.dataSet.connection.authMethod", "base64://!!not-valid-base64!!"); + final Response response = base + .path("component/migrate/{id}/{version}") + .resolveTemplate("id", client.getJdbcId()) + .resolveTemplate("version", 1) + .request(APPLICATION_JSON_TYPE) + .post(entity(body, APPLICATION_JSON_TYPE)); + assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus()); + } + @Test void migrateFromStudioWs() { final Map migrated = ws diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java index 2c4b797eafd06..dbd5edfc9c759 100755 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/ComponentValidator.java @@ -78,7 +78,7 @@ public ComponentValidator(final Configuration configuration, final File[] classe super(classes); this.configuration = configuration; this.sourceRoot = sourceRoot; - this.validator = new SvgValidator(this.configuration.isValidateLegacyIcons()); + this.validator = new SvgValidator(); try { this.log = Log.class.isInstance(log) ? Log.class.cast(log) : new ReflectiveLog(log); diff --git a/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java b/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java index ec3f30dcf828a..a61f7879c682b 100644 --- a/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java +++ b/component-tools/src/main/java/org/talend/sdk/component/tools/SvgValidator.java @@ -36,13 +36,6 @@ public class SvgValidator { private final SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(XMLResourceDescriptor.getXMLParserClassName()); - @SuppressWarnings("java:S1068") - private final Boolean legacy; - - public SvgValidator(final Boolean legacy) { - this.legacy = legacy; - } - public Stream validate(final Path path) { final String prefix = "[" + path.getFileName() + "] "; diff --git a/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java b/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java index c6bfe31c74220..2f02fb417bb4b 100644 --- a/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java +++ b/component-tools/src/test/java/org/talend/sdk/component/tools/SvgValidatorTest.java @@ -81,7 +81,7 @@ void noDisplayNone() { } private List doValidate(final String name, final int count, final Boolean legacyMode) { - final List errors = new SvgValidator(legacyMode).validate(icon(name)).collect(toList()); + final List errors = new SvgValidator().validate(icon(name)).collect(toList()); assertEquals(count, errors.size()); return errors; } From 625c0134b3299f90206d2b24e02dd61ef96b397b Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 17:25:55 +0200 Subject: [PATCH 17/41] chore(QTDI-2897): fix missing stream --- .../sdk/component/runtime/beam/spi/record/AvroRecordTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java index 95e8ddc5e4363..eec1f45da7f7a 100644 --- a/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java +++ b/component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java @@ -747,7 +747,7 @@ void pipelineTimestampFieldsWithAvroRecord() throws Exception { final Pipeline pipeline = Pipeline.create(); - pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())); // + pipeline.apply(Create.of(asList(rec1, rec2)).withCoder(SchemaRegistryCoder.of())).apply(new RecordToRecord()); assertEquals(org.apache.beam.sdk.PipelineResult.State.DONE, pipeline.run().waitUntilFinish()); } From 28688df319b7f42917445ec58ecf94ba17812708 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 17:54:08 +0200 Subject: [PATCH 18/41] chore(QTDI-2897): fix revert refactoring going out of scope --- .../server/front/ComponentResourceImpl.java | 44 ++++++--------- .../front/ComponentResourceImplTest.java | 56 ------------------- 2 files changed, 17 insertions(+), 83 deletions(-) diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java index e89ea73abe05b..6136791c51eee 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java @@ -549,7 +549,15 @@ public Response getIconIndex(final String theme) { @Override public Map migrate(final String id, final int version, final Map config) { - decodeBase64Values(config); + config.entrySet().stream().map(e -> { + if (e.getValue().startsWith(BASE64_PREFIX)) { + final String value = new String(Base64 + .getUrlDecoder() + .decode(e.getValue().substring(BASE64_PREFIX.length()).getBytes(StandardCharsets.UTF_8))); + e.setValue(value); + } + return e; + }).collect(toMap(Entry::getKey, Entry::getValue)); if (virtualComponents.isExtensionEntity(id)) { return config; } @@ -567,32 +575,14 @@ public Map migrate(final String id, final int version, final Map log.info("[Component#migrate] {}#{} registry version {} - incoming: {}.", comp.getParent().getName(), comp.getName(), comp.getVersion(), version); } - return comp.getMigrationHandler().get().migrate(version, config); - } - - /** - * Decodes in place every value of {@code config} prefixed by {@value #BASE64_PREFIX}. - *

- * Null values are tolerated, an invalid base64 payload is reported as an HTTP 400 instead of - * propagating an {@link IllegalArgumentException} as an opaque 500. - */ - private void decodeBase64Values(final Map config) { - try { - config.replaceAll((key, value) -> { - if (value == null || !value.startsWith(BASE64_PREFIX)) { - return value; - } - final byte[] decoded = Base64.getUrlDecoder().decode(value.substring(BASE64_PREFIX.length())); - return new String(decoded, StandardCharsets.UTF_8); - }); - } catch (final IllegalArgumentException iae) { - throw new WebApplicationException(Response - .status(Status.BAD_REQUEST) - .type(APPLICATION_JSON_TYPE) - .entity(new ErrorPayload(ErrorDictionary.UNEXPECTED, - "Invalid base64-encoded value in migration config: " + iae.getMessage())) - .build()); - } + return ofNullable(componentDao.findById(id)) + .orElseThrow(() -> new WebApplicationException(Response + .status(Response.Status.NOT_FOUND) + .entity(new ErrorPayload(COMPONENT_MISSING, "Didn't find component " + id)) + .build())) + .getMigrationHandler() + .get() + .migrate(version, config); } @Override diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java index 09e8b343cd5a0..3989cd76d5bac 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ComponentResourceImplTest.java @@ -481,62 +481,6 @@ void migrateFromStudio() { assertEquals("true", migrated.get("migrated")); } - @Test - void migrateToleratesNullValues() { - // Regression: previously a null value triggered NPE on String#startsWith(BASE64_PREFIX) - // before the migration handler could run. - final HashMap body = new HashMap<>(); - body.put("going", "nowhere"); - body.put("nullable", null); - body.put("configuration.dataSet.connection.authMethod", "base64://QWN0aXZlRGlyZWN0b3J5"); - final Map migrated = base - .path("component/migrate/{id}/{version}") - .resolveTemplate("id", client.getJdbcId()) - .resolveTemplate("version", 1) - .request(APPLICATION_JSON_TYPE) - .post(entity(body, APPLICATION_JSON_TYPE), new GenericType>() { - }); - assertEquals("ActiveDirectory", migrated.get("configuration.dataSet.connection.authMethod")); - assertEquals("nowhere", migrated.get("going")); - } - - @Test - void migrateToleratesEmptyAndPrefixOnlyValues() { - // Empty strings ("") must be left untouched (no prefix match) and a payload reduced to - // the prefix only ("base64://") must decode to an empty string without throwing. - final HashMap body = new HashMap<>(); - body.put("empty", ""); - body.put("prefixOnly", "base64://"); - body.put("going", "nowhere"); - body.put("configuration.dataSet.connection.authMethod", "base64://QWN0aXZlRGlyZWN0b3J5"); - final Map migrated = base - .path("component/migrate/{id}/{version}") - .resolveTemplate("id", client.getJdbcId()) - .resolveTemplate("version", 1) - .request(APPLICATION_JSON_TYPE) - .post(entity(body, APPLICATION_JSON_TYPE), new GenericType>() { - }); - assertEquals("", migrated.get("empty")); - assertEquals("", migrated.get("prefixOnly")); - assertEquals("ActiveDirectory", migrated.get("configuration.dataSet.connection.authMethod")); - assertEquals("nowhere", migrated.get("going")); - } - - @Test - void migrateInvalidBase64Returns400() { - // Regression: an invalid base64 payload used to bubble up as an opaque 500. - // It should be reported as a 400 Bad Request. - final HashMap body = new HashMap<>(); - body.put("configuration.dataSet.connection.authMethod", "base64://!!not-valid-base64!!"); - final Response response = base - .path("component/migrate/{id}/{version}") - .resolveTemplate("id", client.getJdbcId()) - .resolveTemplate("version", 1) - .request(APPLICATION_JSON_TYPE) - .post(entity(body, APPLICATION_JSON_TYPE)); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus()); - } - @Test void migrateFromStudioWs() { final Map migrated = ws From e3d55e308fa0f534f5cd43ac341d2b9b97ef679e Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 18:10:06 +0200 Subject: [PATCH 19/41] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../runtime/di/beam/components/DIBatchSimulationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java index a5bd8e1439cb5..29fa0121b3c90 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java @@ -239,7 +239,6 @@ private void doRun(final ComponentManager manager, final Collection sour final Map, Object> servicesMapper = manager.findPlugin(mapperMapper.plugin()).get().get(ComponentManager.AllServices.class).getServices(); final Jsonb jsonbMapper = Jsonb.class.cast(servicesMapper.get(Jsonb.class)); - JsonBuilderFactory.class.cast(servicesMapper.get(JsonBuilderFactory.class)); final RecordBuilderFactory recordBuilderMapper = RecordBuilderFactory.class.cast(servicesMapper.get(RecordBuilderFactory.class)); final RecordConverters converters = new RecordConverters(); From 0a37e2dabdfeba69c63405892f01f6b19e938b27 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 18:34:26 +0200 Subject: [PATCH 20/41] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../runtime/di/beam/components/DIBatchSimulationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java index 29fa0121b3c90..491dbaa6c6eb7 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/beam/components/DIBatchSimulationTest.java @@ -34,7 +34,6 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.bind.Jsonb; From 33883a361863554599c6216b134f6f2fa58b4bdb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 May 2026 17:05:43 +0000 Subject: [PATCH 21/41] fix: replace no-op stream collect with entrySet forEach in migrate --- .../sdk/component/server/front/ComponentResourceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java index 6136791c51eee..9aab8fc65ecfe 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/front/ComponentResourceImpl.java @@ -549,15 +549,14 @@ public Response getIconIndex(final String theme) { @Override public Map migrate(final String id, final int version, final Map config) { - config.entrySet().stream().map(e -> { + config.entrySet().forEach(e -> { if (e.getValue().startsWith(BASE64_PREFIX)) { final String value = new String(Base64 .getUrlDecoder() .decode(e.getValue().substring(BASE64_PREFIX.length()).getBytes(StandardCharsets.UTF_8))); e.setValue(value); } - return e; - }).collect(toMap(Entry::getKey, Entry::getValue)); + }); if (virtualComponents.isExtensionEntity(id)) { return config; } From e3aab0689165298244e919e28827f57b4ccd7c29 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 28 May 2026 19:31:46 +0200 Subject: [PATCH 22/41] chore(QTDI-2895): S6126 Text blocks initial raw commit - used intellij inspection as it is... --- .../configuration/ui/layout/GridLayout.java | 10 +- .../asyncvalidation/AsyncValidation.java | 7 +- .../component/api/service/schema/Schema.java | 10 +- .../server/api/BulkReadResource.java | 29 +- .../ComponentServerConfiguration.java | 17 +- .../server/front/ActionResourceImplTest.java | 40 ++- .../front/DocumentationResourceImplTest.java | 224 +++++++++++---- .../beam/BeamActionSerializationTest.java | 41 ++- ...tualDependenciesServiceTemplatingTest.java | 10 +- .../component/server/test/InitTestInfra.java | 16 +- .../service/facet/codenvy/CodenvyFacet.java | 11 +- .../service/facet/travis/TravisFacet.java | 30 +- .../server/service/facet/wadl/WADLFacet.java | 36 ++- .../service/openapi/OpenAPIGenerator.java | 6 +- .../server/front/ProjectResourceTest.java | 15 +- .../ComponentGeneratorConfigurationTest.java | 134 ++++++--- .../di/schema/TaCoKitGuessSchemaTest.java | 22 +- .../tools/AsciidocDocumentationGenerator.java | 7 +- .../InternationalizationValidator.java | 9 +- .../AsciidocDocumentationGeneratorTest.java | 261 ++++++++++++------ .../tools/ComponentValidatorTest.java | 57 ++-- .../documentation/StaticRedirector.java | 19 +- 22 files changed, 696 insertions(+), 315 deletions(-) diff --git a/component-api/src/main/java/org/talend/sdk/component/api/configuration/ui/layout/GridLayout.java b/component-api/src/main/java/org/talend/sdk/component/api/configuration/ui/layout/GridLayout.java index e726ea64fff53..2944f367a29c6 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/configuration/ui/layout/GridLayout.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/configuration/ui/layout/GridLayout.java @@ -27,10 +27,12 @@ import org.talend.sdk.component.api.meta.Documentation; @Ui -@Documentation("Advanced layout to place properties by row, this is exclusive with `@OptionsOrder`.\n" - + "\nNOTE: the logic to handle forms (gridlayout names) is to use the only layout if there is only one defined, " - + "else to check if there are `Main` and `Advanced` and if at least `Main` exists, use them, else " - + "use all available layouts.") +@Documentation(""" + Advanced layout to place properties by row, this is exclusive with `@OptionsOrder`. + + NOTE: the logic to handle forms (gridlayout names) is to use the only layout if there is only one defined, \ + else to check if there are `Main` and `Advanced` and if at least `Main` exists, use them, else \ + use all available layouts.""") @Target(TYPE) @Retention(RUNTIME) @Repeatable(GridLayouts.class) diff --git a/component-api/src/main/java/org/talend/sdk/component/api/service/asyncvalidation/AsyncValidation.java b/component-api/src/main/java/org/talend/sdk/component/api/service/asyncvalidation/AsyncValidation.java index 437e37eda9e6b..98e6a7a52741e 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/service/asyncvalidation/AsyncValidation.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/service/asyncvalidation/AsyncValidation.java @@ -27,8 +27,11 @@ @ActionType(value = "validation", expectedReturnedType = ValidationResult.class) @Target(METHOD) @Retention(RUNTIME) -@Documentation("Mark a method as being used to validate a configuration.\n\nIMPORTANT: this is a server validation " - + "so only use it if you can't use other client side validation to implement it.") +@Documentation(""" + Mark a method as being used to validate a configuration. + + IMPORTANT: this is a server validation \ + so only use it if you can't use other client side validation to implement it.""") public @interface AsyncValidation { /** diff --git a/component-api/src/main/java/org/talend/sdk/component/api/service/schema/Schema.java b/component-api/src/main/java/org/talend/sdk/component/api/service/schema/Schema.java index 3722653369ce0..1cbce33514449 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/service/schema/Schema.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/service/schema/Schema.java @@ -31,9 +31,13 @@ import lombok.Data; import lombok.NoArgsConstructor; -@Partial("This API should support nested schema but the Studio is not yet ready.\n\n" - + "The cloud platform also doesn't use it yet.\n\nAlso prefer to use " - + "`org.talend.sdk.component.api.record.Schema` over this partial default implementation.") +@Partial(""" + This API should support nested schema but the Studio is not yet ready. + + The cloud platform also doesn't use it yet. + + Also prefer to use \ + `org.talend.sdk.component.api.record.Schema` over this partial default implementation.""") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java index ff00a5129d741..df6dd6591a2be 100644 --- a/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java +++ b/component-server-parent/component-server-api/src/main/java/org/talend/sdk/component/server/api/BulkReadResource.java @@ -45,20 +45,21 @@ public interface BulkReadResource { description = "The request payloads.", content = @Content(mediaType = APPLICATION_JSON)) CompletionStage bulk(@RequestBody( - description = "The requests list as json objects containing a list of request objects. \n" + - "If your request contains multiple identifiers, you must use a list of string. \n" + - "Example : \n" + - "`{ \n" + - "\"requests\" : [ \n" + - "{ \n" + - " \"path\" : \"/api/v1/component/index\", \n" + - " \"queryParameters\" : {\"identifiers\" : [\"12345\", \"6789A\"]}, \n" + - " \"verb\" : \"GET\", \n" + - " \"headers\" : {...}, \n" + - "}, \n" + - "{ [...]} \n" + - "] \n" + - "}`", + description = """ + The requests list as json objects containing a list of request objects. \s + If your request contains multiple identifiers, you must use a list of string. \s + Example : \s + `{ \s + "requests" : [ \s + { \s + "path" : "/api/v1/component/index", \s + "queryParameters" : {"identifiers" : ["12345", "6789A"]}, \s + "verb" : "GET", \s + "headers" : {...}, \s + }, \s + { [...]} \s + ] \s + }`""", required = true, content = @Content(mediaType = APPLICATION_JSON)) final BulkRequests requests); } diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/ComponentServerConfiguration.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/ComponentServerConfiguration.java index 847360ece24c9..8db7d19881d3f 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/ComponentServerConfiguration.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/configuration/ComponentServerConfiguration.java @@ -96,13 +96,16 @@ public class ComponentServerConfiguration { private Boolean supportsEnvironment; @Inject - @Documentation("A folder available for the server - don't forget to mount it in docker if you are using the " - + "image - which accepts subfolders named as component plugin id " - + "(generally the artifactId or jar name without the version, ex: jdbc). Each family folder can contain:\n\n" - + "- a `user-configuration.properties` file which will be merged with component configuration system " - + "(see services). This properties file enables the function `userJar(xxxx)` to replace the jar named `xxxx` " - + "by its virtual gav (`groupId:artifactId:version`),\n" - + "- a list of jars which will be merged with component family classpath\n") + @Documentation(""" + A folder available for the server - don't forget to mount it in docker if you are using the \ + image - which accepts subfolders named as component plugin id \ + (generally the artifactId or jar name without the version, ex: jdbc). Each family folder can contain: + + - a `user-configuration.properties` file which will be merged with component configuration system \ + (see services). This properties file enables the function `userJar(xxxx)` to replace the jar named `xxxx` \ + by its virtual gav (`groupId:artifactId:version`), + - a list of jars which will be merged with component family classpath + """) @ConfigProperty(name = "talend.component.server.user.extensions.location") private Optional userExtensions; diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java index c1b6724a612fb..e9245e2244049 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/ActionResourceImplTest.java @@ -195,14 +195,38 @@ void checkSchemaSerialization() { .request(APPLICATION_JSON_TYPE) .post(Entity.entity(emptyMap(), APPLICATION_JSON_TYPE), String.class); final String expected = - "{\n \"entries\":[\n {\n \"elementSchema\":{\n \"entries\":[\n ],\n" + - " \"metadata\":[\n ],\n \"props\":{\n\n },\n \"type\":\"STRING\"\n" - + - " },\n \"errorCapable\":false," + - "\n \"metadata\":false,\n \"name\":\"array\",\n \"nullable\":false,\n" + - " \"props\":{\n\n },\n \"type\":\"ARRAY\",\n" + - " \"valid\":true\n }\n ],\n \"metadata\":[\n" + - " ],\n \"props\":{\n \"talend.fields.order\":\"array\"\n },\n \"type\":\"RECORD\"\n}"; + """ + { + "entries":[ + { + "elementSchema":{ + "entries":[ + ], + "metadata":[ + ], + "props":{ + + }, + "type":"STRING" + }, + "errorCapable":false, + "metadata":false, + "name":"array", + "nullable":false, + "props":{ + + }, + "type":"ARRAY", + "valid":true + } + ], + "metadata":[ + ], + "props":{ + "talend.fields.order":"array" + }, + "type":"RECORD" + }"""; assertEquals(expected, schema); } diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java index 15987a29a4eb9..058a6f6ed0742 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/DocumentationResourceImplTest.java @@ -48,87 +48,195 @@ class DocumentationResourceImplTest { void selectById() { final String foo = new DocumentationResourceImpl() .selectById("Foo1", - "== Foo0\n\n00000\n\n" + "=== Configuration\n\nWhatever0\n\n== Foo1\n\nThe description\n\n" - + "=== Configuration\n\nWhatever1\n\n" - + "== Foo2\n\n2222\n\n=== Configuration\n\nWhatever2", + """ + == Foo0 + + 00000 + + === Configuration + + Whatever0 + + == Foo1 + + The description + + === Configuration + + Whatever1 + + == Foo2 + + 2222 + + === Configuration + + Whatever2""", DocumentationResourceImpl.DocumentationSegment.DESCRIPTION); assertEquals("The description", foo.trim()); } @RepeatedTest(2) void selectByIdUsingComments() { - final String content = "//component_start:my\n" + "\n" + "== my\n" + "\n" + "super my component\n" + "\n" - + "//configuration_start\n" + "\n" + "=== Configuration\n" + "\n" - + "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|configuration|configuration configuration|-|Always enabled|configuration|-\n" - + "|input|the input value|-|Always enabled|configuration.input|-\n" - + "|nested|it is nested|-|Always enabled|configuration.nested|dataset\n" - + "|datastore|the datastore|-|Always enabled|configuration.nested.datastore|datastore\n" - + "|user|the user to log in|unknown|Always enabled|configuration.nested.user|dataset\n" + "|===\n" - + "\n" + "//configuration_end\n" + "\n" + "//component_end:my\n" + "\n" + "//component_start:my2\n" - + "\n" + "== my2\n" + "\n" + "super my component2\n" + "\n" + "//configuration_start\n" + "\n" - + "=== Configuration\n" + "\n" + "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|ds|ds configuration|-|Always enabled|ds|dataset\n" - + "|datastore|the datastore|-|Always enabled|ds.datastore|datastore\n" + "|===\n" + "\n" - + "//configuration_end\n" + "\n" + "//component_end:my2\n" + "\n" + "//component_start:my3\n" + "\n" - + "== my2\n" + "\n" + "super my componentv3\n" + "\n" + "//configuration_start\n" + "\n" - + "=== Configuration\n" + "\n" + "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|datastore|the datastore|-|Always enabled|ds.datastore|datastore\n" + "|===\n" + "\n" - + "//configuration_end\n" + "\n" + "//component_end:my3\n"; + final String content = """ + //component_start:my + + == my + + super my component + + //configuration_start + + === Configuration + + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |configuration|configuration configuration|-|Always enabled|configuration|- + |input|the input value|-|Always enabled|configuration.input|- + |nested|it is nested|-|Always enabled|configuration.nested|dataset + |datastore|the datastore|-|Always enabled|configuration.nested.datastore|datastore + |user|the user to log in|unknown|Always enabled|configuration.nested.user|dataset + |=== + + //configuration_end + + //component_end:my + + //component_start:my2 + + == my2 + + super my component2 + + //configuration_start + + === Configuration + + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |ds|ds configuration|-|Always enabled|ds|dataset + |datastore|the datastore|-|Always enabled|ds.datastore|datastore + |=== + + //configuration_end + + //component_end:my2 + + //component_start:my3 + + == my2 + + super my componentv3 + + //configuration_start + + === Configuration + + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |datastore|the datastore|-|Always enabled|ds.datastore|datastore + |=== + + //configuration_end + + //component_end:my3 + """; final DocumentationResourceImpl impl = new DocumentationResourceImpl(); assertEquals("super my component", impl.selectById("my", content, DocumentationResourceImpl.DocumentationSegment.DESCRIPTION).trim()); - assertEquals("[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|configuration|configuration configuration|-|Always enabled|configuration|-\n" - + "|input|the input value|-|Always enabled|configuration.input|-\n" - + "|nested|it is nested|-|Always enabled|configuration.nested|dataset\n" - + "|datastore|the datastore|-|Always enabled|configuration.nested.datastore|datastore\n" - + "|user|the user to log in|unknown|Always enabled|configuration.nested.user|dataset\n" + "|===", + assertEquals(""" + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |configuration|configuration configuration|-|Always enabled|configuration|- + |input|the input value|-|Always enabled|configuration.input|- + |nested|it is nested|-|Always enabled|configuration.nested|dataset + |datastore|the datastore|-|Always enabled|configuration.nested.datastore|datastore + |user|the user to log in|unknown|Always enabled|configuration.nested.user|dataset + |===""", impl.selectById("my", content, DocumentationResourceImpl.DocumentationSegment.CONFIGURATION).trim()); assertEquals( - "== my\n" + "\n" + "super my component\n" + "\n" + "//configuration_start\n" + "\n" - + "=== Configuration\n" + "\n" + "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|configuration|configuration configuration|-|Always enabled|configuration|-\n" - + "|input|the input value|-|Always enabled|configuration.input|-\n" - + "|nested|it is nested|-|Always enabled|configuration.nested|dataset\n" - + "|datastore|the datastore|-|Always enabled|configuration.nested.datastore|datastore\n" - + "|user|the user to log in|unknown|Always enabled|configuration.nested.user|dataset\n" - + "|===\n" + "\n" + "//configuration_end", + """ + == my + + super my component + + //configuration_start + + === Configuration + + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |configuration|configuration configuration|-|Always enabled|configuration|- + |input|the input value|-|Always enabled|configuration.input|- + |nested|it is nested|-|Always enabled|configuration.nested|dataset + |datastore|the datastore|-|Always enabled|configuration.nested.datastore|datastore + |user|the user to log in|unknown|Always enabled|configuration.nested.user|dataset + |=== + + //configuration_end""", impl.selectById("my", content, DocumentationResourceImpl.DocumentationSegment.ALL).trim()); assertEquals("super my component2", impl.selectById("my2", content, DocumentationResourceImpl.DocumentationSegment.DESCRIPTION).trim()); assertEquals( - "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|ds|ds configuration|-|Always enabled|ds|dataset\n" - + "|datastore|the datastore|-|Always enabled|ds.datastore|datastore\n" + "|===", + """ + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |ds|ds configuration|-|Always enabled|ds|dataset + |datastore|the datastore|-|Always enabled|ds.datastore|datastore + |===""", impl.selectById("my2", content, DocumentationResourceImpl.DocumentationSegment.CONFIGURATION).trim()); assertEquals( - "== my2\n" + "\n" + "super my component2\n" + "\n" + "//configuration_start\n" + "\n" - + "=== Configuration\n" + "\n" + "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|ds|ds configuration|-|Always enabled|ds|dataset\n" - + "|datastore|the datastore|-|Always enabled|ds.datastore|datastore\n" + "|===\n" + "\n" - + "//configuration_end", + """ + == my2 + + super my component2 + + //configuration_start + + === Configuration + + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |ds|ds configuration|-|Always enabled|ds|dataset + |datastore|the datastore|-|Always enabled|ds.datastore|datastore + |=== + + //configuration_end""", impl.selectById("my2", content, DocumentationResourceImpl.DocumentationSegment.ALL).trim()); assertEquals("super my componentv3", impl.selectById("my3", content, DocumentationResourceImpl.DocumentationSegment.DESCRIPTION).trim()); assertEquals( - "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|datastore|the datastore|-|Always enabled|ds.datastore|datastore\n" + "|===", + """ + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |datastore|the datastore|-|Always enabled|ds.datastore|datastore + |===""", impl.selectById("my3", content, DocumentationResourceImpl.DocumentationSegment.CONFIGURATION).trim()); assertEquals( - "== my2\n" + "\n" + "super my componentv3\n" + "\n" + "//configuration_start\n" + "\n" - + "=== Configuration\n" + "\n" + "[cols=\"d,d,m,a,e,d\",options=\"header\"]\n" + "|===\n" - + "|Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type\n" - + "|datastore|the datastore|-|Always enabled|ds.datastore|datastore\n" + "|===\n" + "\n" - + "//configuration_end", + """ + == my2 + + super my componentv3 + + //configuration_start + + === Configuration + + [cols="d,d,m,a,e,d",options="header"] + |=== + |Display Name|Description|Default Value|Enabled If|Configuration Path|Configuration Type + |datastore|the datastore|-|Always enabled|ds.datastore|datastore + |=== + + //configuration_end""", impl.selectById("my3", content, DocumentationResourceImpl.DocumentationSegment.ALL).trim()); } diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java index 6bd4f20eb9c44..a49e467b81019 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/front/beam/BeamActionSerializationTest.java @@ -42,15 +42,38 @@ void checkSchemaSerialization() { .queryParam("lang", "it") .request(APPLICATION_JSON_TYPE) .post(Entity.entity(emptyMap(), APPLICATION_JSON_TYPE), String.class); - final String attended = "{\n" + " \"entries\":[\n" + " {\n" + " \"elementSchema\":{\n" - + " \"entries\":[\n" + " ],\n" + " \"metadata\":[\n" + " ],\n" - + " \"props\":{\n" + "\n" + " },\n" + " \"type\":\"STRING\"\n" + " },\n" - + " \"errorCapable\":false,\n \"metadata\":false,\n" - + " \"name\":\"array\",\n" + " \"nullable\":false,\n" - + " \"props\":{\n" + "\n" + " },\n" + " \"type\":\"ARRAY\",\n" + - " \"valid\":true\n }\n" + " ],\n" - + " \"metadata\":[\n" + " ],\n" + " \"props\":{\n" + " \"talend.fields.order\":\"array\"\n" - + " },\n" + " \"type\":\"RECORD\"\n" + "}"; + final String attended = """ + { + "entries":[ + { + "elementSchema":{ + "entries":[ + ], + "metadata":[ + ], + "props":{ + + }, + "type":"STRING" + }, + "errorCapable":false, + "metadata":false, + "name":"array", + "nullable":false, + "props":{ + + }, + "type":"ARRAY", + "valid":true + } + ], + "metadata":[ + ], + "props":{ + "talend.fields.order":"array" + }, + "type":"RECORD" + }"""; assertEquals(attended, schema); } } diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTemplatingTest.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTemplatingTest.java index 3e9bd13d60867..f52697aef9f2b 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTemplatingTest.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/service/VirtualDependenciesServiceTemplatingTest.java @@ -50,9 +50,13 @@ private static Stream replaceGavConfigurationSource() { "a=virtual.talend.component.server.generated.foo_plugin:dummy:jar:unknown\nc=d"), new Pair("a=b\nc=userJar(dummy)", "a=b\nc=virtual.talend.component.server.generated.foo_plugin:dummy:jar:unknown"), - new Pair("a=b\n" + "c=userJar(dummy)\n" + "another[0]=userJar(other)", "a=b\n" - + "c=virtual.talend.component.server.generated.foo_plugin:dummy:jar:unknown\n" - + "another[0]=virtual.talend.component.server.generated.foo_plugin:other:jar:unknown")); + new Pair(""" + a=b + c=userJar(dummy) + another[0]=userJar(other)""", """ + a=b + c=virtual.talend.component.server.generated.foo_plugin:dummy:jar:unknown + another[0]=virtual.talend.component.server.generated.foo_plugin:other:jar:unknown""")); } @ToString diff --git a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/InitTestInfra.java b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/InitTestInfra.java index 97549a5974636..6546667a4ba9a 100644 --- a/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/InitTestInfra.java +++ b/component-server-parent/component-server/src/test/java/org/talend/sdk/component/server/test/InitTestInfra.java @@ -350,8 +350,20 @@ private File createJdbcPlugin(final File target) { out.putNextEntry(new JarEntry("TALEND-INF/documentation.adoc")); out - .write(("== input\n\ndesc\n\n=== Configuration\n\nSomething1\n\n" - + "== output\n\n=== Configuration\n\nSomething else") + .write((""" + == input + + desc + + === Configuration + + Something1 + + == output + + === Configuration + + Something else""") .getBytes(StandardCharsets.UTF_8)); out.closeEntry(); } catch (final IOException e) { diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/codenvy/CodenvyFacet.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/codenvy/CodenvyFacet.java index e609c90ec791c..7455c5df93af5 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/codenvy/CodenvyFacet.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/codenvy/CodenvyFacet.java @@ -57,10 +57,13 @@ public Category category() { @Override public String readme() { - return "Codenvy allows you to code on this project from any web browser if you host your sources in a Github repository.\n\n" - + "Click on this link and the project " + "will be opened on your account, ready to develop:\n\n" - + "image:http://beta.codenvy.com/factory/resources/codenvy-contribute.svg[" - + "Codenvy,link=http://codenvy.io/f?url=https://github.com/@organization@/@repository@,window=\"_blank\"]"; + return """ + Codenvy allows you to code on this project from any web browser if you host your sources in a Github repository. + + Click on this link and the project will be opened on your account, ready to develop: + + image:http://beta.codenvy.com/factory/resources/codenvy-contribute.svg[\ + Codenvy,link=http://codenvy.io/f?url=https://github.com/@organization@/@repository@,window="_blank"]"""; } @Override diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/travis/TravisFacet.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/travis/TravisFacet.java index adcdae8c25db4..3e5683e821a9e 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/travis/TravisFacet.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/travis/TravisFacet.java @@ -34,11 +34,19 @@ public class TravisFacet implements FacetGenerator { public void register(@Observes final GeneratorRegistration init) { init.registerFacetType(this); - travisYml = new InMemoryFile(".travis.yml", "language: java\njdk:\n- oraclejdk8\nenv:\n" + " global:\n" - + " - MAVEN_OPTS=\"-Dmaven.artifact.threads=64 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn\"\n" - + "cache:\n" + " directories:\n - \"$HOME/.m2\"\n" - + "install: mvn clean install -DskipTests -Dinvoker.skip=true --batch-mode\n" - + "script: mvn clean install -e --batch-mode\n"); + travisYml = new InMemoryFile(".travis.yml", """ + language: java + jdk: + - oraclejdk8 + env: + global: + - MAVEN_OPTS="-Dmaven.artifact.threads=64 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn" + cache: + directories: + - "$HOME/.m2" + install: mvn clean install -DskipTests -Dinvoker.skip=true --batch-mode + script: mvn clean install -e --batch-mode + """); } @Override @@ -50,11 +58,13 @@ public Stream create(final String packageBase, final Build build, @Override public String readme() { - return "The .travis.yml file created at the root of the project is preconfigured to be able to build " - + "a common component. It caches the maven repository to speed up builds and decrease the maven " - + "log level to avoid to reach Travis CI output limit too fast for no reason.\n\n" - + "More information can be found at " - + "link:https://docs.travis-ci.com/user/getting-started/#To-get-started-with-Travis-CI[Get Started with Travis CI]."; + return """ + The .travis.yml file created at the root of the project is preconfigured to be able to build \ + a common component. It caches the maven repository to speed up builds and decrease the maven \ + log level to avoid to reach Travis CI output limit too fast for no reason. + + More information can be found at \ + link:https://docs.travis-ci.com/user/getting-started/#To-get-started-with-Travis-CI[Get Started with Travis CI]."""; } @Override diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/wadl/WADLFacet.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/wadl/WADLFacet.java index 9beffe2eca03c..b5a28509210b1 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/wadl/WADLFacet.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/wadl/WADLFacet.java @@ -53,18 +53,30 @@ public void register(@Observes final GeneratorRegistration init) { @Override public String readme() { - return "Generates the needed classes to call HTTP endpoints defined by a WADL located at `src/main/resources/wadl/client.xml`.\n" - + "The `wadl2java` CXF plugin generates interfaces representing the endpoints and you can create a client using CXF `JAXRSClientFactoryBean` " - + "class:\n\n" + "[source,java]\n" + "----\n" - + "import org.talend.sdk.component.api.service.Service;\n\n" - + "import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;\n\n" + "@Service\n" - + "public class MyService {\n" + " public MyGeneratedEndpointApi newClient(final String url) {\n" - + " return JAXRSClientFactoryBean.create(url, MyGeneratedEndpointApi.class);\n" + " }\n" + "}\n" - + "----\n\n" - + "Don't forget you need to build once the project to have the generated interfaces and be able to write your client from the " - + "using the sources created in `generated-sources` folder.\n\n" - + "TIP: you can customize the way the client is created from the interface - including the providers/serializers used,\n" - + "more details available at http://cxf.apache.org/docs/jax-rs-client-api.html."; + return """ + Generates the needed classes to call HTTP endpoints defined by a WADL located at `src/main/resources/wadl/client.xml`. + The `wadl2java` CXF plugin generates interfaces representing the endpoints and you can create a client using CXF `JAXRSClientFactoryBean` \ + class: + + [source,java] + ---- + import org.talend.sdk.component.api.service.Service; + + import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; + + @Service + public class MyService { + public MyGeneratedEndpointApi newClient(final String url) { + return JAXRSClientFactoryBean.create(url, MyGeneratedEndpointApi.class); + } + } + ---- + + Don't forget you need to build once the project to have the generated interfaces and be able to write your client from the \ + using the sources created in `generated-sources` folder. + + TIP: you can customize the way the client is created from the interface - including the providers/serializers used, + more details available at http://cxf.apache.org/docs/jax-rs-client-api.html."""; } @Override diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java index fc4e634b24a0e..7d4d22706bd19 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/openapi/OpenAPIGenerator.java @@ -141,8 +141,10 @@ private Collection toFiles(final String basePackage renderer.render("generator/openapi/connection.mustache", new ConnectionModel(basePackage)))); payloads .add(new FacetGenerator.InMemoryFile(resourcesBaseFolder + "connection/Messages.properties", - "APIConnection.baseUrl._displayName = Base URL\n" - + "APIConnection.baseUrl._placeholder = Base URL...\n")); + """ + APIConnection.baseUrl._displayName = Base URL + APIConnection.baseUrl._placeholder = Base URL... + """)); final Collection