Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup and simplify uses of DynamicSchemaContext

Browse Source
This commit is contained in:
Kris De Volder
2017-01-20 15:41:38 -08:00
parent 7fc85b79c9
commit adb27f7862
4 changed files with 19 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
View File

@@ -80,7 +80,7 @@ public class YTypeAssistContext extends AbstractYamlAssistContext {
int queryOffset = offset - query.length();
SNode contextNode = getContextNode();
DynamicSchemaContext dynamicCtxt = getSchemaContext();
List<YTypedProperty> properties = typeUtil.getProperties(type, dynamicCtxt);
List<YTypedProperty> properties = typeUtil.getProperties(type);
if (CollectionUtil.hasElements(properties)) {
ArrayList<ICompletionProposal> proposals = new ArrayList<>(properties.size());
Set<String> definedProps = dynamicCtxt.getDefinedProperties();
@@ -180,12 +180,11 @@ public class YTypeAssistContext extends AbstractYamlAssistContext {
@Override
public YamlAssistContext traverse(YamlPathSegment s) throws Exception {
if (s.getType()==YamlPathSegmentType.VAL_AT_KEY) {
DynamicSchemaContext dynamicCtxt = getSchemaContext();
if (typeUtil.isSequencable(type) || typeUtil.isMap(type)) {
return contextWith(s, typeUtil.getDomainType(type));
}
String key = s.toPropString();
Map<String, YTypedProperty> subproperties = typeUtil.getPropertiesMap(type, dynamicCtxt);
Map<String, YTypedProperty> subproperties = typeUtil.getPropertiesMap(type);
if (subproperties!=null) {
return contextWith(s, getType(subproperties.get(key)));
}
@@ -265,6 +264,6 @@ public class YTypeAssistContext extends AbstractYamlAssistContext {
}
private YTypedProperty getProperty(String name) {
return typeUtil.getPropertiesMap(getType(), getSchemaContext()).get(name);
return typeUtil.getPropertiesMap(getType()).get(name);
}
}

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java
View File

@@ -118,7 +118,7 @@ public class SchemaBasedYamlASTReconciler implements YamlASTReconciler {
reconcile(doc, valueAt(path, key), entry.getValueNode(), typeUtil.getDomainType(type));
}
} else if (typeUtil.isBean(type)) {
Map<String, YTypedProperty> beanProperties = typeUtil.getPropertiesMap(type, schemaContext);
Map<String, YTypedProperty> beanProperties = typeUtil.getPropertiesMap(type);
checkRequiredProperties(map, type, beanProperties);
for (NodeTuple entry : map.getValue()) {
Node keyNode = entry.getKeyNode();

70
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
View File

@@ -89,13 +89,13 @@ public class YTypeFactory {
}
@Override
public Map<String, YTypedProperty> getPropertiesMap(YType type, DynamicSchemaContext dc) {
return ((AbstractType)type).getPropertiesMap(dc);
public Map<String, YTypedProperty> getPropertiesMap(YType type) {
return ((AbstractType)type).getPropertiesMap();
}
@Override
public List<YTypedProperty> getProperties(YType type, DynamicSchemaContext dc) {
return ((AbstractType)type).getProperties(dc);
public List<YTypedProperty> getProperties(YType type) {
return ((AbstractType)type).getProperties();
}
@Override
@@ -207,11 +207,11 @@ public class YTypeFactory {
return ImmutableList.of();
}
public List<YTypedProperty> getProperties(DynamicSchemaContext dc) {
public List<YTypedProperty> getProperties() {
return Collections.unmodifiableList(propertyList);
}
public Map<String, YTypedProperty> getPropertiesMap(DynamicSchemaContext dc) {
public Map<String, YTypedProperty> getPropertiesMap() {
if (cachedPropertyMap==null) {
cachedPropertyMap = new LinkedHashMap<>();
for (YTypedProperty p : propertyList) {
@@ -412,25 +412,6 @@ public class YTypeFactory {
return true;
}
/**
* Deprecated. This method disregards {@link DynamicSchemaContext}. This may be
* alright for Schemas which don't rely on it but it will result in incorrect/inaccurate
* behavior for Schemas that do.
*/
@Deprecated
public List<YTypedProperty> getProperties() {
return getProperties(DynamicSchemaContext.NULL);
}
/**
* Deprecated. This method disregards {@link DynamicSchemaContext}. This may be
* alright for Schemas which don't rely on it but it will result in incorrect/inaccurate
* behavior for Schemas that do.
*/
@Deprecated
public Map<String, YTypedProperty> getPropertiesMap() {
return getPropertiesMap(DynamicSchemaContext.NULL);
}
}
public static class YAtomicType extends AbstractType {
@@ -477,7 +458,7 @@ public class YTypeFactory {
private String findPrimary(AbstractType t, List<YBeanType> types) {
//Note: passing null dynamic context below is okay, assuming the properties in YBeanType
// do not care about dynamic context.
for (YTypedProperty p : t.getProperties(DynamicSchemaContext.NULL)) {
for (YTypedProperty p : t.getProperties()) {
String name = p.getName();
if (isUniqueFor(name, t, types)) {
return name;
@@ -491,7 +472,7 @@ public class YTypeFactory {
if (other!=t) {
//Note: passing null dynamic context below is okay, assuming the properties in YBeanType
// do not care about dynamic context.
if (other.getPropertiesMap(DynamicSchemaContext.NULL).containsKey(name)) {
if (other.getPropertiesMap().containsKey(name)) {
return false;
}
}
@@ -508,38 +489,11 @@ public class YTypeFactory {
}
@Override
public Map<String, YTypedProperty> getPropertiesMap(DynamicSchemaContext dc) {
return asMap(getProperties(dc));
}
private Map<String, YTypedProperty> asMap(List<YTypedProperty> properties) {
ImmutableMap.Builder<String, YTypedProperty> builder = ImmutableMap.builder();
for (YTypedProperty p : properties) {
builder.put(p.getName(), p);
}
return builder.build();
}
@Override
public List<YTypedProperty> getProperties(DynamicSchemaContext dc) {
Set<String> existingProps = dc.getDefinedProperties();
if (!existingProps.isEmpty()) {
Builder<YTypedProperty> builder = ImmutableList.builder();
for (Entry<String, AbstractType> entry : typesByPrimary().entrySet()) {
String primaryName = entry.getKey();
if (existingProps.contains(primaryName)) {
builder.addAll(entry.getValue().getProperties(dc));
break;
}
}
//Add 'shared' properties too:
builder.addAll(super.getProperties(dc));
return builder.build();
}
public List<YTypedProperty> getProperties() {
//Reaching here means we couldn't guess the type from existing props.
//We'll just return the primary properties, these are good to give as hints
//then, since at least one of them should be added.
return getPrimaryProps(dc);
return getPrimaryProps();
}
private synchronized Map<String, AbstractType> typesByPrimary() {
@@ -559,11 +513,11 @@ public class YTypeFactory {
return typesByPrimary;
}
private List<YTypedProperty> getPrimaryProps(DynamicSchemaContext dc) {
private List<YTypedProperty> getPrimaryProps() {
if (primaryProps==null) {
Builder<YTypedProperty> builder = ImmutableList.builder();
for (Entry<String, AbstractType> entry : typesByPrimary().entrySet()) {
builder.add(entry.getValue().getPropertiesMap(dc).get(entry.getKey()));
builder.add(entry.getValue().getPropertiesMap().get(entry.getKey()));
}
primaryProps = builder.build();
}

6
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java
View File

@@ -35,13 +35,13 @@ public interface YTypeUtil {
ValueParser getValueParser(YType type, DynamicSchemaContext dc);
//TODO: only one of these two should be enough?
List<YTypedProperty> getProperties(YType type, DynamicSchemaContext dc);
Map<String, YTypedProperty> getPropertiesMap(YType yType, DynamicSchemaContext dc);
List<YTypedProperty> getProperties(YType type);
Map<String, YTypedProperty> getPropertiesMap(YType yType);
/**
* Given a {@link DynamicSchemaContext} attempt to get a more specific type, as
* may be inferred by stuff present in the context. If not enough information is
* present in the context to narrow the type, then the type itself
* present in the context to narrow the type, then the type itself
* should be returned.
*/
YType inferMoreSpecificType(YType type, DynamicSchemaContext dc);