Merge "Addressing Technical Debt for ONAP-XACML"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / PolicyController.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
index d244cf5..03709cc 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
@@ -144,6 +144,9 @@ public class PolicyController extends RestrictedBaseController {
        private static String configHome;
        private static String actionHome;
        
+       //File upload size
+       private static long fileSizeLimit;
+       
        private static boolean jUnit = false;
        
 
@@ -161,6 +164,7 @@ public class PolicyController extends RestrictedBaseController {
        }
 
        public PolicyController() {
+               // Empty constructor
        }
 
        @PostConstruct
@@ -176,6 +180,8 @@ public class PolicyController extends RestrictedBaseController {
                        }
                        // load a properties file
                        prop.load(input);
+                       //file upload size limit property
+                       setFileSizeLimit(prop.getProperty("file.size.limit"));
                        //pap url
                        setPapUrl(prop.getProperty("xacml.rest.pap.url"));
                        // get the property values
@@ -442,7 +448,7 @@ public class PolicyController extends RestrictedBaseController {
                for(Object entity : policyEntity){
                        PolicyEntity pEntity = (PolicyEntity) entity;
                        String removeExtension = pEntity.getPolicyName().replace(".xml", "");
-                       String version = removeExtension.substring(removeExtension.lastIndexOf(".")+1);
+                       String version = removeExtension.substring(removeExtension.lastIndexOf('.')+1);
                        av.add(version);
                }
                if(policyName.contains("/")){
@@ -716,6 +722,19 @@ public class PolicyController extends RestrictedBaseController {
                return file;
        }
        
+       public static void setFileSizeLimit(String uploadSize) {
+               //Default size limit is 30MB
+               if (uploadSize == null || uploadSize.isEmpty()) {
+                       fileSizeLimit = 30000000;
+               }
+               else {
+                       fileSizeLimit = Long.parseLong(uploadSize);
+               }
+       }
+       
+       public static long getFileSizeLimit() {
+               return fileSizeLimit;
+       }
        public String convertDate(String dateTTL) {
                String formateDate = null;
                if(dateTTL.contains("-")){