TypedValue.NULL_TYPED_VALUE -> TypedValue.NULL

jhoeller · jhoeller · commit 2ec39f50005f · 2009-12-15T20:19:24.000Z
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/TypedValue.java b/org.springframework.expression/src/main/java/org/springframework/expression/TypedValue.java
@@ -28,13 +28,13 @@
  */
 public class TypedValue {
 
-	public static final TypedValue NULL_TYPED_VALUE = new TypedValue(null, TypeDescriptor.NULL);
+	public static final TypedValue NULL = new TypedValue(null, TypeDescriptor.NULL);
 
 
 	private final Object value;
 
 	private TypeDescriptor typeDescriptor;
-	
+
 
 	/**
 	 * Create a TypedValue for a simple object. The type descriptor is inferred
@@ -43,9 +43,9 @@ public class TypedValue {
 	 */
 	public TypedValue(Object value) {
 		this.value = value;
-		this.typeDescriptor = null;// initialized when/if requested
+		this.typeDescriptor = null;  // initialized when/if requested
 	}
-	
+
 	/**
 	 * Create a TypedValue for a particular value with a particular type descriptor.
 	 * @param value the object value
@@ -62,8 +62,8 @@ public Object getValue() {
 	}
 	
 	public TypeDescriptor getTypeDescriptor() {
-		if (this.typeDescriptor==null) {
-			this.typeDescriptor = TypeDescriptor.forObject(value);
+		if (this.typeDescriptor == null) {
+			this.typeDescriptor = TypeDescriptor.forObject(this.value);
 		}
 		return this.typeDescriptor;
 	}
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
@@ -121,7 +121,7 @@ public void setVariable(String name, Object value) {
 	public TypedValue lookupVariable(String name) {
 		Object value = this.relatedContext.lookupVariable(name);
 		if (value == null) {
-			return TypedValue.NULL_TYPED_VALUE;
+			return TypedValue.NULL;
 		}
 		else {
 			return new TypedValue(value, TypeDescriptor.forObject(value));
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
@@ -63,7 +63,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		}
 		if (currentContext.getValue() == null) {
 			if (nullSafe) {
-				return TypedValue.NULL_TYPED_VALUE;
+				return TypedValue.NULL;
 			} else {
 				throw new SpelEvaluationException(getStartPosition(), SpelMessage.METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED,
 						FormatHelper.formatMethodForMessage(name, getTypes(arguments)));
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java
@@ -30,7 +30,7 @@ public NullLiteral(int pos) {
 
 	@Override
 	public TypedValue getLiteralValue() {
-		return TypedValue.NULL_TYPED_VALUE;
+		return TypedValue.NULL;
 	}
 
 	@Override
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java
@@ -70,7 +70,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 	}
 
 	private void assertTypedValueNotNull(TypedValue typedValue) {
-		if (TypedValue.NULL_TYPED_VALUE.equals(typedValue)) {
+		if (TypedValue.NULL.equals(typedValue)) {
 			throw new SpelEvaluationException(SpelMessage.TYPE_CONVERSION_ERROR, "null", "boolean");
 		}
 	}
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java
@@ -69,7 +69,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 	}
 
 	private void assertTypedValueNotNull(TypedValue typedValue) {
-		if (TypedValue.NULL_TYPED_VALUE.equals(typedValue)) {
+		if (TypedValue.NULL.equals(typedValue)) {
 			throw new SpelEvaluationException(SpelMessage.TYPE_CONVERSION_ERROR, "null", "boolean");
 		}
 	}
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java
@@ -41,7 +41,7 @@ public OperatorNot(int pos, SpelNodeImpl operand) {
 	public BooleanTypedValue getValueInternal(ExpressionState state) throws EvaluationException {
 		try {
 			TypedValue typedValue = children[0].getValueInternal(state);
-			if (TypedValue.NULL_TYPED_VALUE.equals(typedValue)) {
+			if (TypedValue.NULL.equals(typedValue)) {
 				throw new SpelEvaluationException(SpelMessage.TYPE_CONVERSION_ERROR, "null", "boolean");
 			}
 			boolean value = (Boolean) state.convertValue(typedValue, TypeDescriptor.valueOf(Boolean.class));
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
@@ -109,7 +109,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		} else {
 			if (operand==null) {
 				if (nullSafe) {
-					return TypedValue.NULL_TYPED_VALUE;
+					return TypedValue.NULL;
 				} else {					
 					throw new SpelEvaluationException(getStartPosition(),SpelMessage.PROJECTION_NOT_SUPPORTED_ON_TYPE, "null");
 				}
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
@@ -136,7 +136,7 @@ private TypedValue readProperty(ExpressionState state, String name) throws Evalu
 		Object targetObject = contextObject.getValue();
 
 		if (targetObject == null && nullSafe) {
-			return TypedValue.NULL_TYPED_VALUE;
+			return TypedValue.NULL;
 		}
 
 		PropertyAccessor accessorToUse = this.cachedReadAccessor;
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Selection.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
@@ -133,7 +133,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 				}
 			}
 			if ((variant == FIRST || variant == LAST) && result.size() == 0) {
-				return TypedValue.NULL_TYPED_VALUE;
+				return TypedValue.NULL;
 			}
 			if (variant == LAST) {
 				return new TypedValue(result.get(result.size() - 1),TypeDescriptor.valueOf(op.getTypeDescriptor().getElementType()));
@@ -150,7 +150,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		} else {
 			if (operand==null) {
 				if (nullSafe) { 
-					return TypedValue.NULL_TYPED_VALUE;
+					return TypedValue.NULL;
 				} else {
 					throw new SpelEvaluationException(getStartPosition(), SpelMessage.INVALID_TYPE_FOR_SELECTION,
 							"null");
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
@@ -235,7 +235,7 @@ public void setEvaluationContext(EvaluationContext context) {
 
 	private TypedValue toTypedValue(Object object) {
 		if (object == null) {
-			return TypedValue.NULL_TYPED_VALUE;
+			return TypedValue.NULL;
 		}
 		else {
 			return new TypedValue(object);
diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
@@ -76,7 +76,7 @@ public StandardEvaluationContext(Object rootObject) {
 
 	public void setRootObject(Object rootObject) {
 		if (this.rootObject == null) {
-			this.rootObject = TypedValue.NULL_TYPED_VALUE; 
+			this.rootObject = TypedValue.NULL;
 		} else {
 			this.rootObject = new TypedValue(rootObject);//, TypeDescriptor.forObject(rootObject));
 		}
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
@@ -68,7 +68,7 @@ public void testLocalVariables() {
 	public void testVariables() {
 		ExpressionState state = getState();
 		TypedValue typedValue = state.lookupVariable("foo");
-		Assert.assertEquals(TypedValue.NULL_TYPED_VALUE,typedValue);
+		Assert.assertEquals(TypedValue.NULL,typedValue);
 
 		state.setVariable("foo",34);
 		typedValue = state.lookupVariable("foo");
@@ -85,11 +85,11 @@ public void testVariables() {
 	public void testNoVariableInteference() {
 		ExpressionState state = getState();
 		TypedValue typedValue = state.lookupVariable("foo");
-		Assert.assertEquals(TypedValue.NULL_TYPED_VALUE,typedValue);
+		Assert.assertEquals(TypedValue.NULL,typedValue);
 		
 		state.setLocalVariable("foo",34);
 		typedValue = state.lookupVariable("foo");
-		Assert.assertEquals(TypedValue.NULL_TYPED_VALUE,typedValue);
+		Assert.assertEquals(TypedValue.NULL,typedValue);
 
 		state.setVariable("goo","hello");
 		Assert.assertNull(state.lookupLocalVariable("goo"));
@@ -124,7 +124,7 @@ public void testRootContextObject() {
 		// Assert.assertEquals(null, state.getRootContextObject().getValue());
 		
 		state = new ExpressionState(new StandardEvaluationContext());
-		Assert.assertEquals(TypedValue.NULL_TYPED_VALUE,state.getRootContextObject());
+		Assert.assertEquals(TypedValue.NULL,state.getRootContextObject());
 		
 
 		((StandardEvaluationContext)state.getEvaluationContext()).setRootObject(null,TypeDescriptor.NULL);
@@ -156,7 +156,7 @@ public void testActiveContextObject() {
 		Assert.assertEquals(state.getRootContextObject().getValue(),state.getActiveContextObject().getValue());
 		
 		state = new ExpressionState(new StandardEvaluationContext());
-		Assert.assertEquals(TypedValue.NULL_TYPED_VALUE,state.getActiveContextObject());
+		Assert.assertEquals(TypedValue.NULL,state.getActiveContextObject());
 	}
 	
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public void setVariable(String name, Object value) {`
`121`	`121`	`public TypedValue lookupVariable(String name) {`
`122`	`122`	`Object value = this.relatedContext.lookupVariable(name);`
`123`	`123`	`if (value == null) {`
`124`		`- return TypedValue.NULL_TYPED_VALUE;`
	`124`	`+ return TypedValue.NULL;`
`125`	`125`	`}`
`126`	`126`	`else {`
`127`	`127`	`return new TypedValue(value, TypeDescriptor.forObject(value));`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep`
`63`	`63`	`}`
`64`	`64`	`if (currentContext.getValue() == null) {`
`65`	`65`	`if (nullSafe) {`
`66`		`- return TypedValue.NULL_TYPED_VALUE;`
	`66`	`+ return TypedValue.NULL;`
`67`	`67`	`} else {`
`68`	`68`	`throw new SpelEvaluationException(getStartPosition(), SpelMessage.METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED,`
`69`	`69`	`FormatHelper.formatMethodForMessage(name, getTypes(arguments)));`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public NullLiteral(int pos) {`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public TypedValue getLiteralValue() {`
`33`		`- return TypedValue.NULL_TYPED_VALUE;`
	`33`	`+ return TypedValue.NULL;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private void assertTypedValueNotNull(TypedValue typedValue) {`
`73`		`- if (TypedValue.NULL_TYPED_VALUE.equals(typedValue)) {`
	`73`	`+ if (TypedValue.NULL.equals(typedValue)) {`
`74`	`74`	`throw new SpelEvaluationException(SpelMessage.TYPE_CONVERSION_ERROR, "null", "boolean");`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`private void assertTypedValueNotNull(TypedValue typedValue) {`
`72`		`- if (TypedValue.NULL_TYPED_VALUE.equals(typedValue)) {`
	`72`	`+ if (TypedValue.NULL.equals(typedValue)) {`
`73`	`73`	`throw new SpelEvaluationException(SpelMessage.TYPE_CONVERSION_ERROR, "null", "boolean");`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public OperatorNot(int pos, SpelNodeImpl operand) {`
`41`	`41`	`public BooleanTypedValue getValueInternal(ExpressionState state) throws EvaluationException {`
`42`	`42`	`try {`
`43`	`43`	`TypedValue typedValue = children[0].getValueInternal(state);`
`44`		`- if (TypedValue.NULL_TYPED_VALUE.equals(typedValue)) {`
	`44`	`+ if (TypedValue.NULL.equals(typedValue)) {`
`45`	`45`	`throw new SpelEvaluationException(SpelMessage.TYPE_CONVERSION_ERROR, "null", "boolean");`
`46`	`46`	`}`
`47`	`47`	`boolean value = (Boolean) state.convertValue(typedValue, TypeDescriptor.valueOf(Boolean.class));`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep`
`109`	`109`	`} else {`
`110`	`110`	`if (operand==null) {`
`111`	`111`	`if (nullSafe) {`
`112`		`- return TypedValue.NULL_TYPED_VALUE;`
	`112`	`+ return TypedValue.NULL;`
`113`	`113`	`} else {`
`114`	`114`	`throw new SpelEvaluationException(getStartPosition(),SpelMessage.PROJECTION_NOT_SUPPORTED_ON_TYPE, "null");`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private TypedValue readProperty(ExpressionState state, String name) throws Evalu`
`136`	`136`	`Object targetObject = contextObject.getValue();`
`137`	`137`
`138`	`138`	`if (targetObject == null && nullSafe) {`
`139`		`- return TypedValue.NULL_TYPED_VALUE;`
	`139`	`+ return TypedValue.NULL;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`PropertyAccessor accessorToUse = this.cachedReadAccessor;`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`if ((variant == FIRST \|\| variant == LAST) && result.size() == 0) {`
`136`		`- return TypedValue.NULL_TYPED_VALUE;`
	`136`	`+ return TypedValue.NULL;`
`137`	`137`	`}`
`138`	`138`	`if (variant == LAST) {`
`139`	`139`	`return new TypedValue(result.get(result.size() - 1),TypeDescriptor.valueOf(op.getTypeDescriptor().getElementType()));`
`@@ -150,7 +150,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep`
`150`	`150`	`} else {`
`151`	`151`	`if (operand==null) {`
`152`	`152`	`if (nullSafe) {`
`153`		`- return TypedValue.NULL_TYPED_VALUE;`
	`153`	`+ return TypedValue.NULL;`
`154`	`154`	`} else {`
`155`	`155`	`throw new SpelEvaluationException(getStartPosition(), SpelMessage.INVALID_TYPE_FOR_SELECTION,`
`156`	`156`	`"null");`