[
https://issues.apache.org/jira/browse/MNG-7764?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17712276#comment-17712276
]
ASF GitHub Bot commented on MNG-7764:
-------------------------------------
gnodet commented on code in PR #1088:
URL: https://github.com/apache/maven/pull/1088#discussion_r1166498043
##########
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java:
##########
@@ -55,23 +54,17 @@ public
DefaultToolchainsBuilder(org.apache.maven.toolchain.building.ToolchainsBu
@Override
public ToolchainsBuilderResult build(ToolchainsBuilderRequest request)
throws ToolchainsBuilderException, IllegalArgumentException {
- DefaultSession session = (DefaultSession) request.getSession();
try {
DefaultToolchainsBuildingRequest req = new
DefaultToolchainsBuildingRequest();
- if (request.getGlobalToolchainsSource().isPresent()) {
- req.setGlobalToolchainsSource(new MappedToolchainsSource(
- request.getGlobalToolchainsSource().get()));
- } else if (request.getGlobalToolchainsPath().isPresent()) {
- req.setGlobalToolchainsSource(new
org.apache.maven.building.FileSource(
- request.getGlobalToolchainsPath().get().toFile()));
- }
- if (request.getUserToolchainsSource().isPresent()) {
- req.setUserToolchainsSource(new MappedToolchainsSource(
- request.getUserToolchainsSource().get()));
- } else if (request.getUserToolchainsPath().isPresent()) {
- req.setUserToolchainsSource(new
org.apache.maven.building.FileSource(
- request.getUserToolchainsPath().get().toFile()));
- }
+
+ request.getGlobalToolchainsSource()
+ .ifPresent(s -> req.setGlobalToolchainsSource(new
MappedToolchainsSource(s)));
+ request.getGlobalToolchainsPath().ifPresent(s ->
req.setGlobalToolchainsSource(new FileSource(s.toFile())));
Review Comment:
Not sure if this is problematic, but the before and after code are not
equivalent.
In the code before, the `setGlobalToolchainsSource` cannot be called twice
because of the `else if` statement. With the new proposed code, a second call
will override the first one...
##########
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java:
##########
@@ -55,23 +54,17 @@ public
DefaultToolchainsBuilder(org.apache.maven.toolchain.building.ToolchainsBu
@Override
public ToolchainsBuilderResult build(ToolchainsBuilderRequest request)
throws ToolchainsBuilderException, IllegalArgumentException {
- DefaultSession session = (DefaultSession) request.getSession();
try {
DefaultToolchainsBuildingRequest req = new
DefaultToolchainsBuildingRequest();
- if (request.getGlobalToolchainsSource().isPresent()) {
- req.setGlobalToolchainsSource(new MappedToolchainsSource(
- request.getGlobalToolchainsSource().get()));
- } else if (request.getGlobalToolchainsPath().isPresent()) {
- req.setGlobalToolchainsSource(new
org.apache.maven.building.FileSource(
- request.getGlobalToolchainsPath().get().toFile()));
- }
- if (request.getUserToolchainsSource().isPresent()) {
- req.setUserToolchainsSource(new MappedToolchainsSource(
- request.getUserToolchainsSource().get()));
- } else if (request.getUserToolchainsPath().isPresent()) {
- req.setUserToolchainsSource(new
org.apache.maven.building.FileSource(
- request.getUserToolchainsPath().get().toFile()));
- }
+
+ request.getGlobalToolchainsSource()
+ .ifPresent(s -> req.setGlobalToolchainsSource(new
MappedToolchainsSource(s)));
+ request.getGlobalToolchainsPath().ifPresent(s ->
req.setGlobalToolchainsSource(new FileSource(s.toFile())));
+
+ request.getUserToolchainsSource()
+ .ifPresent(s -> req.setUserToolchainsSource(new
MappedToolchainsSource(s)));
+ request.getUserToolchainsPath().ifPresent(s ->
req.setUserToolchainsSource(new FileSource(s.toFile())));
Review Comment:
Same here
> Small Code Improvments.
> -----------------------
>
> Key: MNG-7764
> URL: https://issues.apache.org/jira/browse/MNG-7764
> Project: Maven
> Issue Type: Improvement
> Affects Versions: 4.0.0-alpha-5
> Reporter: Karl Heinz Marbaise
> Assignee: Karl Heinz Marbaise
> Priority: Minor
> Fix For: 4.0.0-alpha-6
>
>
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
