Refactoring in FileService

Refactoring in FileService

samples/j2ee/snippets/com.ibm.sbt.automation.core/src/main/java/com/ibm/sbt/automation/core/test/BaseGridTestSetup.java

@@ -7,10 +7,11 @@
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.ibm.sbt.automation.core.utils.Trace;
 import com.ibm.sbt.security.authentication.AuthenticationException;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.base.transformers.TransformerException;
 import com.ibm.sbt.services.client.connections.activity.Activity;
 import com.ibm.sbt.services.client.connections.activity.ActivityService;
@@ -20,7 +21,6 @@
 import com.ibm.sbt.services.client.connections.communities.CommunityServiceException;
 import com.ibm.sbt.services.client.connections.files.File;
 import com.ibm.sbt.services.client.connections.files.FileService;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 import com.ibm.sbt.services.client.connections.files.model.FileCreationParameters;
 import com.ibm.sbt.services.client.connections.forums.Forum;
 import com.ibm.sbt.services.client.connections.forums.ForumService;
@@ -100,7 +100,7 @@ public void createBookmark(){
 		} catch (AuthenticationException e) {
 			e.printStackTrace();
 		}
-		super.launchSnippet("Social_Bookmarks_API_CreateBookmark",this.authType.AUTO_DETECT);
+		super.launchSnippet("Social_Bookmarks_API_CreateBookmark",AuthType.AUTO_DETECT);
 
 	}
 
