Commits

Paweł Bugalski committed a613293 Merge

Merge remote-tracking branch 'refs/remotes/origin/master'

Comments (0)

Files changed (8)

     <parent>
         <groupId>com.atlassian.jira</groupId>
         <artifactId>jira-rest-java-client-parent</artifactId>
-        <version>2.0.0-m24-SNAPSHOT</version>
+        <version>2.0.0-m25-SNAPSHOT</version>
     </parent>
 
     <artifactId>jira-rest-java-client-api</artifactId>
     <parent>
         <groupId>com.atlassian.jira</groupId>
         <artifactId>jira-rest-java-client-parent</artifactId>
-        <version>2.0.0-m24-SNAPSHOT</version>
+        <version>2.0.0-m25-SNAPSHOT</version>
     </parent>
 
     <artifactId>jira-rest-java-client-core</artifactId>

core/src/main/java/com/atlassian/jira/rest/client/internal/async/AsynchronousIssueRestClient.java

 				}
 			}
 			final Iterable<FieldInput> fields = transitionInput.getFields();
-			JSONObject fieldsJs = new IssueUpdateJsonGenerator().generate(fields);
+			final JSONObject fieldsJs = new IssueUpdateJsonGenerator().generate(fields);
 			if (fieldsJs.keys().hasNext()) {
 				jsonObject.put("fields", fieldsJs);
 			}

core/src/main/java/com/atlassian/jira/rest/client/internal/json/gen/IssueUpdateJsonGenerator.java

 		final JSONObject fields = new JSONObject();
 		if (fieldInputs != null) {
 			for (final FieldInput field : fieldInputs) {
-				if (field.getValue() != null) {
-					fields.put(field.getId(), generator.generateFieldValueForJson(field.getValue()));
-				}
+				final Object fieldValue = (field.getValue() == null) ? JSONObject.NULL
+						: generator.generateFieldValueForJson(field.getValue());
+
+				fields.put(field.getId(), fieldValue);
 			}
 		}
 		return fields;
     <parent>
         <groupId>com.atlassian.jira</groupId>
         <artifactId>jira-rest-java-client-parent</artifactId>
-        <version>2.0.0-m24-SNAPSHOT</version>
+        <version>2.0.0-m25-SNAPSHOT</version>
     </parent>
 
     <artifactId>jira-rest-java-client-plugin</artifactId>
     </parent>
     <groupId>com.atlassian.jira</groupId>
     <artifactId>jira-rest-java-client-parent</artifactId>
-    <version>2.0.0-m24-SNAPSHOT</version>
+    <version>2.0.0-m25-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>JIRA REST Java Client</name>
     <description>Java library which allows to easily talk to any JIRA 5.0+ instance.</description>
 	<distributionManagement>
 		<site>
 			<id>atlassian-documentation</id>
-			<url>scp://docs-fe.internal.atlassian.com/var/www/domains/docs.atlassian.com/${project.artifactId}/${project.version}</url>
+			<url>scpexe://docs-app.internal.atlassian.com/var/www/domains/docs.atlassian.com/${project.artifactId}/${project.version}</url>
 		</site>
 	</distributionManagement>
     <scm>
     <parent>
         <groupId>com.atlassian.jira</groupId>
         <artifactId>jira-rest-java-client-parent</artifactId>
-        <version>2.0.0-m24-SNAPSHOT</version>
+        <version>2.0.0-m25-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.atlassian.jira</groupId>

test/src/test/java/it/AsynchronousIssueRestClientTest.java

 @Restore(DEFAULT_JIRA_DUMP_FILE)
 public class AsynchronousIssueRestClientTest extends AbstractAsynchronousRestClientTest {
 
-	public static final String UTF8_FILE_BODY = "File body encoded in utf8: Kaźń i żółtość będą! | ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει Би шил идэй чадна, надад хортой биш., or 2πR";
-	public static final String UTF8_FILE_NAME = "utf8 file name Kaźń i żółtość będą! | ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει Би шил идэй чадна, надад хортой биш., or 2πR";
+	public static final String UTF8_FILE_BODY = "File body encoded in utf8: Ka\u017a\u0144 i \u017c\u00f3\u0142to\u015b\u0107 b\u0119d\u0105! | \u1f55\u03b1\u03bb\u03bf\u03bd \u03d5\u03b1\u03b3\u03b5\u1fd6\u03bd \u03b4\u1f7b\u03bd\u03b1\u03bc\u03b1\u03b9\u0387 \u03c4\u03bf\u1fe6\u03c4\u03bf \u03bf\u1f54 \u03bc\u03b5 \u03b2\u03bb\u1f71\u03c0\u03c4\u03b5\u03b9 \u0411\u0438 \u0448\u0438\u043b \u0438\u0434\u044d\u0439 \u0447\u0430\u0434\u043d\u0430, \u043d\u0430\u0434\u0430\u0434 \u0445\u043e\u0440\u0442\u043e\u0439 \u0431\u0438\u0448., or 2\u03c0R";
+	public static final String UTF8_FILE_NAME = "utf8 file name Ka\u017a\u0144 i \u017c\u00f3\u0142to\u015b\u0107 b\u0119d\u0105! | \u1f55\u03b1\u03bb\u03bf\u03bd \u03d5\u03b1\u03b3\u03b5\u1fd6\u03bd \u03b4\u1f7b\u03bd\u03b1\u03bc\u03b1\u03b9\u0387 \u03c4\u03bf\u1fe6\u03c4\u03bf \u03bf\u1f54 \u03bc\u03b5 \u03b2\u03bb\u1f71\u03c0\u03c4\u03b5\u03b9 \u0411\u0438 \u0448\u0438\u043b \u0438\u0434\u044d\u0439 \u0447\u0430\u0434\u043d\u0430, \u043d\u0430\u0434\u0430\u0434 \u0445\u043e\u0440\u0442\u043e\u0439 \u0431\u0438\u0448., or 2\u03c0R";
 
 	@Test
 	public void testTransitionWithNumericCustomFieldPolishLocale() throws Exception {