[682] Correct the fix for 670 and return the type if the type has alr…

[jamezp]

…eady been resolved.

resolves #682

[KyleAure]

This fix looks good.
I think all we are missing from the tests are appropriate de-serialization testing for the same scenario. This looks like common practice in this test class so I added those suggestions below.

[KyleAure]

Suggested change

	// Use a new instance of Jsonb to avoid any caching
	try (var jsonb = JsonbBuilder.create()) {
	assertEquals(expectedJson, jsonb.toJson(container));
	}
	// Use a new instance of Jsonb to avoid any caching
	try (var jsonb = JsonbBuilder.create()) {
	assertEquals(expectedJson, jsonb.toJson(container));
	TreeContainer<TreeElement> result = jsonb.fromJson(expectedJson, new TestTypeToken<TreeContainer<TreeElement>>() {}.getType());
	assertIterableEquals(container.getTree().getChildren(), result.getTree().getChildren());
	}

Requires addition of:

import static org.junit.jupiter.api.Assertions.assertIterableEquals;

[KyleAure]

Suggested change

	// Use a new instance of Jsonb to avoid any caching
	try (var jsonb = JsonbBuilder.create()) {
	assertEquals(expectedJson, jsonb.toJson(container));
	}
	// Use a new instance of Jsonb to avoid any caching
	try (var jsonb = JsonbBuilder.create()) {
	assertEquals(expectedJson, jsonb.toJson(container));
	ListContainer<TreeElement> result = jsonb.fromJson(expectedJson, new TestTypeToken<ListContainer<TreeElement>>() {}.getType());
	assertIterableEquals(container.getList(), result.getList());
	}

Requires addition of:

import static org.junit.jupiter.api.Assertions.assertIterableEquals;

[KyleAure]

Suggested change

	private final String name;
	private String name;
	public TreeElement() {
	}

suggestion: allow for deserialization

[KyleAure]

Suggested change

	}
	public void setName(final String name) {
	this.name = name;
	}
	@Override
	public boolean equals(Object o) {
	if (this == o) {
	return true;
	}
	if (o == null || getClass() != o.getClass()) {
	return false;
	}
	if (!super.equals(o)) {
	return false;
	}
	TreeElement that = (TreeElement) o;
	return name != null ? name.equals(that.name) : that.name == null;
	}
	}

suggestion: allow for deserialization and assertions.

[KyleAure]

Suggested change

	}
	@Override
	public boolean equals(Object o) {
	if (this == o) {
	return true;
	}
	if (o == null || getClass() != o.getClass()) {
	return false;
	}
	TreeTypeContainer<?> that = (TreeTypeContainer<?>) o;
	if (children == null) {
	return that.children == null;
	}
	return children.containsAll(that.children) && that.children.containsAll(children);
	}
	}

Suggestion: allow for assertions.