Skip to content

Commit 730a00c

Browse files
authored
Merge pull request #630 from bci-oss/fix-formatting-issues
Fix formatting issues in documentation
2 parents af5f1da + 5df90b9 commit 730a00c

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

documentation/developer-guide/modules/tooling-guide/pages/java-aspect-tooling.adoc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,23 +152,24 @@ include::esmf-developer-guide:ROOT:partial$esmf-aspect-meta-model-java-artifact.
152152
[[understanding-model-resolution]]
153153
=== Understanding Model Resolution
154154

155-
The example in the last section showed how a self-contained Aspect Model file can be loaded (i.e., a file that
156-
does not refer to model element definitions in other files or namespaces). Whenever models are loaded that
157-
could contain such references, or you want to load a model element by URN, the AspectModelLoader relies on
158-
so-called _resolution strategies_. A resolution strategy is a function that takes a model element identifier
159-
(a model element URN) as an input and returns the content of the file that contains the corresponding model
160-
element definition. Note that this is not necessarily a file in the local filesystem, but it could also be a
161-
remote file or even exist only virtually as a collection of statements in an RDF triple store. Several
162-
`ResolutionStrategy`s are provided that can be instantiated and passed to the `AspectModelLoader` constructor
163-
to enable it to find model element definitions:
155+
The example in the last section showed how a self-contained Aspect Model file can be loaded (i.e., a
156+
file that does not refer to model element definitions in other files or namespaces). Whenever models
157+
are loaded that could contain such references, or you want to load a model element by URN, the
158+
AspectModelLoader relies on so-called _resolution strategies_. A resolution strategy is a function
159+
that takes a model element identifier (a model element URN) as an input and returns the content of
160+
the file that contains the corresponding model element definition. Note that this is not necessarily
161+
a file in the local filesystem, but it could also be a remote file or even exist only virtually as a
162+
collection of statements in an RDF triple store. Several `ResolutionStrategy`​s are provided
163+
that can be instantiated and passed to the `AspectModelLoader` constructor to enable it to find
164+
model element definitions:
164165

165166
* The `FileSystemStrategy` resolves elements from files in the file system which are either structured in the
166167
xref:tooling-guide:samm-cli.adoc#models-directory-structure[models directory structure] or exist as flat
167168
list of files in one directory (by using `FileSystemStrategy` with a `FlatModelsRoot`).
168169
* The `ClassPathStrategy` resolves model elements from resources in the Java class path.
169170
* The `FromLoadedFileStrategy` resolves model elements from an `AspectModelFile` that already resides in
170171
memory.
171-
* The `EitherStrategy` can be used to chain two or more different `ResolutionStrategy`s.
172+
* The `EitherStrategy` can be used to chain two or more different `ResolutionStrategy`​s.
172173
* The `ExternalResolverStrategy` delegates resolution to an external command such as a script; it is used in
173174
the implementation of the `--custom-resolver` option of the xref:tooling-guide:samm-cli.adoc[samm-cli].
174175

documentation/developer-guide/modules/tooling-guide/pages/maven-plugin.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Configuration Properties:
266266
| `aspectApiBaseUrl` | The base URL for the Aspect API OpenAPI specification. | `String` | none | {ok}
267267
| `aspectParameterFile` | The path to a file including the schema description for the resource. For JSON the description has to be in json, for YAML it has to be in YAML. | `String` | none | {nok}
268268
| `useSemanticApiVersion` | Use the complete semantic version of the Aspect Model as the version of the Aspect API. | `Boolean` | `false` | {nok}
269-
| `aspectResourcePath` | The resource-path` for the Aspect API endpoints. | `String` | none | {nok}
269+
| `aspectResourcePath` | The `resource-path` for the Aspect API endpoints. | `String` | none | {nok}
270270
| `includeQueryApi` | Include the path for the Query Aspect API Endpoint in the OpenAPI specification. | `Boolean` | `false` | {nok}
271271
| `includeFullCrud` | Include the POST/PUT/PATCH methods in the OpenAPI specification. | `Boolean` | `false` | {nok}
272272
| `includePost` | Include the POST method in the OpenAPI specification. | `Boolean` | `false` | {nok}

0 commit comments

Comments
 (0)