From a7da378bc510077516874909770ee2d9208782a0 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Fri, 29 May 2026 11:05:30 +0200 Subject: [PATCH] chore(QTDI-2896): S6208 Switch case merging --- .../impl/widget/AbstractWidgetConverter.java | 3 +-- .../impl/widget/DateTimeConverter.java | 3 +-- .../validation/spi/ext/BaseValidation.java | 3 +-- .../spi/AvroRecordBuilderFactoryProvider.java | 3 +-- .../runtime/beam/spi/record/AvroSchema.java | 4 +-- .../avro/SchemalessJsonToIndexedRecord.java | 3 +-- .../record/RecordBuilderFactoryImpl.java | 3 +-- .../runtime/record/RecordConverters.java | 3 +-- .../manager/chain/internal/DSLParser.java | 3 +-- .../reflect/ParameterModelService.java | 5 +--- .../reflect/visibility/PayloadMapper.java | 6 ++--- .../manager/util/DefaultValueInspector.java | 4 +-- .../converter/ZonedDateTimeConverter.java | 20 +++++++------- .../FakeRecordBuilderFactoryProvider.java | 3 +-- .../service/SimpleQueryLanguageCompiler.java | 3 +-- .../service/facet/util/NameConventions.java | 3 +-- .../service/openapi/OpenAPIGenerator.java | 10 +++---- .../runtime/di/record/DiRowStructVisitor.java | 26 +++++-------------- .../runtime/di/schema/TaCoKitGuessSchema.java | 3 +-- .../component/tools/AsciidoctorExecutor.java | 3 +-- .../sdk/component/tools/DocBaseGenerator.java | 5 +--- .../talend/runtime/documentation/Github.java | 3 +-- .../singer/kitap/JsonSchemaGenerator.java | 9 +++---- .../sdk/component/singer/kitap/Kitap.java | 3 +-- 24 files changed, 44 insertions(+), 90 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..9b944e2d1af34 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 @@ -380,8 +380,7 @@ protected Map> toCondition(final String path, final S .withVar(path + ".length") .withValue(String.class.isInstance(value) ? Integer.parseInt(String.valueOf(value)) : value) .build(); - case "contains": - case "contains(lowercase=true)": + case "contains", "contains(lowercase=true)": final UiSchema.ConditionValuesBuilder in = new UiSchema.ConditionBuilder().withOperator("in"); final Object val = strategy.endsWith("(lowercase=true)") ? String.class.cast(value).toLowerCase(ROOT) : value; diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DateTimeConverter.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DateTimeConverter.java index 5ac6bd44c6d1d..2c9e1d86f92db 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DateTimeConverter.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/DateTimeConverter.java @@ -67,8 +67,7 @@ private void initDatePicker(final PropertyContext context, final UiSchema sch schema.setWidget("date"); schema.setOptions(singletonMap("dateFormat", dateFormat)); break; - case "datetime": - case "zoneddatetime": { + case "datetime", "zoneddatetime": { schema.setWidget("datetime"); final Map options = new HashMap<>(); options.put("useSeconds", useSeconds); diff --git a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/BaseValidation.java b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/BaseValidation.java index 93ca8d7100ad8..ecbf30d2e007a 100644 --- a/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/BaseValidation.java +++ b/component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/BaseValidation.java @@ -59,8 +59,7 @@ public Stream apply(final JsonValue obj) { switch (value.getValueType()) { case STRING: return onString(JsonString.class.cast(value)); - case TRUE: - case FALSE: + case TRUE, FALSE: return onBoolean(JsonValue.TRUE.equals(value)); case NUMBER: return onNumber(JsonNumber.class.cast(value)); diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/AvroRecordBuilderFactoryProvider.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/AvroRecordBuilderFactoryProvider.java index 0689333b5038c..b864818123bd8 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/AvroRecordBuilderFactoryProvider.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/AvroRecordBuilderFactoryProvider.java @@ -40,8 +40,7 @@ public class AvroRecordBuilderFactoryProvider implements RecordBuilderFactoryPro @Override public RecordBuilderFactory apply(final String containerId) { switch (System.getProperty("talend.component.beam.record.factory.impl", "auto")) { - case "memory": - case "default": + case "memory", "default": return new RecordBuilderFactoryImpl(containerId); case "avro": if (!hasAvroRecordBuilderFactory()) { 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..3ee2327655b8a 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 @@ -334,9 +334,7 @@ private Type doMapType(final Schema schema) { } return Type.BYTES; // very unlikely to happen but treat all available types - case MAP: - case UNION: - case NULL: + case MAP, UNION, NULL: log.warn("[doMapType] unmanaged avro type {}. Storing as Object.", schema.getType()); // the storage will be an object so returning record kind... return Type.RECORD; 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..1142bb358e389 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 @@ -86,8 +86,7 @@ private Schema guessSchema(final String recordName, final JsonValue element) { return INT; } return DOUBLE; - case FALSE: - case TRUE: + case FALSE, TRUE: return BOOLEAN; case NULL: return NULL; diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordBuilderFactoryImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordBuilderFactoryImpl.java index 0bdd513b12fe1..b413098106fda 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordBuilderFactoryImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordBuilderFactoryImpl.java @@ -37,8 +37,7 @@ public class RecordBuilderFactoryImpl implements RecordBuilderFactory, Serializa @Override public Schema.Builder newSchemaBuilder(final Schema.Type type) { switch (type) { - case RECORD: - case ARRAY: + case RECORD, ARRAY: return new SchemaImpl.BuilderImpl().withType(type); default: return Schemas.valueOf(type.name()); diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordConverters.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordConverters.java index 7d4dc4bbbe231..bd90ad3c923f9 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordConverters.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordConverters.java @@ -120,8 +120,7 @@ private Record json2Record(final RecordBuilderFactory factory, final JsonObject .build(), record); break; } - case TRUE: - case FALSE: + case TRUE, FALSE: builder.withBoolean(key, JsonValue.TRUE.equals(value)); break; case STRING: diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/DSLParser.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/DSLParser.java index 6b7e3b1a39770..852d112083a78 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/DSLParser.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/chain/internal/DSLParser.java @@ -84,8 +84,7 @@ private static Map parseQuery(final String query) { parameterComplete = true; pos++; break; - case '%': - case '+': + case '%', '+': // Decoding required if (parsingName) { decodeName = true; 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..7c55601bb982e 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 @@ -308,10 +308,7 @@ private List buildParametersMetas(final String name, final String } if (Class.class.isInstance(type)) { switch (findType(type)) { - case ENUM: - case STRING: - case NUMBER: - case BOOLEAN: + case ENUM, STRING, NUMBER, BOOLEAN: return singletonList(buildParameter(name, prefix, new ParameterMeta.Source() { @Override diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/PayloadMapper.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/PayloadMapper.java index 44cb993e4d390..bdd4d8eecaeb5 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/PayloadMapper.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/reflect/visibility/PayloadMapper.java @@ -112,8 +112,7 @@ private void onProperty(final String contextualPrefix, final Collection json.add(name, v)); @@ -186,8 +185,7 @@ private JsonValue onArrayPrimitive(final ParameterMeta itemDef, final ArrayEntry case NUMBER: final Double number = Double.valueOf(value.trim()); return number == number.longValue() ? jsonp.createValue(number.longValue()) : jsonp.createValue(number); - case ENUM: - case STRING: + case ENUM, STRING: return jsonp.createValue(value); default: throw new IllegalArgumentException("Unsupported structure in " + "array: " + itemDef.getType()); diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/util/DefaultValueInspector.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/util/DefaultValueInspector.java index 053e4542055b7..3c7416090878f 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/util/DefaultValueInspector.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/util/DefaultValueInspector.java @@ -85,9 +85,7 @@ public String findDefault(final Object instance, final ParameterMeta param) { return null; case ENUM: return Enum.class.cast(instance).name(); - case STRING: - case NUMBER: - case BOOLEAN: + case STRING, NUMBER, BOOLEAN: return String.valueOf(instance); case ARRAY: // can be enhanced if (!param.getNestedParameters().isEmpty()) { diff --git a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/ZonedDateTimeConverter.java b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/ZonedDateTimeConverter.java index 3fe3154b8dccb..b5043eee9f6f9 100644 --- a/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/ZonedDateTimeConverter.java +++ b/component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/xbean/converter/ZonedDateTimeConverter.java @@ -44,17 +44,17 @@ protected Object toObjectImpl(final String data) { switch (text.length()) { case 10: // YYYY-MM-dd return ZonedDateTime.of(LocalDate.parse(text), NO_TIME, ZoneId.of("UTC")); - case 18: // HH:mm:ss.SSSSSSSSS - case 15: // HH:mm:ss.SSSSSS - case 12: // HH:mm:ss.SSS - case 8: // HH:mm:ss - case 5: // HH:mm + case 18 // HH:mm:ss.SSSSSSSSS + , 15 // HH:mm:ss.SSSSSS + , 12 // HH:mm:ss.SSS + , 8 // HH:mm:ss + , 5: // HH:mm return ZonedDateTime.of(NO_DATE, LocalTime.parse(text), UTC); - case 29: // YYYY-MM-dd HH:mm:ss.SSSSSSSSS - case 26: // YYYY-MM-dd HH:mm:ss.SSSSSS - case 23: // YYYY-MM-dd HH:mm:ss.SSS - case 19: // YYYY-MM-dd HH:mm:ss - case 16: // YYYY-MM-dd HH:mm + case 29 // YYYY-MM-dd HH:mm:ss.SSSSSSSSS + , 26 // YYYY-MM-dd HH:mm:ss.SSSSSS + , 23 // YYYY-MM-dd HH:mm:ss.SSS + , 19 // YYYY-MM-dd HH:mm:ss + , 16: // YYYY-MM-dd HH:mm default: // YYYY-MM-dd HH:mm.ss+HH:mm[...] text = text.replace(' ', 'T'); if (text.contains("+") || text.contains("[")) { diff --git a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/record/FakeRecordBuilderFactoryProvider.java b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/record/FakeRecordBuilderFactoryProvider.java index bb775d965b78a..28203cf0992bb 100644 --- a/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/record/FakeRecordBuilderFactoryProvider.java +++ b/component-runtime-manager/src/test/java/org/talend/sdk/component/runtime/manager/service/record/FakeRecordBuilderFactoryProvider.java @@ -29,8 +29,7 @@ public RecordBuilderFactory apply(final String containerId) { : "org.talend.sdk.component.runtime.beam.TalendIO"; switch (System.getProperty("talend.component.beam.record.factory.impl", "auto")) { - case "memory": - case "default": + case "memory", "default": return new RecordBuilderFactoryImpl(containerId); case "avro": return new FakeRecordBuilderFactory(containerId); diff --git a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/SimpleQueryLanguageCompiler.java b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/SimpleQueryLanguageCompiler.java index 9c86be6e90447..a5d8078328c57 100644 --- a/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/SimpleQueryLanguageCompiler.java +++ b/component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/SimpleQueryLanguageCompiler.java @@ -184,8 +184,7 @@ private Token nextToken(final char[] buffer, final int from) { } final String string = new String(buffer, actualFrom, idx - actualFrom); switch (string) { - case "AND": - case "OR": + case "AND", "OR": return new Token(idx, TokenType.COMBINER, string); default: return new Token(idx, TokenType.VALUE, string); diff --git a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/util/NameConventions.java b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/util/NameConventions.java index 1a2b385dc6cd0..199b0f6f9924f 100644 --- a/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/util/NameConventions.java +++ b/component-starter-server/src/main/java/org/talend/sdk/component/starter/server/service/facet/util/NameConventions.java @@ -71,8 +71,7 @@ public String toJavaConfigType(final String root, final String pack, final Proje return "boolean"; case "double": return "double"; - case "int": - case "integer": + case "int", "integer": return "int"; case "uri": // todo: import return "java.net.URI"; 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..60022bf6ee676 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 @@ -277,9 +277,7 @@ private Parameter mapParameter(final JsonObject it, final String type, final Str getObject(it, "schema").map(this::mapJavaType).orElse("String"), getObject(it, "schema").map(schema -> schema.get("default")).map(defaultValue -> { switch (defaultValue.getValueType()) { - case TRUE: - case FALSE: - case NUMBER: + case TRUE, FALSE, NUMBER: return String.valueOf(defaultValue); case STRING: return JsonString.class.cast(defaultValue).getString(); @@ -297,8 +295,7 @@ private String getMarkerImportForParameter(final String name, final String type) return "org.talend.sdk.component.api.service.http.Path"; case "header": return "org.talend.sdk.component.api.service.http.Header"; - case "body": - case "formData": + case "body", "formData": return null; default: throw new IllegalArgumentException("Unsupported parameter: " + type + "(" + name + ")"); @@ -313,8 +310,7 @@ private String getJavaMarkerForParameter(final String name, final String type) { return "@Path(\"" + name + "\") "; case "header": return "@Header(\"" + name + "\") "; - case "body": - case "formData": + case "body", "formData": return ""; default: throw new IllegalArgumentException("Unsupported parameter: " + type + "(" + name + ")"); diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java index 0448eadedee21..93e9ab7e0f0b1 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java @@ -123,8 +123,7 @@ private void visit(final Object data) { case StudioTypes.BYTE: onInt(name, Byte.class.cast(raw).intValue()); break; - case StudioTypes.INTEGER: - case StudioTypes.SHORT: + case StudioTypes.INTEGER, StudioTypes.SHORT: onInt(name, raw); break; case StudioTypes.LONG: @@ -185,8 +184,7 @@ private void handleDynamic(final Object raw) { // so we can pick the entry from the schema onArray(rowStructSchema.getEntry(metaName), (Collection) value); break; - case StudioTypes.STRING: - case StudioTypes.CHARACTER: + case StudioTypes.STRING, StudioTypes.CHARACTER: onString(metaName, value); break; case StudioTypes.BYTE_ARRAY: @@ -204,9 +202,7 @@ private void handleDynamic(final Object raw) { } onBytes(metaName, bytes); break; - case StudioTypes.BYTE: - case StudioTypes.SHORT: - case StudioTypes.INTEGER: + case StudioTypes.BYTE, StudioTypes.SHORT, StudioTypes.INTEGER: onInt(metaName, value); break; case StudioTypes.LONG: @@ -301,9 +297,7 @@ private Schema inferSchema(final Object data, final RecordBuilderFactory factory case StudioTypes.LIST: schema.withEntry(toCollectionEntry(name, originalDbColumnName, raw)); break; - case StudioTypes.OBJECT: - case StudioTypes.STRING: - case StudioTypes.CHARACTER: + case StudioTypes.OBJECT, StudioTypes.STRING, StudioTypes.CHARACTER: schema.withEntry(toEntry(name, STRING, originalDbColumnName, isNullable, comment, isKey, length, precision, defaultValue, null, studioType)); break; @@ -312,9 +306,7 @@ private Schema inferSchema(final Object data, final RecordBuilderFactory factory toEntry(name, DECIMAL, originalDbColumnName, isNullable, comment, isKey, length, precision, defaultValue, null, studioType)); break; - case StudioTypes.INTEGER: - case StudioTypes.SHORT: - case StudioTypes.BYTE: + case StudioTypes.INTEGER, StudioTypes.SHORT, StudioTypes.BYTE: schema.withEntry( toEntry(name, INT, originalDbColumnName, isNullable, comment, isKey, null, null, defaultValue, null, studioType)); @@ -388,9 +380,7 @@ private void inferDynamicSchema(final Object raw, case StudioTypes.LIST: schema.withEntry(toCollectionEntry(metaName, metaOriginalName, value)); break; - case StudioTypes.OBJECT: - case StudioTypes.STRING: - case StudioTypes.CHARACTER: + case StudioTypes.OBJECT, StudioTypes.STRING, StudioTypes.CHARACTER: schema.withEntry( toEntry(metaName, STRING, metaOriginalName, metaIsNullable, comment, metaIsKey, null, null, defaultValue, metaPattern, metaStudioType)); @@ -404,9 +394,7 @@ private void inferDynamicSchema(final Object raw, schema.withEntry(toEntry(metaName, BYTES, metaOriginalName, metaIsNullable, comment, metaIsKey, null, null, defaultValue, null, metaStudioType)); break; - case StudioTypes.BYTE: - case StudioTypes.SHORT: - case StudioTypes.INTEGER: + case StudioTypes.BYTE, StudioTypes.SHORT, StudioTypes.INTEGER: schema.withEntry(toEntry(metaName, INT, metaOriginalName, metaIsNullable, comment, metaIsKey, null, null, defaultValue, null, metaStudioType, logicalType)); break; 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..c4357f24ad3e2 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 @@ -869,8 +869,7 @@ public synchronized void close() { protected String getTalendType(final JsonValue value) { switch (value.getValueType()) { - case TRUE: - case FALSE: + case TRUE, FALSE: return javaTypesManager.BOOLEAN.getId(); case NUMBER: final Number number = JsonNumber.class.cast(value).numberValue(); 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..61c4cdd7a6e56 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 @@ -179,8 +179,7 @@ private void configureDefaultsAttributes(final File workDir, final Log log, fina extractResources(workDir, log); } switch (backend.toLowerCase(ENGLISH)) { - case "html": - case "html5": + case "html", "html5": if (!attributes.containsKey("stylesheet")) { attrs.attribute("stylesheet", "talend.css"); } 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..6ac7719559071 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 @@ -560,10 +560,7 @@ private String findDefault(final ParameterMeta p, final DefaultValueInspector.In } switch (p.getType()) { - case NUMBER: - case BOOLEAN: - case STRING: - case ENUM: + case NUMBER, BOOLEAN, STRING, ENUM: return ofNullable(instance.getValue()) .map(String::valueOf) .map(it -> it.isEmpty() ? "" : it) 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..9137305bcbc3e 100644 --- a/documentation/src/main/java/org/talend/runtime/documentation/Github.java +++ b/documentation/src/main/java/org/talend/runtime/documentation/Github.java @@ -203,8 +203,7 @@ private Contributor loadContributor(final String token, final Client client, fin private String normalizeLogin(final String login) { if (login != null) { switch (login.toLowerCase(ROOT)) { - case "jsomsanith-tlnd": - case "jso-technologies": + case "jsomsanith-tlnd", "jso-technologies": return "jsomsanith"; case "toutpt": return "jmfrancois"; diff --git a/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/JsonSchemaGenerator.java b/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/JsonSchemaGenerator.java index 1578d6eefaaf4..2007d85d3d6be 100644 --- a/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/JsonSchemaGenerator.java +++ b/singer-parent/component-kitap/src/main/java/org/talend/sdk/component/singer/kitap/JsonSchemaGenerator.java @@ -51,8 +51,7 @@ public JsonObject get() { private Map.Entry toJson(final Schema.Entry entry) { final JsonObject schema; switch (entry.getType()) { - case BYTES: - case STRING: + case BYTES, STRING: schema = jsonBuilderFactory.createObjectBuilder() .add("type", types("string", entry.isNullable())) .build(); @@ -75,14 +74,12 @@ private Map.Entry toJson(final Schema.Entry entry) { .add("type", types("boolean", entry.isNullable())) .build(); break; - case FLOAT: - case DOUBLE: + case FLOAT, DOUBLE: schema = jsonBuilderFactory.createObjectBuilder() .add("type", types("number", entry.isNullable())) .build(); break; - case INT: - case LONG: + case INT, LONG: schema = jsonBuilderFactory.createObjectBuilder() .add("type", types("integer", entry.isNullable())) .build(); 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..28d363c550f9c 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 @@ -204,8 +204,7 @@ private Map toConfig(final JsonObject object) { return JsonString.class.cast(e.getValue()).getString(); case NUMBER: return String.valueOf(JsonNumber.class.cast(e.getValue()).doubleValue()); - case TRUE: - case FALSE: + case TRUE, FALSE: return String.valueOf(JsonValue.TRUE.equals(e.getValue())); default: throw new IllegalArgumentException("Unsupported json entry: " + e);