Repository: incubator-juneau Updated Branches: refs/heads/master 7e7c0bcd8 -> b7da974cd
Add toString() methods on all DTOs Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/44094423 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/44094423 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/44094423 Branch: refs/heads/master Commit: 44094423c444c2492e5646bc10ea90d759d1f790 Parents: 7e7c0bc Author: JamesBognar <jamesbog...@apache.org> Authored: Tue Sep 12 09:26:41 2017 -0400 Committer: JamesBognar <jamesbog...@apache.org> Committed: Tue Sep 12 09:27:19 2017 -0400 ---------------------------------------------------------------------- .../org/apache/juneau/dto/atom/AtomTest.java | 10 +++ .../juneau/dto/html5/Html5BasicTests.java | 37 ++++++++ .../juneau/dto/jsonschema/JsonSchemaTest.java | 94 ++++++++++++++++++++ .../java/org/apache/juneau/dto/atom/Common.java | 6 ++ .../apache/juneau/dto/html5/HtmlElement.java | 5 ++ .../apache/juneau/dto/jsonschema/Schema.java | 6 ++ .../org/apache/juneau/dto/swagger/Swagger.java | 6 ++ 7 files changed, 164 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/44094423/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java index 91ba021..584b32e 100755 --- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java +++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/atom/AtomTest.java @@ -192,4 +192,14 @@ public class AtomTest { f2 = p.parse(r, Feed.class); assertEqualObjects(f, f2); } + + @Test + public void testToString() throws Exception { + XmlParser p = XmlParser.DEFAULT; + String r; + Feed f = createFeed(), f2; + r = f.toString(); + f2 = p.parse(r, Feed.class); + assertEqualObjects(f, f2); + } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/44094423/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5BasicTests.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5BasicTests.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5BasicTests.java new file mode 100644 index 0000000..4429833 --- /dev/null +++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5BasicTests.java @@ -0,0 +1,37 @@ +// *************************************************************************************************************************** +// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * +// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * +// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * +// * with the License. You may obtain a copy of the License at * +// * * +// * http://www.apache.org/licenses/LICENSE-2.0 * +// * * +// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * +// * specific language governing permissions and limitations under the License. * +// *************************************************************************************************************************** +package org.apache.juneau.dto.html5; + +import static org.apache.juneau.dto.html5.HtmlBuilder.*; +import static org.junit.Assert.*; + +import org.junit.*; + +public class Html5BasicTests { + + @Test + public void testToString() { + Form f = form("bar", + fieldset( + legend("foo:"), + "Name:", input("text"), br(), + "Email:", input("text"), br(), + "X:", keygen().name("X"), + label("label")._for("Name") + ) + ); + + String r = f.toString(); + assertEquals("<form action='bar'><fieldset><legend>foo:</legend>Name:<input type='text'/><br/>Email:<input type='text'/><br/>X:<keygen name='X'/><label for='Name'>label</label></fieldset></form>", r); + } +} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/44094423/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java index 19d95e9..fe8f125 100755 --- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java +++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java @@ -153,6 +153,100 @@ public class JsonSchemaTest { assertEquals(expected, r); } + @Test + public void testToString() throws Exception { + JsonSerializer s = new JsonSerializerBuilder().simple().ws().addBeanTypeProperties(false).build(); + JsonParser p = JsonParser.DEFAULT; + String r; + Schema t, t2; + + String expected = + "{\n" + +" id: 'http://id',\n" + +" '$schema': 'http://schemaVersionUri',\n" + +" title: 'title',\n" + +" description: 'description',\n" + +" type: 'number',\n" + +" definitions: {\n" + +" definition: {\n" + +" '$ref': 'http://definition'\n" + +" }\n" + +" },\n" + +" properties: {\n" + +" property: {\n" + +" type: 'number'\n" + +" }\n" + +" },\n" + +" patternProperties: {\n" + +" '/pattern/': {\n" + +" type: 'number'\n" + +" }\n" + +" },\n" + +" dependencies: {\n" + +" dependency: {\n" + +" '$ref': 'http://dependency'\n" + +" }\n" + +" },\n" + +" items: [\n" + +" {\n" + +" type: 'number'\n" + +" }\n" + +" ],\n" + +" multipleOf: 1,\n" + +" maximum: 2,\n" + +" exclusiveMaximum: true,\n" + +" minimum: 3,\n" + +" exclusiveMinimum: true,\n" + +" maxLength: 4,\n" + +" minLength: 5,\n" + +" pattern: '/pattern/',\n" + +" additionalItems: [\n" + +" {\n" + +" type: 'number'\n" + +" }\n" + +" ],\n" + +" maxItems: 6,\n" + +" minItems: 7,\n" + +" uniqueItems: true,\n" + +" maxProperties: 8,\n" + +" minProperties: 9,\n" + +" required: [\n" + +" 'required'\n" + +" ],\n" + +" additionalProperties: {\n" + +" '$ref': 'http://additionalProperty'\n" + +" },\n" + +" 'enum': [\n" + +" 'enum'\n" + +" ],\n" + +" allOf: [\n" + +" {\n" + +" '$ref': 'http://allOf'\n" + +" }\n" + +" ],\n" + +" anyOf: [\n" + +" {\n" + +" '$ref': 'http://anyOf'\n" + +" }\n" + +" ],\n" + +" oneOf: [\n" + +" {\n" + +" '$ref': 'http://oneOf'\n" + +" }\n" + +" ],\n" + +" not: {\n" + +" '$ref': 'http://not'\n" + +" }\n" + +"}"; + + t = getTest1(); + r = t.toString(); + t2 = p.parse(r, Schema.class); + r = s.serialize(t2); + assertEquals(expected, r); + } + + /** Bean with simple values for each property */ public static Schema getTest1() { return new Schema() http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/44094423/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java index 544b8f2..c7e04fe 100644 --- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java +++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java @@ -20,6 +20,7 @@ import java.net.URI; import org.apache.juneau.*; import org.apache.juneau.annotation.*; +import org.apache.juneau.xml.*; import org.apache.juneau.xml.annotation.*; /** @@ -109,4 +110,9 @@ public abstract class Common { this.lang = lang; return this; } + + @Override /* Object */ + public String toString() { + return XmlSerializer.DEFAULT_SQ.toString(this); + } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/44094423/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java index f687ee3..543d2ee 100644 --- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java +++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java @@ -846,4 +846,9 @@ public abstract class HtmlElement { attr("translate", translate); return this; } + + @Override /* Object */ + public String toString() { + return HtmlSerializer.DEFAULT_SQ.toString(this); + } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/44094423/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java index 37b68e8..dcccb9a 100644 --- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java +++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java @@ -20,6 +20,7 @@ import java.util.*; import org.apache.juneau.*; import org.apache.juneau.annotation.*; +import org.apache.juneau.json.*; import org.apache.juneau.parser.*; import org.apache.juneau.serializer.*; import org.apache.juneau.transform.*; @@ -1487,4 +1488,9 @@ public class Schema { this.schemaMap = schemaMap; return this; } + + @Override /* Object */ + public String toString() { + return JsonSerializer.DEFAULT_SQ.toString(this); + } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/44094423/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java index 8500444..2b6d303 100644 --- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java +++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java @@ -16,6 +16,7 @@ import java.util.*; import org.apache.juneau.annotation.*; import org.apache.juneau.http.*; +import org.apache.juneau.json.*; import org.apache.juneau.utils.*; /** @@ -1034,4 +1035,9 @@ public class Swagger extends SwaggerElement { return i2.compareTo(i1); } } + + @Override /* Object */ + public String toString() { + return JsonSerializer.DEFAULT_SQ.toString(this); + } }
