Skip to content

Commit 51319d1

Browse files
authored
chore: DH-21421: Update Java style guide for record formatting (#7576)
Some experimentation with records and sealed classes produced very bad code; it seems like this is a [known issue w/ the eclipse style guide](diffplug/spotless#951) when setting the source level to 1.7.
1 parent 9490c82 commit 51319d1

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

Plot/src/main/java/io/deephaven/plot/ChartImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ private Set<SwappableTable> getSwappableTables() {
378378
public ChartTitle getChartTitle() {
379379
return chartTitle;
380380
}
381+
381382
////////////////////////// convenience //////////////////////////
382383

383384

engine/api/src/main/java/io/deephaven/engine/table/MultiJoinFactory.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@
3434
* </p>
3535
*
3636
* <pre>{@code
37-
* private Table doIterativeMultiJoin(String [] keyColumns, List<? extends Table> inputTables) {
38-
* final List<Table> keyTables = inputTables.stream().map(t -> t.view(keyColumns)).collect(Collectors.toList());
39-
* final Table base = TableTools.merge(keyTables).selectDistinct(keyColumns);
37+
* private Table doIterativeMultiJoin(String[] keyColumns, List<? extends Table> inputTables) {
38+
* final List<Table> keyTables = inputTables.stream().map(t -> t.view(keyColumns)).collect(Collectors.toList());
39+
* final Table base = TableTools.merge(keyTables).selectDistinct(keyColumns);
4040
*
41-
* Table result = base;
42-
* for (int ii = 0; ii < inputTables.size(); ++ii) {
43-
* result = result.naturalJoin(inputTables.get(ii), Arrays.asList(keyColumns));
44-
* }
45-
*
46-
* return result;
47-
* }
41+
* Table result = base;
42+
* for (int ii = 0; ii < inputTables.size(); ++ii) {
43+
* result = result.naturalJoin(inputTables.get(ii), Arrays.asList(keyColumns));
4844
* }
45+
*
46+
* return result;
47+
* }
48+
* }
4949
* </pre>
5050
*/
5151

engine/rowset/src/test/java/io/deephaven/engine/rowset/impl/WritableRowSetImplTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,6 +1894,7 @@ private long rangeSize(TLongArrayList values, int start) {
18941894
// RowSet modified = readIndices.get("modifiedIndices");
18951895
//
18961896
//// Assert.eq(saveModified2, "saveModified2", modified, "modified");
1897+
18971898
//
18981899
//
18991900
//

style/eclipse-java-google-style.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
5959
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
6060
<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
61-
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
6261
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
6362
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
6463
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
@@ -201,7 +200,6 @@
201200
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
202201
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
203202
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
204-
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
205203
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
206204
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
207205
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
@@ -284,7 +282,6 @@
284282
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
285283
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
286284
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
287-
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
288285
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
289286
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
290287
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>

0 commit comments

Comments
 (0)