|
33 | 33 | import static com.microsoft.azure.toolkit.intellij.common.AzureArtifactType.File; |
34 | 34 |
|
35 | 35 | public class AzureArtifactManager { |
36 | | - private static Map<Project, AzureArtifactManager> projectAzureArtifactManagerMap = new HashMap<>(); |
| 36 | + private static final Map<Project, AzureArtifactManager> projectAzureArtifactManagerMap = new HashMap<>(); |
37 | 37 | private final Project project; |
38 | 38 |
|
39 | 39 | private AzureArtifactManager(Project project) { |
@@ -151,34 +151,28 @@ public Module getModuleFromAzureArtifact(AzureArtifact azureArtifact) { |
151 | 151 | } |
152 | 152 |
|
153 | 153 | private String getGradleProjectId(ExternalProjectPojo gradleProjectPojo) { |
154 | | - ExternalProject externalProject = getRelatedExternalProject(gradleProjectPojo); |
| 154 | + final ExternalProject externalProject = getRelatedExternalProject(gradleProjectPojo); |
155 | 155 | return Objects.nonNull(externalProject) ? externalProject.getQName() : null; |
156 | 156 | } |
157 | 157 |
|
158 | 158 | private ExternalProject getRelatedExternalProject(ExternalProjectPojo gradleProjectPojo) { |
159 | | - ExternalProject externalProject = |
160 | | - ExternalProjectDataCache.getInstance(project).getRootExternalProject(gradleProjectPojo.getPath()); |
161 | | - return externalProject; |
| 159 | + return ExternalProjectDataCache.getInstance(project).getRootExternalProject(gradleProjectPojo.getPath()); |
162 | 160 | } |
163 | 161 |
|
164 | 162 | private List<AzureArtifact> prepareAzureArtifacts(Predicate<String> packagingFilter) { |
165 | | - List<AzureArtifact> azureArtifacts = new ArrayList<>(); |
166 | | - List<ExternalProjectPojo> gradleProjects = GradleUtils.listGradleProjects(project); |
| 163 | + final List<AzureArtifact> azureArtifacts = new ArrayList<>(); |
| 164 | + final List<ExternalProjectPojo> gradleProjects = GradleUtils.listGradleProjects(project); |
167 | 165 | if (Objects.nonNull(gradleProjects)) { |
168 | 166 | azureArtifacts.addAll(gradleProjects.stream() |
169 | 167 | .map(AzureArtifact::createFromGradleProject) |
170 | 168 | .collect(Collectors.toList())); |
171 | 169 | } |
172 | | - List<MavenProject> mavenProjects = MavenProjectsManager.getInstance(project).getProjects(); |
173 | | - if (Objects.nonNull(mavenProjects)) { |
174 | | - azureArtifacts.addAll( |
175 | | - mavenProjects.stream().map(AzureArtifact::createFromMavenProject).collect(Collectors.toList())); |
176 | | - } |
177 | | - List<Artifact> artifactList = MavenRunTaskUtil.collectProjectArtifact(project); |
178 | | - if (Objects.nonNull(artifactList)) { |
179 | | - azureArtifacts.addAll( |
180 | | - artifactList.stream().map(AzureArtifact::createFromArtifact).collect(Collectors.toList())); |
181 | | - } |
| 170 | + final List<MavenProject> mavenProjects = MavenProjectsManager.getInstance(project).getProjects(); |
| 171 | + azureArtifacts.addAll(mavenProjects.stream().map(AzureArtifact::createFromMavenProject).collect(Collectors.toList())); |
| 172 | + |
| 173 | + final List<Artifact> artifactList = MavenRunTaskUtil.collectProjectArtifact(project); |
| 174 | + azureArtifacts.addAll(artifactList.stream().map(AzureArtifact::createFromArtifact).collect(Collectors.toList())); |
| 175 | + |
182 | 176 | if (packagingFilter == null) { |
183 | 177 | return azureArtifacts; |
184 | 178 | } |
|
0 commit comments