tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Polishing

pull/633/merge
Juergen Hoeller 10 years ago
parent
8eac87064d
commit
60e58a2012
3 changed files with 39 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
  2. 6
      spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
  3. 74
      spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java

2
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
Unescape View File

@ -379,7 +379,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements @@ -379,7 +379,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
return;
}
// No entry yet -> fully synchronized manipulation of the dependentBeans Set
// No entry yet -> fully synchronized manipulation of the containedBeans Set
synchronized (this.containedBeanMap) {
containedBeans = this.containedBeanMap.get(containingBeanName);
if (containedBeans == null) {

6
spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 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.
@ -66,7 +66,7 @@ public abstract class PropertiesLoaderSupport { @@ -66,7 +66,7 @@ public abstract class PropertiesLoaderSupport {
* Set local properties, e.g. via the "props" tag in XML bean definitions,
* allowing for merging multiple properties sets into one.
*/
public void setPropertiesArray(Properties[] propertiesArray) {
public void setPropertiesArray(Properties... propertiesArray) {
this.localProperties = propertiesArray;
}
@ -88,7 +88,7 @@ public abstract class PropertiesLoaderSupport { @@ -88,7 +88,7 @@ public abstract class PropertiesLoaderSupport {
* Hence, make sure that the most specific files are the last
* ones in the given list of locations.
*/
public void setLocations(Resource[] locations) {
public void setLocations(Resource... locations) {
this.locations = locations;
}

74
spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
Unescape View File

@ -179,19 +179,13 @@ public class Indexer extends SpelNodeImpl { @@ -179,19 +179,13 @@ public class Indexer extends SpelNodeImpl {
@Override
public boolean isCompilable() {
if (this.indexedType == IndexedType.array) {
return exitTypeDescriptor != null;
return (this.exitTypeDescriptor != null);
}
else if (this.indexedType == IndexedType.list) {
return this.children[0].isCompilable();
}
else if (this.indexedType == IndexedType.map) {
if (this.children[0] instanceof PropertyOrFieldReference) {
// Only the name will be used, so that is OK
return true;
}
else {
return this.children[0].isCompilable();
}
return (this.children[0] instanceof PropertyOrFieldReference || this.children[0].isCompilable());
}
else if (this.indexedType == IndexedType.object) {
// If the string name is changing the accessor is clearly going to change (so compilation is not possible)
@ -199,22 +193,21 @@ public class Indexer extends SpelNodeImpl { @@ -199,22 +193,21 @@ public class Indexer extends SpelNodeImpl {
(this.cachedReadAccessor instanceof ReflectivePropertyAccessor.OptimalPropertyAccessor) &&
(getChild(0) instanceof StringLiteral)) {
return true;
};
}
}
return false;
}
@Override
public void generateCode(MethodVisitor mv, CodeFlow codeflow) {
String s = codeflow.lastDescriptor();
if (s == null) {
// stack is empty, should use context object
String descriptor = codeflow.lastDescriptor();
if (descriptor == null) {
// Stack is empty, should use context object
codeflow.loadTarget(mv);
}
if (this.indexedType == IndexedType.array) {
if ("I".equals(exitTypeDescriptor)) {
if ("I".equals(this.exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST,"[I");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
@ -222,47 +215,47 @@ public class Indexer extends SpelNodeImpl { @@ -222,47 +215,47 @@ public class Indexer extends SpelNodeImpl {
codeflow.exitCompilationScope();
mv.visitInsn(IALOAD);
}
else if ("D".equals(exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST,"[D");
else if ("D".equals(this.exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST, "[D");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
index.generateCode(mv, codeflow);
mv.visitInsn(DALOAD);
}
else if ("J".equals(exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST,"[J");
else if ("J".equals(this.exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST, "[J");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
index.generateCode(mv, codeflow);
codeflow.exitCompilationScope();
mv.visitInsn(LALOAD);
}
else if ("F".equals(exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST,"[F");
else if ("F".equals(this.exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST, "[F");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
index.generateCode(mv, codeflow);
codeflow.exitCompilationScope();
mv.visitInsn(FALOAD);
}
else if ("S".equals(exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST,"[S");
else if ("S".equals(this.exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST, "[S");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
index.generateCode(mv, codeflow);
codeflow.exitCompilationScope();
mv.visitInsn(SALOAD);
}
else if ("B".equals(exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST,"[B");
else if ("B".equals(this.exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST, "[B");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
index.generateCode(mv, codeflow);
codeflow.exitCompilationScope();
mv.visitInsn(BALOAD);
}
else if ("C".equals(exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST,"[C");
else if ("C".equals(this.exitTypeDescriptor)) {
mv.visitTypeInsn(CHECKCAST, "[C");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
index.generateCode(mv, codeflow);
@ -270,7 +263,9 @@ public class Indexer extends SpelNodeImpl { @@ -270,7 +263,9 @@ public class Indexer extends SpelNodeImpl {
mv.visitInsn(CALOAD);
}
else {
mv.visitTypeInsn(CHECKCAST,"["+exitTypeDescriptor+(CodeFlow.isPrimitiveArray(exitTypeDescriptor)?"":";"));//depthPlusOne(exitTypeDescriptor)+"Ljava/lang/Object;");
mv.visitTypeInsn(CHECKCAST, "["+ this.exitTypeDescriptor +
(CodeFlow.isPrimitiveArray(this.exitTypeDescriptor) ? "" : ";"));
//depthPlusOne(exitTypeDescriptor)+"Ljava/lang/Object;");
SpelNodeImpl index = this.children[0];
codeflow.enterCompilationScope();
index.generateCode(mv, codeflow);
@ -279,15 +274,15 @@ public class Indexer extends SpelNodeImpl { @@ -279,15 +274,15 @@ public class Indexer extends SpelNodeImpl {
}
}
else if (this.indexedType == IndexedType.list) {
mv.visitTypeInsn(CHECKCAST,"java/util/List");
mv.visitTypeInsn(CHECKCAST, "java/util/List");
codeflow.enterCompilationScope();
this.children[0].generateCode(mv, codeflow);
codeflow.exitCompilationScope();
mv.visitMethodInsn(INVOKEINTERFACE,"java/util/List","get","(I)Ljava/lang/Object;", true);
CodeFlow.insertCheckCast(mv,exitTypeDescriptor);
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;", true);
CodeFlow.insertCheckCast(mv, this.exitTypeDescriptor);
}
else if (this.indexedType == IndexedType.map) {
mv.visitTypeInsn(CHECKCAST,"java/util/Map");
mv.visitTypeInsn(CHECKCAST, "java/util/Map");
// Special case when the key is an unquoted string literal that will be parsed as
// a property/field reference
if ((this.children[0] instanceof PropertyOrFieldReference)) {
@ -300,16 +295,14 @@ public class Indexer extends SpelNodeImpl { @@ -300,16 +295,14 @@ public class Indexer extends SpelNodeImpl {
this.children[0].generateCode(mv, codeflow);
codeflow.exitCompilationScope();
}
mv.visitMethodInsn(INVOKEINTERFACE,"java/util/Map","get","(Ljava/lang/Object;)Ljava/lang/Object;", true);
CodeFlow.insertCheckCast(mv,exitTypeDescriptor);
mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
CodeFlow.insertCheckCast(mv, this.exitTypeDescriptor);
}
else if (this.indexedType == IndexedType.object) {
ReflectivePropertyAccessor.OptimalPropertyAccessor accessor =
(ReflectivePropertyAccessor.OptimalPropertyAccessor)this.cachedReadAccessor;
(ReflectivePropertyAccessor.OptimalPropertyAccessor) this.cachedReadAccessor;
Member member = accessor.member;
boolean isStatic = Modifier.isStatic(member.getModifiers());
String descriptor = codeflow.lastDescriptor();
String memberDeclaringClassSlashedDescriptor = member.getDeclaringClass().getName().replace('.','/');
if (!isStatic) {
if (descriptor == null) {
@ -320,13 +313,16 @@ public class Indexer extends SpelNodeImpl { @@ -320,13 +313,16 @@ public class Indexer extends SpelNodeImpl {
}
}
if (member instanceof Field) {
mv.visitFieldInsn(isStatic?GETSTATIC:GETFIELD,memberDeclaringClassSlashedDescriptor,member.getName(),CodeFlow.toJVMDescriptor(((Field) member).getType()));
mv.visitFieldInsn(isStatic ? GETSTATIC : GETFIELD, memberDeclaringClassSlashedDescriptor,
member.getName(), CodeFlow.toJVMDescriptor(((Field) member).getType()));
}
else {
mv.visitMethodInsn(isStatic?INVOKESTATIC:INVOKEVIRTUAL, memberDeclaringClassSlashedDescriptor, member.getName(),CodeFlow.createSignatureDescriptor((Method)member),false);
mv.visitMethodInsn(isStatic? INVOKESTATIC : INVOKEVIRTUAL, memberDeclaringClassSlashedDescriptor,
member.getName(), CodeFlow.createSignatureDescriptor((Method) member), false);
}
}
codeflow.pushDescriptor(exitTypeDescriptor);
codeflow.pushDescriptor(this.exitTypeDescriptor);
}
@Override

Write Preview
Loading…
Cancel
Save