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-5350: rework Maven plugin to avoid using Everrest Websocket #5527

Merged
merged 2 commits into from
Jul 5, 2017
Merged

CHE-5350: rework Maven plugin to avoid using Everrest Websocket #5527

merged 2 commits into from
Jul 5, 2017

Conversation

svor
Copy link
Contributor

@svor svor commented Jul 3, 2017

What does this PR do?

Replaces using Everrest Websocket with JSON-RPC for Maven plugin

What issues does this PR fix or reference?

#5350

Changelog

Use JSON-RPC for broadcasting maven output events

@svor svor added kind/enhancement A feature request - must adhere to the feature request template. team/ide labels Jul 3, 2017
@svor svor self-assigned this Jul 3, 2017
@svor svor requested review from dkuleshov and vparfonov July 3, 2017 16:36
@codenvy-ci
Copy link

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/2984/

dkuleshov
dkuleshov reviewed Jul 4, 2017
View reviewed changes
...in/java/org/eclipse/che/plugin/maven/generator/archetype/MavenArchetypeJsonRpcMessenger.java Outdated
}

@Inject
private void configureSubscribeHandler(RequestHandlerConfigurator configurator) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if we could have also a method to cancel subscription here, what do you think?

dkuleshov
dkuleshov reviewed Jul 4, 2017
View reviewed changes
...in/java/org/eclipse/che/plugin/maven/generator/archetype/MavenArchetypeJsonRpcMessenger.java Outdated

@Override
public void onEvent(ArchetypeOutput event) {
sendArchetypeNotification(event);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say that we don't need to have one more method here, we probably can just move

         ArchetypeOutput archetypeOutput = DtoFactory.newDto(ArchetypeOutput.class);
         archetypeOutput.setOutput(event.getOutput());
         archetypeOutput.setState(event.getState());
 
         endpointIds.forEach(it -> transmitter.newRequest()
                                              .endpointId(it)
                                              .methodName(MAVEN_ARCHETYPE_CHANEL_OUTPUT)
                                              .paramsAsDto(archetypeOutput)
                                              .sendAndSkipResult());

here or did I miss the reason that stands by this decision?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree. I've removed the excessive method.

dkuleshov
dkuleshov reviewed Jul 4, 2017
View reviewed changes
...ugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenWorkspace.java
@@ -110,9 +110,16 @@ public void projectUpdated(Map<MavenProject, MavenProjectModifications> updated,
List<MavenProject> needResolve = manager.findDependentProjects(allChangedProjects);
needResolve.addAll(updated.keySet());

List<String> updatedPaths = updated.keySet().stream()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be compliant to streaming ideology I think it would be nice if we could have here something like this:

updated.keySet().stream()
                             .map(project -> project.getProject())
                             .map(project -> project.getFullPath())
                             .map(fullPath -> fullPath.toOSString())
                             .collect(Collectors.toList());

Don't you agree?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, but since when did "streaming ideology" become an argument for code quality? The version you propose has the advantage that it is easier to debug (because I can use line breakpoints), on the other hand, it will perform worse and is longer.
Btw: if we want to be more catholic than the pope, it would have to be .map(project::getProject), etc.

Copy link

@dkuleshov dkuleshov Jul 4, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Java Streams ideology becomes an argument since @svor uses Java Streams API.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And btw talking about your btw: if we want to be more catholic than the pope, it would be .map(MavenProject::getProject) :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think popes are good people :)

dkuleshov
dkuleshov reviewed Jul 4, 2017
View reviewed changes
...e-plugin-maven-shared/src/main/java/org/eclipse/che/plugin/maven/shared/MavenAttributes.java Outdated
String MAVEN_ARCHETYPE_CHANEL_NAME = "maven:archetype:output";


String MAVEN_CHANEL_SUBSCRIBE = "maven/subscribe";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be mavenOutput/subscribe ?

dkuleshov
dkuleshov reviewed Jul 4, 2017
View reviewed changes
...plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/core/MavenMessage.java Outdated
private final MavenOutputEvent mavenOutputEvent;
private final String notificationType;

public MavenMessage(MavenOutputEvent mavenOutputEvent, String notificationType) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please explain why do we use String for notification type because I'm not sure that I understood the idea?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's unnecessary class which I've forgotten to delete. Thank you!

vparfonov
vparfonov reviewed Jul 4, 2017
View reviewed changes
...de/src/main/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandler.java Outdated
}

private void handleOperations(final WsAgentStateController wsAgentStateController) {
private void handleOperations() {
eventBus.addHandler(WsAgentStateEvent.TYPE, new WsAgentStateHandler() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove this handler
eventBus.addHandler(WorkspaceStoppedEvent.TYPE, event -> dependencyResolver.hide());
will be enough

vparfonov
vparfonov reviewed Jul 4, 2017
View reviewed changes
.../main/java/org/eclipse/che/plugin/maven/client/project/ResolvingMavenProjectStateHolder.java Outdated
@@ -91,32 +75,10 @@ public void removeResolvingProjectStateListener(ResolvingProjectStateListener li

@Override
public void onWsAgentStarted(WsAgentStateEvent event) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! Done, thank you!

@codenvy-ci
Copy link

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/2992/

@svor svor merged commit ef74274 into master Jul 5, 2017
@svor svor deleted the CHE-5350 branch July 5, 2017 13:22
@svor svor mentioned this pull request Jul 5, 2017
Closed
@slemeur slemeur removed the team/ide label Jul 6, 2017
@slemeur slemeur added this to the 5.15.0 milestone Jul 6, 2017
@slemeur
Copy link
Contributor

slemeur commented Jul 6, 2017

@svor : Please assign milestone when merging.

JPinkney pushed a commit to JPinkney/che that referenced this pull request Aug 17, 2017
CHE-5350: rework Maven plugin to avoid using Everrest Websocket (ecli…
6cd3f03 
…pse-che#5527)
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tsmaeder tsmaeder tsmaeder left review comments

@dkuleshov dkuleshov dkuleshov approved these changes

@vparfonov vparfonov vparfonov approved these changes

Assignees

@svor svor

Labels
kind/enhancement A feature request - must adhere to the feature request template.
Projects
None yet
Milestone
5.15.0
Development

Successfully merging this pull request may close these issues.
6 participants
@svor @codenvy-ci @slemeur @dkuleshov @vparfonov @tsmaeder