Skip to content

Commit 7a98da0

Browse files
undxundx
committed
Merge branch 'master' into ouf/QTDI-2893_pattern_instanceof
# Conflicts: # component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecord.java # component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/OutputsHandler.java # component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java # component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/studio/ParameterSetter.java
2 parents 7808e1e + 7eebed9 commit 7a98da0

230 files changed

Lines changed: 1177 additions & 1261 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/NpmPublish.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class Npm {
146146
for (final String entry : base.list()) {
147147
if ('package.json' == entry) { // rewritten so updated on the fly
148148
def content = jsonb.toJson(pck).getBytes(StandardCharsets.UTF_8)
149-
def archiveEntry = new TarArchiveEntry('package/package.json');
149+
def archiveEntry = new TarArchiveEntry('package/package.json')
150150
archiveEntry.setSize(content.length)
151151
tarGz.putArchiveEntry(archiveEntry)
152152
tarGz.write(content)
@@ -160,7 +160,7 @@ class Npm {
160160
161161
See https://talend.github.io/component-runtime/
162162
""".getBytes(StandardCharsets.UTF_8)
163-
def archiveEntry = new TarArchiveEntry('package/readme.md');
163+
def archiveEntry = new TarArchiveEntry('package/readme.md')
164164
archiveEntry.setSize(content.length)
165165
tarGz.putArchiveEntry(archiveEntry)
166166
tarGz.write(content)
@@ -239,9 +239,9 @@ See https://talend.github.io/component-runtime/
239239

240240
private void doTarGz(tarGz, file, prefix) throws IOException {
241241
def path = file.getPath().replace(prefix, '').replace(File.separator, '/')
242-
def archiveEntry = new TarArchiveEntry(file, "package/${path}");
242+
def archiveEntry = new TarArchiveEntry(file, "package/${path}")
243243
if (path.endsWith('.sh')) {
244-
archiveEntry.setMode(0755);
244+
archiveEntry.setMode(0755)
245245
}
246246
tarGz.putArchiveEntry(archiveEntry)
247247
if (file.isDirectory()) {

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/api/UiSpecService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private CompletionStage<Ui> convert(final Supplier<String> displayName, final Su
162162
new UiSchemaConverter(null, family.get(), ui.getUiSchema(), new ArrayList<>(), client,
163163
ui.getJsonSchema(), props, actions.get(), lang, customPropertyConverters, new AtomicInteger(1));
164164
final PropertiesConverter propertiesConverter =
165-
new PropertiesConverter(jsonb, Map.class.cast(ui.getProperties()), props);
165+
new PropertiesConverter(jsonb, (Map) ui.getProperties(), props);
166166

167167
return CompletableFuture
168168
.allOf(props

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/converter/impl/widget/AbstractWidgetConverter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ protected <T> CompletionStage<List<UiSchema.NameValue>> loadDynamicValues(final
7171
.map(v -> v.get("items"))
7272
.filter(Collection.class::isInstance)
7373
.map(c -> {
74-
final Collection<?> dynamicValues = Collection.class.cast(c);
74+
final Collection<?> dynamicValues = (Collection) c;
7575
return dynamicValues
7676
.stream()
7777
.filter(Map.class::isInstance)
78-
.filter(m -> Map.class.cast(m).get("id") != null
79-
&& Map.class.cast(m).get("id") instanceof String)
78+
.filter(m -> ((Map) m).get("id") != null
79+
&& ((Map) m).get("id") instanceof String)
8080
.map(Map.class::cast)
8181
.map(entry -> {
8282
final UiSchema.NameValue val = new UiSchema.NameValue();
8383
val
8484
.setName(entry.get("label") == null ? (String) entry.get("id")
85-
: String.class.cast(entry.get("label")));
86-
val.setValue(String.class.cast(entry.get("id")));
85+
: (String) entry.get("label"));
86+
val.setValue((String) entry.get("id"));
8787
return val;
8888
})
8989
.collect(toList());
@@ -378,13 +378,13 @@ protected Map<String, Collection<Object>> toCondition(final String path, final S
378378
return new UiSchema.ConditionBuilder()
379379
.withOperator("===")
380380
.withVar(path + ".length")
381-
.withValue(String.class.isInstance(value) ? Integer.parseInt(String.valueOf(value)) : value)
381+
.withValue(value instanceof String ? Integer.parseInt(String.valueOf(value)) : value)
382382
.build();
383383
case "contains":
384384
case "contains(lowercase=true)":
385385
final UiSchema.ConditionValuesBuilder in = new UiSchema.ConditionBuilder().withOperator("in");
386386
final Object val =
387-
strategy.endsWith("(lowercase=true)") ? String.class.cast(value).toLowerCase(ROOT) : value;
387+
strategy.endsWith("(lowercase=true)") ? ((String) value).toLowerCase(ROOT) : value;
388388
if (def != null && "array".equalsIgnoreCase(def.getType())) {
389389
in.withVar(path).withValue(val).up();
390390
} else {

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/JsonSchemaValidatorFactoryExt.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public JsonSchemaValidatorFactoryExt() {
4242
public List<org.apache.johnzon.jsonschema.spi.ValidationExtension> createDefaultValidations() {
4343
List validations = super.createDefaultValidations()
4444
.stream()
45-
.filter(v -> !org.apache.johnzon.jsonschema.spi.builtin.TypeValidation.class.isInstance(v))
46-
.filter(v -> !org.apache.johnzon.jsonschema.spi.builtin.EnumValidation.class.isInstance(v))
47-
.filter(v -> !org.apache.johnzon.jsonschema.spi.builtin.MinimumValidation.class.isInstance(v))
48-
.filter(v -> !org.apache.johnzon.jsonschema.spi.builtin.MaximumValidation.class.isInstance(v))
49-
.filter(v -> !org.apache.johnzon.jsonschema.spi.builtin.RequiredValidation.class.isInstance(v))
50-
.filter(v -> !org.apache.johnzon.jsonschema.spi.builtin.PatternValidation.class.isInstance(v))
45+
.filter(v -> !(v instanceof org.apache.johnzon.jsonschema.spi.builtin.TypeValidation))
46+
.filter(v -> !(v instanceof org.apache.johnzon.jsonschema.spi.builtin.EnumValidation))
47+
.filter(v -> !(v instanceof org.apache.johnzon.jsonschema.spi.builtin.MinimumValidation))
48+
.filter(v -> !(v instanceof org.apache.johnzon.jsonschema.spi.builtin.MaximumValidation))
49+
.filter(v -> !(v instanceof org.apache.johnzon.jsonschema.spi.builtin.RequiredValidation))
50+
.filter(v -> !(v instanceof PatternValidation))
5151
.collect(Collectors.toList());
5252
validations.add(new TypeValidation());
5353
validations.add(new EnumValidationWithDefaultValue());

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/BaseValidation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ public Stream<ValidationResult.ValidationError> apply(final JsonValue obj) {
5858

5959
switch (value.getValueType()) {
6060
case STRING:
61-
return onString(JsonString.class.cast(value));
61+
return onString((JsonString) value);
6262
case TRUE:
6363
case FALSE:
6464
return onBoolean(JsonValue.TRUE.equals(value));
6565
case NUMBER:
66-
return onNumber(JsonNumber.class.cast(value));
66+
return onNumber((JsonNumber) value);
6767
case OBJECT:
6868
return onObject(value.asJsonObject());
6969
case ARRAY:

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/MaximumValidation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public Optional<Function<JsonValue, Stream<ValidationError>>> create(final Valid
3636
.ofNullable(model.getSchema().get("maximum"))
3737
.filter(v -> v.getValueType() == JsonValue.ValueType.NUMBER)
3838
.map(m -> new Impl(model.toPointer(), model.getValueProvider(),
39-
JsonNumber.class.cast(m).doubleValue()));
39+
((JsonNumber) m).doubleValue()));
4040
}
4141
return Optional.empty();
4242
}

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/MinimumValidation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public Optional<Function<JsonValue, Stream<ValidationError>>> create(final Valid
3636
.ofNullable(model.getSchema().get("minimum"))
3737
.filter(v -> v.getValueType() == JsonValue.ValueType.NUMBER)
3838
.map(m -> new Impl(model.toPointer(), model.getValueProvider(),
39-
JsonNumber.class.cast(m).doubleValue()));
39+
((JsonNumber) m).doubleValue()));
4040
}
4141
return Optional.empty();
4242
}

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/RequiredValidation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Optional<Function<JsonValue, Stream<ValidationError>>> create(final Valid
3939
.filter(it -> it.getValueType() == JsonValue.ValueType.ARRAY)
4040
.map(JsonValue::asJsonArray)
4141
.filter(arr -> arr.stream().allMatch(it -> it.getValueType() == JsonValue.ValueType.STRING))
42-
.map(arr -> arr.stream().map(it -> JsonString.class.cast(it).getString()).collect(toSet()))
42+
.map(arr -> arr.stream().map(it -> ((JsonString) it).getString()).collect(toSet()))
4343
.map(required -> new Impl(required, model.getValueProvider(), model.toPointer()));
4444
}
4545

‎component-form/component-form-core/src/main/java/org/talend/sdk/component/form/internal/validation/spi/ext/TypeValidation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ public class TypeValidation implements ValidationExtension {
3838
@Override
3939
public Optional<Function<JsonValue, Stream<ValidationError>>> create(final ValidationContext model) {
4040
final JsonValue value = model.getSchema().get("type");
41-
if (JsonString.class.isInstance(value)) {
41+
if (value instanceof JsonString) {
4242
return Optional
4343
.of(new Impl(model.toPointer(), model.getValueProvider(),
44-
mapType(JsonString.class.cast(value)).toArray(JsonValue.ValueType[]::new)));
44+
mapType((JsonString) value).toArray(JsonValue.ValueType[]::new)));
4545
}
46-
if (JsonArray.class.isInstance(value)) {
46+
if (value instanceof JsonArray) {
4747
return Optional
4848
.of(new Impl(model.toPointer(), model.getValueProvider(),
4949
value.asJsonArray().stream().flatMap(this::mapType).toArray(JsonValue.ValueType[]::new)));
@@ -53,7 +53,7 @@ public Optional<Function<JsonValue, Stream<ValidationError>>> create(final Valid
5353
}
5454

5555
private Stream<? extends JsonValue.ValueType> mapType(final JsonValue value) {
56-
switch (JsonString.class.cast(value).getString()) {
56+
switch (((JsonString) value).getString()) {
5757
case "null":
5858
return Stream.of(JsonValue.ValueType.NULL);
5959
case "string":

‎component-form/component-form-core/src/test/java/org/talend/sdk/component/form/api/UiSpecServiceTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void advancedWithoutMain() throws Exception {
155155
void paramResolutionToParent() throws Exception {
156156
final ConfigTypeNode node = load("param-resolution-to-parent.json", ConfigTypeNode.class);
157157
final Ui payload = service.convert("test", "en", node, null).toCompletableFuture().get();
158-
final List<UiSchema> rootItems = List.class.cast(payload.getUiSchema().iterator().next().getItems());
158+
final List<UiSchema> rootItems = (List) payload.getUiSchema().iterator().next().getItems();
159159
final UiSchema.Trigger trigger = rootItems
160160
.stream()
161161
.filter(it -> "configuration.customObjectName".equals(it.getKey()))
@@ -234,8 +234,8 @@ void conditionAnd() throws Exception {
234234
.orElseThrow(NoSuchElementException::new);
235235
final Map<String, Collection<Object>> condition = schema.getCondition();
236236
final Collection<Object> and = condition.get("and");
237-
and.forEach(it -> assertFalse(Collection.class.isInstance(it)));
238-
final Map<String, Collection<Object>> firstCond = Map.class.cast(and.iterator().next());
237+
and.forEach(it -> assertFalse(it instanceof Collection));
238+
final Map<String, Collection<Object>> firstCond = (Map) and.iterator().next();
239239
assertEquals(asList(singletonMap("var", "conf.str"), "value"), firstCond.get("==="));
240240
}
241241

@@ -581,7 +581,7 @@ void jsonSchema() throws Exception {
581581
assertProperty(jsonSchema.getProperties().get("configuration"), "object", "Configuration", p -> {
582582
final Map<String, JsonSchema> nestedProperties = p.getProperties();
583583
assertEquals(2, nestedProperties.size());
584-
assertTrue(TreeMap.class.isInstance(nestedProperties));
584+
assertTrue(nestedProperties instanceof TreeMap);
585585
assertEquals(asList("connection", "query"), new ArrayList<>(nestedProperties.keySet()));
586586
assertProperty(nestedProperties.get("query"), "object", "query", q -> {
587587
final Map<String, JsonSchema> queryNestedProperties = q.getProperties();
@@ -611,13 +611,13 @@ void jsonSchema() throws Exception {
611611
@Test
612612
void properties() throws Exception {
613613
final Ui payload = service.convert(load("jdbc.json"), "en", null).toCompletableFuture().get();
614-
final Map<String, Object> properties = Map.class.cast(payload.getProperties());
614+
final Map<String, Object> properties = (Map) payload.getProperties();
615615
assertEquals(1, properties.size());
616616

617-
final Map<String, Object> configuration = Map.class.cast(properties.get("configuration"));
617+
final Map<String, Object> configuration = (Map) properties.get("configuration");
618618
assertEquals(2, configuration.size());
619619

620-
final Map<String, Object> connection = Map.class.cast(configuration.get("connection"));
620+
final Map<String, Object> connection = (Map) configuration.get("connection");
621621
assertEquals(2, connection.size());
622622

623623
assertEquals("", connection.get("password"));
@@ -758,10 +758,10 @@ private void assertTriggerParameter(final UiSchema.Parameter next, final String
758758
}
759759

760760
private Object read(final Object rootMap, final String path) {
761-
Map<String, ?> current = Map.class.cast(rootMap);
761+
Map<String, ?> current = (Map) rootMap;
762762
final String[] split = path.split("\\.");
763763
for (int i = 0; i < split.length - 1; i++) {
764-
current = Map.class.cast(current.get(split[i]));
764+
current = (Map) current.get(split[i]);
765765
}
766766
return current.get(split[split.length - 1]);
767767
}

0 commit comments

Comments
 (0)