added UMA import, closes mitreid-connect#811 even harder

Author: jricher

openid-connect-common/src/main/java/org/mitre/uma/repository/PermissionRepository.java

@@ -19,6 +19,7 @@
 
 import java.util.Collection;
 
+import org.mitre.uma.model.Permission;
 import org.mitre.uma.model.PermissionTicket;
 
 /**
@@ -45,8 +46,24 @@ public interface PermissionRepository {
 public PermissionTicket getByTicket(String ticket);
 
 /**
+ * Get all the tickets in the system (used by the import/export API)
+ * 
  * @return
  */
 public Collection<PermissionTicket> getAll();
 
+/**
+ * Save a permission object with no associated ticket (used by the import/export API)
+ * 
+ * @param p
+ * @return 
+ */
+public Permission saveRawPermission(Permission p);
+
+/**
+ * @param permissionId
+ * @return
+ */
+public Permission getById(Long permissionId);
+
 }

openid-connect-common/src/main/java/org/mitre/uma/service/PermissionService.java

@@ -17,7 +17,6 @@
 
 package org.mitre.uma.service;
 
-import java.util.Collection;
 import java.util.Set;
 
 import org.mitre.uma.model.PermissionTicket;
@@ -56,9 +55,4 @@ public interface PermissionService {
  */
 public PermissionTicket updateTicket(PermissionTicket ticket);
 
-/**
- * @return
- */
-public Collection<PermissionTicket> getAll();
-
 }

openid-connect-common/src/main/java/org/mitre/uma/service/ResourceSetService.java

@@ -41,6 +41,4 @@ public interface ResourceSetService {
 
 public Collection<ResourceSet> getAllForOwnerAndClient(String owner, String authClientId);
 
-public Collection<ResourceSet> getAll();
-
 }

openid-connect-server-webapp/src/main/resources/db/tables/hsql_database_tables.sql

@@ -299,7 +299,7 @@ CREATE TABLE IF NOT EXISTS permission_ticket (
 
 CREATE TABLE IF NOT EXISTS permission (
 id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
-resource_set_id BIGINT NOT NULL
+resource_set_id BIGINT
 );
 
 CREATE TABLE IF NOT EXISTS permission_scope (

openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DummyResourceSetService.java

@@ -64,9 +64,4 @@ public Collection<ResourceSet> getAllForOwnerAndClient(String owner, String auth
 return Collections.emptySet();
 }
 
-@Override
-public Collection<ResourceSet> getAll() {
-return Collections.emptySet();
-}
-
 }