Updates for release 3.0

Updates for release 3.0

Author: BRIAN HOLYFIELD

SendSafelyAPI/src/com/sendsafely/BasePackage.java

@@ -1,27 +1,34 @@
 package com.sendsafely;
 
+import java.util.Date;
 import java.util.List;
 
 import com.sendsafely.enums.PackageState;
+import com.sendsafely.enums.PackageStatus;
 
 /**
  * A Java Bean containing information about a package. 
  * Only the Getters should be used from this object, since the server will populate the object. 
  * Updating the setters will not change any state on the server and should be avoided.
- * @author Erik Larsson
  *
  */
 public class BasePackage {
 
 	private String packageId;
+	private String packageDescriptor;
 	private String packageCode;
 	private String serverSecret;
 	private String keyCode;
 	private List<File> files;
 	private List<String> approverList;
 	private boolean needsApproval;
 	private PackageState state;
+	private PackageStatus status;
 	private int life;
+	private String rootDirectoryId; 
+	private boolean isWorkspace;
+	private Date packageTimestamp;
+	private String packageOwner = "";
 
 	/**
 	 * @description The package ID used to identify a given package
@@ -152,6 +159,22 @@ public void setState(PackageState state) {
 		this.state = state;
 	}
 
+	/** 
+	 * @description Returns the current state of the package. 
+	 * @return
+	 */
+	public PackageStatus getStatus() {
+		return status;
+	}
+	
+	/**
+	 * @description Set internally by the API.
+	 * @param status
+	 */
+	public void setStatus(PackageStatus status) {
+		this.status = status;
+	}
+	
 	/**
 	 * @description Get the number of days the final package will be available for before it expires.
 	 * @return
@@ -167,5 +190,51 @@ public int getLife() {
 	public void setLife(int life) {
 		this.life = life;
 	}
+
+	public String getRootDirectoryId() {
+		return rootDirectoryId;
+	}
+
+	public void setRootDirectoryId(String rootDirectoryId) {
+		this.rootDirectoryId = rootDirectoryId;
+	}
+
+	public String getPackageDescriptor() {
+		return packageDescriptor;
+	}
+
+	public void setPackageDescriptor(String packageDescriptor) {
+		this.packageDescriptor = packageDescriptor;
+	}
+
+	public boolean getIsWorkspace() {
+		return isWorkspace;
+	}
+
+	public void setIsWorkspace(boolean isWorkspace) {
+		this.isWorkspace = isWorkspace;
+	}
+
+	public Date getPackageTimestamp() {
+		return packageTimestamp;
+	}
+
+	public void setPackageTimestamp(Date packageTimestamp) {
+		this.packageTimestamp = packageTimestamp;
+	}
+
+	public String getPackageOwner() {
+		return packageOwner;
+	}
+
+	public void setPackageOwner(String packageOwner) {
+		if(packageOwner == null){
+			this.packageOwner = "";
+		}else{
+			this.packageOwner = packageOwner;
+		}
+	}
+	
+	
 
 }

SendSafelyAPI/src/com/sendsafely/ContactGroup.java

@@ -1,10 +1,7 @@
 package com.sendsafely;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 
 import com.sendsafely.dto.ContactGroupMember;
 
@@ -14,12 +11,12 @@
  * contactGroupId, contactGroupName, ContactGroupUsers, and users.
  * Only the Getters should be used from this object, since the server will populate the object. 
  * Updating the setters will not change any state on the server and should be avoided.
- * @author michaelnowak
  *
  */
 public class ContactGroup {
 	private String contactGroupId;
 	private String contactGroupName;
+	private boolean contactGroupIsOrganizationGroup;
 	private List<ContactGroupMember> users = new ArrayList<ContactGroupMember>(0);
 
 	/**
@@ -69,4 +66,24 @@ public List<ContactGroupMember> getContactGroupMembers() {
 	public void setContactGroupMembers(List<ContactGroupMember> users) {
 		this.users = users;
 	}
+
+	/**
+	 * @description Gets the status of if it's an enterprise contact group.
+	 * @return is enterprise contact group
+	 */
+	public boolean getContactGroupIsOrganizationGroup() {
+		return contactGroupIsOrganizationGroup;
+	}
+
+	/**
+	 * Sets the value for if the group is an enterprise contact group.
+	 * @param contactGroupIsOrganizationGroup
+	 */
+	
+
+	public void setContactGroupIsOrganizationGroup(boolean contactGroupIsOrganizationGroup) {
+		this.contactGroupIsOrganizationGroup = contactGroupIsOrganizationGroup;
+	}
+	
+	
 }

SendSafelyAPI/src/com/sendsafely/Directory.java

@@ -0,0 +1,64 @@
+package com.sendsafely;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.sendsafely.dto.Subdirectory;
+
+
+public class Directory {
+	private Directory directory;
+	private String directoryName;
+	private String directoryId;
+	private List<File> files;
+	private Collection<Subdirectory> subDirectories;
+	
+	public Directory(String directoryId, String directoryName){
+		this.directoryName = directoryName;
+		this.directoryId = directoryId;
+	}
+
+	public String getDirectoryId() {
+		return directoryId;
+	}
+
+	public void setDirectoryId(String directoryId) {
+		this.directoryId = directoryId;
+	}
+
+	public Directory getDirectory() {
+		return directory;
+	}
+
+	public void setDirectory(Directory directory) {
+		this.directory = directory;
+	}
+
+	public String getDirectoryName() {
+		return directoryName;
+	}
+
+	public void setDirectoryName(String directoryName) {
+		this.directoryName = directoryName;
+	}
+
+	public List<File> getFiles() {
+		return files;
+	}
+
+	public void setFiles(List<File> files) {
+		this.files = files;
+	}
+
+	public Collection<Subdirectory> getSubDirectories() {
+		return subDirectories;
+	}
+
+	public void setSubDirectories(Collection<Subdirectory> subDirectories) {
+		this.subDirectories = subDirectories;
+	}
+	
+	
+	
+
+}

SendSafelyAPI/src/com/sendsafely/File.java

@@ -4,7 +4,6 @@
  * A Java Bean containing information about a file. 
  * Only the Getters should be used from this object, since the server will populate the object. 
  * Updating the setters will not change any state on the server and should be avoided.
- * @author Erik Larsson
  *
  */
 public class File {
@@ -15,6 +14,17 @@ public class File {
 	//private String createdBy;
 	private int parts;
 
+	public File(String fileId, String fileName, long fileSize, int parts){
+		this.fileId = fileId;
+		this.fileName = fileName;
+		this.fileSize = fileSize;
+		this.parts = parts;
+	}
+	
+	public File() {
+		// TODO Auto-generated constructor stub
+	}
+
 	/**
 	 * @description Get the unique file ID associated with the file.
 	 * @return
@@ -75,6 +85,7 @@ public void setCreatedBy(String createdBy) {
 	/**
 	 * @description Returns the number of parts this file is internally split up into when stored on the SendSafely servers.
 	 * @return
+	 * @deprecated
 	 */
 	public int getParts() {
 		return parts;

SendSafelyAPI/src/com/sendsafely/Package.java

@@ -2,13 +2,10 @@
 
 import java.util.List;
 
-import com.sendsafely.enums.PackageState;
-
 /**
  * A Java Bean containing information about a package. 
  * Only the Getters should be used from this object, since the server will populate the object. 
  * Updating the setters will not change any state on the server and should be avoided.
- * @author Erik Larsson
  *
  */
 public class Package extends BasePackage {
@@ -47,8 +44,6 @@ public List<ContactGroup> getContactGroups() {
 	 */
 	public void setContactGroups(List<ContactGroup> contactGroups) {
 		this.contactGroups = contactGroups;
-	}
-	
-	
+	}	
 
 }

SendSafelyAPI/src/com/sendsafely/PackageReference.java

@@ -2,13 +2,10 @@
 
 import java.util.List;
 
-import com.sendsafely.enums.PackageState;
-
 /**
  * A Java Bean containing information about a package. 
  * Only the Getters should be used from this object, since the server will populate the object. 
  * Updating the setters will not change any state on the server and should be avoided.
- * @author Erik Larsson
  *
  */
 public class PackageReference extends BasePackage {

SendSafelyAPI/src/com/sendsafely/PackageSearchResults.java

@@ -0,0 +1,21 @@
+package com.sendsafely;
+
+import java.util.List;
+
+public class PackageSearchResults {
+
+	List<PackageReference> packages;
+	boolean capped;
+	public List<PackageReference> getPackages() {
+		return packages;
+	}
+	public void setPackages(List<PackageReference> packages) {
+		this.packages = packages;
+	}
+	public boolean isCapped() {
+		return capped;
+	}
+	public void setCapped(boolean limit) {
+		this.capped = limit;
+	}
+}

SendSafelyAPI/src/com/sendsafely/ProgressInterface.java

@@ -2,7 +2,6 @@
 
 /**
  * An interface, which can be implemented to track the progress of the file currently being uploaded. 
- * @author Erik Larsson
  *
  */
 public interface ProgressInterface {

SendSafelyAPI/src/com/sendsafely/Recipient.java

@@ -9,18 +9,15 @@
  * A Java Bean containing information about a recipient. 
  * Only the Getters should be used from this object, since the server will populate the object. 
  * Updating the setters will not change any state on the server and should be avoided.
- * @author Erik Larsson
  *
  */
 public class Recipient {
 
 	private String recipientId;
 	private String email;
 	private boolean needsApproval;
-	private boolean canAddFiles;
-	private boolean canAddMessages;
-	private boolean canAddRecipients;
 	private List<Confirmation> confirmations = new ArrayList<Confirmation>();
+	private String role;
 
 	/**
 	 * @description Get the unique recipient ID for the object. The recipient ID is unique for every new package. The same user will have different recipient IDs for different packages.
@@ -86,29 +83,13 @@ public List<Confirmation> getConfirmations() {
 	public void setConfirmations(List<Confirmation> confirmations) {
 		this.confirmations = confirmations;
 	}
-	
-	/*
-	public boolean canAddFiles() {
-		return this.canAddFiles;
-	}
-	
-	public void setCanAddFiles(boolean canAddFiles) {
-		this.canAddFiles = canAddFiles;
-	}
-	
-	public boolean canAddMessages() {
-		return this.canAddMessages;
-	}
-	
-	public void setCanAddMessages(boolean canAddMessages) {
-		this.canAddMessages = canAddMessages;
+
+	public String getRole() {
+		return role;
 	}
-	
-	public boolean canAddRecipients() {
-		return this.canAddRecipients;
+
+	public void setRole(String roleName) {
+		this.role = roleName;
 	}
 
-	public void setCanAddRecipients(boolean canAddRecipients) {
-		this.canAddRecipients = canAddRecipients;
-	}*/
 }