public class ConnectionsMergeHandlerHelper
extends java.lang.Object
Modifier and Type | Field and Description |
---|---|
static java.lang.String |
MAINLINE_MO |
static java.lang.String |
SANDBOX_BRANCH_POINT_MO |
static java.lang.String |
SANDBOX_MO |
Constructor and Description |
---|
ConnectionsMergeHandlerHelper() |
Modifier and Type | Method and Description |
---|---|
static boolean |
autoMerge(org.w3c.dom.Document document,
java.lang.String nonConflictKey,
ReferenceDetails conflictConnection,
ConnectionsMergeDiffDetails conflicts)
Resolves the soft conflict cases(automerge) that may exist between Mainline and Sandbox tip.
|
static boolean |
conflictMerge(org.w3c.dom.Document document,
java.lang.String conflictKey,
ReferenceDetails conflictConnection)
Resolves the hard conflict cases that may exist between Mainline and Sandbox tip.
|
static java.util.Map<java.lang.String,ConnectionsMergeDiffDetails> |
getCandidateMergeConflicts(ConnectionsMergeDiffDetails MLDiff,
ConnectionsMergeDiffDetails SBDiff)
Returns a Map containg the connectionname(name+classname) and the conflict details for that connection after computing the delta between
the MainlineMO and SandboxTipMO
|
static ConnectionsMergeDiffDetails |
getMOMapDiff(ConnectionsMergeDiffDetails moInitial,
ConnectionsMergeDiffDetails moToCompare)
Returns a data structure
ConnectionsMergeDiffDetails after computing the delta between
the branchpoint MO and the MainlineMO or SandBoxTipMO |
static void |
logObjectMergeDetails(java.lang.String key,
ConnectionsMergeDiffDetails conflicts,
int mode,
oracle.mds.core.MetadataObject mainlineMO,
oracle.mds.core.MetadataObject sbMO,
ReferenceDetails SBPreMergeConnection,
java.lang.String sbKey)
Generates a report consisting of conflict/non-conflict changes done by the merge handler.
|
public static final java.lang.String SANDBOX_BRANCH_POINT_MO
public static final java.lang.String MAINLINE_MO
public static final java.lang.String SANDBOX_MO
public static ConnectionsMergeDiffDetails getMOMapDiff(ConnectionsMergeDiffDetails moInitial, ConnectionsMergeDiffDetails moToCompare)
ConnectionsMergeDiffDetails
after computing the delta between
the branchpoint MO and the MainlineMO or SandBoxTipMOmoInitial
- - MO to comapre againstmoToCompare
- - MO to be comparedConnectionsMergeDiffDetails
containing the delta changes for all connections in a docpublic static java.util.Map<java.lang.String,ConnectionsMergeDiffDetails> getCandidateMergeConflicts(ConnectionsMergeDiffDetails MLDiff, ConnectionsMergeDiffDetails SBDiff)
MLDiff
- - Mainline deltaSBDiff
- - Sandbox deltapublic static boolean conflictMerge(org.w3c.dom.Document document, java.lang.String conflictKey, ReferenceDetails conflictConnection) throws java.lang.Exception
document
- - The document to be updated. It will be the Sandbox document retrieved from SandboxMOconflictKey
- - The connectionname(name+classname) for which the conflict needs to be resolved.conflictConnection
- - The refernece node content, that will be used to update the Sandbox document. This is obtained from
mainline document.java.lang.Exception
- - In case of an exception to indicate the caller that the merge was not successfull so that the mergestatus can be set accordingly.public static boolean autoMerge(org.w3c.dom.Document document, java.lang.String nonConflictKey, ReferenceDetails conflictConnection, ConnectionsMergeDiffDetails conflicts) throws java.lang.Exception
document
- - The document to be updated. It will be the Sandbox document retrieved from SandboxMOnonConflictKey
- - The changed connectionname(name+classname) from mainline and sandbox , but sandbox keys are not processed as nothing to do in case of sandbox
changes and retained as is.conflictConnection
- - The changed reference content from both mainline and sandbox, but sandbox content is not processed.conflicts
- - The conflict details which contains the delta and other details like conflict type, MO origin etc.java.lang.Exception
- - In case of an exception to indicate the caller that the merge was not successfull so that the mergestatus can be set accordingly.public static void logObjectMergeDetails(java.lang.String key, ConnectionsMergeDiffDetails conflicts, int mode, oracle.mds.core.MetadataObject mainlineMO, oracle.mds.core.MetadataObject sbMO, ReferenceDetails SBPreMergeConnection, java.lang.String sbKey)
key
- - connectionname(name+classname) to reportconflicts
- - The conflict details which contains the delta and other details like conflict type, MO origin etc for a connectionname(name+classname)mode
- - The resolver mode set on the ResourceBundleMergeResolver(default being main wins).mainlineMO
- - Mainline MOSBPreMergeConnection
- - Pre merge content of the sandbox MO to report the pre-refresh sandbox content.