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

CHE-4920: Analyze maven profiles #5122

Merged
merged 3 commits into from
May 18, 2017
Merged

CHE-4920: Analyze maven profiles #5122

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
268c39e
CHE-4920: add an ability to analyze maven profiles
May 18, 2017
cd8ff7a
CHE-4920: code cleanup
May 18, 2017
52c0138
CHE-4920: code cleanup
May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions ide/che-core-ide-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,26 @@
</ignoredDependencies>
</configuration>
</execution>
<execution>
<id>unpack-terminal</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.che.lib</groupId>
<artifactId>che-terminal-client</artifactId>
<version>${che.lib.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.outputDirectory}/org/eclipse/che/public/term</outputDirectory>
<excludes>org/**,META-INF/**</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down Expand Up @@ -318,32 +338,6 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-terminal</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.che.lib</groupId>
<artifactId>che-terminal-client</artifactId>
<version>${che.lib.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.outputDirectory}/org/eclipse/che/public/term</outputDirectory>
<excludes>org/**,META-INF/**</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
11 changes: 11 additions & 0 deletions ...in-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;

import org.eclipse.che.maven.data.MavenExplicitProfiles;
import org.eclipse.che.maven.data.MavenModel;
import org.eclipse.che.maven.server.MavenRemoteServer;
import org.eclipse.che.maven.server.MavenServer;
import org.eclipse.che.maven.server.MavenServerDownloadListener;
import org.eclipse.che.maven.server.MavenServerLogger;
import org.eclipse.che.maven.server.MavenSettings;
import org.eclipse.che.maven.server.MavenTerminal;
import org.eclipse.che.maven.server.ProfileApplicationResult;
import org.eclipse.che.plugin.maven.server.execution.CommandLine;
import org.eclipse.che.plugin.maven.server.execution.JavaParameters;
import org.eclipse.che.plugin.maven.server.execution.ProcessExecutor;
Expand All @@ -37,6 +40,7 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

/**
Expand Down Expand Up @@ -122,6 +126,13 @@ public MavenModel interpolateModel(MavenModel model, File projectDir) {
return perform(() -> getOrCreateWrappedObject().interpolateModel(model, projectDir));
}

public ProfileApplicationResult applyProfiles(MavenModel model,
File projectDir,
MavenExplicitProfiles explicitProfiles,
Collection<String> alwaysOnProfiles) {
return perform(() -> getOrCreateWrappedObject().applyProfiles(model, projectDir, explicitProfiles, alwaysOnProfiles));
}

@PreDestroy
public void shutdown() {
client.stopAll(false);
Expand Down
208 changes: 197 additions & 11 deletions ...rver/src/main/java/org/eclipse/che/plugin/maven/server/core/project/MavenModelReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,35 @@

import org.eclipse.che.commons.lang.Pair;
import org.eclipse.che.commons.xml.XMLTreeException;
import org.eclipse.che.ide.maven.tools.Activation;
import org.eclipse.che.ide.maven.tools.ActivationFile;
import org.eclipse.che.ide.maven.tools.ActivationOS;
import org.eclipse.che.ide.maven.tools.ActivationProperty;
import org.eclipse.che.ide.maven.tools.Build;
import org.eclipse.che.ide.maven.tools.Dependency;
import org.eclipse.che.ide.maven.tools.Model;
import org.eclipse.che.ide.maven.tools.Parent;
import org.eclipse.che.ide.maven.tools.Plugin;
import org.eclipse.che.ide.maven.tools.Profile;
import org.eclipse.che.ide.maven.tools.Resource;
import org.eclipse.che.maven.data.MavenActivation;
import org.eclipse.che.maven.data.MavenActivationFile;
import org.eclipse.che.maven.data.MavenActivationOS;
import org.eclipse.che.maven.data.MavenActivationProperty;
import org.eclipse.che.maven.data.MavenArtifact;
import org.eclipse.che.maven.data.MavenBuild;
import org.eclipse.che.maven.data.MavenExplicitProfiles;
import org.eclipse.che.maven.data.MavenKey;
import org.eclipse.che.maven.data.MavenModel;
import org.eclipse.che.maven.data.MavenParent;
import org.eclipse.che.maven.data.MavenPlugin;
import org.eclipse.che.maven.data.MavenProblemType;
import org.eclipse.che.maven.data.MavenProfile;
import org.eclipse.che.maven.data.MavenProjectProblem;
import org.eclipse.che.maven.data.MavenResource;
import org.eclipse.che.maven.server.MavenProjectInfo;
import org.eclipse.che.maven.server.MavenServerResult;
import org.eclipse.che.maven.server.ProfileApplicationResult;
import org.eclipse.che.plugin.maven.server.MavenServerManager;
import org.eclipse.che.plugin.maven.server.MavenServerWrapper;
import org.slf4j.Logger;
Expand All @@ -41,6 +57,8 @@
import java.util.Set;
import java.util.stream.Collectors;

import static com.google.common.base.Strings.isNullOrEmpty;
import static java.lang.Boolean.parseBoolean;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.eclipse.che.plugin.maven.shared.MavenAttributes.DEFAULT_RESOURCES_FOLDER;
Expand All @@ -62,7 +80,7 @@ public MavenModelReaderResult resolveMavenProject(File pom, MavenServerWrapper m
if (projectInfo != null) {
return new MavenModelReaderResult(projectInfo.getMavenModel(),
projectInfo.getActiveProfiles(),
Collections.emptyList(),
emptyList(),
resolveProject.getProblems(),
resolveProject.getUnresolvedArtifacts());
} else {
Expand All @@ -86,23 +104,39 @@ public MavenModelReaderResult resolveMavenProject(File pom, MavenServerWrapper m
}

public MavenModelReaderResult readMavenProject(File pom, MavenServerManager serverManager) {
Pair<ModelReadingResult, Pair<List<String>, List<String>>> readResult = readModel(pom);
Pair<ModelReadingResult, Pair<List<String>, List<String>>> readResult = readModel(pom, serverManager);
MavenModel model = readResult.first.model;
model = serverManager.interpolateModel(model, pom.getParentFile());

Pair<List<String>, List<String>> profilesPair = readResult.second;
return new MavenModelReaderResult(model,
profilesPair.first,
profilesPair.first,
profilesPair.second,
readResult.first.problems,
Collections.emptySet());
}

private Pair<ModelReadingResult, Pair<List<String>, List<String>>> readModel(File pom) {
private Pair<ModelReadingResult, Pair<List<String>, List<String>>> readModel(File pom, MavenServerManager serverManager) {
ModelReadingResult readingResult = doRead(pom);
//TODO resolve parent pom and profiles
//TODO resolve parent pom

ProfileApplicationResult applied = serverManager.applyProfiles(readingResult.model,
pom.getParentFile(),
MavenExplicitProfiles.NONE,
emptyList());
final MavenModel model = applied.getModel();
updateModelBody(model);

final MavenExplicitProfiles activatedProfiles = applied.getActivatedProfiles();

final ArrayList<String> disabledProfiles = new ArrayList<>(activatedProfiles.getDisabledProfiles().size());
disabledProfiles.addAll(activatedProfiles.getDisabledProfiles());

return Pair.of(readingResult, Pair.of(Collections.emptyList(), Collections.emptyList()));
final ArrayList<String> enableProfiles = new ArrayList<>(activatedProfiles.getEnabledProfiles().size());
enableProfiles.addAll(activatedProfiles.getEnabledProfiles());

return Pair.of(new ModelReadingResult(model, readingResult.problems, readingResult.enabledProfiles),
Pair.of(enableProfiles, disabledProfiles));
}

private ModelReadingResult doRead(File pom) {
Expand Down Expand Up @@ -171,10 +205,137 @@ private ModelReadingResult doRead(File pom) {
result.getBuild().setResources(convertResources(build.getResources()));
}

//TODO add profiles
List<Profile> profiles = model.getProfiles();
if (profiles != null && !profiles.isEmpty()) {
List<MavenProfile> resultProfiles = new ArrayList<>(profiles.size());
for (Profile profile : profiles) {
enabledProfiles.add(profile.getId());

MavenProfile resultProfile = new MavenProfile(profile.getId(), Profile.SOURCE_POM);

setProfileActivation(resultProfile, profile);
setProfileProperties(resultProfile, profile);
setProfileModules(resultProfile, profile);
setProfileBuild(resultProfile, profile);
setProfileDependencies(resultProfile, profile);

resultProfiles.add(resultProfile);
}
result.setProfiles(resultProfiles);
}

return new ModelReadingResult(result, problems, enabledProfiles);
}

private void setProfileProperties(MavenProfile resultProfile, Profile profile) {
Properties resultProperties = new Properties();
resultProperties.putAll(profile.getProperties());
resultProfile.setProperties(resultProperties);
}

private void updateModelBody(MavenModel model) {
MavenBuild build = model.getBuild();

if (build == null) {
return;
}

if (isNullOrEmpty(build.getFinalName())) {
build.setFinalName("${project.artifactId}-${project.version}");
}

if (build.getSources().isEmpty()) {
build.setSources(singletonList("src/main/java"));
}
if (build.getTestSources().isEmpty()) build.setTestSources(singletonList("src/test/java"));

build.setResources(updateResources(build.getResources(), "src/main/resources"));
build.setTestResources(updateResources(build.getTestResources(), "src/test/resources"));

build.setDirectory(isNullOrEmpty(build.getDirectory()) ? "target" : build.getDirectory());
build.setOutputDirectory(isNullOrEmpty(build.getOutputDirectory())
? "${project.build.directory}/classes" : build.getOutputDirectory());
build.setTestOutputDirectory(isNullOrEmpty(build.getTestOutputDirectory())
? "${project.build.directory}/test-classes" : build.getTestOutputDirectory());
}

private List<MavenResource> updateResources(List<MavenResource> resources, String defaultDir) {
List<MavenResource> result = new ArrayList<>();
if (resources.isEmpty()) {
result.add(createResource(defaultDir));
return result;
}

for (MavenResource each : resources) {
if (isNullOrEmpty(each.getDirectory())) continue;
result.add(each);
}
return result;
}

private MavenResource createResource(String directory) {
return new MavenResource(directory, false, null, emptyList(), emptyList());
}

private void setProfileDependencies(MavenProfile resultProfile, Profile profile) {
final List<Dependency> dependencies = profile.getDependencies();
final List<MavenArtifact> mavenArtifacts = dependencies.stream()
.map(dependency -> new MavenArtifact(dependency.getGroupId(),
dependency.getArtifactId(),
dependency.getVersion(),
dependency.getVersion(),
dependency.getType(),
dependency.getClassifier(),
dependency.getScope(),
dependency.isOptional(),
dependency.getType(),
null,
null,
false,
false
)).collect(Collectors.toList());

resultProfile.setDependencies(mavenArtifacts);
}

private void setProfileActivation(MavenProfile resultProfile, Profile profile) {
final Activation activation = profile.getActivation();
if (activation != null) {
resultProfile.setActivation(convertActivation(activation));
}
}

private void setProfileBuild(MavenProfile resultProfile, Profile profile) {
final Build build = profile.getBuild();
if (build == null) {
return;
}
final List<Plugin> plugins = build.getPlugins();
if (plugins != null && !plugins.isEmpty()) {
List<MavenPlugin> mavenPlugins = new ArrayList<>(plugins.size());
for (Plugin plugin : plugins) {
mavenPlugins.add(new MavenPlugin(plugin.getGroupId(),
plugin.getArtifactId(),
plugin.getVersion(),
false,
null, emptyList(), emptyList()));
}
resultProfile.setPlugins(mavenPlugins);
resultProfile.getBuild().setFinalName(build.getFinalName());
resultProfile.getBuild().setDefaultGoal(build.getDefaultGoal());
resultProfile.getBuild().setOutputDirectory(build.getOutputDirectory());
resultProfile.getBuild().setTestOutputDirectory(build.getTestOutputDirectory());
resultProfile.getBuild().setTestOutputDirectory(build.getTestOutputDirectory());
}
}

private void setProfileModules(MavenProfile resultProfile, Profile profile) {
final List<String> profileModules = profile.getModules();
if (profileModules != null) {
resultProfile.setModules(profileModules);
}
}

private void fillModelByDefaults(MavenModel model) {
model.setMavenKey(new MavenKey("unknown", "unknown", "unknown"));

Expand All @@ -191,13 +352,13 @@ private void fillModelByDefaults(MavenModel model) {
build.setResources(singletonList(new MavenResource(DEFAULT_RESOURCES_FOLDER,
false,
null,
Collections.emptyList(),
Collections.emptyList())));
emptyList(),
emptyList())));
build.setTestResources(singletonList(new MavenResource(DEFAULT_TEST_RESOURCES_FOLDER,
false,
null,
Collections.emptyList(),
Collections.emptyList())));
emptyList(),
emptyList())));
}

private String getNotNull(String value, String defaultValue) {
Expand All @@ -214,6 +375,31 @@ private List<MavenResource> convertResources(List<Resource> resources) {
.collect(Collectors.toList());
}

private MavenActivation convertActivation(Activation activation) {
MavenActivation mavenActivation = new MavenActivation();

final ActivationOS activationOs = activation.getOs();
final ActivationFile activationFile = activation.getFile();
final ActivationProperty activationProperty = activation.getProperty();
if (activationOs != null) {
mavenActivation.setOs(new MavenActivationOS(activationOs.getName(),
activationOs.getFamily(),
activationOs.getArch(),
activationOs.getVersion()));
}
if (activationFile != null) {
mavenActivation.setFile(new MavenActivationFile(activationFile.getExist(), activationFile.getMissing()));
}
if (activationProperty != null) {
mavenActivation.setProperty(new MavenActivationProperty(activationProperty.getName(), activationProperty.getValue()));
}

mavenActivation.setJdk(activation.getJdk());
mavenActivation.setActiveByDefault(parseBoolean(activation.isActiveByDefault()));

return mavenActivation;
}

private static class ModelReadingResult {
MavenModel model;
List<MavenProjectProblem> problems;
Expand Down
Loading