Small changes

Author: JohannesJander

docs/creating-schemas.md

@@ -20,7 +20,7 @@ schema.addField(nameField);
 Field coordinatesField = new GeopointField("coordinates");
 schema.addField(coordinatesField);
 
-System.out.println(schema.getJson());
+System.out.println(schema.asJson());
 
 // {"fields":[{"name":"name","format":"default","description":"","type":"string","title":""},{"name":"coordinates","format":"default","description":"","type":"geopoint","title":""}]}
 ```
@@ -51,7 +51,7 @@ coordinatesFieldJsonObject.put("type", Field.FIELD_TYPE_GEOPOINT);
 coordinatesFieldJsonObject.put("format", Field.FIELD_FORMAT_ARRAY);
 schema.addField(coordinatesFieldJsonObject);
 
-System.out.println(schema.getJson());
+System.out.println(schema.asJson());
 
 /* 
 {"fields":[
@@ -82,7 +82,7 @@ URL url = new URL("https://raw.githubusercontent.com/frictionlessdata/tableschem
 Table table = Table.fromSource(url);
 
 Schema schema = table.inferSchema();
-System.out.println(schema.getJson());
+System.out.println(schema.asJson());
 
 // {"fields":[{"name":"id","format":"","description":"","title":"","type":"integer","constraints":{}},{"name":"title","format":"","description":"","title":"","type":"string","constraints":{}}]}
 
@@ -119,7 +119,7 @@ To make sure a schema complies with [Table Schema specifications](https://specs.
 JSONObject schemaJsonObj = new JSONObject();
 Field nameField = new IntegerField("id");
 schemaJsonObj.put("fields", new JSONArray());
-schemaJsonObj.getJSONArray("fields").put(nameField.getJson());
+schemaJsonObj.asJsonArray("fields").put(nameField.asJson());
 
 Schema schema = Schema.fromJson(schemaJsonObj.toString(), true);
 

src/main/java/io/frictionlessdata/tableschema/schema/Schema.java

@@ -212,7 +212,7 @@ public void writeJson(File outputFile) throws IOException {
 
     public void writeJson(OutputStream output) throws IOException {
         try (BufferedWriter file = new BufferedWriter(new OutputStreamWriter(output))) {
-            file.write(this.getJson());
+            file.write(this.asJson());
         }
     }
 
@@ -322,8 +322,18 @@ public List<ValidationException> getErrors(){
         return this.errors;
     }
 
+    /**
+     * For consistency, use {@link #asJson()} instead
+     * @return JSON-Representation
+     */
+    @Deprecated()
     @JsonIgnore
     public String getJson() {
+        return asJson();
+    }
+
+    @JsonIgnore
+    public String asJson() {
         return JsonUtil.getInstance().serialize(this);
     }
 
@@ -412,7 +422,7 @@ public int hashCode() {
      */
     @JsonIgnore
     public void validate() throws ValidationException{
-        String json = this.getJson();
+        String json = this.asJson();
         Set<ValidationMessage> messages = tableFormalSchemaValidator.validate(json);
         if (!messages.isEmpty()) {
             errors.add(new ValidationException(tableFormalSchemaValidator, messages));

src/test/java/io/frictionlessdata/tableschema/DocumentationCases.java

@@ -171,7 +171,7 @@ void buildASchema() throws Exception{
         Field coordinatesField = new GeopointField("coordinates");
         schema.addField(coordinatesField);
 
-        System.out.println(schema.getJson());
+        System.out.println(schema.asJson());
 
         /*
         {"fields":[
@@ -218,7 +218,7 @@ void buildASchema2() throws Exception{
         */
 
         ObjectMapper objectMapper = new ObjectMapper();
-        Object jsonObject = objectMapper.readValue(schema.getJson(), Object.class);
+        Object jsonObject = objectMapper.readValue(schema.asJson(), Object.class);
         String expectedString = TestHelper.getResourceFileContent(
                 "/fixtures/schema/documentation-cases/employee_schema_invalid.json");
         assertEquals(objectMapper.readValue(expectedString, Object.class), jsonObject);
@@ -232,7 +232,7 @@ void inferASchema() throws Exception{
         Table table = Table.fromSource(url);
 
         Schema schema = table.inferSchema();
-        System.out.println(schema.getJson());
+        System.out.println(schema.asJson());
 
         /*
          {"fields":[

src/test/java/io/frictionlessdata/tableschema/schema/SchemaInferralTests.java

@@ -28,7 +28,7 @@ void inferASchema() throws Exception{
         Schema schema = table.inferSchema();
 
         ObjectMapper objectMapper = new ObjectMapper();
-        Object jsonObject = objectMapper.readValue(schema.getJson(), Object.class);
+        Object jsonObject = objectMapper.readValue(schema.asJson(), Object.class);
         String expectedString = TestHelper.getResourceFileContent(
                 "/fixtures/schema/employee_schema.json");
         assertEquals(objectMapper.readValue(expectedString, Object.class), jsonObject);
@@ -63,7 +63,7 @@ void inferSchemaWithEmptyColumns() throws Exception{
 
         Schema schema = table.inferSchema();
 
-        Object jsonObject = objectMapper.readValue(schema.getJson(), Object.class);
+        Object jsonObject = objectMapper.readValue(schema.asJson(), Object.class);
         String expectedString = TestHelper.getResourceFileContent(
                 "/fixtures/schema/issue-72.json");
         assertEquals(objectMapper.readValue(expectedString, Object.class), jsonObject);
@@ -75,7 +75,7 @@ void inferSchemaWithEmptyColumns() throws Exception{
 
         Schema schema2 = table2.inferSchema();
 
-        jsonObject = objectMapper.readValue(schema2.getJson(), Object.class);
+        jsonObject = objectMapper.readValue(schema2.asJson(), Object.class);
         assertEquals(objectMapper.readValue(expectedString, Object.class), jsonObject);
         Assertions.assertTrue(schema.isValid());
     }

src/test/java/io/frictionlessdata/tableschema/schema/SchemaTest.java

@@ -501,7 +501,7 @@ public void testValidForeignKeyString() throws Exception {
     public void testInferTypesComplexSchema() throws Exception {
         Table table = Table.fromSource(new File("data/employee_data.csv"), getTestDataDirectory());
 
-        String schemaObjStr = table.inferSchema().getJson();
+        String schemaObjStr = table.inferSchema().asJson();
         Schema schema = Schema.fromJson(schemaObjStr, true);
 
         File f = new File(getTestDataDirectory(), "schema/employee_schema.json");
@@ -572,7 +572,7 @@ public void test2Issue20() throws Exception {
         Table table = Table.fromSource(url);
 
         Schema schema = table.inferSchema();
-        String json = schema.getJson();
+        String json = schema.asJson();
         Schema newSchema = Schema.fromJson(json, true);
         Assertions.assertTrue(newSchema.isValid());
     }

src/test/java/io/frictionlessdata/tableschema/table_tests/TableOtherTest.java

@@ -170,7 +170,7 @@ public void testReadFromValidJSONArrayWithExtendedSchema() throws Exception{
     public void testInferTypesIntAndDates() throws Exception{
         Table table = Table.fromSource(new File ("dates_data.csv"), getTestDataDirectory());
         ObjectMapper objectMapper = new ObjectMapper();
-        JsonNode schema = objectMapper.readTree(table.inferSchema().getJson());
+        JsonNode schema = objectMapper.readTree(table.inferSchema().asJson());
         JsonNode schemaFiles = schema.get("fields");
 
         // The field names are the same as the name of the type we are expecting to be inferred.