issue IQSS#3165 final commit

jacksonokuhn · Jun 10, 2016 · 5a75f84 · 5a75f84
1 parent 929a233
commit 5a75f84
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 20 deletions.
diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
@@ -340,6 +340,14 @@ Toggles superuser mode on the ``AuthenticatedUser`` whose ``identifier`` (withou
 
     POST http://$SERVER/api/admin/superuser/$identifier
 
+System
+~~~~~~~~~~~~~~~~
+This part of the API exposes settings (namely :DatasetPublishPopupCustomText) necessary for OSF integration.
+
+Get the :DatasetPublishPopupCustomText setting:
+
+    GET http://$SERVER/api/system/settings/:DatasetPublishPopupCustomText
+
 IpGroups
 ^^^^^^^^
 

diff --git a/lib/unknown/binary/javax.ws.rs-api-2.0/SNAPSHOT/javax.ws.rs-api-2.0-SNAPSHOT.jar b/lib/unknown/binary/javax.ws.rs-api-2.0/SNAPSHOT/javax.ws.rs-api-2.0-SNAPSHOT.jar
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Sys.java b/src/main/java/edu/harvard/iq/dataverse/api/Sys.java
@@ -28,15 +28,18 @@ public class Sys extends AbstractApiBean{
         @Path("settings/:DatasetPublishPopupCustomText")
     public Response getDatasetPublishPopupCustomText(){
 
-        String setting = settingsService.get("DatasetPublishPopupCustomText");
+        String setting = settingsService.getValueForKey(
+                SettingsServiceBean.Key.DatasetPublishPopupCustomText);
 
         JsonObjectBuilder response = Json.createObjectBuilder();
 
         if(setting != null){
-            return okResponse(response.add("DatasetPublishPopupCustomText", setting));
+            return okResponse(response.add(
+                    "message", setting));
         } else {
-            return notFound("Setting DatasetPublishPopupCustomText not found");
+            return notFound("Setting "
+                    +SettingsServiceBean.Key.DatasetPublishPopupCustomText
+                    +" not found");
         }
     }
-
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SysIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SysIT.java
@@ -5,7 +5,8 @@
  */
 package edu.harvard.iq.dataverse.api;
 
-import static com.jayway.restassured.RestAssured.*;
+import static com.jayway.restassured.RestAssured.given;
+import com.jayway.restassured.response.Response;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import org.junit.Test;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -25,24 +26,26 @@ public void testGetDatasetPublishPopupCustomText() {
         System.out.println("checking getDatasetPublishPopupCustomText");
 
         given().urlEncodingEnabled(false)
-                .get("/api/system/settings/:DatasetPublishPopupCustomText")
-                .then().assertThat().statusCode(404)
-                .body("message", equalTo("Setting DatasetPublishPopupCustomText not found"));
-
-        given().urlEncodingEnabled(false)
-                .body("Hello world!").put("/api/admin/settings/DatasetPublishPopupCustomText");
+                .body("Hello world!")
+                .put("/api/admin/settings/" 
+                        + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
 
-        given().urlEncodingEnabled(false)
-                .get("/api/system/settings/:DatasetPublishPopupCustomText")
-                .then().assertThat().statusCode(200)
-                .body("data.DatasetPublishPopupCustomText", equalTo("Hello world!"));
+        Response response = given().urlEncodingEnabled(false)
+                .get("/api/system/settings/" + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
+        response.prettyPrint();     
+        response.then().assertThat().statusCode(200)
+                .body("data.message", equalTo("Hello world!"));
 
         given().urlEncodingEnabled(false)
-                .delete("/api/admin/settings/DatasetPublishPopupCustomText");
+                .delete("/api/admin/settings/" 
+                        + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
 
-        given().urlEncodingEnabled(false)
-                .get("/api/system/settings/:DatasetPublishPopupCustomText")
-                .then().assertThat().statusCode(404)
-                .body("message", equalTo("Setting DatasetPublishPopupCustomText not found"));
+        response = given().urlEncodingEnabled(false)
+                .get("/api/system/settings/" + SettingsServiceBean.Key.DatasetPublishPopupCustomText);
+        response.prettyPrint();     
+        response.then().assertThat().statusCode(404)
+                .body("message", equalTo("Setting " 
+                        + SettingsServiceBean.Key.DatasetPublishPopupCustomText 
+                        + " not found"));
     }
 }