@@ -229,7 +229,7 @@ public void createFolder() {
 			folder = fileService.createFolder("TestFolder");		
 			fileService.pinFolder(folder.getFileId());
 			Trace.log("Created test folder: " + folder.getFileId());			
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			e.printStackTrace();
 			Assert.fail("Error creating test folder: " + e.getMessage());
 		} catch (TransformerException te) {
@@ -274,10 +274,10 @@ public void createFile() {
 
 
 			Trace.log("Created test file: " + fileEntry.getFileId());
-		} catch (FileServiceException fse) {
+		} catch (ClientServicesException cse) {
 			fileEntry = null;
-	        fse.printStackTrace();
-			Assert.fail("Error creating test file: " + fse.getMessage());
+	        cse.printStackTrace();
+			Assert.fail("Error creating test file: " + cse.getMessage());
 		} catch (TransformerException te) {
 			te.printStackTrace();
 			Assert.fail("Error creating test file: " + te.getMessage());
@@ -288,22 +288,22 @@ public void deleteFileAndQuit() {
 		if (fileEntry != null) {
 			try {
 				fileService.deleteFile(fileEntry.getFileId());
-			} catch (FileServiceException fse) {
+			} catch (ClientServicesException cse) {
 				fileEntry = null;
 				if (failIfAfterDeletionFails()) {
-					Assert.fail("Error deleting test file: " + fse.getMessage());
-					fse.printStackTrace();
+					Assert.fail("Error deleting test file: " + cse.getMessage());
+					cse.printStackTrace();
 				}
 			}
 		}
 		if (folder != null) {
 			try {
 				fileService.deleteFolder(folder.getFileId());
-			} catch (FileServiceException fse) {
+			} catch (ClientServicesException cse) {
 				folder = null;
 				if (failIfAfterDeletionFails()) {
-					Assert.fail("Error deleting test folder: " + fse.getMessage());
-					fse.printStackTrace();
+					Assert.fail("Error deleting test folder: " + cse.getMessage());
+					cse.printStackTrace();
 				}
 			}
 		}
@@ -313,7 +313,7 @@ public void deleteFileAndQuit() {
 	public void emptyTrash(){
 		try {
 			fileService.deleteAllFilesFromRecycleBin();
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.core/src/main/java/com/ibm/sbt/automation/core/test/connections/BaseFilesTest.java

@@ -1,5 +1,5 @@
 /*
- * © Copyright IBM Corp. 2013
+ * © Copyright IBM Corp. 2013
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); 
  * you may not use this file except in compliance with the License. 
@@ -38,7 +38,6 @@
 import com.ibm.sbt.services.client.connections.communities.CommunityServiceException;
 import com.ibm.sbt.services.client.connections.files.File;
 import com.ibm.sbt.services.client.connections.files.FileService;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 import com.ibm.sbt.services.client.connections.files.model.FileCreationParameters;
 
 /**
@@ -183,7 +182,7 @@ public void createFolder() {
 		try {
 			folder = fileService.createFolder("TestFolder");
 			Trace.log("Created test folder: " + folder.getFileId());
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			e.printStackTrace();
 			fail("Error creating test folder: ", e);
 		} catch (TransformerException te) {
@@ -219,7 +218,7 @@ public void createFile(String id) {
 					"Comment added by BaseFilesTest", params);
 
 			Trace.log("Created test file: " + fileEntry.getFileId());
-		} catch (FileServiceException fse) {
+		} catch (ClientServicesException fse) {
 			fileEntry = null;
 			fse.printStackTrace();
 			fail("Error creating test file: ", fse);
@@ -237,7 +236,7 @@ public void deleteFileAndQuit() {
 
 			try {
 				fileService.deleteFile(fileEntry.getFileId());
-			} catch (FileServiceException fse) {
+			} catch (ClientServicesException fse) {
 				fileEntry = null;
 				if (failIfAfterDeletionFails()) {
 					fail("Error deleting test file: ", fse);
@@ -251,7 +250,7 @@ public void deleteFileAndQuit() {
 
 			try {
 				fileService.deleteFolder(folder.getFileId());
-			} catch (FileServiceException fse) {
+			} catch (ClientServicesException fse) {
 				folder = null;
 				if (failIfAfterDeletionFails()) {
 					fail("Error deleting test folder: ", fse);
@@ -277,7 +276,7 @@ public void deleteFile(File file) {
 		if (file != null) {
 			try {
 				fileService.deleteFile(file.getFileId());
-			} catch (FileServiceException fse) {
+			} catch (ClientServicesException fse) {
 				if (failIfAfterDeletionFails()) {
 					fail("Error deleting test file: ", fse);
 					fse.printStackTrace();

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetFile.java

@@ -8,8 +8,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetFile extends BaseFilesTest {
 
@@ -24,7 +24,7 @@ public void init() {
 			addSnippetParam("sample.fileId", fileEntry.getFileId());
 			fileService = getFileService();
 			file = fileService.getFile(fileEntry.getFileId(), true);
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			Assert.fail(e.getMessage());
 			e.printStackTrace();
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetFilesSharedByMe.java

@@ -11,8 +11,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetFilesSharedByMe extends BaseFilesTest {
 
@@ -25,7 +25,7 @@ public void init() {
 		try {
 			fileService = getFileService();
 			files = fileService.getFilesSharedByMe(new HashMap<String, String>());
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			Assert.fail(e.getMessage());
 			e.printStackTrace();
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetFilesSharedWithMe.java

@@ -11,8 +11,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetFilesSharedWithMe extends BaseFilesTest {
 
@@ -25,7 +25,7 @@ public void init() {
 		try {
 			fileService = getFileService();
 			files = fileService.getFilesSharedWithMe(new HashMap<String, String>());
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			Assert.fail(e.getMessage());
 			e.printStackTrace();
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetMyFiles.java

@@ -11,8 +11,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetMyFiles extends BaseFilesTest {
 
@@ -25,7 +25,7 @@ public void init() {
 		try {
 			fileService = getFileService();
 			files = fileService.getMyFiles(new HashMap<String, String>());
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			Assert.fail(e.getMessage());
 			e.printStackTrace();
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetMyFolders.java

@@ -12,8 +12,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetMyFolders extends BaseFilesTest {
 
@@ -29,7 +29,7 @@ public void init() {
 				createFolder();
 			}
 			folders = fileService.getMyFolders(new HashMap<String, String>());
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			Assert.fail(e.getMessage());
 		}
 	}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetMyPinnedFiles.java

@@ -13,8 +13,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetMyPinnedFiles extends BaseFilesTest {
 
@@ -30,7 +30,7 @@ public void init() {
 			fileService = getFileService();
 			files = fileService.getPinnedFiles(new HashMap<String, String>());
 			assertNotNull(files);
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			e.printStackTrace();
 			Assert.fail(e.getMessage());
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetPinnedFiles.java

@@ -13,8 +13,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetPinnedFiles extends BaseFilesTest {
 
@@ -30,7 +30,7 @@ public void init() {
 			fileService = getFileService();
 			files = fileService.getPinnedFiles(new HashMap<String, String>());
 			assertNotNull(files);
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			e.printStackTrace();
 			Assert.fail(e.getMessage());
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetPublicFileComments.java

@@ -12,8 +12,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.Comment;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetPublicFileComments extends BaseFilesTest {
 
@@ -30,7 +30,7 @@ public void init() {
 		addSnippetParam("sample.fileId", fileEntry.getFileId());
 		try {
 			comments = fileService.getAllFileComments(fileEntry.getFileId(), new HashMap<String, String>());
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			Assert.fail(e.getMessage());
 			e.printStackTrace();
 		}

samples/j2ee/snippets/com.ibm.sbt.automation.test/src/main/java/com/ibm/sbt/test/js/connections/files/api/GetPublicFiles.java

@@ -1,7 +1,5 @@
 package com.ibm.sbt.test.js.connections.files.api;
 
-import static org.junit.Assert.fail;
-
 import java.util.HashMap;
 import java.util.List;
 
@@ -14,8 +12,8 @@
 import com.ibm.commons.util.io.json.JsonJavaObject;
 import com.ibm.sbt.automation.core.test.connections.BaseFilesTest;
 import com.ibm.sbt.automation.core.test.pageobjects.JavaScriptPreviewPage;
+import com.ibm.sbt.services.client.ClientServicesException;
 import com.ibm.sbt.services.client.connections.files.File;
-import com.ibm.sbt.services.client.connections.files.FileServiceException;
 
 public class GetPublicFiles extends BaseFilesTest {
 
@@ -33,7 +31,7 @@ public void init() {
 		addSnippetParam("sample.fileId", fileEntry.getFileId());
 		try {
 			files = fileService.getPublicFiles(new HashMap<String, String>());
-		} catch (FileServiceException e) {
+		} catch (ClientServicesException e) {
 			Assert.fail(e.getMessage());
 			e.printStackTrace();
 		}

samples/j2ee/snippets/com.ibm.sbt.sample.web/src/main/webapp/samples/java/Social/ActivityStreams/Updates From Community.jsp

@@ -20,10 +20,10 @@
 <%@page import="java.io.PrintWriter"%>
 <%@page import="com.ibm.sbt.services.client.connections.activitystreams.model.Reply"%>
 <%@page import="com.ibm.sbt.services.client.connections.activitystreams.ActivityStreamEntity"%>
-<%@page import="com.ibm.sbt.services.client.connections.activitystreams.ActivityStreamEntityList"%>
 <%@page import="com.ibm.sbt.services.client.connections.activitystreams.ActivityStreamService"%>
-<%@page import="com.ibm.sbt.services.client.connections.communities.CommunityList"%>
 <%@page import="com.ibm.sbt.services.client.connections.communities.CommunityService"%>
+<%@page import="com.ibm.sbt.services.client.connections.communities.Community"%>
+<%@page import="com.ibm.sbt.services.client.base.datahandlers.EntityList"%>
 <%@page import="java.util.List"%>
 <%@page import="java.util.Iterator"%>
 <html>
@@ -41,13 +41,13 @@
 
 		// Fetch list of my communities, we need to community uuid for making call in ActivityStreamService.
 		CommunityService comService = new CommunityService();
-		CommunityList listOfCommunities = comService.getMyCommunities();
+		EntityList<Community> listOfCommunities = comService.getMyCommunities();
 		if(listOfCommunities.size()<=0){
 			out.println("You are not owner of any community");
 		}else{
 		
 			ActivityStreamService _service = new ActivityStreamService();
-			ActivityStreamEntityList _entries = _service.getUpdatesFromCommunity(listOfCommunities.get(0).getCommunityUuid());
+			EntityList<ActivityStreamEntity> _entries = _service.getUpdatesFromCommunity(listOfCommunities.get(0).getCommunityUuid());
 
 			if (_entries.size() <= 0){
 				out.println("No updates to be displayed");

samples/j2ee/snippets/com.ibm.sbt.sample.web/src/main/webapp/samples/java/Social/Communities/Accept Invite.jsp

@@ -21,7 +21,7 @@
 <%@page	import="com.ibm.sbt.services.client.connections.communities.Community"%>
 <%@page import="com.ibm.sbt.services.client.connections.communities.CommunityService"%>
 <%@page import="com.ibm.sbt.services.client.connections.communities.Invite"%>
-<%@page	import="com.ibm.sbt.services.client.connections.communities.InviteList"%>
+<%@page import="com.ibm.sbt.services.client.base.datahandlers.EntityList"%>
 <%@page language="java" contentType="text/html; charset=ISO-8859-1"
 	pageEncoding="ISO-8859-1"%>
 <html>
@@ -35,7 +35,7 @@
 	<%
 		try {
 			CommunityService svc = new CommunityService();
-			InviteList invites = svc.getMyInvites();
+			EntityList<Invite> invites = svc.getMyInvites();
 			if(invites.size()>0){
 				String communityId = invites.get(0).getCommunityUuid();
 				String userId = invites.get(0).getContributor().getUserid();

samples/j2ee/snippets/com.ibm.sbt.sample.web/src/main/webapp/samples/java/Social/Communities/Add Member.jsp

@@ -18,9 +18,9 @@
 <%@page import="com.ibm.commons.runtime.Application"%>
 <%@page import="com.ibm.commons.runtime.Context"%>
 <%@page import="com.ibm.sbt.services.client.connections.communities.Community"%>
-<%@page import="com.ibm.sbt.services.client.connections.communities.CommunityList"%>
 <%@page import="com.ibm.sbt.services.client.connections.communities.CommunityService"%>
 <%@page import="com.ibm.sbt.services.client.connections.communities.Member"%>
+<%@page import="com.ibm.sbt.services.client.base.datahandlers.EntityList"%>
 <%@page import="java.util.HashMap"%>
 <%@page import="java.util.Collection"%>
 <%@page 
@@ -38,7 +38,7 @@
 	<%
 	try {
 		CommunityService communityService = new CommunityService();
-		CommunityList communities = communityService.getMyCommunities();
+		EntityList<Community> communities = communityService.getMyCommunities();
 		Community community = communities.iterator().next();
 		String id = Context.get().getProperty("sample.id2");
 		Member newMember = new Member(communityService,id);