TouchInstinct
/
android-templates
309
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master-rx-java-2 

# Conflicts:
#	src/main/java/ru/touchin/templates/TouchinApp.java
This commit is contained in:
Arhipov 2017-05-04 14:10:06 +03:00
parent 0b4e2eb14d d102f2954f
commit 317bcce28e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8

7
src/main/java/ru/touchin/templates/googlejson/GoogleJsonModel.java
View File

@ -78,8 +78,11 @@ public abstract class GoogleJsonModel extends ApiModel {
* @throws ValidationException Exception of validation.
*/
protected static void validateNotNull(@Nullable final Object object) throws ValidationException {
if (isNullOrMissed(object)) {
throw new ValidationException("Not nullable object is null or missed at " + Lc.getCodePoint(null, 1));
if (isNull(object)) {
throw new ValidationException("Not nullable object is null at " + Lc.getCodePoint(null, 1));
}
if (isMissed(object)) {
throw new ValidationException("Not nullable object is missed at " + Lc.getCodePoint(null, 1));
}
}