Skip to content

Commit fa664f4

Browse files
authored
chore: Documentation changes for the next release (#1073)
1 parent e943d36 commit fa664f4

File tree

3 files changed

+66
-32
lines changed

3 files changed

+66
-32
lines changed

doc/folders.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,25 @@ long offset = 0;
121121
long limit = 100;
122122
PagingParameters paging = PagingParameters.offset(offset, limit)
123123
Iterable<BoxItem.Info> itemIterator = childFolder.getChildren(sorting, paging);
124-
while (itemIterator.hasNext()){
124+
while (itemIterator.hasNext()) {
125125
BoxItem.Info itemInfo=itemIterator.next();
126126
// Do something
127127
}
128128
```
129129

130130
With offset pagination you cannot set offset larger than 300000.
131-
132-
By default, SDK is using marker based pagination to get items.
133131
With marker based pagination you can iterate over folders containing more than 300000 elements.
134-
If you want to use PagingParameters to start marker based pagination:
132+
With marker based pagination you cannot use sorting. Use `SortParameters.none()` to turn off sort.
133+
If you want to use PagingParameters to start marker based pagination do:
135134
```java
136135
BoxFolder folder = new BoxFolder(this.api, "12345");
137-
// setup descending sorting by name
138-
SortParameters sorting = SortParameters.descending("name");
136+
// disable sorting
137+
SortParameters sorting = SortParameters.none();
139138
// setup paging with makred based pagination and limit 100
140139
long limit = 100;
141140
PagingParameters paging = PagingParameters.marker(limit)
142141
Iterable<BoxItem.Info> itemIterator = childFolder.getChildren(sorting, paging);
143-
while (itemIterator.hasNext()){
142+
while (itemIterator.hasNext()) {
144143
BoxItem.Info itemInfo=itemIterator.next();
145144
// Do something
146145
}

doc/logging.md

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ By default, the `Java Util Logging` prints to console output only messages that
1515
can limit what is being logged by setting desired level on `com.box.sdk` logger like this:
1616

1717
```java
18-
import java.util.logging.Logger;
19-
import java.util.logging.Level;
18+
import com.box.sdk.BoxLogger;
2019

21-
Logger.getLogger("com.box.sdk").setLevel(Level.SEVERE)
20+
BoxLogger.defaultLogger().setLevelToError();
2221
```
2322

2423
Example above will limit printed logs to `SEVERE` level only.
2524

26-
### Getting FINE logs printed
25+
### Getting FINE (ALL) logs printed
2726

2827
By default `FINE` level logs are not printed to the console. There are several ways to do that.
2928
One way is to define custom handler:
@@ -34,19 +33,24 @@ import java.util.logging.Handler;
3433
import java.util.logging.Level;
3534
import java.util.logging.Logger;
3635

37-
Logger sdkLogger=Logger.getLogger("com.box.sdk");
38-
Handler systemOut=new ConsoleHandler();
36+
Logger sdkLogger = BoxLogger.defaultLogger();
37+
Handler systemOut = new ConsoleHandler();
3938
// this handler will print any message to System.out
4039
systemOut.setLevel(Level.ALL);
4140
sdkLogger.addHandler(systemOut);
4241
// allow sdk logger to print FINE logs
43-
sdkLogger.setLevel(Level.FINE);
42+
sdkLogger.setLevelToAll();
4443
// prevent logs from being processed by default Console handler
4544
sdkLogger.setUseParentHandlers(false);
4645
```
4746

4847
you can do this in your aplication initialization.
4948

49+
### Turn logging off
50+
51+
To disable logging use `BoxLogger.defaultLogger().turnLoggingOff()`.
52+
53+
5054
## Putting SDK logs into application logs
5155

5256
If you are using different logging solution like Log4J2 or Logstash you can use SLF4J and proper bridgge to get your
@@ -81,10 +85,13 @@ this configuration to your logback.xml file:
8185

8286
Below is a list of log levels used by SDK and coresponding Logback levels:
8387

84-
| SDK | Logback |
85-
:-------------------: | :-------:
86-
| FINE | DEBUG |
87-
| WARNING | WARN |
88-
| SEVERE | ERROR |
88+
| SDK | Logback |
89+
:------:|:-------:
90+
| ALL | ALL |
91+
| OFF | OFF |
92+
| FINE | DEBUG |
93+
| INFO | INFO |
94+
| WARN | WARN |
95+
| SEVERE | ERROR |
8996

9097
You can read more on java Util Logging to SLF4J bridge [here](http://www.slf4j.org/legacy.html#jul-to-slf4j).

doc/trash.md

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,43 @@ Get Trashed Items
2525
The [`BoxTrash`][trash-object] implements `Iterable<BoxItem.Info>`, so to get
2626
the collection of items currently in the trash, simply iterate over it.
2727

28-
<!-- sample get_trash -->
28+
<!-- sample get_folders_trash_items -->
2929
```java
3030
BoxTrash trash = new BoxTrash(api);
3131
for (BoxItem.Info itemInfo : trash) {
32-
// Process the item
32+
// Process the item
3333
}
3434
```
3535

36-
[trash-object]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html
36+
Alternatively you can specify sort order, limit, use marker based pagination or specify which fields you want to extract with
37+
[`BoxTrash#items`][trash-items].
38+
39+
To use sorting you have to use offset based pagination:
40+
```java
41+
BoxTrash trash = new BoxTrash(api);
42+
Iterable<BoxItem.Info> trashEntries = trash.items(
43+
SortParameters.ascending("name"),
44+
PagingParameters.offset(0, 500)
45+
);
46+
for (BoxItem.Info trashEntry : trashEntries) {
47+
// Process the item
48+
}
49+
```
50+
If you have a lot of items in trash and offset value is in tens of thousands it is better to use marker based pagination.
51+
However, marker based pagination cannot be used with sorting. To disable sorting use `SortParameters.none()`:
52+
```java
53+
BoxTrash trash = new BoxTrash(api);
54+
Iterable<BoxItem.Info> trashEntries = trash.items(
55+
SortParameters.none(),
56+
PagingParameters.marker(500)
57+
);
58+
for (BoxItem.Info trashEntry : trashEntries) {
59+
// Process the item
60+
}
61+
```
62+
63+
[trash-object]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html
64+
[trash-items]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#items-com.box.sdk.SortParameters-com.box.sdk.PagingParameters-java.lang.String...-
3765

3866
Get Trashed File Information
3967
----------------------------
@@ -52,8 +80,8 @@ BoxTrash trash = new BoxTrash(api);
5280
BoxFile.Info fileInfo = trash.getFileInfo(fileID);
5381
```
5482

55-
[get-trashed-file]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFileInfo-java.lang.String-
56-
[get-trashed-file-fields]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFileInfo-java.lang.String-java.lang.String...-
83+
[get-trashed-file]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFileInfo-java.lang.String-
84+
[get-trashed-file-fields]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFileInfo-java.lang.String-java.lang.String...-
5785

5886
Get Trashed Folder Information
5987
------------------------------
@@ -72,8 +100,8 @@ BoxTrash trash = new BoxTrash(api);
72100
BoxFolder.Info folderInfo = trash.getFolderInfo(folderInfo);
73101
```
74102

75-
[get-trashed-folder]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFolderInfo-java.lang.String-
76-
[get-trashed-folder-fields]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFolderInfo-java.lang.String-java.lang.String...-
103+
[get-trashed-folder]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFolderInfo-java.lang.String-
104+
[get-trashed-folder-fields]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#getFolderInfo-java.lang.String-java.lang.String...-
77105

78106

79107
Permanently Delete File From Trash
@@ -91,7 +119,7 @@ BoxTrash trash = new BoxTrash(api);
91119
trash.deleteFile(fileID);
92120
```
93121

94-
[delete-file]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#deleteFile-java.lang.String-
122+
[delete-file]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#deleteFile-java.lang.String-
95123

96124

97125
Permanently Delete Folder From Trash
@@ -109,7 +137,7 @@ BoxTrash trash = new BoxTrash(api);
109137
trash.deleteFolder(folderID);
110138
```
111139

112-
[delete-folder]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#deleteFolder-java.lang.String-
140+
[delete-folder]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#deleteFolder-java.lang.String-
113141

114142
Restore a File from the Trash
115143
-----------------------------
@@ -132,8 +160,8 @@ BoxTrash trash = new BoxTrash(api);
132160
trash.restoreFile(fileID, newName, newParentID);
133161
```
134162

135-
[restore-file]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFile-java.lang.String-
136-
[restore-file-safe]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFile-java.lang.String-java.lang.String-java.lang.String-
163+
[restore-file]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFile-java.lang.String-
164+
[restore-file-safe]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFile-java.lang.String-java.lang.String-java.lang.String-
137165

138166
Restore a Folder from the Trash
139167
-------------------------------
@@ -157,5 +185,5 @@ BoxTrash trash = new BoxTrash(api);
157185
trash.restoreFolder(folderID, newName, newParentID);
158186
```
159187

160-
[restore-folder]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFolder-java.lang.String-
161-
[restore-folder-safe]: http://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFolder-java.lang.String-java.lang.String-java.lang.String-
188+
[restore-folder]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFolder-java.lang.String-
189+
[restore-folder-safe]: https://opensource.box.com/box-java-sdk/javadoc/com/box/sdk/BoxTrash.html#restoreFolder-java.lang.String-java.lang.String-java.lang.String-

0 commit comments

Comments
 (0)