From 482c82e5333b11839fd04422bdaa83b103748b83 Mon Sep 17 00:00:00 2001
From: Rick Herrick <jrherrick@wustl.edu>
Date: Mon, 4 Apr 2016 09:47:34 -0500
Subject: [PATCH] Added Jackson YAML support, updated version of Spring
Framework.
---
build.gradle | 3 +-
.../nrg/xapi/rest/AbstractXnatRestApi.java | 39 -------------------
.../org/nrg/xapi/rest/users/UsersApi.java | 4 +-
3 files changed, 3 insertions(+), 43 deletions(-)
delete mode 100644 src/main/java/org/nrg/xapi/rest/AbstractXnatRestApi.java
diff --git a/build.gradle b/build.gradle
index 9af87ed3..3e458afa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
def vXnat = '1.7.0-SNAPSHOT'
def vXnatPipeline = vXnat
-def vSpring = '4.2.4.RELEASE'
+def vSpring = '4.2.5.RELEASE'
def vSpringSecurity = '4.0.3.RELEASE'
def vSwagger = '2.3.1'
def vHibernate = '4.3.11.Final'
@@ -297,6 +297,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-annotations:${vJackson}"
compile "com.fasterxml.jackson.core:jackson-core:${vJackson}"
compile "com.fasterxml.jackson.core:jackson-databind:${vJackson}"
+ compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${vJackson}"
compile "org.json:json:20151123"
compile "xerces:xercesImpl:2.11.0"
diff --git a/src/main/java/org/nrg/xapi/rest/AbstractXnatRestApi.java b/src/main/java/org/nrg/xapi/rest/AbstractXnatRestApi.java
deleted file mode 100644
index 1c2e5618..00000000
--- a/src/main/java/org/nrg/xapi/rest/AbstractXnatRestApi.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.nrg.xapi.rest;
-
-import org.nrg.xdat.security.XDATUser;
-import org.nrg.xft.security.UserI;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * Provides basic functions for integrating Spring REST controllers with XNAT.
- */
-public abstract class AbstractXnatRestApi {
- protected HttpStatus isPermitted(String id) {
- UserI sessionUser = getSessionUser();
- if (sessionUser == null) {
- return HttpStatus.UNAUTHORIZED;
- }
- if ((sessionUser.getUsername().equals(id)) || (isPermitted() == null)) {
- return null;
- }
- return HttpStatus.FORBIDDEN;
- }
-
- protected UserI getSessionUser() {
- Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- if ((principal instanceof UserI)) {
- return (UserI) principal;
- }
- return null;
- }
-
- protected HttpStatus isPermitted() {
- UserI sessionUser = getSessionUser();
- if ((sessionUser instanceof XDATUser)) {
- return ((XDATUser) sessionUser).isSiteAdmin() ? null : HttpStatus.FORBIDDEN;
- }
-
- return null;
- }
-}
diff --git a/src/main/java/org/nrg/xapi/rest/users/UsersApi.java b/src/main/java/org/nrg/xapi/rest/users/UsersApi.java
index 34fe4503..83adf8be 100644
--- a/src/main/java/org/nrg/xapi/rest/users/UsersApi.java
+++ b/src/main/java/org/nrg/xapi/rest/users/UsersApi.java
@@ -3,9 +3,8 @@ package org.nrg.xapi.rest.users;
import io.swagger.annotations.*;
import org.apache.commons.lang3.StringUtils;
import org.nrg.xapi.model.users.User;
-import org.nrg.xapi.rest.AbstractXnatRestApi;
import org.nrg.xapi.rest.NotFoundException;
-import org.nrg.xdat.security.XDATUser;
+import org.nrg.xdat.rest.AbstractXnatRestApi;
import org.nrg.xdat.security.helpers.Users;
import org.nrg.xdat.security.user.exceptions.UserInitException;
import org.nrg.xdat.security.user.exceptions.UserNotFoundException;
@@ -16,7 +15,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
--
GitLab