Skip to content

Commit b8e2994

Browse files
ypiel-talendypiel-talend
committed
feat(QTDI-1914): Copilot code review fixes.
1 parent 27d47be commit b8e2994

9 files changed

Lines changed: 31 additions & 32 deletions

File tree

‎sample-parent/sample-features/loading-analysis/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ It will generate TCK/records containing those fields:
105105
- `first_record`: if the dependency is a TCK plugin, this is the first record retrieve from the loaded connector
106106
- `root_repository`: The value of the property `talend.component.manager.m2.repository`
107107
- `runtime_classpath`: the value of the property `java.class.path`
108-
- `Working_directory`: the value of the property `user.dir`
108+
- `working_directory`: the value of the property `user.dir`
109109
- `comment`: a comment
110110

111111
##### The first record is the result of the class loading from a static dependency, the generated record should be something like:
@@ -123,7 +123,7 @@ It will generate TCK/records containing those fields:
123123
| first_record | null |
124124
| root_repository | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository |
125125
| runtime_classpath | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/workspace/AAAA/poms/jobs/process/qtdi2134_dyndeps_0.1/target/classpath.jar;/C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository/org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar; |
126-
| Working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
126+
| working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
127127
| comment | Check static dependency. |
128128
+-----------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
129129
```
@@ -146,7 +146,7 @@ The `DynamicDependencyWithXxxInput` is well loaded from `org.talend.sdk.componen
146146
| first_record | null |
147147
| root_repository | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository |
148148
| runtime_classpath | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/workspace/AAAA/poms/jobs/process/qtdi2134_dyndeps_0.1/target/classpath.jar;/C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository/org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar; |
149-
| Working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
149+
| working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
150150
| comment | Check provided dependency. |
151151
+-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
152152
```
@@ -167,7 +167,7 @@ In this example, we can see that the class `org.talend.sdk.component.api.service
167167
| first_record | null |
168168
| root_repository | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository |
169169
| runtime_classpath | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/workspace/AAAA/poms/jobs/process/qtdi2134_dyndeps_0.1/target/classpath.jar;/C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository/org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar; |
170-
| Working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
170+
| working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
171171
| comment | An instance has been instantiated and assigned. |
172172
+-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
173173
```
@@ -189,7 +189,7 @@ In this environment, it has been loaded from the `AppClassLoader`. It happens wh
189189
| first_record | {"name":"Rogahn"} |
190190
| root_repository | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository |
191191
| runtime_classpath | C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/workspace/AAAA/poms/jobs/process/qtdi2134_dyndeps_0.1/target/classpath.jar;/C:/tmp/202601_dyndeps_exports/Talend-Studio-20260121_1719-V8.0.1/configuration/.m2/repository/org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar; |
192-
| Working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
192+
| working_directory | C:\tmp\202601_dyndeps_exports\Talend-Studio-20260121_1719-V8.0.1 |
193193
| comment | |
194194
+-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
195195
```

‎sample-parent/sample-features/loading-analysis/loading-dependencies-common/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/service/AbstractDynamicDependenciesService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public abstract class AbstractDynamicDependenciesService implements Serializable
7979

8080
public static final String ENTRY_RUNTIME_CLASSPATH = "runtime_classpath";
8181

82-
public static final String ENTRY_WORKING_DIRECTORY = "Working_directory";
82+
public static final String ENTRY_WORKING_DIRECTORY = "working_directory";
8383

