Skip to content

Commit af71abc

Browse files
refactor: deprecate old schema (#305)
1 parent 5723cb9 commit af71abc

File tree

5 files changed

+51
-39
lines changed

5 files changed

+51
-39
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.crowdin.client.reports.model;
2+
3+
import lombok.Data;
4+
import lombok.EqualsAndHashCode;
5+
6+
import java.util.Date;
7+
import java.util.List;
8+
9+
@Data
10+
@EqualsAndHashCode(callSuper = true)
11+
public class PreTranslateAccuracyGenerateReportRequest extends GenerateReportRequest {
12+
private String name = "pre-translate-accuracy";
13+
private Schema schema;
14+
15+
@Data
16+
public static class Schema {
17+
private Unit unit = Unit.WORDS;
18+
private ReportsFormat format = ReportsFormat.XLSX;
19+
private List<String> postEditingCategories;
20+
}
21+
22+
@Data
23+
@EqualsAndHashCode(callSuper = true)
24+
public static class GeneralSchema extends Schema {
25+
private String languageId;
26+
private Date dateFrom;
27+
private Date dateTo;
28+
}
29+
30+
@Data
31+
@EqualsAndHashCode(callSuper = true)
32+
public static class ByTaskSchema extends Schema {
33+
private Long taskId;
34+
}
35+
36+
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,12 @@
11
package com.crowdin.client.reports.model;
22

3-
import lombok.Data;
4-
import lombok.EqualsAndHashCode;
5-
6-
import java.util.Date;
7-
import java.util.List;
8-
9-
@Data
10-
@EqualsAndHashCode(callSuper = true)
11-
public class PreTranslateEfficiencyGenerateReportRequest extends GenerateReportRequest {
12-
private String name = "pre-translate-efficiency";
13-
private Schema schema;
14-
15-
@Data
16-
public static class Schema {
17-
private Unit unit = Unit.WORDS;
18-
private ReportsFormat format = ReportsFormat.XLSX;
19-
private List<String> postEditingCategories;
20-
}
21-
22-
@Data
23-
@EqualsAndHashCode(callSuper = true)
24-
public static class GeneralSchema extends Schema {
25-
private String languageId;
26-
private Date dateFrom;
27-
private Date dateTo;
28-
}
29-
30-
@Data
31-
@EqualsAndHashCode(callSuper = true)
32-
public static class ByTaskSchema extends Schema {
33-
private Long taskId;
34-
}
35-
3+
/**
4+
* @deprecated Use {@link PreTranslateAccuracyGenerateReportRequest} instead
5+
*/
6+
@Deprecated
7+
public class PreTranslateEfficiencyGenerateReportRequest extends PreTranslateAccuracyGenerateReportRequest {
8+
public PreTranslateEfficiencyGenerateReportRequest() {
9+
super();
10+
this.setName("pre-translate-efficiency");
11+
}
3612
}

src/test/java/com/crowdin/client/reports/ReportsApiTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ReportsApiTest extends TestClient {
5959
public List<RequestMock> getMocks() {
6060
return Arrays.asList(
6161
RequestMock.build(this.url + "/projects/" + projectId + "/reports", HttpPost.METHOD_NAME, "api/reports/generateReport.json", "api/reports/reportGenerationStatus.json"),
62-
RequestMock.build(this.url + "/projects/" + projectId + "/reports", HttpPost.METHOD_NAME, "api/reports/generatePreTranslateEfficiencyReport.json", "api/reports/preTranslateEfficiencyReportStatus.json"),
62+
RequestMock.build(this.url + "/projects/" + projectId + "/reports", HttpPost.METHOD_NAME, "api/reports/generatePreTranslateAccuracyReport.json", "api/reports/preTranslateAccuracyReportStatus.json"),
6363
RequestMock.build(this.url + "/projects/" + projectId + "/reports/" + id, HttpGet.METHOD_NAME, "api/reports/reportGenerationStatus.json"),
6464
RequestMock.build(this.url + "/projects/" + projectId + "/reports/" + id + "/download", HttpGet.METHOD_NAME, "api/reports/downloadLink.json"),
6565
RequestMock.build(this.url + "/projects/" + projectId + "/reports/settings-templates", HttpGet.METHOD_NAME, "api/reports/listReportSettingsTemplate.json"),
@@ -151,12 +151,12 @@ public void generateReportTest() {
151151
}
152152

153153
@Test
154-
public void testGeneratePreTranslateEfficiencyReport() {
154+
public void testGeneratePreTranslateAccuracyReport() {
155155
TimeZone.setDefault(tz);
156156
Date reportCreatedAt = getDate(2019, Calendar.SEPTEMBER, 23, 11, 26, 54);
157157

158-
PreTranslateEfficiencyGenerateReportRequest request = new PreTranslateEfficiencyGenerateReportRequest();
159-
PreTranslateEfficiencyGenerateReportRequest.GeneralSchema schema = new PreTranslateEfficiencyGenerateReportRequest.GeneralSchema();
158+
PreTranslateAccuracyGenerateReportRequest request = new PreTranslateAccuracyGenerateReportRequest();
159+
PreTranslateAccuracyGenerateReportRequest.GeneralSchema schema = new PreTranslateAccuracyGenerateReportRequest.GeneralSchema();
160160
schema.setUnit(Unit.STRINGS);
161161
schema.setPostEditingCategories(singletonList(postEditingCategory));
162162
schema.setLanguageId(languageId);

src/test/resources/api/reports/generatePreTranslateEfficiencyReport.json src/test/resources/api/reports/generatePreTranslateAccuracyReport.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "pre-translate-efficiency",
2+
"name": "pre-translate-accuracy",
33
"schema": {
44
"unit": "strings",
55
"format": "xlsx",

src/test/resources/api/reports/preTranslateEfficiencyReportStatus.json src/test/resources/api/reports/preTranslateAccuracyReportStatus.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"progress": 100,
66
"attributes": {
77
"format": "xlsx",
8-
"reportName": "pre-translate-efficiency",
8+
"reportName": "pre-translate-accuracy",
99
"schema": {}
1010
},
1111
"createdAt": "2019-09-23T11:26:54+00:00",

0 commit comments

Comments
 (0)