rename SqlViewSelect to SqlViewSelectData

#668
metasfresh · Nov 13, 2017 · 010ae52 · 010ae52
1 parent fac4707
commit 010ae52
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/de/metas/ui/web/handlingunits/SqlHUEditorViewRepository.java b/src/main/java/de/metas/ui/web/handlingunits/SqlHUEditorViewRepository.java
@@ -53,7 +53,7 @@
 import de.metas.ui.web.view.descriptor.SqlAndParams;
 import de.metas.ui.web.view.descriptor.SqlViewBinding;
 import de.metas.ui.web.view.descriptor.SqlViewRowIdsConverter;
-import de.metas.ui.web.view.descriptor.SqlViewSelect;
+import de.metas.ui.web.view.descriptor.SqlViewSelectData;
 import de.metas.ui.web.view.descriptor.SqlViewSelectionQueryBuilder;
 import de.metas.ui.web.window.datatypes.DocumentIdsSelection;
 import de.metas.ui.web.window.datatypes.WindowId;
@@ -95,7 +95,7 @@ public class SqlHUEditorViewRepository implements HUEditorViewRepository
 
 	private final SqlViewBinding sqlViewBinding;
 	private final ViewRowIdsOrderedSelectionFactory viewSelectionFactory;
-	private final SqlViewSelect sqlViewSelect;
+	private final SqlViewSelectData sqlViewSelect;
 
 	@Builder
 	private SqlHUEditorViewRepository(
@@ -459,7 +459,7 @@ public Page<Integer> retrieveHUIdsPage(final ViewRowIdsOrderedSelection selectio
 				}
 				huIds.add(huId);
 
-				final int lastRow = rs.getInt(SqlViewSelect.COLUMNNAME_Paging_SeqNo_OneBased);
+				final int lastRow = rs.getInt(SqlViewSelectData.COLUMNNAME_Paging_SeqNo_OneBased);
 				lastRowMax = Math.max(lastRowMax, lastRow);
 			}
 

diff --git a/src/main/java/de/metas/ui/web/view/SqlViewDataRepository.java b/src/main/java/de/metas/ui/web/view/SqlViewDataRepository.java
@@ -37,7 +37,7 @@
 import de.metas.ui.web.view.descriptor.SqlViewBinding;
 import de.metas.ui.web.view.descriptor.SqlViewRowFieldBinding;
 import de.metas.ui.web.view.descriptor.SqlViewRowFieldBinding.SqlViewRowFieldLoader;
-import de.metas.ui.web.view.descriptor.SqlViewSelect;
+import de.metas.ui.web.view.descriptor.SqlViewSelectData;
 import de.metas.ui.web.window.datatypes.DocumentId;
 import de.metas.ui.web.window.datatypes.DocumentIdsSelection;
 import de.metas.ui.web.window.datatypes.WindowId;
@@ -72,7 +72,7 @@ class SqlViewDataRepository implements IViewDataRepository
 	private static final Logger logger = LogManager.getLogger(SqlViewDataRepository.class);
 
 	private final String tableName;
-	private final SqlViewSelect sqlViewSelect;
+	private final SqlViewSelectData sqlViewSelect;
 	private final ViewRowIdsOrderedSelectionFactory viewRowIdsOrderedSelectionFactory;
 	private final DocumentFilterDescriptorsProvider viewFilterDescriptors;
 	private final List<DocumentQueryOrderBy> defaultOrderBys;