8484
public static final String ENTRY_COMMENT = "comment";
8585

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dataprepRunAnnotation/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDataprepRunAnnotation/annotation/DynamicDependencySupported.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@Target(TYPE)
2828
@Retention(RUNTIME)
2929
@ConfigurationType("configuration")
30-
@Documentation("Copy/past of the annotation from tDataprepRun." +
30+
@Documentation("Copy/paste of the annotation from tDataprepRun." +
3131
"It should be removed soon and replaced by the 'DynamicDependenciesConfiguration' provided by the framework.")
3232
@Deprecated
3333
public @interface DynamicDependencySupported {

‎sample-parent/sample-features/loading-analysis/loading-dependencies-with-dynamicDependenciesConfiguration/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDynamicDependenciesConfiguration/input/DynamicDependenciesWithDynamicDependenciesConfigurationInput.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.talend.sdk.component.api.record.Record;
2929
import org.talend.sdk.component.sample.feature.loadinganalysis.service.AbstractDynamicDependenciesService;
3030
import org.talend.sdk.component.sample.feature.loadinganalysis.withDynamicDependenciesConfiguration.config.Config;
31-
import org.talend.sdk.component.sample.feature.loadinganalysis.withDynamicDependenciesConfiguration.service.DynamicDependenciesWithDynamicependenciesConfigurationService;
31+
import org.talend.sdk.component.sample.feature.loadinganalysis.withDynamicDependenciesConfiguration.service.DynamicDependenciesWithDynamicDependenciesConfigurationService;
3232

3333
@Version
3434
@Icon(value = Icon.IconType.CUSTOM, custom = "icon")
@@ -39,12 +39,12 @@ public class DynamicDependenciesWithDynamicDependenciesConfigurationInput extend
3939

4040
private final Config config;
4141

42-
private final DynamicDependenciesWithDynamicependenciesConfigurationService service;
42+
private final DynamicDependenciesWithDynamicDependenciesConfigurationService service;
4343

4444
private Iterator<Record> recordIterator;
4545

4646
public DynamicDependenciesWithDynamicDependenciesConfigurationInput(final Config config,
47-
final DynamicDependenciesWithDynamicependenciesConfigurationService service) {
47+
final DynamicDependenciesWithDynamicDependenciesConfigurationService service) {
4848
this.config = config;
4949
this.service = service;
5050
}

sample-parent/sample-features/loading-analysis/loading-dependencies-with-dynamicDependenciesConfiguration/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDynamicDependenciesConfiguration/service/DynamicDependenciesWithDynamicependenciesConfigurationService.java renamed to sample-parent/sample-features/loading-analysis/loading-dependencies-with-dynamicDependenciesConfiguration/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDynamicDependenciesConfiguration/service/DynamicDependenciesWithDynamicDependenciesConfigurationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
@Slf4j
3333
@Service
34-
public class DynamicDependenciesWithDynamicependenciesConfigurationService extends AbstractDynamicDependenciesService
34+
public class DynamicDependenciesWithDynamicDependenciesConfigurationService extends AbstractDynamicDependenciesService
3535
implements Serializable {
3636

3737
public final static String DEPENDENCY_WITHDYNDEPSCONFIG_ACTION = "DEPENDENCY_WITHDYNDEPSCONFIG_ACTION";

sample-parent/sample-features/loading-analysis/loading-dependencies-with-dynamicDependenciesConfiguration/src/test/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDynamicDependenciesConfiguration/service/DynamicDependenciesWithDynamicependenciesConfigurationServiceTest.java renamed to sample-parent/sample-features/loading-analysis/loading-dependencies-with-dynamicDependenciesConfiguration/src/test/java/org/talend/sdk/component/sample/feature/loadinganalysis/withDynamicDependenciesConfiguration/service/DynamicDependenciesWithDynamicDependenciesConfigurationServiceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
@Slf4j
3131
@WithComponents(
3232
value = "org.talend.sdk.component.sample.feature.loadinganalysis.withDynamicDependenciesConfiguration")
33-
public class DynamicDependenciesWithDynamicependenciesConfigurationServiceTest
33+
public class DynamicDependenciesWithDynamicDependenciesConfigurationServiceTest
3434
extends
35-
AbstractDynamicDependenciesServiceTest<Config, DynamicDependenciesWithDynamicependenciesConfigurationService> {
35+
AbstractDynamicDependenciesServiceTest<Config, DynamicDependenciesWithDynamicDependenciesConfigurationService> {
3636

3737
@Service
38-
DynamicDependenciesWithDynamicependenciesConfigurationService dynamicDependenciesServiceService;
38+
DynamicDependenciesWithDynamicDependenciesConfigurationService dynamicDependenciesServiceService;
3939

4040
@Override
4141
protected Config buildConfig() {
@@ -51,7 +51,7 @@ protected Config buildConfig() {
5151
}
5252

5353
@Override
54-
protected DynamicDependenciesWithDynamicependenciesConfigurationService getService() {
54+
protected DynamicDependenciesWithDynamicDependenciesConfigurationService getService() {
5555
return dynamicDependenciesServiceService;
5656
}
5757
}

‎sample-parent/sample-features/loading-analysis/loading-services-and-resources-lib/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/classloadertestlibrary/spiConsumers/AbstractSPIConsumer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class AbstractSPIConsumer<S, T> {
2929

3030
private final Optional<S> spiImpl;
3131

32-
protected AbstractSPIConsumer(final Class clazz) {
32+
protected AbstractSPIConsumer(final Class<S> clazz) {
3333
ServiceLoader<S> serviceLoader = ServiceLoader.load(clazz, AbstractSPIConsumer.class.getClassLoader());
3434

3535
List<S> implProvider = new ArrayList<>();

‎sample-parent/sample-features/loading-analysis/loading-services-and-resources/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/withspi/service/CustomizeClassLoader.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
public class CustomizeClassLoader implements ComponentManager.Customizer {
2626

2727
private static final String DISABLE_CUSTOMIZE_PROPERTY =
28-
"talend.sample.feature.dynamicdependencies.withspi.CustomizeClassLoader.disabled";
28+
"org.talend.sdk.component.sample.feature.loadinganalysis.withspi.service.CustomizeClassLoader.disabled";
2929

3030
private static final boolean DISABLE_CUSTOMIZE = Boolean.parseBoolean(
3131
System.getProperty(DISABLE_CUSTOMIZE_PROPERTY, "true"));
@@ -34,20 +34,20 @@ public class CustomizeClassLoader implements ComponentManager.Customizer {
3434
public Stream<String> containerClassesAndPackages() {
3535
if (DISABLE_CUSTOMIZE) {
3636
log.info(
37-
"org.talend.sdk.component.sample.feature.dynamicdependencies.withspi.service.CustomizeClassLoader is disabled.\n"
37+
"org.talend.sdk.component.sample.feature.loadinganalysis.withspi.service.CustomizeClassLoader is disabled.\n"
3838
+ "use \"" + DISABLE_CUSTOMIZE_PROPERTY + "=false\""
3939
+ " property to enable it.");
4040
return Stream.empty();
4141
}
4242

4343
log.info(
44-
"org.talend.sdk.component.sample.feature.dynamicdependencies.withspi.service.CustomizeClassLoader is enable,\n"
44+
"org.talend.sdk.component.sample.feature.loadinganalysis.withspi.service.CustomizeClassLoader is enabled,\n"
4545
+ "use \"" + DISABLE_CUSTOMIZE_PROPERTY + "=true\""
4646
+ " property to disable it.");
4747
return Stream.of(
4848
// Implementation should come from a dynamic dependency
49-
"org.talend.sdk.component.sample.feature.dynamicdependencies.classloadertestlibrary.serviceInterfaces.StringProviderSPIAsDependency",
49+
"org.talend.sdk.component.sample.feature.loadinganalysis.classloadertestlibrary.serviceInterfaces.StringProviderSPIAsDependency",
5050
// Implementation should come from runtime
51-
"org.talend.sdk.component.sample.feature.dynamicdependencies.classloadertestlibrary.serviceInterfaces.StringProviderSPIAsDynamicDependency");
51+
"org.talend.sdk.component.sample.feature.loadinganalysis.classloadertestlibrary.serviceInterfaces.StringProviderSPIAsDynamicDependency");
5252
}
5353
}

‎sample-parent/sample-features/loading-analysis/loading-services-and-resources/src/main/java/org/talend/sdk/component/sample/feature/loadinganalysis/withspi/service/DynamicDependenciesWithSPIService.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ public class DynamicDependenciesWithSPIService implements Serializable {
6666

6767
@DynamicDependencies
6868
public List<String> getDynamicDependencies(@Option("theDataset") final Dataset dataset) {
69-
String dep = "org.talend.sdk.samplefeature.dynamicdependencies:service-provider-from-dynamic-dependency:"
69+
String dep = "org.talend.sdk.component.loading-analysis:service-provider-from-dynamic-dependency:"
7070
+ loadVersion();
7171
List<String> strings = Collections.singletonList(dep);
72-
log.info("Dynamic dependencies with SPI: {}", strings.stream().collect(Collectors.joining(";")));
72+
log.info("Loading SPI: {}", strings.stream().collect(Collectors.joining(";")));
7373
return strings;
7474
}
7575

@@ -231,6 +231,9 @@ private static String loadVersion() {
231231
if (version == null) {
232232
try (InputStream is = DynamicDependenciesWithSPIService.class.getClassLoader()
233233
.getResourceAsStream("version.properties")) {
234+
if (is == null) {
235+
throw new ComponentException("Can't retrieve version.properties resource.");
236+
}
234237
Properties props = new Properties();
235238
props.load(is);
236239
version = props.getProperty("version");
@@ -242,19 +245,15 @@ private static String loadVersion() {
242245
}
243246

244247
private String filterComments(final InputStream stream) {
245-
BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
246-
247-
String collect = reader.lines()
248-
.filter(line -> !line.trim().startsWith("#"))
249-
.filter(line -> !line.trim().isEmpty())
250-
.collect(Collectors.joining(System.lineSeparator()));
251-
try {
252-
reader.close();
248+
try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
249+
return reader.lines()
250+
.filter(line -> !line.trim().startsWith("#"))
251+
.filter(line -> !line.trim().isEmpty())
252+
.collect(Collectors.joining(System.lineSeparator()));
253253
} catch (IOException e) {
254254
throw new ComponentException("Can't close a resource reader.", e);
255255
}
256256

257-
return collect;
258257
}
259258

260259
private String loadAPropertyFromResource(final String resource, final String property) {

0 commit comments

Comments
 (0)