allow SqlViewGroupingBinding to specify the SqlViewRowIdsConverter

#681
metasfresh · Nov 16, 2017 · 8b160cc · 8b160cc
1 parent f37188d
commit 8b160cc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/main/java/de/metas/ui/web/view/SqlViewFactory.java b/src/main/java/de/metas/ui/web/view/SqlViewFactory.java
@@ -231,7 +231,7 @@ private SqlViewBinding createViewBinding(@NonNull final SqlViewBindingKey key)
 		final SqlViewBinding.Builder builder = createBuilderForEntityBindingAndFieldNames(entityBinding, displayFieldNames);
 
 		builder.setFilterDescriptors(filterDescriptors)
-				.setGroupingBinding(groupingBinding);;
+				.setGroupingBinding(groupingBinding);
 
 		if (windowId2SqlDocumentFilterConverterDecorator.containsKey(key.getWindowId()))
 		{

diff --git a/src/main/java/de/metas/ui/web/view/descriptor/SqlViewBinding.java b/src/main/java/de/metas/ui/web/view/descriptor/SqlViewBinding.java
@@ -299,7 +299,7 @@ public static final class Builder
 		private DocumentFilterDescriptorsProvider filterDescriptors = NullDocumentFilterDescriptorsProvider.instance;
 		private SqlDocumentFilterConvertersList.Builder filterConverters = null;
 
-		private SqlViewRowIdsConverter rowIdsConverter = DefaultSqlViewRowIdsConverter.instance;
+		private SqlViewRowIdsConverter rowIdsConverter = null;
 
 		private SqlViewGroupingBinding groupingBinding;
 		private SqlDocumentFilterConverterDecorator sqlDocumentFilterConverterDecorator = null;
@@ -454,7 +454,15 @@ public Builder setRowIdsConverter(@NonNull SqlViewRowIdsConverter rowIdsConverte
 
 		private SqlViewRowIdsConverter getRowIdsConverter()
 		{
-			return rowIdsConverter;
+			if (rowIdsConverter != null)
+			{
+				return rowIdsConverter;
+			}
+			if (groupingBinding != null)
+			{
+				return groupingBinding.getRowIdsConverter();
+			}
+			return DefaultSqlViewRowIdsConverter.instance;
 		}
 
 		public Builder setGroupingBinding(SqlViewGroupingBinding groupingBinding)

diff --git a/src/main/java/de/metas/ui/web/view/descriptor/SqlViewGroupingBinding.java b/src/main/java/de/metas/ui/web/view/descriptor/SqlViewGroupingBinding.java
@@ -4,6 +4,9 @@
 import com.google.common.collect.ImmutableSet;
 
 import lombok.Builder;
+import lombok.Builder.Default;
+import lombok.Getter;
+import lombok.NonNull;
 import lombok.Singular;
 import lombok.ToString;
 
@@ -38,11 +41,16 @@ public final class SqlViewGroupingBinding
 	@Singular("columnSql")
 	private final ImmutableMap<String, String> columnSqlByFieldName;
 
+	@NonNull
+	@Default
+	@Getter
+	private final SqlViewRowIdsConverter rowIdsConverter = DefaultSqlViewRowIdsConverter.instance;
+
 	public ImmutableSet<String> getGroupByFieldNames()
 	{
 		return groupByFieldNames;
 	}
-	
+
 	public boolean isGroupBy(final String fieldName)
 	{
 		return groupByFieldNames.contains(fieldName);
@@ -52,7 +60,7 @@ public String getColumnSqlByFieldName(final String fieldName)
 	{
 		return columnSqlByFieldName.get(fieldName);
 	}
-	
+
 	public boolean isAggregated(final String fieldName)
 	{
 		return columnSqlByFieldName.containsKey(fieldName);