Issue32

src/main/java/com/silverpop/api/client/command/GetContactScoresCommand.java

@@ -11,18 +11,18 @@
 public class GetContactScoresCommand implements ApiCommand {
 
 	@XStreamAlias("CONTACT_ID")
-	private Integer contactId;
+	private Long contactId;
 
 	@Override
 	public Class<? extends ApiResult> getResultType() {
 		return GetContactScoresResult.class;
 	}
 
-	public void setContactId(Integer contactId) {
+	public void setContactId(Long contactId) {
 		this.contactId = contactId;
 	}
 
-	public Integer getContactId() {
+	public Long getContactId() {
 		return contactId;
 	}
 }

src/main/java/com/silverpop/api/client/command/LogoutCommand.java

@@ -0,0 +1,19 @@
+package com.silverpop.api.client.command;
+
+import com.silverpop.api.client.ApiCommand;
+import com.silverpop.api.client.XmlApiProperties;
+import com.silverpop.api.client.result.LogoutResult;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XmlApiProperties("Logout")
+public class LogoutCommand implements ApiCommand {
+
+    public LogoutCommand() {}
+
+    @Override
+    public Class<LogoutResult> getResultType() {
+        return LogoutResult.class;
+    }
+
+}

src/main/java/com/silverpop/api/client/converters/ApiDateConverter.java

@@ -5,9 +5,9 @@
 public class ApiDateConverter extends DateConverter {
 	public static final String DEFAULT_FORMAT = "MM/dd/yy hh:mm a";
 	public static final String[] ACCEPTABLE_FORMATS = {
-		
-	};
-	
+            "yyyy-MM-dd HH:mm:ss.SSS"
+    };
+
 	public ApiDateConverter() {
 		super(DEFAULT_FORMAT, ACCEPTABLE_FORMATS);
 	}

src/main/java/com/silverpop/api/client/result/GetContactScoresResult.java

@@ -1,19 +1,33 @@
 package com.silverpop.api.client.result;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.silverpop.api.client.result.elements.GetContactScoresModelScoreComponent;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import com.silverpop.api.client.ApiResult;
 import com.silverpop.api.client.result.elements.GetContactScoresModel;
 
 public class GetContactScoresResult implements ApiResult {
-
-	@XStreamAlias("MODELS")
-	private List<GetContactScoresModel> models;
-
-	public List<GetContactScoresModel> getModels() {
-		return models;
-	}
-
+
+    @XStreamAlias("MODELS")
+    private List<GetContactScoresModel> models = new ArrayList<GetContactScoresModel>();
+
+    public List<GetContactScoresModel> getModels() {
+        return models;
+    }
+
+    public void setModels(List<GetContactScoresModel> models) {
+        this.models = models;
+    }
+
+    @Override
+    public String toString() {
+        StringBuffer stringBuffer = new StringBuffer();
+        for (GetContactScoresModel model : models) {
+            stringBuffer.append(model + "\n");
+        }
+        return stringBuffer.toString();
+    }
 }

src/main/java/com/silverpop/api/client/result/LogoutResult.java

@@ -0,0 +1,11 @@
+package com.silverpop.api.client.result;
+
+import com.silverpop.api.client.ApiResult;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XStreamAlias("RESULT")
+public class LogoutResult implements ApiResult {
+
+
+}

src/main/java/com/silverpop/api/client/result/elements/GetContactScoresModel.java

@@ -6,33 +6,46 @@
 
 @XStreamAlias("MODEL")
 public class GetContactScoresModel {
-
-	@XStreamAlias("ID")
-	private Integer id;
-
-	@XStreamAlias("NAME")
-	private String name;
-
-	@XStreamAlias("SCORE_COMPONENETS")
-	private List<GetContactScoresModelScoreComponent> scoreComponents;
-
-	public void setId(Integer id){
-		this.id = id;
-	}
-
-	public Integer getId(){
-		return id;
-	}
-
-	public void setName(String name){
-		this.name = name;
-	}
-
-	public String getName(){
-		return name;
-	}
-
-	public List<GetContactScoresModelScoreComponent> getScoreComponents() {
-		return scoreComponents;
-	}
+
+    @XStreamAlias("ID")
+    private Integer id;
+
+    @XStreamAlias("NAME")
+    private String name;
+
+    @XStreamAlias("SCORE_COMPONENTS")
+    private List<GetContactScoresModelScoreComponent> scoreComponents;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<GetContactScoresModelScoreComponent> getScoreComponents() {
+        return scoreComponents;
+    }
+
+    public void setScoreComponents(List<GetContactScoresModelScoreComponent> scoreComponents) {
+        this.scoreComponents = scoreComponents;
+    }
+
+    @Override
+    public String toString() {
+        StringBuffer stringBuffer = new StringBuffer(this.getName() + ": ");
+        for (GetContactScoresModelScoreComponent score : scoreComponents) {
+            stringBuffer.append(score + ", ");
+        }
+        return stringBuffer.substring(0, stringBuffer.length() - 2);
+    }
 }

src/main/java/com/silverpop/api/client/result/elements/GetContactScoresModelScoreComponent.java

@@ -4,19 +4,31 @@
 
 @XStreamAlias("SCORE_COMPONENT")
 public class GetContactScoresModelScoreComponent {
-
-	@XStreamAlias("KEY")
-	private String key;
-
-	@XStreamAlias("VALUE")
-	private Integer value;
-
-	public String getKey(){
-		return key;
-	}
-
-	public Integer getValue(){
-		return value;
-	}
 
+    @XStreamAlias("KEY")
+    private String key;
+
+    @XStreamAlias("VALUE")
+    private String value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return key + "=" + value;
+    }
 }

src/main/java/com/silverpop/api/client/result/elements/GetScoringModelsModel.java

@@ -10,68 +10,68 @@
 
 @XStreamAlias("MODEL")
 public class GetScoringModelsModel {
-	
-	@XStreamAlias("ID")
-	private Integer id;
-	
-	@XStreamAlias("NAME")
-	private String name;
-	
-	@XStreamAlias("DESCRIPTION")
-	private String description;
-	
-	@XStreamAlias("CREATED")
-	@XStreamConverter(ApiDateConverter.class)
-	private Date created;
-	
-	@XStreamAlias("LAST_MODIFIED")
-	@XStreamConverter(ApiDateConverter.class)
-	private Date lastModified;
-	
-	@XStreamAlias("SCORE_COMPONENTS")
-	private List<GetScoringModelsModelScoreComponent> scoreComponents;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return id;
-	}
-	
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return name;
-	}
-
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return description;
-	}
-	
-	public void setCreated(Date created){
-		this.created = created;
-	}
-	
-	public Date getCreated(){
-		return created;
-	}
-	
-	public void setLastModified(Date lastModified){
-		this.lastModified = lastModified;
-	}
-	
-	public Date getLastModified(){
-		return lastModified;
-	}
-
-	public List<GetScoringModelsModelScoreComponent> getScoreComponents() {
-		return scoreComponents;
-	}
+
+    @XStreamAlias("ID")
+    private Integer id;
+
+    @XStreamAlias("NAME")
+    private String name;
+
+    @XStreamAlias("DESCRIPTION")
+    private String description;
+
+    @XStreamAlias("CREATED")
+    @XStreamConverter(ApiDateConverter.class)
+    private Date created;
+
+    @XStreamAlias("LAST_MODIFIED")
+    @XStreamConverter(ApiDateConverter.class)
+    private Date lastModified;
+
+    @XStreamAlias("SCORE_COMPONENT_TYPES")
+    private List<GetScoringModelsModelScoreComponent> scoreComponents;
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+
+    public Integer getId(){
+        return id;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public String getName(){
+        return name;
+    }
+
+    public void setDescription(String description){
+        this.description = description;
+    }
+
+    public String getDescription(){
+        return description;
+    }
+
+    public void setCreated(Date created){
+        this.created = created;
+    }
+
+    public Date getCreated(){
+        return created;
+    }
+
+    public void setLastModified(Date lastModified){
+        this.lastModified = lastModified;
+    }
+
+    public Date getLastModified(){
+        return lastModified;
+    }
+
+    public List<GetScoringModelsModelScoreComponent> getScoreComponents() {
+        return scoreComponents;
+    }
 }

src/main/java/com/silverpop/api/client/result/elements/GetScoringModelsModelScoreComponent.java

@@ -1,21 +1,21 @@
 package com.silverpop.api.client.result.elements;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
 
-@XStreamAlias("SCORE_COMPONENT")
+@XStreamAlias("SCORE_COMPONENT_TYPE")
 public class GetScoringModelsModelScoreComponent {
 
 
 	@XStreamAlias("KEY")
 	private String key;
-	
+
 	@XStreamAlias("DESCRIPTION")
 	private String description;
 
-	@XStreamAlias("VALUES")
-	private GetScoringModelsModelScoreComponentValues values;
+    @XStreamAlias("VALUES")
+    private GetScoringModelsModelScoreComponentValues values;
 
-
 	public String getKey() {
 		return key;
 	}