Skip to content

Commit

Permalink
Merge 0963fb8 into c6ebb67
Browse files Browse the repository at this point in the history
  • Loading branch information
atodorov committed Feb 28, 2021
2 parents c6ebb67 + 0963fb8 commit 5de9a17
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -215,4 +215,4 @@ im `pom.xml` if you are having problems building locally!
You will need Maven >= 3.3.9 which on RHEL/CentOS system can be obtained via
SoftwareCollections:

scl enable rh-maven35 /bin/bash
scl enable rh-maven36 /bin/bash
4 changes: 2 additions & 2 deletions src/main/java/org/kiwitcms/java/api/RpcClient.java
@@ -1,5 +1,5 @@
// Copyright (c) 2018-2019 Aneta Petkova <aneta.v.petkova@gmail.com>
// Copyright (c) 2019-2020 Alexander Todorov <atodorov@MrSenko.com>
// Copyright (c) 2019-2021 Alexander Todorov <atodorov@MrSenko.com>

// Licensed under the GPLv3: https://www.gnu.org/licenses/gpl.html

Expand Down Expand Up @@ -296,7 +296,7 @@ public Product createNewProduct(String name) {
Object classificationId = ((JSONObject) jsonArray.get(0)).get("id");

params.put("name", name);
params.put("classification_id", classificationId);
params.put("classification", classificationId);

JSONObject json = (JSONObject) executeViaPositionalParams(CREATE_PRODUCT_METHOD, Arrays.asList((Object) params));
try {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/kiwitcms/java/model/TestCase.java
@@ -1,5 +1,5 @@
// Copyright (c) 2018-2019 Aneta Petkova <aneta.v.petkova@gmail.com>
// Copyright (c) 2020 Alexander Todorov <atodorov@MrSenko.com>
// Copyright (c) 2020-2021 Alexander Todorov <atodorov@MrSenko.com>

// Licensed under the GPLv3: https://www.gnu.org/licenses/gpl.html

Expand Down Expand Up @@ -39,7 +39,7 @@ public Date getCreateDate() {
return createDate;
}

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS")
@JsonSetter("create_date")
public void setCreateDate(Date createDate) {
this.createDate = createDate;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/kiwitcms/java/model/TestPlan.java
@@ -1,5 +1,5 @@
// Copyright (c) 2018-2019 Aneta Petkova <aneta.v.petkova@gmail.com>
// Copyright (c) 2020 Alexander Todorov <atodorov@MrSenko.com>
// Copyright (c) 2020-2021 Alexander Todorov <atodorov@MrSenko.com>

// Licensed under the GPLv3: https://www.gnu.org/licenses/gpl.html

Expand Down Expand Up @@ -52,7 +52,7 @@ public String getCreateDate() {
return createDate;
}

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS")
@JsonSetter("create_date")
public void setCreateDate(String createDate) {
this.createDate = createDate;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/kiwitcms/java/model/TestRun.java
@@ -1,5 +1,5 @@
// Copyright (c) 2018-2019 Aneta Petkova <aneta.v.petkova@gmail.com>
// Copyright (c) 2020 Alexander Todorov <atodorov@MrSenko.com>
// Copyright (c) 2020-2021 Alexander Todorov <atodorov@MrSenko.com>

// Licensed under the GPLv3: https://www.gnu.org/licenses/gpl.html

Expand Down Expand Up @@ -39,7 +39,7 @@ public int getPlan() {
return plan;
}

@JsonSetter("plan_id")
@JsonSetter("plan")
public void setPlan(int plan) {
this.plan = plan;
}
Expand All @@ -48,7 +48,7 @@ public int getBuild() {
return build;
}

@JsonSetter("build_id")
@JsonSetter("build")
public void setBuild(int build) {
this.build = build;
}
Expand Down

0 comments on commit 5de9a17

Please sign in to comment.