Use ArrayListMultimap when values are ColumnValue #5855
Conversation
pkoenig10
force-pushed
the
pkoenig10/columnValue
branch
2 times, most recently
from
eda5c6b
to
4bb953f
Compare
pkoenig10
force-pushed
the
pkoenig10/columnValue
branch
from
4bb953f
to
f3cfcd5
Compare
| .map(entry -> entry.getTableName() + "Table") | ||
| .collect(Collectors.toList()); | ||
| String schemaName = ApiTestSchema.getSchema().getName(); | ||
| checkIfFilesAreTheSame(schemaName + "TableFactory"); |
There was a problem hiding this comment.
Previously this test was not testing the generated table factory. This explains why tests didn't break in #5843.
I've updated this test to ensure we're testing all generated files.
|
|
||
| private String readFileIntoString(File baseDir, String path) throws IOException { | ||
| return new String(Files.toByteArray(new File(baseDir, path)), StandardCharsets.UTF_8); | ||
| assertThat(expectedFile).hasSameTextualContentAs(actualFile); |
There was a problem hiding this comment.
Simplified tests to use AssertJ's AbstractFileAssert instead of our hand-rolled line-based comparison.
There was a problem hiding this comment.
nice, thanks! yeah that makes sense :)
| @@ -110,6 +110,7 @@ public TableClassRendererV2(String packageName, Namespace namespace, String rawT | |||
|
|
|||
| public String render() { | |||
| JavaFile javaFile = JavaFile.builder(packageName, this.buildTypeSpec()) | |||
| .skipJavaLangImports(true) | |||
There was a problem hiding this comment.
This matches what Conjure does:
https://github.com/palantir/conjure-java/search?q=skipJavaLangImports
| return Renderers.CamelCase(index.getIndexName()); | ||
| } else { | ||
| public static String getIndexTableName(IndexMetadata index) { | ||
| if (index.getJavaIndexName() != null) { |
There was a problem hiding this comment.
Small refactor for consistency with getClassTableName
|
|
||
| private String readFileIntoString(File baseDir, String path) throws IOException { | ||
| return new String(Files.toByteArray(new File(baseDir, path)), StandardCharsets.UTF_8); | ||
| assertThat(expectedFile).hasSameTextualContentAs(actualFile); |
There was a problem hiding this comment.
nice, thanks! yeah that makes sense :)
ColumnValuevalues do not overrideequalsand are compared using reference equality. When creating multimaps withColumnValuevalues we can just useArrayListMultimapto avoid the comparison overhead (and we shouldn't be using reference equality anyways).This matches the behavior of
getAffectedCells, which also uses anArrayListMultimapto store a multimap withColumnValuevalues.