Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #54

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bad8b6a
less timeout
trajano Jan 30, 2018
33e98c6
fixed sonar warning
trajano Jan 30, 2018
0c6011d
fixed sonar issues
trajano Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion quasar-ms/src/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const router = new VueRouter({
* build publicPath back to '' so Cordova builds work again.
*/

mode: navigator.userAgent.indexOf('Cordova') > 0 ? 'hash' : 'history',
mode: navigator.userAgent.includes('Cordova') ? 'hash' : 'history',
scrollBehavior: () => ({ y: 0 }),

routes: [
Expand Down
5 changes: 1 addition & 4 deletions sample-ms/src/main/java/net/trajano/ms/example/HelloResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,13 @@ public Response maven() {
}
}

@SuppressWarnings("null")
@ApiOperation(value = "throw null pointer exception")
@GET
@Path("/null")
@Produces(MediaType.APPLICATION_JSON)
public JsonObject nullOp() {

final JsonObject ret = null;
ret.add("Hello", new JsonPrimitive("world"));
return ret;
throw new NullPointerException();
}

@ApiOperation(value = "Cancelling after 1 seconds",
Expand Down
1 change: 1 addition & 0 deletions src/test/artillery/load-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
config:
target: "http://localhost:8910"
timeout: 10
phases:
- duration: 120
arrivalRate: 50
Expand Down