@@ -269,7 +269,7 @@ private ViewRow.Builder loadViewRow(final ResultSet rs, final WindowId windowId,
 	{
 		final ViewRow.Builder viewRowBuilder = ViewRow.builder(windowId);
 
-		final int parentIdInt = rs.getInt(SqlViewSelect.COLUMNNAME_Paging_Parent_ID);
+		final int parentIdInt = rs.getInt(SqlViewSelectData.COLUMNNAME_Paging_Parent_ID);
 		if (!rs.wasNull())
 		{
 			viewRowBuilder.setParentRowId(DocumentId.of(parentIdInt));

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
@@ -63,7 +63,7 @@ public class SqlViewBinding implements SqlEntityBinding
 	private final ImmutableMap<String, SqlViewRowFieldBinding> _fieldsByFieldName;
 	private final SqlViewRowFieldBinding _keyField;
 
-	private final SqlViewSelect sqlViewSelect;
+	private final SqlViewSelectData sqlViewSelect;
 	private final IStringExpression sqlWhereClause;
 	private final List<SqlViewRowFieldLoader> rowFieldLoaders;
 
@@ -93,7 +93,7 @@ private SqlViewBinding(final Builder builder)
 
 		final Collection<SqlViewRowFieldBinding> allFields = _fieldsByFieldName.values();
 		this.groupingBinding = builder.groupingBinding;
-		sqlViewSelect = SqlViewSelect.builder()
+		sqlViewSelect = SqlViewSelectData.builder()
 				.sqlTableName(_tableName)
 				.sqlTableAlias(_tableAlias)
 				.keyField(_keyField)
@@ -186,7 +186,7 @@ public SqlViewRowFieldBinding getFieldByFieldName(final String fieldName)
 		return field;
 	}
 
-	public SqlViewSelect getSqlViewSelect()
+	public SqlViewSelectData getSqlViewSelect()
 	{
 		return sqlViewSelect;
 	}

diff --git a/...ui/web/view/descriptor/SqlViewSelect.java → ...eb/view/descriptor/SqlViewSelectData.java b/...ui/web/view/descriptor/SqlViewSelect.java → ...eb/view/descriptor/SqlViewSelectData.java
@@ -53,7 +53,7 @@
  * 
  * @author metas-dev <dev@metasfresh.com>
  */
-public class SqlViewSelect
+public class SqlViewSelectData
 {
 	private static final String COLUMNNAME_Paging_UUID = "_sel_UUID";
 	public static final String COLUMNNAME_Paging_SeqNo_OneBased = "_sel_SeqNo";
@@ -68,7 +68,7 @@ public class SqlViewSelect
 	private final IStringExpression sqlSelectLinesByRowIds;
 
 	@Builder
-	private SqlViewSelect(
+	private SqlViewSelectData(
 			final String sqlTableName,
 			final String sqlTableAlias,
 			final SqlViewRowFieldBinding keyField,
@@ -109,7 +109,7 @@ private SqlViewSelect(
 				.toComposer()
 				.append("\n WHERE ")
 				// .append("\n " + SqlViewSelectionQueryBuilder.COLUMNNAME_Paging_UUID + "=?") // already filtered above
-				.append("\n " + SqlViewSelect.COLUMNNAME_Paging_Record_ID + " IN ").append(PLACEHOLDER_Paging_Record_IDs)
+				.append("\n " + SqlViewSelectData.COLUMNNAME_Paging_Record_ID + " IN ").append(PLACEHOLDER_Paging_Record_IDs)
 				.build();
 
 	}
@@ -312,13 +312,13 @@ private static IStringExpression buildSqlSelectLines(
 			sql.append(", \n").appendAllJoining("\n, ", sqlSelectDisplayNamesList); // DisplayName fields
 		}
 
-		sql.append("\n, " + SqlViewSelect.COLUMNNAME_Paging_Record_ID + " AS " + SqlViewSelect.COLUMNNAME_Paging_Parent_ID);
+		sql.append("\n, " + SqlViewSelectData.COLUMNNAME_Paging_Record_ID + " AS " + SqlViewSelectData.COLUMNNAME_Paging_Parent_ID);
 
 		sql.append("\n FROM (")
 				.append("\n   SELECT ")
 				.append("\n   ").append(Joiner.on("\n   , ").join(sqlSelectValuesList))
-				.append("\n , sl." + I_T_WEBUI_ViewSelectionLine.COLUMNNAME_UUID + " AS " + SqlViewSelect.COLUMNNAME_Paging_UUID)
-				.append("\n , sl." + I_T_WEBUI_ViewSelectionLine.COLUMNNAME_Record_ID + " AS " + SqlViewSelect.COLUMNNAME_Paging_Record_ID)
+				.append("\n , sl." + I_T_WEBUI_ViewSelectionLine.COLUMNNAME_UUID + " AS " + SqlViewSelectData.COLUMNNAME_Paging_UUID)
+				.append("\n , sl." + I_T_WEBUI_ViewSelectionLine.COLUMNNAME_Record_ID + " AS " + SqlViewSelectData.COLUMNNAME_Paging_Record_ID)
 				.append("\n   FROM " + I_T_WEBUI_ViewSelectionLine.Table_Name + " sl")
 				.append("\n   LEFT OUTER JOIN " + sqlTableName + " ON (" + sqlTableName + "." + sqlKeyColumnName + " = sl." + I_T_WEBUI_ViewSelectionLine.COLUMNNAME_Line_ID + ")")
 				// Filter by UUID. Keep this closer to the source table, see https://github.com/metasfresh/metasfresh-webui-api/issues/437