Merge branch 'master' into release-1.0

Preparing to release 1.0.23

pom.xml

@@ -87,6 +87,10 @@
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-release-plugin</artifactId>
  <version>2.5.1</version>
+ <configuration>
+ <goals>deploy</goals>
+ <tagNameFormat>@{version}</tagNameFormat>
+ </configuration>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>

src/main/java/edu/ksu/canvas/interfaces/ContentMigrationReader.java

@@ -9,6 +9,7 @@ public interface ContentMigrationReader extends CanvasReader<ContentMigration, C
  /**
  * Returns a content migration.
  * @param courseId The course ID for this API call
+ * @param id The Canvas ID of the content migration to query
  * @return A ContentMigration object
  * @throws IOException When there is an error communicating with Canvas
  */

src/main/java/edu/ksu/canvas/model/ExternalTool.java

@@ -24,6 +24,8 @@ public class ExternalTool extends BaseCanvasModel implements Serializable {
  private String configType;
  private String configXml;
  private String configUrl;
+ // The LTI version eg, 1.1 or 1.3
+ private String version;
  private Map<String, String> customFields;
  //These navigation settings are problematic. The possible values in these maps are documented
  //at https://canvas.instructure.com/doc/api/external_tools.html#method.external_tools.create
@@ -173,6 +175,19 @@ public void setConfigUrl(String configUrl) {
  this.configUrl = configUrl;
  }
 
+ /**
+ * The LTI version that this tool uses. Example values: 1.1, 1.3
+ * This field is not documented in the Canvas API docs
+ * @return LTI version used by this tool
+ */
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
  /**
  * A map of Canvas specific custom fields that will be added to the LTI launch request.
  * See <a href="https://canvas.instructure.com/doc/api/file.tools_variable_substitutions.html">Variable Subsitution</a> docs

src/main/java/edu/ksu/canvas/model/assignment/Assignment.java

@@ -56,7 +56,7 @@ public class Assignment extends BaseCanvasModel implements Serializable{
  private LockInfo lockInfo;
  private String lockExplanation;
  private Boolean notifyOfUpdate;
-
+ private Boolean omitFromFinalGrade;
 
  public Integer getId() {
  return id;
@@ -398,6 +398,15 @@ public void setNotifyOfUpdate(Boolean notifyOfUpdate) {
  this.notifyOfUpdate = notifyOfUpdate;
  }
 
+ @CanvasField(postKey = "omit_from_final_grade")
+ public Boolean isOmitFromFinalGrade() {
+ return omitFromFinalGrade;
+ }
+
+ public void setOmitFromFinalGrade(Boolean omitFromFinalGrade) {
+ this.omitFromFinalGrade = omitFromFinalGrade;
+ }
+
  public class ExternalToolTagAttribute implements Serializable {
  private static final long serialVersionUID = 1L;
 

src/main/java/edu/ksu/canvas/requestOptions/UpdateCourseTabOptions.java

@@ -26,6 +26,8 @@ public UpdateCourseTabOptions(String courseId, String tabId) {
 
  /**
  * Sets the position (1-based).
+ * @param position The new position of the tab (1-based)
+ * @return This object to continue adding options
  */
  public UpdateCourseTabOptions position(int position) {
  addSingleItem("position", Integer.toString(position));