#359 Added more properties to Database object

This should have it in sync with ML 9.0-9.1

Author: rjrudin

src/main/java/com/marklogic/mgmt/api/database/Database.java

@@ -234,9 +234,64 @@ public class Database extends Resource implements Comparable<Database> {
 	@XmlElement(name = "range-element-index")
 	private List<ElementIndex> rangeElementIndex;
 
+	@XmlElementWrapper(name = "range-element-attribute-indexes")
+	@XmlElement(name = "range-element-attribute-index")
+	private List<ElementAttributeIndex> rangeElementAttributeIndex;
+
+	@XmlElementWrapper(name = "element-word-lexicons")
+	@XmlElement(name = "element-word-lexicon")
+	private List<ElementWordLexicon> elementWordLexicon;
+
+	@XmlElementWrapper(name = "element-attribute-word-lexicons")
+	@XmlElement(name = "element-attribute-word-lexicon")
+	private List<ElementAttributeWordLexicon> elementAttributeWordLexicon;
+
+	@XmlElementWrapper(name = "path-namespaces")
+	@XmlElement(name = "path-namespace")
+	private List<PathNamespace> pathNamespace;
+
 	@XmlElementWrapper(name = "fields")
 	private List<Field> field;
 
+	@XmlElementWrapper(name = "range-field-indexes")
+	@XmlElement(name = "range-field-index")
+	private List<FieldIndex> rangeFieldIndex;
+
+	@XmlElementWrapper(name = "geospatial-element-indexes")
+	@XmlElement(name = "geospatial-element-index")
+	private List<GeospatialElementIndex> geospatialElementIndex;
+
+	@XmlElementWrapper(name = "geospatial-element-child-indexes")
+	@XmlElement(name = "geospatial-element-child-index")
+	private List<GeospatialElementChildIndex> geospatialElementChildIndex;
+
+	@XmlElementWrapper(name = "geospatial-element-pair-indexes")
+	@XmlElement(name = "geospatial-element-pair-index")
+	private List<GeospatialElementPairIndex> geospatialElementPairIndex;
+
+	@XmlElementWrapper(name = "geospatial-element-attribute-pair-indexes")
+	@XmlElement(name = "geospatial-element-attribute-pair-index")
+	private List<GeospatialElementPairIndex> geospatialElementAttributePairIndex;
+
+	@XmlElementWrapper(name = "geospatial-path-indexes")
+	@XmlElement(name = "geospatial-path-index")
+	private List<GeospatialPathIndex> geospatialPathIndex;
+
+	@XmlElementWrapper(name = "geospatial-region-path-indexes")
+	@XmlElement(name = "geospatial-region-path-index")
+	private List<GeospatialRegionPathIndex> geospatialRegionPathIndex;
+
+	@XmlElementWrapper(name = "default-rulesets")
+	@XmlElement(name = "default-ruleset")
+	private List<DefaultRuleset> defaultRuleset;
+
+	@XmlElement(name = "database-replication")
+	private DatabaseReplication databaseReplication;
+
+	@XmlElementWrapper(name = "database-references")
+	@XmlElement(name = "database-reference")
+	private List<DatabaseReference> databaseReference;
+
 	@XmlElement(name = "rebalancer-enable")
 	private Boolean rebalancerEnable;
 
@@ -1015,4 +1070,116 @@ public AssignmentPolicy getAssignmentPolicy() {
 	public void setAssignmentPolicy(AssignmentPolicy assignmentPolicy) {
 		this.assignmentPolicy = assignmentPolicy;
 	}
+
+	public List<FieldIndex> getRangeFieldIndex() {
+		return rangeFieldIndex;
+	}
+
+	public void setRangeFieldIndex(List<FieldIndex> rangeFieldIndex) {
+		this.rangeFieldIndex = rangeFieldIndex;
+	}
+
+	public List<ElementAttributeIndex> getRangeElementAttributeIndex() {
+		return rangeElementAttributeIndex;
+	}
+
+	public void setRangeElementAttributeIndex(List<ElementAttributeIndex> rangeElementAttributeIndex) {
+		this.rangeElementAttributeIndex = rangeElementAttributeIndex;
+	}
+
+	public List<ElementWordLexicon> getElementWordLexicon() {
+		return elementWordLexicon;
+	}
+
+	public void setElementWordLexicon(List<ElementWordLexicon> elementWordLexicon) {
+		this.elementWordLexicon = elementWordLexicon;
+	}
+
+	public List<ElementAttributeWordLexicon> getElementAttributeWordLexicon() {
+		return elementAttributeWordLexicon;
+	}
+
+	public void setElementAttributeWordLexicon(List<ElementAttributeWordLexicon> elementAttributeWordLexicon) {
+		this.elementAttributeWordLexicon = elementAttributeWordLexicon;
+	}
+
+	public List<PathNamespace> getPathNamespace() {
+		return pathNamespace;
+	}
+
+	public void setPathNamespace(List<PathNamespace> pathNamespace) {
+		this.pathNamespace = pathNamespace;
+	}
+
+	public List<GeospatialElementIndex> getGeospatialElementIndex() {
+		return geospatialElementIndex;
+	}
+
+	public void setGeospatialElementIndex(List<GeospatialElementIndex> geospatialElementIndex) {
+		this.geospatialElementIndex = geospatialElementIndex;
+	}
+
+	public List<GeospatialElementChildIndex> getGeospatialElementChildIndex() {
+		return geospatialElementChildIndex;
+	}
+
+	public void setGeospatialElementChildIndex(List<GeospatialElementChildIndex> geospatialElementChildIndex) {
+		this.geospatialElementChildIndex = geospatialElementChildIndex;
+	}
+
+	public List<GeospatialElementPairIndex> getGeospatialElementPairIndex() {
+		return geospatialElementPairIndex;
+	}
+
+	public void setGeospatialElementPairIndex(List<GeospatialElementPairIndex> geospatialElementPairIndex) {
+		this.geospatialElementPairIndex = geospatialElementPairIndex;
+	}
+
+	public List<GeospatialElementPairIndex> getGeospatialElementAttributePairIndex() {
+		return geospatialElementAttributePairIndex;
+	}
+
+	public void setGeospatialElementAttributePairIndex(List<GeospatialElementPairIndex> geospatialElementAttributePairIndex) {
+		this.geospatialElementAttributePairIndex = geospatialElementAttributePairIndex;
+	}
+
+	public List<GeospatialPathIndex> getGeospatialPathIndex() {
+		return geospatialPathIndex;
+	}
+
+	public void setGeospatialPathIndex(List<GeospatialPathIndex> geospatialPathIndex) {
+		this.geospatialPathIndex = geospatialPathIndex;
+	}
+
+	public List<GeospatialRegionPathIndex> getGeospatialRegionPathIndex() {
+		return geospatialRegionPathIndex;
+	}
+
+	public void setGeospatialRegionPathIndex(List<GeospatialRegionPathIndex> geospatialRegionPathIndex) {
+		this.geospatialRegionPathIndex = geospatialRegionPathIndex;
+	}
+
+	public List<DefaultRuleset> getDefaultRuleset() {
+		return defaultRuleset;
+	}
+
+	public void setDefaultRuleset(List<DefaultRuleset> defaultRuleset) {
+		this.defaultRuleset = defaultRuleset;
+	}
+
+	public DatabaseReplication getDatabaseReplication() {
+		return databaseReplication;
+	}
+
+	public void setDatabaseReplication(DatabaseReplication databaseReplication) {
+		this.databaseReplication = databaseReplication;
+	}
+
+	public List<DatabaseReference> getDatabaseReference() {
+		return databaseReference;
+	}
+
+	public void setDatabaseReference(List<DatabaseReference> databaseReference) {
+		this.databaseReference = databaseReference;
+	}
 }

src/main/java/com/marklogic/mgmt/api/database/DatabaseReference.java

@@ -0,0 +1,31 @@
+package com.marklogic.mgmt.api.database;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class DatabaseReference {
+
+	@XmlElement(name = "reference-cluster-name")
+	private String referenceClusterName;
+
+	@XmlElement(name = "reference-database-name")
+	private String referenceDatabaseName;
+
+	public String getReferenceClusterName() {
+		return referenceClusterName;
+	}
+
+	public void setReferenceClusterName(String referenceClusterName) {
+		this.referenceClusterName = referenceClusterName;
+	}
+
+	public String getReferenceDatabaseName() {
+		return referenceDatabaseName;
+	}
+
+	public void setReferenceDatabaseName(String referenceDatabaseName) {
+		this.referenceDatabaseName = referenceDatabaseName;
+	}
+}

src/main/java/com/marklogic/mgmt/api/database/DatabaseReplication.java

@@ -14,7 +14,7 @@ public class DatabaseReplication {
 	private List<ForeignReplica> foreignReplica;
 
 	@XmlElement(name = "foreign-master")
-	private ForeignReplica foreignMaster;
+	private ForeignMaster foreignMaster;
 
 	public List<ForeignReplica> getForeignReplica() {
 		return foreignReplica;
@@ -24,11 +24,11 @@ public void setForeignReplica(List<ForeignReplica> foreignReplica) {
 		this.foreignReplica = foreignReplica;
 	}
 
-	public ForeignReplica getForeignMaster() {
+	public ForeignMaster getForeignMaster() {
 		return foreignMaster;
 	}
 
-	public void setForeignMaster(ForeignReplica foreignMaster) {
+	public void setForeignMaster(ForeignMaster foreignMaster) {
 		this.foreignMaster = foreignMaster;
 	}
 }

src/main/java/com/marklogic/mgmt/api/database/DefaultRuleset.java

@@ -0,0 +1,18 @@
+package com.marklogic.mgmt.api.database;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class DefaultRuleset {
+
+	private String location;
+
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+}

src/main/java/com/marklogic/mgmt/api/database/ElementAttributeIndex.java

@@ -0,0 +1,31 @@
+package com.marklogic.mgmt.api.database;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ElementAttributeIndex extends ElementIndex {
+
+	@XmlElement(name = "parent-namespace-uri")
+	private String parentNamespaceUri;
+
+	@XmlElement(name = "parent-localname")
+	private String parentLocalname;
+
+	public String getParentNamespaceUri() {
+		return parentNamespaceUri;
+	}
+
+	public void setParentNamespaceUri(String parentNamespaceUri) {
+		this.parentNamespaceUri = parentNamespaceUri;
+	}
+
+	public String getParentLocalname() {
+		return parentLocalname;
+	}
+
+	public void setParentLocalname(String parentLocalname) {
+		this.parentLocalname = parentLocalname;
+	}
+}

src/main/java/com/marklogic/mgmt/api/database/ElementAttributeWordLexicon.java

@@ -0,0 +1,31 @@
+package com.marklogic.mgmt.api.database;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ElementAttributeWordLexicon extends ElementWordLexicon {
+
+	@XmlElement(name = "parent-namespace-uri")
+	private String parentNamespaceUri;
+
+	@XmlElement(name = "parent-localname")
+	private String parentLocalname;
+
+	public String getParentNamespaceUri() {
+		return parentNamespaceUri;
+	}
+
+	public void setParentNamespaceUri(String parentNamespaceUri) {
+		this.parentNamespaceUri = parentNamespaceUri;
+	}
+
+	public String getParentLocalname() {
+		return parentLocalname;
+	}
+
+	public void setParentLocalname(String parentLocalname) {
+		this.parentLocalname = parentLocalname;
+	}
+}

src/main/java/com/marklogic/mgmt/api/database/ElementIndex.java

@@ -5,29 +5,12 @@
 import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ElementIndex {
-
-	@XmlElement(name = "scalar-type")
-	private String scalarType;
+public class ElementIndex extends Index {
 
 	@XmlElement(name = "namespace-uri")
 	private String namespaceUri;
+	
 	private String localname;
-	private String collation;
-
-	@XmlElement(name = "range-value-positions")
-	private Boolean rangeValuePositions;
-
-	@XmlElement(name = "invalid-values")
-	private String invalidValues;
-
-	public String getScalarType() {
-		return scalarType;
-	}
-
-	public void setScalarType(String scalarType) {
-		this.scalarType = scalarType;
-	}
 
 	public String getNamespaceUri() {
 		return namespaceUri;
@@ -44,28 +27,4 @@ public String getLocalname() {
 	public void setLocalname(String localname) {
 		this.localname = localname;
 	}
-
-	public String getCollation() {
-		return collation;
-	}
-
-	public void setCollation(String collation) {
-		this.collation = collation;
-	}
-
-	public Boolean isRangeValuePositions() {
-		return rangeValuePositions;
-	}
-
-	public void setRangeValuePositions(Boolean rangeValuePositions) {
-		this.rangeValuePositions = rangeValuePositions;
-	}
-
-	public String getInvalidValues() {
-		return invalidValues;
-	}
-
-	public void setInvalidValues(String invalidValues) {
-		this.invalidValues = invalidValues;
-	}
 }