You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/06/12 01:03:52 UTC
[2/2] incubator-usergrid git commit: Renames "organization" method to
org for ease of use
Renames "organization" method to org for ease of use
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2981ba69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2981ba69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2981ba69
Branch: refs/heads/USERGRID-744
Commit: 2981ba695dbde6f5003b445155364f00c313b621
Parents: 2975bcd
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Jun 11 17:03:49 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Jun 11 17:03:49 2015 -0600
----------------------------------------------------------------------
.../rest/applications/ApplicationCreateIT.java | 8 +--
.../rest/applications/ApplicationDeleteIT.java | 32 +++++------
.../applications/ApplicationResourceIT.java | 12 ++--
.../usergrid/rest/management/AdminUsersIT.java | 6 +-
.../rest/management/ExportResourceIT.java | 60 ++++++++++----------
.../rest/management/ImportResourceIT.java | 38 ++++++-------
.../rest/management/ManagementResourceIT.java | 14 ++---
.../rest/management/OrganizationsIT.java | 18 +++---
.../rest/management/RegistrationIT.java | 5 +-
.../organizations/AdminEmailEncodingIT.java | 3 +-
.../rest/test/resource2point0/ClientSetup.java | 7 +--
.../endpoints/mgmt/OrgResource.java | 2 +-
12 files changed, 98 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
index 921027f..7ec562d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
@@ -56,9 +56,9 @@ public class ApplicationCreateIT extends AbstractRestIT {
applicationMap.put( "name", appName );
this.management().token().setToken(orgAdminToken);
- this.management().orgs().organization( orgName ).apps().post(applicationMap );
+ this.management().orgs().org( orgName ).apps().post(applicationMap );
- Entity response = this.management().orgs().organization( orgName ).addToPath( "apps" ).addToPath( appName ).get();
+ Entity response = this.management().orgs().org( orgName ).addToPath( "apps" ).addToPath( appName ).get();
assertNotNull( response );
}
@@ -84,7 +84,7 @@ public class ApplicationCreateIT extends AbstractRestIT {
// test that we get all applications back from the management end-point
ManagementResponse orgAppResponse = clientSetup.getRestClient()
- .management().orgs().organization( orgName ).apps().getOrganizationApplications();
+ .management().orgs().org( orgName ).apps().getOrganizationApplications();
int count = 0;
for ( String name : orgAppResponse.getData().keySet() ) {
@@ -100,7 +100,7 @@ public class ApplicationCreateIT extends AbstractRestIT {
String orgName, String appName, Token orgAdminToken, List<Entity> entities) {
ApiResponse appCreateResponse = clientSetup.getRestClient()
- .management().orgs().organization( orgName ).app().post( new Application( appName ) );
+ .management().orgs().org( orgName ).app().post( new Application( appName ) );
UUID appId = appCreateResponse.getEntities().get(0).getUuid();
refreshIndex();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
index 786ab7d..2fe05e3 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
@@ -66,8 +66,8 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// delete the app
try {
- clientSetup.getRestClient()
- .org(orgName).app(appToDeleteId.toString()).getResource()
+ clientSetup.getRestClient() .management().orgs()
+ .org(orgName).apps().app(appToDeleteId.toString()).getResource()
.queryParam("access_token", orgAdminToken.getAccessToken())
.delete();
@@ -77,8 +77,8 @@ public class ApplicationDeleteIT extends AbstractRestIT {
logger.error("Error", e);
}
- clientSetup.getRestClient()
- .org(orgName).app(appToDeleteId.toString() ).getResource()
+ clientSetup.getRestClient().management().orgs()
+ .org(orgName).apps().app(appToDeleteId.toString() ).getResource()
.queryParam("access_token", orgAdminToken.getAccessToken() )
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
.delete();
@@ -86,8 +86,8 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// test that we can no longer get the app
try {
- clientSetup.getRestClient()
- .org(orgName).app(appToDeleteName).getResource()
+ clientSetup.getRestClient().management().orgs()
+ .org(orgName).apps().app(appToDeleteName).getResource()
.queryParam("access_token", orgAdminToken.getAccessToken())
.type(MediaType.APPLICATION_JSON)
.get(ApiResponse.class);
@@ -142,7 +142,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
refreshIndex();
ManagementResponse orgAppResponse = clientSetup.getRestClient()
- .management().orgs().organization( orgName ).apps().getOrganizationApplications();
+ .management().orgs().org( orgName ).apps().getOrganizationApplications();
for ( String appName : orgAppResponse.getData().keySet() ) {
if ( orgAppResponse.getData().get( appName ).equals( appToDeleteId.toString() )) {
@@ -153,8 +153,8 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// test that we cannot delete the application a second time
try {
- clientSetup.getRestClient()
- .org(orgName).app(appToDeleteId.toString()).getResource()
+ clientSetup.getRestClient().management().orgs()
+ .org(orgName).apps().app(appToDeleteId.toString()).getResource()
.queryParam("access_token", orgAdminToken.getAccessToken())
.delete();
@@ -167,7 +167,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// test that we can create a new application with the same name
ApiResponse appCreateAgainResponse = clientSetup.getRestClient()
- .management().orgs().organization( orgName ).app().getResource()
+ .management().orgs().org( orgName ).app().getResource()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.type( MediaType.APPLICATION_JSON )
.post( ApiResponse.class, new Application( appToDeleteName ) );
@@ -229,7 +229,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
logger.debug("\n\nGetting app list from management end-point\n");
ManagementResponse orgAppResponse = clientSetup.getRestClient()
- .management().orgs().organization( orgName ).apps().getOrganizationApplications();
+ .management().orgs().org( orgName ).apps().getOrganizationApplications();
boolean found = false;
for ( String appName : orgAppResponse.getData().keySet() ) {
@@ -328,10 +328,9 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// delete the app
- clientSetup.getRestClient()
- .org( orgName ).app(appToDeleteId.toString() ).getResource()
+ clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( appToDeleteId.toString() ).getResource()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
- .queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
+ .queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" )
.delete();
// create new app with same name
@@ -342,8 +341,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
try {
- clientSetup.getRestClient()
- .org(orgName).app( newAppId.toString() ).getResource()
+ clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( newAppId.toString() ).getResource()
.queryParam("access_token", orgAdminToken.getAccessToken())
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
.delete();
@@ -360,7 +358,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
String orgName, String appName, Token orgAdminToken, List<Entity> entities) {
ApiResponse appCreateResponse = clientSetup.getRestClient()
- .management().orgs().organization( orgName ).app().getResource()
+ .management().orgs().org( orgName ).app().getResource()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.type( MediaType.APPLICATION_JSON )
.post( ApiResponse.class, new Application( appName ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
index 4ce3396..d4a3e06 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
@@ -130,7 +130,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
//Create the organization resource
OrganizationResource orgResource = clientSetup.getRestClient()
- .management().orgs().organization(clientSetup.getOrganizationName());
+ .management().orgs().org( clientSetup.getOrganizationName() );
//retrieve the credentials
Credentials orgCredentials = new Credentials( orgResource.credentials().get(ApiResponse.class));
@@ -442,13 +442,13 @@ public class ApplicationResourceIT extends AbstractRestIT {
assertNotNull(entity);
refreshIndex();
//Retrieve an authentication token for the user
- Token tokenResponse = this.app().getResource(false).path(String.format("/%s/%s/token", orgName, appName))
+ Token tokenResponse = this.app().getResource(false).path("token")
.queryParam("grant_type", "password")
.queryParam("username", username)
.queryParam("password", "password")
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .get(Token.class);
+ .accept( MediaType.APPLICATION_JSON )
+ .type( MediaType.APPLICATION_JSON_TYPE )
+ .get( Token.class );
String token = tokenResponse.getAccessToken();
assertNotNull(token);
@@ -756,7 +756,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
*/
public Credentials getOrgCredentials() throws IOException {
String orgName = clientSetup.getOrganizationName().toLowerCase();
- return new Credentials( clientSetup.getRestClient().management().orgs().organization(orgName).credentials().get(ApiResponse.class,null,true) );
+ return new Credentials( clientSetup.getRestClient().management().orgs().org( orgName ).credentials().get(ApiResponse.class,null,true) );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
index 9306f2b..1277ae2 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
@@ -495,7 +495,7 @@ public class AdminUsersIT extends AbstractRestIT {
orgPropertiesPayload.put("properties", props);
- management().orgs().organization( clientSetup.getOrganizationName() ).put( orgPropertiesPayload );
+ management().orgs().org( clientSetup.getOrganizationName() ).put( orgPropertiesPayload );
//Creates a payload with the same password to verify we cannot change the password to itself.
Map<String, Object> payload = new HashMap<>( );
@@ -615,12 +615,12 @@ public class AdminUsersIT extends AbstractRestIT {
// management().token().setToken( organizationToken );
//Create admin user
- management().orgs().organization( clientSetup.getOrganizationName() ).users().post(ApiResponse.class ,adminUserPayload );
+ management().orgs().org( clientSetup.getOrganizationName() ).users().post(ApiResponse.class ,adminUserPayload );
refreshIndex();
//Retrieves the admin users
- ApiResponse adminUsers = management().orgs().organization( clientSetup.getOrganizationName() ).users().get(ApiResponse.class);
+ ApiResponse adminUsers = management().orgs().org( clientSetup.getOrganizationName() ).users().get(ApiResponse.class);
assertEquals("There need to be 2 admin users",2,( ( ArrayList ) adminUsers.getData() ).size());
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
index 8ed6777..0874fc7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
@@ -53,7 +53,7 @@ public class ExportResourceIT extends AbstractRestIT {
public void exportApplicationUUIDRetTest() throws Exception {
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() ).addToPath( "export" );
}
catch ( UniformInterfaceException uie ) {
@@ -72,7 +72,7 @@ public class ExportResourceIT extends AbstractRestIT {
try {
- exportEntity = management().orgs().organization( clientSetup.getOrganizationName() )
+ exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid()).addToPath( "collection" )
.addToPath( "users" ).addToPath( "export" ).post(ApiResponse.class,payloadBuilder() );
}
@@ -97,7 +97,7 @@ public class ExportResourceIT extends AbstractRestIT {
try {
- exportEntity = management().orgs().organization( clientSetup.getOrganizationName() )
+ exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payloadBuilder() );
}
catch ( UniformInterfaceException uie ) {
@@ -111,7 +111,7 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = null;
try {
- exportEntity = management().orgs().organization( clientSetup.getOrganizationName() )
+ exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
catch ( UniformInterfaceException uie ) {
@@ -139,7 +139,7 @@ public class ExportResourceIT extends AbstractRestIT {
try {
- exportEntity = management().orgs().organization( clientSetup.getOrganizationName() )
+ exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class, payloadBuilder() );
}
@@ -155,7 +155,7 @@ public class ExportResourceIT extends AbstractRestIT {
refreshIndex();
try {
- exportEntity = management().orgs().organization( clientSetup.getOrganizationName() )
+ exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
catch ( UniformInterfaceException uie ) {
@@ -174,7 +174,7 @@ public class ExportResourceIT extends AbstractRestIT {
ApiResponse exportEntity = null;
- exportEntity = management().orgs().organization( clientSetup.getOrganizationName() )
+ exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid()).addToPath( "collection" )
.addToPath( "users" ).addToPath( "export" )
.post( ApiResponse.class, payloadBuilder() );
@@ -185,7 +185,7 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = null;
try {
- exportEntity = management().orgs().organization( clientSetup.getOrganizationName() )
+ exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
catch ( UniformInterfaceException uie ) {
@@ -205,7 +205,7 @@ public class ExportResourceIT extends AbstractRestIT {
public void exportGetWrongUUID() throws Exception {
UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( fake.toString() ).get( ApiResponse.class );
fail( "Should not have been able to get fake uuid" );
}
@@ -221,7 +221,7 @@ public class ExportResourceIT extends AbstractRestIT {
@Test
public void exportPostApplicationNullPointerProperties() throws Exception {
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class,
new HashMap<String, Object>() );
@@ -237,7 +237,7 @@ public class ExportResourceIT extends AbstractRestIT {
@Test
public void exportPostOrganizationNullPointerProperties() throws Exception {
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, new HashMap<String, Object>() );
fail( "Should not have passed, The payload is empty." );
}
@@ -251,7 +251,7 @@ public class ExportResourceIT extends AbstractRestIT {
@Test
public void exportPostCollectionNullPointer() throws Exception {
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "collection" ).addToPath( "users" )
.addToPath( "export" ).post( ApiResponse.class, new HashMap<String, Object>() );
@@ -269,7 +269,7 @@ public class ExportResourceIT extends AbstractRestIT {
UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "collection" ).addToPath( "users" )
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
@@ -286,7 +286,7 @@ public class ExportResourceIT extends AbstractRestIT {
UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
@@ -302,7 +302,7 @@ public class ExportResourceIT extends AbstractRestIT {
UUID fake = UUID.fromString( "AAAAAAAA-FFFF-FFFF-FFFF-AAAAAAAAAAAA" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
}
@@ -320,7 +320,7 @@ public class ExportResourceIT extends AbstractRestIT {
properties.remove( "storage_info" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -340,7 +340,7 @@ public class ExportResourceIT extends AbstractRestIT {
properties.remove( "storage_info" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class,
payload );
@@ -361,7 +361,7 @@ public class ExportResourceIT extends AbstractRestIT {
properties.remove( "storage_info" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "collection" ).addToPath( "users" )
.addToPath( "export" ).post( ApiResponse.class,
@@ -383,7 +383,7 @@ public class ExportResourceIT extends AbstractRestIT {
properties.remove( "storage_provider" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -403,7 +403,7 @@ public class ExportResourceIT extends AbstractRestIT {
properties.remove( "storage_provider" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class,
payload );
@@ -424,7 +424,7 @@ public class ExportResourceIT extends AbstractRestIT {
properties.remove( "storage_provider" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "collection" ).addToPath( "users" )
.addToPath( "export" ).post( ApiResponse.class,
@@ -448,7 +448,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "s3_key" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -464,7 +464,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "s3_access_id");
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -480,7 +480,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "bucket_location" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -500,7 +500,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "s3_key" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -517,7 +517,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "s3_access_id" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -534,7 +534,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "bucket_location" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class, payload );
fail( "Should not have passed as we were missing an important part of the payload" );
@@ -555,7 +555,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "s3_key" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "collection" ).addToPath( "users" )
.addToPath( "export" ).post( ApiResponse.class, payload );
@@ -573,7 +573,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "s3_access_id" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "collection" ).addToPath( "users" )
.addToPath( "export" ).post( ApiResponse.class, payload );
@@ -591,7 +591,7 @@ public class ExportResourceIT extends AbstractRestIT {
storage_info.remove( "bucket_location" );
try {
- management().orgs().organization( clientSetup.getOrganizationName() )
+ management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "collection" ).addToPath( "users" )
.addToPath( "export" ).post( ApiResponse.class, payload );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
index e33d488..34371b6 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
@@ -138,7 +138,7 @@ public class ImportResourceIT extends AbstractRestIT {
///management/orgs/orgname/apps/appname/import
Entity entity = this.management()
.orgs()
- .organization(org)
+ .org( org )
.app()
.addToPath(app)
.addToPath("imports")
@@ -148,7 +148,7 @@ public class ImportResourceIT extends AbstractRestIT {
entity = this.management()
.orgs()
- .organization(org)
+ .org( org )
.app()
.addToPath(app)
.addToPath("imports")
@@ -175,7 +175,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity payload = payloadBuilder();
// /management/orgs/orgname/apps/appname/import
- Entity entity = this.management().orgs().organization(org).app()
+ Entity entity = this.management().orgs().org( org ).app()
.addToPath(app)
.addToPath("imports")
.post(Entity.class,payload);
@@ -183,7 +183,7 @@ public class ImportResourceIT extends AbstractRestIT {
assertNotNull(entity);
// test that you can access the organization using the currently set token.
- this.management().orgs().organization(org).app().addToPath(app)
+ this.management().orgs().org( org ).app().addToPath(app)
.addToPath("imports").addToPath(entity.getUuid().toString()).get();
//create a new org/app
@@ -208,7 +208,7 @@ public class ImportResourceIT extends AbstractRestIT {
//try to read with the new token, which should fail as unauthorized
try {
- this.management().orgs().organization(org).app().addToPath(app)
+ this.management().orgs().org( org ).app().addToPath(app)
.addToPath("imports").addToPath(entity.getUuid().toString()).get();
fail("Should not be able to read import job with unauthorized token");
} catch (UniformInterfaceException ex) {
@@ -228,7 +228,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity payload = new Entity();
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
+ this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -248,7 +248,7 @@ public class ImportResourceIT extends AbstractRestIT {
properties.remove("storage_info");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
+ this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -270,7 +270,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
+ this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -293,7 +293,7 @@ public class ImportResourceIT extends AbstractRestIT {
storage_info.remove("s3_key");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
+ this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -306,7 +306,7 @@ public class ImportResourceIT extends AbstractRestIT {
storage_info.remove("s3_access_id");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
+ this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -319,7 +319,7 @@ public class ImportResourceIT extends AbstractRestIT {
storage_info.remove("bucket_location");
try {
- this.management().orgs().organization(org).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
+ this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
} catch (UniformInterfaceException uie) {
responseStatus = uie.getResponse().getClientResponseStatus();
}
@@ -438,7 +438,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity importEntity = importCollection();
- Entity importGet = this.management().orgs().organization( org ).app()
+ Entity importGet = this.management().orgs().org( org ).app()
.addToPath(app)
.addToPath( "imports" )
.addToPath(importEntity.getUuid().toString())
@@ -446,7 +446,7 @@ public class ImportResourceIT extends AbstractRestIT {
refreshIndex();
- Entity importGetIncludes = this.management().orgs().organization(org).app()
+ Entity importGetIncludes = this.management().orgs().org( org ).app()
.addToPath(app)
.addToPath("imports")
.addToPath(importEntity.getUuid().toString())
@@ -512,7 +512,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity importEntity = importCollection();
- Entity importGet = this.management().orgs().organization(org).app()
+ Entity importGet = this.management().orgs().org( org ).app()
.addToPath(app)
.addToPath("imports")
.addToPath(importEntity.getUuid().toString()).get();
@@ -558,7 +558,7 @@ public class ImportResourceIT extends AbstractRestIT {
Entity importEntity = importCollection();
- Entity importGet = this.management().orgs().organization(org).app()
+ Entity importGet = this.management().orgs().org( org ).app()
.addToPath(app)
.addToPath("imports" )
.addToPath(importEntity.getUuid().toString() )
@@ -610,13 +610,13 @@ public class ImportResourceIT extends AbstractRestIT {
// we should now have 100 Entities in the default app
- Entity importGet = this.management().orgs().organization( org ).app()
+ Entity importGet = this.management().orgs().org( org ).app()
.addToPath( app )
.addToPath("imports")
.addToPath( importEntity.getUuid().toString() )
.get();
- Entity importGetIncludes = this.management().orgs().organization(org).app()
+ Entity importGetIncludes = this.management().orgs().org( org ).app()
.addToPath(app)
.addToPath("imports" )
.addToPath(importEntity.getUuid().toString() )
@@ -654,7 +654,7 @@ public class ImportResourceIT extends AbstractRestIT {
}});
}});
- Entity importEntity = this.management().orgs().organization(org).app()
+ Entity importEntity = this.management().orgs().org( org ).app()
.addToPath(app)
.addToPath("imports")
.post(Entity.class,importPayload);
@@ -664,7 +664,7 @@ public class ImportResourceIT extends AbstractRestIT {
while (retries++ < maxRetries) {
- Entity importGet = this.management().orgs().organization(org).app()
+ Entity importGet = this.management().orgs().org( org ).app()
.addToPath( app )
.addToPath( "imports")
.addToPath( importEntity.getUuid().toString() )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 25736f7..c41735c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -70,7 +70,7 @@ public class ManagementResourceIT extends AbstractRestIT {
public void setSelfAdminPasswordAsAdwmin() {
UUID uuid = UUIDUtils.newTimeUUID();
management.token().setToken(clientSetup.getSuperuserToken());
- management.orgs().organization(clientSetup.getOrganizationName()).users().post(ApiResponse.class, new User("test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test"));
+ management.orgs().org( clientSetup.getOrganizationName() ).users().post(ApiResponse.class, new User("test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test"));
Map<String, Object> data = new HashMap<>();
data.put( "newpassword", "foo" );
data.put( "oldpassword", "test" );
@@ -110,7 +110,7 @@ public class ManagementResourceIT extends AbstractRestIT {
String returnVal = "";
try {
- returnVal = this.management().orgs().organization(orgName).get(String.class);
+ returnVal = this.management().orgs().org( orgName ).get(String.class);
}
catch ( UniformInterfaceException uie ) {
status = uie.getResponse().getClientResponseStatus();
@@ -122,7 +122,7 @@ public class ManagementResourceIT extends AbstractRestIT {
// this admin should have access to test org
status = null;
try {
- this.management().orgs().organization(this.clientSetup.getOrganizationName()).get( String.class );
+ this.management().orgs().org( this.clientSetup.getOrganizationName() ).get( String.class );
}
catch ( UniformInterfaceException uie ) {
status = uie.getResponse().getClientResponseStatus();
@@ -134,7 +134,7 @@ public class ManagementResourceIT extends AbstractRestIT {
status = null;
try {
- this.management().orgs().organization(this.clientSetup.getOrganizationName()).get( String.class );
+ this.management().orgs().org( this.clientSetup.getOrganizationName() ).get( String.class );
}
catch ( UniformInterfaceException uie ) {
status = uie.getResponse().getClientResponseStatus();
@@ -246,7 +246,7 @@ public class ManagementResourceIT extends AbstractRestIT {
// POST /applications
- ApiResponse apiResponse = management().orgs().organization(clientSetup.getOrganizationName()).app().post(new Application("mgmt-org-app"));
+ ApiResponse apiResponse = management().orgs().org( clientSetup.getOrganizationName() ).app().post(new Application("mgmt-org-app"));
refreshIndex();
@@ -268,7 +268,7 @@ public class ManagementResourceIT extends AbstractRestIT {
// GET /applications/mgmt-org-app
- Entity app = management().orgs().organization(clientSetup.getOrganizationName()).app().addToPath("mgmt-org-app").get();
+ Entity app = management().orgs().org( clientSetup.getOrganizationName() ).app().addToPath("mgmt-org-app").get();
assertEquals(this.clientSetup.getOrganizationName().toLowerCase(), app.get("organizationName").toString());
@@ -327,7 +327,7 @@ public class ManagementResourceIT extends AbstractRestIT {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put( "securityLevel", 5 );
payload.put( OrganizationsResource.ORGANIZATION_PROPERTIES, properties );
- management.orgs().organization(clientSetup.getOrganizationName())
+ management.orgs().org( clientSetup.getOrganizationName() )
.put(payload);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index 4385a4c..8a298f6 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -19,9 +19,7 @@ package org.apache.usergrid.rest.management;
import java.io.IOException;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.UUID;
import org.apache.usergrid.rest.test.resource2point0.model.*;
import org.junit.Ignore;
@@ -82,7 +80,7 @@ public class OrganizationsIT extends AbstractRestIT {
//this.refreshIndex();
//Assert that the get returns the correct org and owner.
- Organization returnedOrg = clientSetup.getRestClient().management().orgs().organization( organization.getOrganization()).get();
+ Organization returnedOrg = clientSetup.getRestClient().management().orgs().org( organization.getOrganization() ).get();
assertTrue( returnedOrg != null && returnedOrg.getName().equals( organization.getOrganization() ) );
@@ -278,7 +276,7 @@ public class OrganizationsIT extends AbstractRestIT {
this.management().token().setToken(tokenReturned);
//Assert that the get returns the correct org and owner.
- Organization returnedOrg = clientSetup.getRestClient().management().orgs().organization( organization.getOrganization() ).get();
+ Organization returnedOrg = clientSetup.getRestClient().management().orgs().org( organization.getOrganization() ).get();
assertTrue(returnedOrg != null && returnedOrg.getName().equals(organization.getOrganization()));
@@ -295,7 +293,7 @@ public class OrganizationsIT extends AbstractRestIT {
try {
//Delete default organization
- clientSetup.getRestClient().management().orgs().organization( clientSetup.getOrganizationName() ).delete();
+ clientSetup.getRestClient().management().orgs().org( clientSetup.getOrganizationName() ).delete();
fail( "Delete is not implemented yet" );
}catch(UniformInterfaceException uie){
assertEquals( ClientResponse.Status.NOT_IMPLEMENTED ,uie.getResponse().getStatus());
@@ -320,7 +318,7 @@ public class OrganizationsIT extends AbstractRestIT {
adminUserPayload.put("password", username);
//create adminUser
- ApiResponse adminUserEntityResponse = management().orgs().organization( clientSetup.getOrganizationName() ).users().post(ApiResponse.class, adminUserPayload);
+ ApiResponse adminUserEntityResponse = management().orgs().org( clientSetup.getOrganizationName() ).users().post(ApiResponse.class, adminUserPayload);
Entity adminUserResponse = new Entity(adminUserEntityResponse);
//verify that the response contains the correct data
@@ -357,12 +355,12 @@ public class OrganizationsIT extends AbstractRestIT {
orgPayload.put( "properties", properties );
//update the organization.
- management().orgs().organization( clientSetup.getOrganizationName() ).put(orgPayload);
+ management().orgs().org( clientSetup.getOrganizationName() ).put(orgPayload);
this.refreshIndex();
//retrieve the organization
- Organization orgResponse = management().orgs().organization( clientSetup.getOrganizationName() ).get();
+ Organization orgResponse = management().orgs().org( clientSetup.getOrganizationName() ).get();
assertEquals(5, orgResponse.getProperties().get("puppies" ));
@@ -371,11 +369,11 @@ public class OrganizationsIT extends AbstractRestIT {
orgPayload.put("properties", properties );
//update the organization.
- management().orgs().organization( clientSetup.getOrganizationName()).put(orgPayload);
+ management().orgs().org( clientSetup.getOrganizationName() ).put(orgPayload);
this.refreshIndex();
- orgResponse = management().orgs().organization( clientSetup.getOrganizationName() ).get();
+ orgResponse = management().orgs().org( clientSetup.getOrganizationName() ).get();
assertEquals( 6, orgResponse.getProperties().get( "puppies" ));
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
index 2972126..fe7ff86 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
@@ -24,7 +24,6 @@ import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
import org.apache.usergrid.rest.test.resource2point0.model.*;
-import org.junit.Ignore;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
import org.slf4j.Logger;
@@ -86,7 +85,7 @@ public class RegistrationIT extends AbstractRestIT {
ApiResponse user = this
.management()
.orgs()
- .organization(organizationName)
+ .org( organizationName )
.users()
.post(new User().chainPut("email", email).chainPut("password", password));
@@ -207,7 +206,7 @@ public class RegistrationIT extends AbstractRestIT {
this
.management()
.orgs()
- .organization(this.clientSetup.getOrganizationName())
+ .org( this.clientSetup.getOrganizationName() )
.users()
.getResource( false )
.queryParam( "access_token", token )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
index a78f4fd..ceab55d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
@@ -28,7 +28,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
import java.util.UUID;
import static junit.framework.TestCase.assertNotNull;
@@ -119,7 +118,7 @@ public class AdminEmailEncodingIT extends AbstractRestIT {
//Instruct the test framework to use the new token
this.app().token().setToken(tokenReturned);
//Create an application within the organization
- clientSetup.getRestClient().management().orgs().organization(organization.getName()).app().post(new Application(app));
+ clientSetup.getRestClient().management().orgs().org( organization.getName() ).app().post(new Application(app));
//retrieve the new management user by username and ensure the username and email address matches the input
Entity me = clientSetup.getRestClient().management().users().entity(username).get();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
index 4cf28e5..7eac0f7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
import org.apache.usergrid.rest.test.resource2point0.model.Application;
import org.apache.usergrid.rest.test.resource2point0.model.Credentials;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
import org.apache.usergrid.rest.test.resource2point0.model.Token;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
@@ -37,8 +36,6 @@ import org.apache.usergrid.rest.test.resource2point0.model.Organization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.core.MediaType;
-
/**
* This class is used to setup the client rule that will setup the RestClient and create default applications.
@@ -122,11 +119,11 @@ public class ClientSetup implements TestRule {
restClient.management().token().get(username,password);
// refreshIndex();
- clientCredentials = restClient.management().orgs().organization( orgName ).credentials().get(Credentials.class);
+ clientCredentials = restClient.management().orgs().org( orgName ).credentials().get(Credentials.class);
//refreshIndex();
- ApiResponse appResponse = restClient.management().orgs().organization(organization.getName()).app().post(new Application(appName));
+ ApiResponse appResponse = restClient.management().orgs().org( organization.getName() ).app().post(new Application(appName));
appUuid = ( String ) appResponse.getEntities().get( 0 ).get( "uuid" );
refreshIndex();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2981ba69/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
index d87bf91..cd7165c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
@@ -51,7 +51,7 @@ public class OrgResource extends NamedResource {
}
- public OrganizationResource organization (final String orgname){
+ public OrganizationResource org( final String orgname ){
return new OrganizationResource( orgname,context,this );
}