Introduced intermediate class

Author: schauder

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/InlineQuery.java

@@ -29,16 +29,14 @@
  * @author Jens Schauder
  * @since 2.3
  */
-public class InlineQuery extends AbstractSegment implements TableLike {
+public class InlineQuery extends Subselect implements TableLike {
 
-	private final Select select;
 	private final SqlIdentifier alias;
 
 	InlineQuery(Select select, SqlIdentifier alias) {
 
 		super(select);
 
-		this.select = select;
 		this.alias = alias;
 	}
 
@@ -81,10 +79,4 @@ public SqlIdentifier getName() {
 	public SqlIdentifier getReferenceName() {
 		return alias;
 	}
-
-	@Override
-	public String toString() {
-		return "(" + select + ") AS " + alias;
-	}
-
 }

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/Subselect.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.relational.core.sql;
+
+/**
+ * Baseclass for all kinds of "select in parenthesis".
+ * 
+ * @since 3.1
+ * @author Mark Paluch
+ * @author Jens Schauder
+ */
+public abstract class Subselect extends AbstractSegment {
+
+	private final Select select;
+
+	protected Subselect(Select select) {
+		this.select = select;
+	}
+
+	public Select getSelect() {
+		return select;
+	}
+
+	@Override
+	public String toString() {
+		return "(" + select + ")";
+	}
+
+}

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SubselectExpression.java

@@ -21,19 +21,10 @@
  * @author Jens Schauder
  * @since 1.1
  */
-public class SubselectExpression extends AbstractSegment implements Expression {
-
-	private final Select subselect;
+public class SubselectExpression extends Subselect implements Expression {
 
 	SubselectExpression(Select subselect) {
 
 		super(subselect);
-
-		this.subselect = subselect;
-	}
-
-	@Override
-	public String toString() {
-		return "(" + subselect + ")";
 	}
 }