SpelNodeImpl manages start/end position in separate integer values

Fixes spring-projectsgh-22157

Author: jhoeller

spring-expression/src/main/java/org/springframework/expression/spel/ast/Assign.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -31,8 +31,8 @@
  */
 public class Assign extends SpelNodeImpl {
 
-	public Assign(int pos, SpelNodeImpl... operands) {
-		super(pos, operands);
+	public Assign(int startPos, int endPos, SpelNodeImpl... operands) {
+		super(startPos, endPos, operands);
 	}
 
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -37,8 +37,8 @@ public class BeanReference extends SpelNodeImpl {
 	private final String beanName;
 
 
-	public BeanReference(int pos, String beanName) {
-		super(pos);
+	public BeanReference(int startPos, int endPos, String beanName) {
+		super(startPos, endPos);
 		this.beanName = beanName;
 	}
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -31,8 +31,8 @@ public class BooleanLiteral extends Literal {
 	private final BooleanTypedValue value;
 
 
-	public BooleanLiteral(String payload, int pos, boolean value) {
-		super(payload, pos);
+	public BooleanLiteral(String payload, int startPos, int endPos, boolean value) {
+		super(payload, startPos, endPos);
 		this.value = BooleanTypedValue.forValue(value);
 		this.exitTypeDescriptor = "Z";
 	}

spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -33,8 +33,8 @@
  */
 public class CompoundExpression extends SpelNodeImpl {
 
-	public CompoundExpression(int pos, SpelNodeImpl... expressionComponents) {
-		super(pos, expressionComponents);
+	public CompoundExpression(int startPos, int endPos, SpelNodeImpl... expressionComponents) {
+		super(startPos, endPos, expressionComponents);
 		if (expressionComponents.length < 2) {
 			throw new IllegalStateException("Do not build compound expressions with less than two entries: " +
 					expressionComponents.length);

spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -72,17 +72,17 @@ public class ConstructorReference extends SpelNodeImpl {
 	 * Create a constructor reference. The first argument is the type, the rest are the parameters to the constructor
 	 * call
 	 */
-	public ConstructorReference(int pos, SpelNodeImpl... arguments) {
-		super(pos, arguments);
+	public ConstructorReference(int startPos, int endPos, SpelNodeImpl... arguments) {
+		super(startPos, endPos, arguments);
 		this.isArrayConstructor = false;
 	}
 
 	/**
 	 * Create a constructor reference. The first argument is the type, the rest are the parameters to the constructor
 	 * call
 	 */
-	public ConstructorReference(int pos, SpelNodeImpl[] dimensions, SpelNodeImpl... arguments) {
-		super(pos, arguments);
+	public ConstructorReference(int startPos, int endPos, SpelNodeImpl[] dimensions, SpelNodeImpl... arguments) {
+		super(startPos, endPos, arguments);
 		this.isArrayConstructor = true;
 		this.dimensions = dimensions;
 	}

spring-expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -36,8 +36,8 @@
  */
 public class Elvis extends SpelNodeImpl {
 
-	public Elvis(int pos, SpelNodeImpl... args) {
-		super(pos, args);
+	public Elvis(int startPos, int endPos, SpelNodeImpl... args) {
+		super(startPos, endPos, args);
 	}
 
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/FloatLiteral.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -32,8 +32,8 @@ public class FloatLiteral extends Literal {
 	private final TypedValue value;
 
 
-	public FloatLiteral(String payload, int pos, float value) {
-		super(payload, pos);
+	public FloatLiteral(String payload, int startPos, int endPos, float value) {
+		super(payload, startPos, endPos);
 		this.value = new TypedValue(value);
 		this.exitTypeDescriptor = "F";
 	}

spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -57,8 +57,8 @@ public class FunctionReference extends SpelNodeImpl {
 	private volatile Method method;
 
 
-	public FunctionReference(String functionName, int pos, SpelNodeImpl... arguments) {
-		super(pos, arguments);
+	public FunctionReference(String functionName, int startPos, int endPos, SpelNodeImpl... arguments) {
+		super(startPos, endPos, arguments);
 		this.name = functionName;
 	}
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/Identifier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -31,8 +31,8 @@ public class Identifier extends SpelNodeImpl {
 	private final TypedValue id;
 
 
-	public Identifier(String payload, int pos) {
-		super(pos);
+	public Identifier(String payload, int startPos, int endPos) {
+		super(startPos, endPos);
 		this.id = new TypedValue(payload);
 	}
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -90,8 +90,8 @@ private enum IndexedType {ARRAY, LIST, MAP, STRING, OBJECT}
 	private IndexedType indexedType;
 
 
-	public Indexer(int pos, SpelNodeImpl expr) {
-		super(pos, expr);
+	public Indexer(int startPos, int endPos, SpelNodeImpl expr) {
+		super(startPos, endPos, expr);
 	}