diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.swagger-codegen-ignore b/.swagger-codegen-ignore old mode 100644 new mode 100755 diff --git a/.swagger-codegen/VERSION b/.swagger-codegen/VERSION old mode 100644 new mode 100755 diff --git a/Docker_Tecnalia_PolicyEngine/docker-compose.yml b/Docker_Tecnalia_PolicyEngine/docker-compose.yml old mode 100644 new mode 100755 diff --git a/Docker_Tecnalia_PolicyEngine/policyengine/Dockerfile b/Docker_Tecnalia_PolicyEngine/policyengine/Dockerfile old mode 100644 new mode 100755 diff --git a/Docker_Tecnalia_PolicyEngine/policyengine/policyengine.jar b/Docker_Tecnalia_PolicyEngine/policyengine/policyengine.jar old mode 100644 new mode 100755 index 0cfd96e72b2ab348de65bebe86d7a917f6b595e3..5ba169196b94cc8852906e90abbe504525fcd93c Binary files a/Docker_Tecnalia_PolicyEngine/policyengine/policyengine.jar and b/Docker_Tecnalia_PolicyEngine/policyengine/policyengine.jar differ diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/nbactions.xml b/nbactions.xml old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/RFC3339DateFormat.java b/src/main/java/com/tecnalia/DVPolicyEngine/RFC3339DateFormat.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/Swagger2SpringBoot.java b/src/main/java/com/tecnalia/DVPolicyEngine/Swagger2SpringBoot.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/api/ApiException.java b/src/main/java/com/tecnalia/DVPolicyEngine/api/ApiException.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/api/ApiOriginFilter.java b/src/main/java/com/tecnalia/DVPolicyEngine/api/ApiOriginFilter.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/api/ApiResponseMessage.java b/src/main/java/com/tecnalia/DVPolicyEngine/api/ApiResponseMessage.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/api/GetAccessApi.java b/src/main/java/com/tecnalia/DVPolicyEngine/api/GetAccessApi.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/api/GetAccessApiController.java b/src/main/java/com/tecnalia/DVPolicyEngine/api/GetAccessApiController.java old mode 100644 new mode 100755 index 7f5fc22ea110d80d8721c2983c8750134900d66b..eaacace2d6e83163e01bc51b2ebd622eb1ba016f --- a/src/main/java/com/tecnalia/DVPolicyEngine/api/GetAccessApiController.java +++ b/src/main/java/com/tecnalia/DVPolicyEngine/api/GetAccessApiController.java @@ -80,6 +80,9 @@ public class GetAccessApiController implements GetAccessApi { }*/ try{ dataSeekerID=body.getDataseekerID(); organizationAttributesAsString=policyService.getDataSeekersOrganizationPolicy(dataSeekerID); + + // organizationAttributesAsString="{\"name\":\"Test Organization\",\"sector\":\"Test Sector\",\"continent\":\"EU\",\"country\":\"GRE\",\"type\":\"Private Entity\",\"size\":\"medium\",\"reputation\":7}"; + System.out.println("organizationAttributesAsString:"+organizationAttributesAsString); datasetIDList=new ArrayList<String>(); @@ -121,6 +124,8 @@ public class GetAccessApiController implements GetAccessApi { JSONObject accessPolicyAsJSON = null; List<Access> listAccess =new ArrayList<Access>(); try{ + + organizationAttributesJson=new JSONObject(organizationAttributesAsString); @@ -130,6 +135,9 @@ public class GetAccessApiController implements GetAccessApi { String accessPolicyasString=policyService.getDatasetPolicy(datasetID); + //String accessPolicyasString="{\"Continent\":[\"testContinent\",\"test2Continent\"],\"Type\":[\"testType\",\"test2Type\"],\"Sector\":[\"testSector\",\"test2Sector\"],\"Size\":[\"testSize\",\"test2Size\"],\"Country\":[\"testCountry\",\"test2Country\"],\"Reputation\":0}"; + + try { diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/api/NotFoundException.java b/src/main/java/com/tecnalia/DVPolicyEngine/api/NotFoundException.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/model/Access.java b/src/main/java/com/tecnalia/DVPolicyEngine/model/Access.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/model/Input.java b/src/main/java/com/tecnalia/DVPolicyEngine/model/Input.java old mode 100644 new mode 100755 diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/service/PolicyService.java b/src/main/java/com/tecnalia/DVPolicyEngine/service/PolicyService.java old mode 100644 new mode 100755 index a624564451572a786c1121efed28c27f96b1eafc..7856b931b1d6e1e23d67776a51ef807f5a69f58f --- a/src/main/java/com/tecnalia/DVPolicyEngine/service/PolicyService.java +++ b/src/main/java/com/tecnalia/DVPolicyEngine/service/PolicyService.java @@ -259,7 +259,7 @@ public class PolicyService { } catch(Exception e){ int iValue=accessPolicyAsJSON.getInt(parameterPolicy); - if (iValue==iOrgValue){ + if ((iValue==0)||(iValue==iOrgValue)){ result=true; // System.out.println("Is the same value?:"+result); diff --git a/src/main/java/com/tecnalia/DVPolicyEngine/utils/HttpUtils.java b/src/main/java/com/tecnalia/DVPolicyEngine/utils/HttpUtils.java old mode 100644 new mode 100755 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties old mode 100644 new mode 100755