Skip to content

Commit 2261235

Browse files
author
Oleksandr Dzhychko
authored
Merge pull request #1079 from modelix/feat/MODELIX-996
feat(mps-model-adapters): remove code for mps-model-server-plugin
2 parents f47f2a9 + 978599e commit 2261235

File tree

42 files changed

+58
-3519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+58
-3519
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/bulk-model-sync-lib/ @mhuster23
66
/bulk-model-sync-mps/ @mhuster23
77
/bulk-model-sync-solution/ @mhuster23
8-
/light-model-client/ @slisson
98
/metamodel-export/ @slisson
109
/model-api/ @slisson
1110
/model-api-gen/ @slisson
@@ -16,7 +15,6 @@
1615
/model-datastructure/ @slisson
1716
/model-server/ @slisson
1817
/model-server-api/ @slisson
19-
/model-server-lib/ @slisson
2018
/model-sync-lib/ @slisson
2119
/modelql-client/ @slisson
2220
/modelql-core/ @slisson
@@ -26,6 +24,5 @@
2624
/modelql-untyped/ @slisson
2725
/mps-model-adapters/ @slisson
2826
/mps-model-server/ @slisson
29-
/mps-model-server-plugin/ @slisson
3027
/ts-model-api/ @slisson
3128
/vue-model-api/ @odzhychko

.github/workflows/mps-compatibility.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ jobs:
4242
:metamodel-export:build
4343
:mps-model-adapters:build
4444
:mps-model-adapters-plugin:build
45-
:mps-model-server-plugin:build
4645
-Pmps.version.major=${{ matrix.version }}

commitlint.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ module.exports = {
88
"bulk-model-sync",
99
"bulk-model-sync-gradle",
1010
"deps",
11-
"light-model-client",
12-
"model-server-lib",
1311
"metamodel-export",
1412
"model-api-gen",
1513
"model-api-gen-gradle",
@@ -20,7 +18,6 @@ module.exports = {
2018
"modelql",
2119
"mps-model-adapters",
2220
"mps-model-server",
23-
"mps-model-server-plugin",
2421
"openapi",
2522
"ts-model-api",
2623
"vue-model-api",

docs/global/modules/core/pages/howto/modelql.adoc

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,36 @@
33
== Independent ModelQLClient
44

55
ModelQL defines its own HTTP endpoint and provides server/client implementations for it.
6-
The `model-server` and the `mps-model-server-plugin` already implement this endpoint.
7-
The client can be created like this:
6+
A xref:reference/component-model-server.adoc[model server] already implements this endpoint.
7+
8+
It is recommended
9+
to use the ModelQL client integrated in to the xref:howto/usage-model-client-v2.adoc[model client V2]
10+
when working with the model server:
811

912
[source,kotlin]
1013
--
11-
val client = ModelQLClient.builder().url("http://localhost/query").httpClient(httpClient).build()
14+
val client = ModelClientV2.builder()
15+
.url("http://localhost:28101/v2")
16+
.build()
17+
1218
val result: List<String?> = client.query { root ->
1319
root.children("modules").property("name").toList()
1420
}
1521
--
1622

17-
== Integration with LightModelClient
18-
19-
When creating a `LightModelClient` you can optionally provide a `ModelQLClient` instance,
20-
which allows invoking `.query { ... }` (see below) on a node returned by the `LightModelClient`.
23+
[NOTE]
24+
--
25+
An independent ModelQL client can be created like this:
2126

2227
[source,kotlin]
23-
--
24-
val modelqlClient = ModelQLClient.builder().build()
25-
val client = LightModelClient.builder().modelQLClient(modelqlClient).build()
26-
val result: List<String?> = client.getRootNode()!!.query {
27-
it.children("modules").property("name").toList()
28+
----
29+
val client = ModelQLClient.builder().url("http://localhost/query").httpClient(httpClient).build()
30+
val result: List<String?> = client.query { root ->
31+
root.children("modules").property("name").toList()
2832
}
33+
----
34+
35+
This is only useful when some custom implementation of a ModelQL server needs to be used.
2936
--
3037

3138
== Type-safe ModelQL API

docs/global/modules/core/pages/howto/mps-model-server-plugin.adoc

Lines changed: 0 additions & 46 deletions
This file was deleted.

docs/global/modules/core/pages/howto/testing-against-model-api.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= How-To test `model-api` client code without a model-server
22
:navtitle: Test `model-api` client code without a model-server
33

4-
If you want to test code that processes `model-api` instances, you can do this in-process without a running (light-) model-server.
4+
If you want to test code that processes `model-api` instances, you can do this in-process without a running model-server.
55
Use the following pattern to set up your test fixture containing `model-api` instances:
66

77
[source,kotlin]

docs/global/modules/core/pages/howto/usage-light-model-client.adoc

Lines changed: 0 additions & 45 deletions
This file was deleted.

docs/global/modules/core/pages/howto/usage-model-server.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
NOTE: If you are interested in a more practical usage of what is presented here, check out the https://github.com/modelix/modelix.samples[samples project^]
55

6-
NOTE: To run a light version of the `model-sever`, check out xref:core:howto/mps-model-server-plugin.adoc[]
7-
86
== Backends: In Memory vs. Database
97

108
The `model-server` will by default require a database backend.

docs/global/modules/core/pages/reference/component-light-model-client.adoc

Lines changed: 0 additions & 17 deletions
This file was deleted.

docs/global/modules/core/pages/reference/component-mps-model-server-plugin.adoc

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)