Skip to content

Commit 9818fb1

Browse files
Maintenance release, corrected typo in method name
1 parent 669cb18 commit 9818fb1

23 files changed

+52
-36
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.frictionlessdata</groupId>
55
<artifactId>tableschema-java</artifactId>
6-
<version>0.8.3-SNAPSHOT</version>
6+
<version>0.9.0-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<issueManagement>
99
<url>https://github.com/frictionlessdata/tableschema-java/issues</url>

src/main/java/io/frictionlessdata/tableschema/Table.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,9 @@ private void writeCsv(Writer out, CSVFormat format, String[] sortedHeaders) {
809809

810810

811811
/**
812-
* Append the data to a {@link org.apache.commons.csv.CSVPrinter}. Column sorting is according to the mapping
812+
* Append the data to a {@link org.apache.commons.csv.CSVPrinter}. Each cell is formatted via the corresponding
813+
* {@link Field}, which takes into account possible Field options. Column sorting is according to the mapping.
814+
*
813815
* @param mapping the mapping of the column numbers in the CSV file to the column numbers in the data source
814816
* @param schema the Schema to use for formatting the data
815817
* @param csvPrinter the CSVPrinter to write to
@@ -838,6 +840,13 @@ private void writeCSVData(Map<Integer, Integer> mapping, Schema schema, CSVPrint
838840
});
839841
}
840842

843+
/**
844+
* Append the data to a {@link org.apache.commons.csv.CSVPrinter}. In absence of a Schema, each cell is formatted
845+
* via a simple call to `toString()`. Column sorting is according to the mapping.
846+
*
847+
* @param mapping the mapping of the column numbers in the CSV file to the column numbers in the data source
848+
* @param csvPrinter the CSVPrinter to write to
849+
*/
841850
private void writeCSVData(Map<Integer, Integer> mapping, CSVPrinter csvPrinter) {
842851
Iterator<Object> iter = this.iterator(false, false, false, false);
843852
iter.forEachRemaining((rec) -> {
@@ -848,8 +857,7 @@ private void writeCSVData(Map<Integer, Integer> mapping, CSVPrinter csvPrinter)
848857
}
849858
List<String> obj = new ArrayList<>();
850859

851-
for (int j = 0; j < sortedRec.length; j++) {
852-
Object s = sortedRec[j];
860+
for (Object s : sortedRec) {
853861
obj.add((null != s) ? s.toString() : "");
854862
}
855863

src/main/java/io/frictionlessdata/tableschema/field/AnyField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public String parseFormat(String value, Map<String, Object> options) {
5151
}
5252

5353
@Override
54-
Object checkMinimumContraintViolated(Object value) {
54+
Object checkMinimumConstraintViolated(Object value) {
5555
return null;
5656
}
5757

src/main/java/io/frictionlessdata/tableschema/field/ArrayField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public String parseFormat(String value, Map<String, Object> options) {
8888
}
8989

9090
@Override
91-
Object[] checkMinimumContraintViolated(Object[] value) {
91+
Object[] checkMinimumConstraintViolated(Object[] value) {
9292
return null;
9393
}
9494

src/main/java/io/frictionlessdata/tableschema/field/BooleanField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public String parseFormat(String value, Map<String, Object> options) {
100100
}
101101

102102
@Override
103-
Boolean checkMinimumContraintViolated(Boolean value) {
103+
Boolean checkMinimumConstraintViolated(Boolean value) {
104104
return null;
105105
}
106106

src/main/java/io/frictionlessdata/tableschema/field/DateField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public String parseFormat(String value, Map<String, Object> options) {
9393
}
9494

9595
@Override
96-
LocalDate checkMinimumContraintViolated(LocalDate value) {
96+
LocalDate checkMinimumConstraintViolated(LocalDate value) {
9797
LocalDate minDate = (LocalDate)this.constraints.get(CONSTRAINT_KEY_MINIMUM);
9898
if(value.isBefore(minDate)){
9999
return minDate;

src/main/java/io/frictionlessdata/tableschema/field/DatetimeField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public String parseFormat(String value, Map<String, Object> options) {
6565
}
6666

6767
@Override
68-
ZonedDateTime checkMinimumContraintViolated(ZonedDateTime value) {
68+
ZonedDateTime checkMinimumConstraintViolated(ZonedDateTime value) {
6969
ZonedDateTime minTime = (ZonedDateTime)this.constraints.get(CONSTRAINT_KEY_MINIMUM);
7070
if(value.isBefore(minTime)){
7171
return minTime;

src/main/java/io/frictionlessdata/tableschema/field/DurationField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public String parseFormat(String value, Map<String, Object> options) {
5151
}
5252

5353
@Override
54-
Duration checkMinimumContraintViolated(Duration value) {
54+
Duration checkMinimumConstraintViolated(Duration value) {
5555
Duration minDuration = (Duration)this.constraints.get(CONSTRAINT_KEY_MINIMUM);
5656
if(value.compareTo(minDuration) < 0){
5757
return minDuration;

src/main/java/io/frictionlessdata/tableschema/field/Field.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public T castValue(String value) throws InvalidCastException, ConstraintsExcepti
270270
return castValue(value, true, options);
271271
}
272272

273-
abstract T checkMinimumContraintViolated(T value);
273+
abstract T checkMinimumConstraintViolated(T value);
274274

275275
/**
276276
* Returns a Map with all the constraints that have been violated.
@@ -289,8 +289,7 @@ public Map<String, Object> checkConstraintViolations(Object value){
289289
}
290290

291291
// All values for that field MUST be unique within the data file in which it is found.
292-
// Can't check UNIQUE constraint when operating with only one value.
293-
// TODO: Implement a method that takes List<Object> value as argument.
292+
// TODO: Implement
294293
/*
295294
if(this.constraints.containsKey(CONSTRAINT_KEY_UNIQUE)){
296295
@@ -339,7 +338,7 @@ public Map<String, Object> checkConstraintViolations(Object value){
339338
* If a minimum value constraint is specified then the field descriptor MUST contain a type key.
340339
**/
341340
if(this.constraints.containsKey(CONSTRAINT_KEY_MINIMUM)){
342-
T violatedContraint = checkMinimumContraintViolated((T)value);
341+
T violatedContraint = checkMinimumConstraintViolated((T)value);
343342
if (null != violatedContraint) {
344343
violatedConstraints.put(CONSTRAINT_KEY_MINIMUM, violatedContraint);
345344
}

src/main/java/io/frictionlessdata/tableschema/field/GeojsonField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public String parseFormat(String json, Map<String, Object> options) {
130130
}
131131

132132
@Override
133-
JsonNode checkMinimumContraintViolated(JsonNode value) {
133+
JsonNode checkMinimumConstraintViolated(JsonNode value) {
134134
return null;
135135
}
136136

0 commit comments

Comments
 (0)