diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/wizard/module/helper/MavenFunctionsModuleBuilderHelper.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/wizard/module/helper/MavenFunctionsModuleBuilderHelper.java index 8e84d87bbc..ab0a3df67e 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/wizard/module/helper/MavenFunctionsModuleBuilderHelper.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/wizard/module/helper/MavenFunctionsModuleBuilderHelper.java @@ -44,7 +44,6 @@ public static void setupMavenModule(final WizardContext wizardContext, @NotNull RefreshQueue.getInstance().refresh(true, true, () -> { final String packageName = wizardContext.getUserData(AzureFunctionsConstants.WIZARD_PACKAGE_NAME_KEY); final MavenProject parentProject = MavenUtils.getMavenProjectByDirectory(project, parentPath); - final MavenProject rootProject = MavenUtils.getRootMavenProject(project, parentProject); final MavenId mavenId = new MavenId(groupId, artifactId, version); final VirtualFile pomFile = Optional.ofNullable(vf).map(file -> file.findChild(MavenConstants.POM_XML)).orElse(null); if (pomFile == null) { diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/java/com/microsoft/intellij/util/util/MavenUtils.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/java/com/microsoft/intellij/util/util/MavenUtils.java index 8cfafc9e2a..fd1aedee35 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/java/com/microsoft/intellij/util/util/MavenUtils.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/java/com/microsoft/intellij/util/util/MavenUtils.java @@ -100,6 +100,7 @@ public static String getPluginConfiguration(String effectivePomXml, String group return null; } + @Nullable public static MavenProject getRootMavenProject(final Project project, final MavenProject mavenProject) { if (mavenProject == null) { return null; @@ -108,11 +109,15 @@ public static MavenProject getRootMavenProject(final Project project, final Mave MavenId parentId = mavenProject.getParentId(); while (parentId != null) { result = getMavenProjectById(project, parentId); + if (result == null) { + return null; + } parentId = result.getParentId(); } return result; } + @Nullable public static MavenProject getMavenProjectById(final Project project, final MavenId mavenId) { return MavenProjectsManager.getInstance(project).getProjects().stream() .filter(pro -> Objects.equals(pro.getMavenId(), mavenId)).findFirst().orElse(null);