Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AF-2433] Fixed error when building the base kie template #3159

Merged
merged 1 commit into from
Feb 14, 2020
Merged

[AF-2433] Fixed error when building the base kie template #3159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 64 additions & 0 deletions ...va/org/kie/workbench/common/screens/archetype/mgmt/backend/maven/BuildProjectCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* Copyright 2020 Red Hat, Inc. and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.kie.workbench.common.screens.archetype.mgmt.backend.maven;

import java.io.File;
import java.nio.file.FileSystems;
import java.util.Properties;

import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.project.ProjectBuildingException;
import org.appformer.maven.integration.embedder.MavenEmbedder;
import org.appformer.maven.integration.embedder.MavenEmbedderException;
import org.appformer.maven.integration.embedder.MavenRequest;
import org.guvnor.common.services.project.backend.server.POMServiceImpl;

public class BuildProjectCommand extends AbstractMavenCommand {

public BuildProjectCommand(final String baseDirectory) {
super(baseDirectory);
}

@Override
public MavenRequest buildMavenRequest() {
throw new UnsupportedOperationException();
}

@Override
public Properties buildUserProperties() {
throw new UnsupportedOperationException();
}

@Override
public MavenExecutionResult execute() throws MavenEmbedderException {
final MavenExecutionResult result = new DefaultMavenExecutionResult();
final MavenEmbedder mavenEmbedder = createMavenEmbedder();
final String pomPath = baseDirectory + FileSystems.getDefault().getSeparator() + POMServiceImpl.POM_XML;

try {
final File pomFile = new File(pomPath);
mavenEmbedder.buildProjects(pomFile, false);
} catch (ProjectBuildingException e) {
result.addException(e);
} finally {
mavenEmbedder.dispose();
}

return result;
}
}
6 changes: 3 additions & 3 deletions ...org/kie/workbench/common/screens/archetype/mgmt/backend/service/ArchetypeServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
import org.kie.workbench.common.screens.archetype.mgmt.backend.config.ArchetypeConfigStorageImpl;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.AbstractMavenCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.ArchetypeGenerateCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.ExecuteGoalsCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.BuildProjectCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.preference.ArchetypePreferencesManager;
import org.kie.workbench.common.screens.archetype.mgmt.backend.util.ArchetypeListingPredicates;
import org.kie.workbench.common.screens.archetype.mgmt.shared.events.ArchetypeListUpdatedEvent;
Expand Down Expand Up @@ -492,7 +492,7 @@ private void validateArchetype(final Repository repository) {

final Path targetDirectoryPath = unpackArchetype(repository);

executeMaven(new ExecuteGoalsCommand(targetDirectoryPath.toString()));
executeMaven(new BuildProjectCommand(targetDirectoryPath.toString()));

updateArchetypeStatus(repository.getAlias(),
ArchetypeStatus.VALID,
Expand Down Expand Up @@ -666,7 +666,7 @@ private Repository makeArchetypeAvailable(final GAV templateGav,
throws GitAPIException, MavenEmbedderException {
createTemporaryGitRepository(repositoryDirectory);

executeMaven(new ExecuteGoalsCommand(repositoryDirectory.getAbsolutePath()));
executeMaven(new BuildProjectCommand(repositoryDirectory.getAbsolutePath()));

return createArchetypeRepository(templateGav,
repositoryDirectory.toURI().toString());
Expand Down
83 changes: 83 additions & 0 deletions ...rg/kie/workbench/common/screens/archetype/mgmt/backend/maven/BuildProjectCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/*
* Copyright 2020 Red Hat, Inc. and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.kie.workbench.common.screens.archetype.mgmt.backend.maven;

import java.io.File;
import java.util.Collections;

import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.project.ProjectBuildingException;
import org.appformer.maven.integration.embedder.MavenEmbedder;
import org.appformer.maven.integration.embedder.MavenEmbedderException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;

@RunWith(MockitoJUnitRunner.class)
public class BuildProjectCommandTest {

private static final String BASE_DIRECTORY = "baseDirectory";

@Test(expected = UnsupportedOperationException.class)
public void buildMavenRequestTest() {
final BuildProjectCommand command = new BuildProjectCommand(BASE_DIRECTORY);

command.buildMavenRequest();
}

@Test(expected = UnsupportedOperationException.class)
public void buildUserPropertiesTest() {
final BuildProjectCommand command = new BuildProjectCommand(BASE_DIRECTORY);

command.buildUserProperties();
}

@Test
public void executeSuccessTest() throws MavenEmbedderException, ProjectBuildingException {
final BuildProjectCommand command = spy(new BuildProjectCommand(BASE_DIRECTORY));

final MavenEmbedder mavenEmbedder = mock(MavenEmbedder.class);
doReturn(Collections.emptyList()).when(mavenEmbedder).buildProjects(any(File.class), eq(false));
doReturn(mavenEmbedder).when(command).createMavenEmbedder();

final MavenExecutionResult executionResult = command.execute();

assertFalse(executionResult.hasExceptions());
}

@Test
public void executeFailedTest() throws MavenEmbedderException, ProjectBuildingException {
final BuildProjectCommand command = spy(new BuildProjectCommand(BASE_DIRECTORY));

final MavenEmbedder mavenEmbedder = mock(MavenEmbedder.class);
doThrow(ProjectBuildingException.class).when(mavenEmbedder).buildProjects(any(File.class), eq(false));
doReturn(mavenEmbedder).when(command).createMavenEmbedder();

final MavenExecutionResult executionResult = command.execute();

assertTrue(executionResult.hasExceptions());
}
}
16 changes: 8 additions & 8 deletions ...kie/workbench/common/screens/archetype/mgmt/backend/service/ArchetypeServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.kie.workbench.common.screens.archetype.mgmt.backend.config.ArchetypeConfigStorageImpl;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.AbstractMavenCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.ArchetypeGenerateCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.ExecuteGoalsCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.maven.BuildProjectCommand;
import org.kie.workbench.common.screens.archetype.mgmt.backend.preference.ArchetypePreferencesManager;
import org.kie.workbench.common.screens.archetype.mgmt.shared.events.ArchetypeListUpdatedEvent;
import org.kie.workbench.common.screens.archetype.mgmt.shared.exceptions.ArchetypeAlreadyExistsException;
Expand Down Expand Up @@ -259,10 +259,10 @@ public void addWhenModuleIsInvalidTest() throws MavenEmbedderException {
}

@Test(expected = MavenExecutionException.class)
public void addWhenExecuteGoalsThrowsExceptionTest() throws MavenEmbedderException {
public void addWhenBuildProjectCommandThrowsExceptionTest() throws MavenEmbedderException {
doReturn(mock(KieModule.class)).when(moduleService).resolveModule(any());
doNothing().when(service).executeMaven(any(ArchetypeGenerateCommand.class));
doThrow(MavenExecutionException.class).when(service).executeMaven(any(ExecuteGoalsCommand.class));
doThrow(MavenExecutionException.class).when(service).executeMaven(any(BuildProjectCommand.class));

service.add(createGav());
}
Expand Down Expand Up @@ -464,7 +464,7 @@ public void validateAllWhenExecuteMavenThrowsExceptionTest() throws MavenEmbedde
.when(repositoryService).getAllRepositories(any(Space.class));
doReturn(mock(Path.class)).when(service).unpackArchetype(any(Repository.class));

doThrow(MavenEmbedderException.class).when(service).executeMaven(any(ExecuteGoalsCommand.class));
doThrow(MavenEmbedderException.class).when(service).executeMaven(any(BuildProjectCommand.class));

final Archetype archetype = createArchetypeWithStatus(ArchetypeStatus.INVALID);
doReturn(archetype).when(archetypeConfigStorage).loadArchetype(anyString());
Expand All @@ -486,7 +486,7 @@ public void validateAllWhenOnlyOneAvailableTest() throws MavenEmbedderException
doReturn(Collections.singletonList(mock(Repository.class)))
.when(repositoryService).getAllRepositories(any(Space.class));
doReturn(mock(Path.class)).when(service).unpackArchetype(any(Repository.class));
doNothing().when(service).executeMaven(any(ExecuteGoalsCommand.class));
doNothing().when(service).executeMaven(any(BuildProjectCommand.class));

final Archetype archetype = createArchetypeWithStatus(ArchetypeStatus.VALID);
doReturn(archetype).when(archetypeConfigStorage).loadArchetype(anyString());
Expand All @@ -510,7 +510,7 @@ public void validateAllWhenManyAvailableTest() throws MavenEmbedderException {
doReturn(Collections.nCopies(10, mock(Repository.class)))
.when(repositoryService).getAllRepositories(any(Space.class));
doReturn(mock(Path.class)).when(service).unpackArchetype(any(Repository.class));
doNothing().when(service).executeMaven(any(ExecuteGoalsCommand.class));
doNothing().when(service).executeMaven(any(BuildProjectCommand.class));

final Archetype archetype = createArchetypeWithStatus(ArchetypeStatus.VALID);
doReturn(archetype).when(archetypeConfigStorage).loadArchetype(anyString());
Expand Down Expand Up @@ -562,7 +562,7 @@ public void validateWhenExecuteMavenThrowsExceptionTest() throws MavenEmbedderEx
eq(COMMON_ARCHETYPE_ALIAS));
doReturn(mock(Path.class)).when(service).unpackArchetype(any(Repository.class));

doThrow(MavenEmbedderException.class).when(service).executeMaven(any(ExecuteGoalsCommand.class));
doThrow(MavenEmbedderException.class).when(service).executeMaven(any(BuildProjectCommand.class));

final Archetype archetype = createArchetypeWithStatus(ArchetypeStatus.INVALID);
doReturn(archetype).when(archetypeConfigStorage).loadArchetype(anyString());
Expand All @@ -585,7 +585,7 @@ public void validateSuccessTest() throws MavenEmbedderException {
doReturn(mock(Repository.class)).when(repositoryService).getRepositoryFromSpace(any(Space.class),
eq(COMMON_ARCHETYPE_ALIAS));
doReturn(mock(Path.class)).when(service).unpackArchetype(any(Repository.class));
doNothing().when(service).executeMaven(any(ExecuteGoalsCommand.class));
doNothing().when(service).executeMaven(any(BuildProjectCommand.class));

final Archetype archetype = createArchetypeWithStatus(ArchetypeStatus.VALID);
doReturn(archetype).when(archetypeConfigStorage).loadArchetype(anyString());
Expand Down