Added JSON-RPC back-end to Project API and removed deprecated VFS classes #6726

dkuleshov · 2017-10-13T11:06:14Z

Work is still in progress.
Original issue: #6122

Changes to Project Service:

Added or reworked components according to Network transport specification draft #6219
Refactoring and decomposition
Reworked some places according to new FS API

Changes to Project Manager:

Refactoring and decomposition
Reworked package structure
Split Guice configuration into several classes
Reworked architecture (where it is possible) to comply DI pattern

Changes to VFS

Removed all deprecated VFS related classes
Rearranged code accordingly
Provided new FS API where needed

Changes to Search

Reworked index classes that depend on VFS

What is yet to be done:

Pass selenium tests
Rework/add unit tests
Rework/add java docs

codenvy-ci · 2017-10-13T15:54:57Z

Build # 4137 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/4137/ to view the results.

skabashnyuk · 2017-10-13T19:39:00Z

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/ProjectServiceClient.java

+    if (url.contains("?")) {
+      url += "&clientId=" + appContext.getApplicationId().orElse("");
+    } else {
+


Both parts of if should look the same.

Improved by this commit

skabashnyuk · 2017-10-13T19:39:10Z

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/ProjectServiceClient.java

+    if (url.contains("?")) {
+      url += "&clientId=" + appContext.getApplicationId().orElse("");
+    } else {
+


Both parts of if should look the same.

skabashnyuk · 2017-10-13T19:39:39Z

ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/ProjectServiceClientTest.java

-    verify(asyncRequest).header(CONTENT_TYPE, APPLICATION_JSON);
-    verify(asyncRequest).send();
+    //    client.importProject(resourcePath, source);
+    //


remove if not needed.

skabashnyuk · 2017-10-13T19:39:52Z

ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/ProjectServiceClientTest.java

-    assertEquals(2, prjsArgCaptor.getValue().size());
+    //    List<NewProjectConfigDto> configs = Arrays.asList(prjConfig1, prjConfig2);
+    //
+    //    client.createBatchProjects(configs);


remove if not needed.

This test is already reworked be one of my previous commits, in general I'm not sure if it is a good idea to review the PR that is in a work-in-progress state, I mean you will have many of your remarks outdated and useless. Please watch "status" label to be aware of current PR status not to waste your time.

skabashnyuk · 2017-10-13T19:41:26Z

...in/java/org/eclipse/che/plugin/composer/server/projecttype/ComposerValueProviderFactory.java

-      Reader reader = new BufferedReader(new InputStreamReader(composerFile.getInputStream()));
-      return new Gson().fromJson(reader, JsonObject.class);
+    private JsonObject readModel(Path projectFsPath) throws ServerException, IOException {
+      return new Gson().fromJson(Files.newBufferedReader(projectFsPath), JsonObject.class);


Do we need to close reader here ?

I'm not familiar with the logic, I did just source code adaptation to a new API, so I don't really know if we need to close reader here. If it matters for you, I guess you can ask an author.

skabashnyuk · 2017-10-13T19:42:01Z

...in-cpp-lang-server/src/main/java/org/eclipse/che/plugin/cpp/generator/CProjectGenerator.java

+    fsManager.createDir(projectWsPath);
+    InputStream inputStream = getClass().getClassLoader().getResourceAsStream(RESOURCE_NAME);
+    String wsPath = resolve(projectWsPath, FILE_NAME);
+    fsManager.createFile(wsPath, inputStream);


do we need to close inputStream here?

Again, I'm not sure if we need to close the stream here, probably we do, however this is out of scope of this issue. The PR already has like three hundreds of file changed, honestly, I see those and some other errors, but I haven't the slightest desire to mix those fixes with this huge PR. I'm sure that there will be enough PR-related bugs and errors.

If you are really concerned about such kind of errors (and I sincerely share your concern) I guess you can create a dedicated issue so we could later get back to it and fix all those bugs.

Created an issue: #6841.

skabashnyuk · 2017-10-13T19:42:24Z

...-cpp-lang-server/src/main/java/org/eclipse/che/plugin/cpp/generator/CppProjectGenerator.java

+      String projectWsPath, Map<String, AttributeValue> attributes, Map<String, String> options)
+      throws ForbiddenException, ConflictException, ServerException, NotFoundException {
+    fsManager.createDir(projectWsPath);
+    InputStream inputStream = getClass().getClassLoader().getResourceAsStream(RESOURCE_NAME);


do we need to close inputStream here?

skabashnyuk · 2017-10-13T19:42:46Z

...va-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/util/ProjectApiUtils.java

+    //
+    //    EventService eventService = new EventService();
+    //    LocalVirtualFileSystemProvider vfsProvider =
+    //        new LocalVirtualFileSystemProvider(root, sProvider);


skabashnyuk · 2017-10-13T19:44:41Z

...-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaFormatterService.java

+      String projectCheFolderWsPath = resolve(projectWsPath, CHE_FOLDER);
+
+      if (!fsManager.existsAsDir(projectCheFolderWsPath)) {
+        fsManager.createDir(projectCheFolderWsPath);


do we need to check if a directory has been created here?

skabashnyuk · 2017-10-13T19:44:56Z

...-lang-server/src/main/java/org/eclipse/che/plugin/java/server/rest/JavaFormatterService.java

+      String cheFormatterWsPath = resolve(projectCheFolderWsPath, CHE_FORMATTER_XML);
+
+      if (!fsManager.existsAsFile(cheFormatterWsPath)) {
+        fsManager.createFile(cheFormatterWsPath, content);


do we need to check if a file has been created here?

dkuleshov · 2017-10-17T12:16:57Z

ci-test

codenvy-ci · 2017-10-17T13:58:52Z

ci-test build report:
Build details
Test report
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

codenvy-ci · 2017-10-17T19:39:32Z

Build # 4185 - FAILED

Please check console output at https://ci.codenvycorp.com/job/che-pullrequests-build/4185/ to view the results.

dkuleshov · 2017-10-19T12:13:06Z

ci-test

codenvy-ci · 2017-10-19T12:43:37Z

ci-test build report:
Build details
Test report
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

…classes Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

dkuleshov · 2017-11-08T14:12:49Z

ci-test

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

codenvy-ci · 2017-11-08T18:43:04Z

ci-test build report:
Build details
Test report
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

dkuleshov · 2017-11-08T21:05:11Z

ci-test

codenvy-ci · 2017-11-09T06:41:04Z

ci-test build report:
Build details
Test report
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

dkuleshov · 2017-11-09T15:59:27Z

ci-test

codenvy-ci · 2017-11-09T20:25:16Z

ci-test build report:
Build details
Test report
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

dkuleshov · 2017-11-10T14:50:15Z

ci-test

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

dkuleshov · 2017-11-14T14:16:32Z

ci-test

codenvy-ci · 2017-11-14T16:56:11Z

ci-test build report:
Build details
Test report
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

benoitf · 2017-11-15T09:17:38Z

it is normal this PR has been closed ? looks like it was a work in progress since one month ?

dkuleshov · 2017-11-15T10:15:42Z

Created a new PR instead of this one #7380

dkuleshov added kind/enhancement A feature request - must adhere to the feature request template. status/in-progress This issue has been taken by an engineer and is under active development. target/branch Indicates that a PR will be merged into a branch other than master. labels Oct 13, 2017

dkuleshov self-assigned this Oct 13, 2017

dkuleshov requested review from evidolob, skabashnyuk, tolusha and vparfonov as code owners October 13, 2017 11:06

skabashnyuk reviewed Oct 13, 2017

View reviewed changes

dkuleshov force-pushed the che#6122 branch from b745dc7 to a669db7 Compare October 17, 2017 12:16

dkuleshov force-pushed the che#6122 branch from a669db7 to 62cb3ee Compare October 17, 2017 12:30

dkuleshov force-pushed the che#6122 branch from 62cb3ee to 1e62f6b Compare October 19, 2017 12:09

skabashnyuk added this to the 6.0.0-M1 milestone Oct 19, 2017

Dmytro Kulieshov added 11 commits October 19, 2017 15:48

initial commit

b224fa2

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixes and refactoring

d98cefb

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixed bugs, rearranged packages, moved guice conf to separate module …

f87e47c

…classes Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

more refactoring

12ced53

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

bug fixes for project importing

13028b6

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fix for selenium tests

0db87aa

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

refactoring, bug fixing, added unit tests

98ca8cf

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

rebased and added several unit tests

98e3dd2

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

added new unit tests, fixed some old unit tests, refactoring

7e5c6dd

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixed formatting

9394cbc

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixed import project from zip

bcdebec

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

Dmytro Kulieshov added 2 commits November 8, 2017 15:45

fixed ProjectItemModifiedEvent event publishing

eca4ca4

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

Merge branch 'che6' into che#6122

50b4e91

Dmytro Kulieshov added 2 commits November 8, 2017 16:23

more fixes to media type filter

0e51f1e

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

temprorary disabled media types exclude matcher unit test

b778678

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

Dmytro Kulieshov added 5 commits November 9, 2017 14:19

removed media type exclude filter for file watcher operations

df40015

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixed DI for zend debugger

a3fb600

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixed selenium test timeout for newly added files

b89fb4e

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixed recursive project and subprojects removal

607c49a

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

formatting was not excellent

812671c

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

vparfonov approved these changes Nov 10, 2017

View reviewed changes

tolusha and others added 2 commits November 10, 2017 15:00

Fix PHP test

18cb4de

minor clean up

1664473

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

Dmytro Kulieshov added 3 commits November 13, 2017 15:57

added some javadocs

9089de2

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

fixed creating of a project in a sub-directory of another project

7dd03fe

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

Merge branch 'che6' into che#6122

b5fffc2

Signed-off-by: Dmytro Kulieshov <dkuliesh@redhat.com>

musienko-maxim closed this Nov 15, 2017

musienko-maxim deleted the che#6122 branch November 15, 2017 08:38

dkuleshov restored the che#6122 branch November 15, 2017 09:43

benoitf mentioned this pull request Nov 15, 2017

Added JSON-RPC back-end to Project API and removed deprecated VFS classes #7380

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added JSON-RPC back-end to Project API and removed deprecated VFS classes #6726

Added JSON-RPC back-end to Project API and removed deprecated VFS classes #6726

dkuleshov commented Oct 13, 2017 •

edited

Loading

codenvy-ci commented Oct 13, 2017

skabashnyuk Oct 13, 2017

dkuleshov Oct 19, 2017

skabashnyuk Oct 13, 2017

skabashnyuk Oct 13, 2017

skabashnyuk Oct 13, 2017

dkuleshov Oct 17, 2017

skabashnyuk Oct 13, 2017

dkuleshov Oct 17, 2017

skabashnyuk Oct 13, 2017

dkuleshov Oct 17, 2017

dkuleshov Oct 19, 2017

skabashnyuk Oct 13, 2017

skabashnyuk Oct 13, 2017

skabashnyuk Oct 13, 2017

skabashnyuk Oct 13, 2017

dkuleshov commented Oct 17, 2017

codenvy-ci commented Oct 17, 2017

codenvy-ci commented Oct 17, 2017

dkuleshov commented Oct 19, 2017

codenvy-ci commented Oct 19, 2017

dkuleshov commented Nov 8, 2017

codenvy-ci commented Nov 8, 2017

dkuleshov commented Nov 8, 2017

codenvy-ci commented Nov 9, 2017

dkuleshov commented Nov 9, 2017

codenvy-ci commented Nov 9, 2017

dkuleshov commented Nov 10, 2017

dkuleshov commented Nov 14, 2017

codenvy-ci commented Nov 14, 2017

benoitf commented Nov 15, 2017

dkuleshov commented Nov 15, 2017

Added JSON-RPC back-end to Project API and removed deprecated VFS classes #6726

Added JSON-RPC back-end to Project API and removed deprecated VFS classes #6726

Conversation

dkuleshov commented Oct 13, 2017 • edited Loading

codenvy-ci commented Oct 13, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dkuleshov commented Oct 17, 2017

codenvy-ci commented Oct 17, 2017

codenvy-ci commented Oct 17, 2017

dkuleshov commented Oct 19, 2017

codenvy-ci commented Oct 19, 2017

dkuleshov commented Nov 8, 2017

codenvy-ci commented Nov 8, 2017

dkuleshov commented Nov 8, 2017

codenvy-ci commented Nov 9, 2017

dkuleshov commented Nov 9, 2017

codenvy-ci commented Nov 9, 2017

dkuleshov commented Nov 10, 2017

dkuleshov commented Nov 14, 2017

codenvy-ci commented Nov 14, 2017

benoitf commented Nov 15, 2017

dkuleshov commented Nov 15, 2017

dkuleshov commented Oct 13, 2017 •

edited

Loading