Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit c04ee6f

Browse files
committed
#260 XML database files are now ordered correctly
Added smoke tests for JAXB annotations for the 5 objects that have them so far
1 parent 4ce3639 commit c04ee6f

File tree

22 files changed

+1362
-905
lines changed

22 files changed

+1362
-905
lines changed

src/main/java/com/marklogic/appdeployer/command/databases/DeployDatabaseCommandComparator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public int compare(DeployDatabaseCommand o1, DeployDatabaseCommand o2) {
3333
return 0;
3434
}
3535

36-
Database db1 = null, db2 = null;
36+
Database db1, db2;
3737
try {
3838
db1 = resourceMapper.readResource(p1, Database.class);
3939
db2 = resourceMapper.readResource(p2, Database.class);
Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
package com.marklogic.mgmt.api.database;
22

3+
import javax.xml.bind.annotation.XmlAccessType;
4+
import javax.xml.bind.annotation.XmlAccessorType;
5+
import javax.xml.bind.annotation.XmlElement;
6+
7+
@XmlAccessorType(XmlAccessType.FIELD)
38
public class AssignmentPolicy {
49

5-
private String assignmentPolicyName;
10+
@XmlElement(name = "assignment-policy-name")
11+
private String assignmentPolicyName;
612

7-
public String getAssignmentPolicyName() {
8-
return assignmentPolicyName;
9-
}
13+
public String getAssignmentPolicyName() {
14+
return assignmentPolicyName;
15+
}
1016

11-
public void setAssignmentPolicyName(String assignmentPolicyName) {
12-
this.assignmentPolicyName = assignmentPolicyName;
13-
}
17+
public void setAssignmentPolicyName(String assignmentPolicyName) {
18+
this.assignmentPolicyName = assignmentPolicyName;
19+
}
1420
}

0 commit comments

Comments
 (0)