From 400438baaf94bbd5349f9fde115a2154fa798c9f Mon Sep 17 00:00:00 2001
From: a-gvo <alina.gvo@gmail.com>
Date: Wed, 11 Oct 2017 15:34:56 -0400
Subject: [PATCH] PT-3381: REST API for family permissions.

- Created the entity-access-rules-rest module, and moved the relevant code.
---
 components/entity-access-rules/pom.xml                      | 1 +
 .../rest/pom.xml                                            | 6 +++---
 .../data/permissions/rest/CollaboratorResource.java         | 0
 .../data/permissions/rest/CollaboratorsResource.java        | 0
 .../data/permissions/rest/DomainObjectFactory.java          | 0
 .../org/phenotips/data/permissions/rest/OwnerResource.java  | 0
 .../data/permissions/rest/PermissionsResource.java          | 0
 .../data/permissions/rest/VisibilityOptionsResource.java    | 0
 .../phenotips/data/permissions/rest/VisibilityResource.java | 0
 .../rest/internal/DefaultCollaboratorResourceImpl.java      | 0
 .../rest/internal/DefaultCollaboratorsResourceImpl.java     | 0
 .../rest/internal/DefaultDomainObjectFactory.java           | 0
 .../permissions/rest/internal/DefaultOwnerResourceImpl.java | 0
 .../rest/internal/DefaultPermissionsResourceImpl.java       | 0
 .../rest/internal/DefaultVisibilityOptionsResourceImpl.java | 0
 .../rest/internal/DefaultVisibilityResourceImpl.java        | 0
 .../permissions/rest/internal/NameAndEmailExtractor.java    | 0
 .../rest/internal/utils/DefaultSecureContextFactory.java    | 0
 .../rest/internal/utils/PatientAccessContext.java           | 0
 .../rest/internal/utils/SecureContextFactory.java           | 0
 .../rest/src/main/resources/META-INF/components.txt         | 0
 .../rest/src/main/resources/permissions.rest.model.xsd      | 0
 .../rest/src/main/resources/rest-permissions.cat            | 1 +
 .../rest/src/main/resources/simple.xjb                      | 0
 components/patient-access-rules/pom.xml                     | 1 -
 .../rest/src/main/resources/rest-permissions.cat            | 1 -
 distribution/war/pom.xml                                    | 2 +-
 27 files changed, 6 insertions(+), 6 deletions(-)
 rename components/{patient-access-rules => entity-access-rules}/rest/pom.xml (97%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorResource.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorsResource.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/DomainObjectFactory.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/OwnerResource.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/PermissionsResource.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityOptionsResource.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityResource.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorResourceImpl.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorsResourceImpl.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultDomainObjectFactory.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultOwnerResourceImpl.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultPermissionsResourceImpl.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityOptionsResourceImpl.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityResourceImpl.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/NameAndEmailExtractor.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/DefaultSecureContextFactory.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/PatientAccessContext.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/SecureContextFactory.java (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/resources/META-INF/components.txt (100%)
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/resources/permissions.rest.model.xsd (100%)
 create mode 100644 components/entity-access-rules/rest/src/main/resources/rest-permissions.cat
 rename components/{patient-access-rules => entity-access-rules}/rest/src/main/resources/simple.xjb (100%)
 delete mode 100644 components/patient-access-rules/rest/src/main/resources/rest-permissions.cat

diff --git a/components/entity-access-rules/pom.xml b/components/entity-access-rules/pom.xml
index 5c00c8e5e7..3f4039a58a 100644
--- a/components/entity-access-rules/pom.xml
+++ b/components/entity-access-rules/pom.xml
@@ -31,5 +31,6 @@
 
   <modules>
     <module>api</module>
+    <module>rest</module>
   </modules>
 </project>
diff --git a/components/patient-access-rules/rest/pom.xml b/components/entity-access-rules/rest/pom.xml
similarity index 97%
rename from components/patient-access-rules/rest/pom.xml
rename to components/entity-access-rules/rest/pom.xml
index f9bd9c6c3c..6e85600411 100644
--- a/components/patient-access-rules/rest/pom.xml
+++ b/components/entity-access-rules/rest/pom.xml
@@ -22,11 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.phenotips</groupId>
-    <artifactId>patient-access-rules</artifactId>
+    <artifactId>entity-access-rules</artifactId>
     <version>1.4-SNAPSHOT</version>
   </parent>
-  <artifactId>patient-access-rules-rest</artifactId>
-  <name>PhenoTips - Patient access rules - REST services</name>
+  <artifactId>entity-access-rules-rest</artifactId>
+  <name>PhenoTips - Entity access rules - REST services</name>
 
   <properties>
     <!-- Fixme. Coverage. -->
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorResource.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorResource.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorResource.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorResource.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorsResource.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorsResource.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorsResource.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/CollaboratorsResource.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/DomainObjectFactory.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/DomainObjectFactory.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/DomainObjectFactory.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/DomainObjectFactory.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/OwnerResource.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/OwnerResource.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/OwnerResource.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/OwnerResource.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/PermissionsResource.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/PermissionsResource.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/PermissionsResource.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/PermissionsResource.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityOptionsResource.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityOptionsResource.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityOptionsResource.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityOptionsResource.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityResource.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityResource.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityResource.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/VisibilityResource.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorResourceImpl.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorResourceImpl.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorResourceImpl.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorResourceImpl.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorsResourceImpl.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorsResourceImpl.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorsResourceImpl.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultCollaboratorsResourceImpl.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultDomainObjectFactory.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultDomainObjectFactory.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultDomainObjectFactory.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultDomainObjectFactory.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultOwnerResourceImpl.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultOwnerResourceImpl.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultOwnerResourceImpl.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultOwnerResourceImpl.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultPermissionsResourceImpl.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultPermissionsResourceImpl.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultPermissionsResourceImpl.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultPermissionsResourceImpl.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityOptionsResourceImpl.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityOptionsResourceImpl.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityOptionsResourceImpl.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityOptionsResourceImpl.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityResourceImpl.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityResourceImpl.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityResourceImpl.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/DefaultVisibilityResourceImpl.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/NameAndEmailExtractor.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/NameAndEmailExtractor.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/NameAndEmailExtractor.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/NameAndEmailExtractor.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/DefaultSecureContextFactory.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/DefaultSecureContextFactory.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/DefaultSecureContextFactory.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/DefaultSecureContextFactory.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/PatientAccessContext.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/PatientAccessContext.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/PatientAccessContext.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/PatientAccessContext.java
diff --git a/components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/SecureContextFactory.java b/components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/SecureContextFactory.java
similarity index 100%
rename from components/patient-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/SecureContextFactory.java
rename to components/entity-access-rules/rest/src/main/java/org/phenotips/data/permissions/rest/internal/utils/SecureContextFactory.java
diff --git a/components/patient-access-rules/rest/src/main/resources/META-INF/components.txt b/components/entity-access-rules/rest/src/main/resources/META-INF/components.txt
similarity index 100%
rename from components/patient-access-rules/rest/src/main/resources/META-INF/components.txt
rename to components/entity-access-rules/rest/src/main/resources/META-INF/components.txt
diff --git a/components/patient-access-rules/rest/src/main/resources/permissions.rest.model.xsd b/components/entity-access-rules/rest/src/main/resources/permissions.rest.model.xsd
similarity index 100%
rename from components/patient-access-rules/rest/src/main/resources/permissions.rest.model.xsd
rename to components/entity-access-rules/rest/src/main/resources/permissions.rest.model.xsd
diff --git a/components/entity-access-rules/rest/src/main/resources/rest-permissions.cat b/components/entity-access-rules/rest/src/main/resources/rest-permissions.cat
new file mode 100644
index 0000000000..ed71a806c8
--- /dev/null
+++ b/components/entity-access-rules/rest/src/main/resources/rest-permissions.cat
@@ -0,0 +1 @@
+REWRITE_SYSTEM "https://phenotips.org/permissions.rest.model.xsd" "maven:org.phenotips:entity-access-rules-rest:jar::!/permissions.rest.model.xsd"
diff --git a/components/patient-access-rules/rest/src/main/resources/simple.xjb b/components/entity-access-rules/rest/src/main/resources/simple.xjb
similarity index 100%
rename from components/patient-access-rules/rest/src/main/resources/simple.xjb
rename to components/entity-access-rules/rest/src/main/resources/simple.xjb
diff --git a/components/patient-access-rules/pom.xml b/components/patient-access-rules/pom.xml
index 3ccedb62e3..df093a77a8 100644
--- a/components/patient-access-rules/pom.xml
+++ b/components/patient-access-rules/pom.xml
@@ -33,6 +33,5 @@
     <module>api</module>
     <module>migrations</module>
     <module>ui</module>
-    <module>rest</module>
   </modules>
 </project>
diff --git a/components/patient-access-rules/rest/src/main/resources/rest-permissions.cat b/components/patient-access-rules/rest/src/main/resources/rest-permissions.cat
deleted file mode 100644
index e5858096d7..0000000000
--- a/components/patient-access-rules/rest/src/main/resources/rest-permissions.cat
+++ /dev/null
@@ -1 +0,0 @@
-REWRITE_SYSTEM "https://phenotips.org/permissions.rest.model.xsd" "maven:org.phenotips:patient-access-rules-rest:jar::!/permissions.rest.model.xsd"
\ No newline at end of file
diff --git a/distribution/war/pom.xml b/distribution/war/pom.xml
index 2eab8c148e..418b7315e9 100644
--- a/distribution/war/pom.xml
+++ b/distribution/war/pom.xml
@@ -697,7 +697,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>patient-access-rules-rest</artifactId>
+      <artifactId>entity-access-rules-rest</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>