[GitHub] [maven] khmarbaise commented on a diff in pull request #1088: [MNG-7764] - Small Code Improvments.

["khmarbaise (via GitHub)" <gi...@apache.org>]

khmarbaise commented on code in PR #1088:
URL: https://github.com/apache/maven/pull/1088#discussion_r1167483332


##########
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:
   Good catch... thanks.. 



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org