feat(QTDI-1291): comments

Author: ozhelezniak-talend

component-server-parent/component-server/src/main/java/org/talend/sdk/component/server/service/PropertiesService.java

@@ -86,8 +86,10 @@ private Stream<SimplePropertyDefinition> buildProperty(final ParameterMeta p,
         final String path = sanitizePropertyName(p.getPath());
         final String name = sanitizePropertyName(p.getName());
         final String type = p.getType().name();
+
         final PropertyValidation validation = buildValidation(p);
         final Map<String, String> metadata = buildMetadata(p, siblings, parent);
+
         final DefaultValueInspector.Instance instance = defaultValueInspector
                 .createDemoInstance(ofNullable(rootInstance)
                         .map(DefaultValueInspector.Instance::getValue)
@@ -96,10 +98,12 @@ private Stream<SimplePropertyDefinition> buildProperty(final ParameterMeta p,
         final ParameterBundle parentBundle = parent == null ? null : parent.findBundle(loader, locale);
         final String displayName = bundle.displayName(parentBundle).orElse(p.getName());
         final String placeholder = bundle.placeholder(parentBundle).orElse(p.getName());
+
         final LinkedHashMap<String, String> enumValues = buildEnumDisplayNames(p, bundle, parentBundle);
         final SimplePropertyDefinition def = new SimplePropertyDefinition(path, name, displayName, type,
                 toDefault(instance, p), validation, rewriteMetadataForLocale(metadata, parentBundle, bundle),
                 placeholder, enumValues);
+
         return Stream.concat(
                 Stream.of(def),
                 buildProperties(p.getNestedParameters(), loader, locale, instance, p));
@@ -117,7 +121,9 @@ private PropertyValidation buildValidation(final ParameterMeta p) {
         return validation;
     }
 
-    private Map<String, String> buildMetadata(final ParameterMeta p, final List<ParameterMeta> siblings,
+    private Map<String, String> buildMetadata(
+            final ParameterMeta p,
+            final List<ParameterMeta> siblings,
             final ParameterMeta parent) {
         final Map<String, String> sanitized = ofNullable(p.getMetadata())
                 .map(m -> m
@@ -132,6 +138,7 @@ private Map<String, String> buildMetadata(final ParameterMeta p, final List<Para
 
         final Map<String, String> metadata = ofNullable(sanitized).orElseGet(HashMap::new);
         metadata.put("definition::parameter::index", String.valueOf(siblings.indexOf(p)));
+        // this one to mark the Schema parameter somehow to differentiate it from the branch name
         if (p.getJavaType() instanceof Class<?> clazzType && Schema.class.isAssignableFrom(clazzType)) {
             metadata.put("definition::parameter::schema", "");
         }
@@ -143,6 +150,7 @@ private LinkedHashMap<String, String> buildEnumDisplayNames(final ParameterMeta
         if (p.getType() != ParameterMeta.Type.ENUM) {
             return null;
         }
+
         return p.getProposals()
                 .stream()
                 .collect(toLinkedMap(identity(), key -> bundle.enumDisplayName(parentBundle, key).orElse(key)));
@@ -180,20 +188,21 @@ private Map<String, String> rewriteLayoutMetadata(final Map<String, String> meta
             return metadata;
         }
         final Predicate<Map.Entry<String, ?>> shouldBeRewritten = k -> keysToRewrite.contains(k.getKey());
-        return Stream
-                .concat(metadata.entrySet().stream().filter(shouldBeRewritten.negate()),
-                        metadata
-                                .entrySet()
-                                .stream()
-                                .filter(shouldBeRewritten)
-                                .map(it -> new AbstractMap.SimpleEntry<>(bundle
-                                        .gridLayoutName(parentBundle,
-                                                it
-                                                        .getKey()
-                                                        .substring("ui::gridlayout::".length(),
-                                                                it.getKey().length() - "::value".length()))
+        return Stream.concat(
+                metadata.entrySet()
+                        .stream()
+                        .filter(shouldBeRewritten.negate()),
+                metadata.entrySet()
+                        .stream()
+                        .filter(shouldBeRewritten)
+                        .map(it -> new AbstractMap.SimpleEntry<>(
+                                bundle.gridLayoutName(parentBundle,
+                                        it.getKey()
+                                                .substring("ui::gridlayout::".length(),
+                                                        it.getKey().length() - "::value".length()))
                                         .map(t -> "ui::gridlayout::" + t + "::value")
-                                        .orElse(it.getKey()), it.getValue())))
+                                        .orElse(it.getKey()),
+                                it.getValue())))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 

component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/schema/TaCoKitGuessSchema.java

@@ -123,7 +123,7 @@ public TaCoKitGuessSchema(final PrintStream out, final Map<String, String> confi
         this.columns = new LinkedHashMap<>();
         this.keysNoTypeYet = new HashSet<>();
         this.javaTypesManager = new JavaTypesManager();
-        this.version = Optional.ofNullable(version).map(Integer::parseInt).orElse(null);
+        this.version = ofNullable(version).map(Integer::parseInt).orElse(null);
         initClass2JavaTypeMap();
     }
 
@@ -251,7 +251,7 @@ private Column createColumnFromEntry(final Schema.Entry entry) {
         column.setComment(entry.getComment());
         parseInteger(entry.getProps().get(SIZE)).ifPresent(column::setLength);
         parseInteger(entry.getProps().get(SCALE)).ifPresent(column::setPrecision);
-        Optional.ofNullable(entry.getProps().get(IS_KEY))
+        ofNullable(entry.getProps().get(IS_KEY))
                 .ifPresent(value -> column.setKey(Boolean.parseBoolean(value)));
 
         if (entryType == Schema.Type.DATETIME || talendType.equals(StudioTypes.DYNAMIC)) {