Skip to content

Commit f0b7625

Browse files
Simran-Bsleto-it
authored andcommitted
Doc - Formatting (arangodb#240)
1 parent 469e6dc commit f0b7625

37 files changed

+943
-729
lines changed

ChangeLog.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
277277

278278
### Fixed
279279

280-
- fixed default Json parsing, include null values (Issue #163)
281-
- fixed Json parsing of negative long (Issue #151)
280+
- fixed default JSON parsing, include null values (Issue #163)
281+
- fixed JSON parsing of negative long (Issue #151)
282282

283283
## [4.3.0] - 2017-11-23
284284

@@ -386,7 +386,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
386386
- added `ArangoDBException#getException()`
387387
- added protocol switch (`ArangoDB.Builder#useProtocol(Protocol)`)
388388
- `Protocol#VST` = VeclocyStream (default)
389-
- `Protocol#HTTP_JSON` = Json over HTTP
389+
- `Protocol#HTTP_JSON` = JSON over HTTP
390390
- `Protocol#HTTP_VPACK` = VelocyPack over HTTP
391391

392392
## [4.1.12] - 2017-04-13
@@ -472,13 +472,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
472472
### Fixed
473473

474474
- fixed URL encoding bug (#97)
475-
- fixed update/replaceDocumets with Json (#98)
475+
- fixed update/replaceDocumets with JSON (#98)
476476

477477
## [4.1.7] - 2017-01-26
478478

479479
### Fixed
480480

481-
- fixed `importDocuments`, `insertDocuments` to work with raw Jsons (issue #91)
481+
- fixed `importDocuments`, `insertDocuments` to work with raw JSONs (issue #91)
482482

483483
## [4.1.6] - 2017-01-18
484484

@@ -523,7 +523,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
523523

524524
### Added
525525

526-
- added `VelocyPack` UTC_DATE parsing to Json String (ISO 8601)
526+
- added `VelocyPack` UTC_DATE parsing to JSON String (ISO 8601)
527527
- added configuration methods for `VPackParser` in `ArangoDB.Builder`
528528
- added `VPackJsonSerializer` for `VPackParser`
529529

docs/Drivers/Java/GettingStarted/README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
## Supported versions
44

5-
<table>
6-
<tr><th>arangodb-java-driver</th><th>ArangoDB</th><th>network protocol</th><th>Java version</th></tr>
7-
<tr><td>5.x.x+</td><td>3.0.0+</td><td>VelocyStream, HTTP</td><td>1.6+</td></tr>
8-
<tr><td>4.2.x+</td><td>3.0.0+</td><td>VelocyStream, HTTP</td><td>1.6+</td></tr>
9-
<tr><td>4.1.x</td><td>3.1.0+</td><td>VelocyStream</td><td>1.6+</td></tr>
10-
<tr><td>3.1.x</td><td>3.1.0+</td><td>HTTP</td><td>1.6+</td></tr>
11-
<tr><td>3.0.x</td><td>3.0.x</td><td>HTTP</td><td>1.6+</td></tr>
12-
<tr><td>2.7.4</td><td>2.7.x, 2.8.x</td><td>HTTP</td><td>1.6+</td></tr>
13-
</table>
5+
arangodb-java-driver | ArangoDB | network protocol | Java version
6+
---------------------|--------------|--------------------|-------------
7+
5.x.x+ | 3.0.0+ | VelocyStream, HTTP | 1.6+
8+
4.2.x+ | 3.0.0+ | VelocyStream, HTTP | 1.6+
9+
4.1.x | 3.1.0+ | VelocyStream | 1.6+
10+
3.1.x | 3.1.0+ | HTTP | 1.6+
11+
3.0.x | 3.0.x | HTTP | 1.6+
12+
2.7.4 | 2.7.x, 2.8.x | HTTP | 1.6+
1413

1514
**Note**: VelocyStream is only supported in ArangoDB 3.1 and above.
1615

@@ -31,7 +30,8 @@ ArangoDB 3.x.x
3130
</dependencies>
3231
```
3332

34-
If you want to test with a snapshot version (e.g. 4.6.0-SNAPSHOT), add the staging repository of oss.sonatype.org to your pom.xml:
33+
If you want to test with a snapshot version (e.g. 4.6.0-SNAPSHOT),
34+
add the staging repository of oss.sonatype.org to your pom.xml:
3535

3636
```XML
3737
<repositories>

docs/Drivers/Java/Reference/Collection/BulkImport.md

+33-17
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@ This function implements the
55

66
## ArangoCollection.importDocuments
77

8-
```
9-
ArangoCollection.importDocuments(Collection<?> values, DocumentImportOptions options) : DocumentImportEntity
10-
```
8+
`ArangoCollection.importDocuments(Collection<?> values, DocumentImportOptions options) : DocumentImportEntity`
119

12-
```
13-
ArangoCollection.importDocuments(String values, DocumentImportOptions options) : DocumentImportEntity
14-
```
10+
`ArangoCollection.importDocuments(String values, DocumentImportOptions options) : DocumentImportEntity`
1511

1612
Bulk imports the given values into the collection.
1713

@@ -27,39 +23,56 @@ Bulk imports the given values into the collection.
2723

2824
- **fromPrefix**: `String`
2925

30-
An optional prefix for the values in \_from attributes. If specified, the value is automatically prepended to each \_from input value. This allows specifying just the keys for \_from.
26+
An optional prefix for the values in \_from attributes. If specified,
27+
the value is automatically prepended to each \_from input value.
28+
This allows specifying just the keys for \_from.
3129

3230
- **toPrefix**: `String`
3331

34-
An optional prefix for the values in \_to attributes. If specified, the value is automatically prepended to each \_to input value. This allows specifying just the keys for \_to.
32+
An optional prefix for the values in \_to attributes. If specified,
33+
the value is automatically prepended to each \_to input value.
34+
This allows specifying just the keys for \_to.
3535

3636
- **overwrite**: `Boolean`
3737

38-
If this parameter has a value of true, then all data in the collection will be removed prior to the import. Note that any existing index definitions will be preseved.
38+
If this parameter has a value of true, then all data in the collection
39+
will be removed prior to the import. Note that any existing index definitions
40+
will be preserved.
3941

4042
- **waitForSync**: `Boolean`
4143

4244
Wait until documents have been synced to disk before returning.
4345

4446
- **onDuplicate**: `OnDuplicate`
4547

46-
Controls what action is carried out in case of a unique key constraint violation. Possible values are:
48+
Controls what action is carried out in case of a unique key constraint violation.
49+
Possible values are:
4750

48-
- **error**: this will not import the current document because of the unique key constraint violation. This is the default setting.
51+
- **error**: this will not import the current document because of the
52+
unique key constraint violation. This is the default setting.
4953

50-
- **update**: this will update an existing document in the database with the data specified in the request. Attributes of the existing document that are not present in the request will be preseved.
54+
- **update**: this will update an existing document in the database with
55+
the data specified in the request. Attributes of the existing document
56+
that are not present in the request will be preserved.
5157

52-
- **replace**: this will replace an existing document in the database with the data specified in the request.
58+
- **replace**: this will replace an existing document in the database with
59+
the data specified in the request.
5360

54-
- **ignore**: this will not update an existing document and simply ignore the error caused by the unique key constraint violation. Note that update, replace and ignore will only work when the import document in the request contains the \_key attribute. update and replace may also fail because of secondary unique key constraint violations.
61+
- **ignore**: this will not update an existing document and simply ignore
62+
the error caused by the unique key constraint violation. Note that update,
63+
replace and ignore will only work when the import document in the request
64+
contains the \_key attribute. update and replace may also fail because of
65+
secondary unique key constraint violations.
5566

5667
- **complete**: `Boolean`
5768

58-
If set to true, it will make the whole import fail if any error occurs. Otherwise the import will continue even if some documents cannot be imported.
69+
If set to true, it will make the whole import fail if any error occurs.
70+
Otherwise the import will continue even if some documents cannot be imported.
5971

6072
- **details**: `Boolean`
6173

62-
If set to true, the result will include an attribute details with details about documents that could not be imported.
74+
If set to true, the result will include an attribute details with details
75+
about documents that could not be imported.
6376

6477
**Examples**
6578

@@ -71,5 +84,8 @@ ArangoCollection collection = db.collection("some-collection");
7184
BaseDocument doc1 = new BaseDocument();
7285
BaseDocument doc2 = new BaseDocument();
7386
BaseDocument doc3 = new BaseDocument();
74-
collection.importDocuments(Arrays.asList(doc1, doc2, doc3), new DocumentImportOptions());
87+
collection.importDocuments(
88+
Arrays.asList(doc1, doc2, doc3),
89+
new DocumentImportOptions()
90+
);
7591
```

0 commit comments

Comments
 (0)