0.0.9

jcasbin · Sep 24, 2019 · 19d27ed · 19d27ed
1 parent 0c9cf65
commit 19d27ed
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Bintray](https://img.shields.io/bintray/v/casbin/maven/casbin-spring-boot-starter.svg?style=flat-square&color=blue)](https://bintray.com/casbin/maven/casbin-spring-boot-starter/_latestVersion)
 [![License](https://img.shields.io/github/license/jcasbin/casbin-spring-boot-starter.svg?style=flat-square&color=blue)](http://www.apache.org/licenses/LICENSE-2.0.txt)
 [![SpringBootVersion](https://img.shields.io/badge/SpringBoot-2.1.4-heightgreen.svg?style=flat-square)](https://spring.io/projects/spring-boot)
-[![JCasbinVersion](https://img.shields.io/badge/JCasbinVersion-1.3.0-heightgreen.svg?style=flat-square)](https://casbin.org)
+[![JCasbinVersion](https://img.shields.io/badge/JCasbinVersion-1.4.0-heightgreen.svg?style=flat-square)](https://casbin.org)
 
 [![](https://raw.githubusercontent.com/casbin/jcasbin/master/casbin-logo.png)](https://casbin.org)
 

diff --git a/README_CN.md b/README_CN.md
@@ -6,7 +6,7 @@
 [![Bintray](https://img.shields.io/bintray/v/casbin/maven/casbin-spring-boot-starter.svg?style=flat-square&color=blue)](https://bintray.com/casbin/maven/casbin-spring-boot-starter/_latestVersion)
 [![License](https://img.shields.io/github/license/jcasbin/casbin-spring-boot-starter.svg?style=flat-square&color=blue)](http://www.apache.org/licenses/LICENSE-2.0.txt)
 [![SpringBootVersion](https://img.shields.io/badge/SpringBoot-2.1.4-heightgreen.svg?style=flat-square)](https://spring.io/projects/spring-boot)
-[![JCasbinVersion](https://img.shields.io/badge/JCasbinVersion-1.3.0-heightgreen.svg?style=flat-square)](https://casbin.org)
+[![JCasbinVersion](https://img.shields.io/badge/JCasbinVersion-1.4.0-heightgreen.svg?style=flat-square)](https://casbin.org)
 
 [![](https://raw.githubusercontent.com/casbin/jcasbin/master/casbin-logo.png)](https://casbin.org)
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ BINTRAY_SUBJECT=casbin
 #GAV坐标
 GROUP=org.casbin
 ARTIFACT_ID=casbin-spring-boot-starter
-VERSION_CODE=0.0.8
+VERSION_CODE=0.0.9
 #项目地址相关
 GITHUB_REPO=jcasbin/casbin-spring-boot-starter
 POM_URL=https://github.com/jcasbin/casbin-spring-boot-starter

diff --git a/src/main/java/org/casbin/spring/boot/autoconfigure/properties/CasbinProperties.java b/src/main/java/org/casbin/spring/boot/autoconfigure/properties/CasbinProperties.java
@@ -5,9 +5,7 @@
 import org.casbin.exception.CasbinPolicyConfigNotFoundException;
 import org.casbin.utils.FileUtils;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.util.ResourceUtils;
 
-import java.io.FileNotFoundException;
 import java.io.InputStream;
 
 /**
@@ -65,11 +63,21 @@ public class CasbinProperties {
     private boolean useDefaultModelIfModelNotSetting = true;
 
     public String getModelContext() {
-        return FileUtils.getFileAsText(model);
+        String text = FileUtils.getFileAsText(model);
+        if (text == null) {
+            throw new CasbinModelConfigNotFoundException();
+        } else {
+            return text;
+        }
     }
 
     public InputStream getPolicyInputStream() {
-        return FileUtils.getFileAsInputStream(policy);
+        InputStream stream = FileUtils.getFileAsInputStream(policy);
+        if (stream == null) {
+            throw new CasbinPolicyConfigNotFoundException();
+        } else {
+            return stream;
+        }
     }
 }