oracle.adfinternal.resourcebundle.merge.handler

Class ResourceBundleMergeHandlerHelper

java.lang.Object

oracle.adfinternal.resourcebundle.merge.handler.ResourceBundleMergeHandlerHelper

public final class ResourceBundleMergeHandlerHelper
extends java.lang.Object

Helper class which provides helper methods to do the actual conflict resolution determination.

Field Summary

Fields

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 Summary

Constructors

Constructor and Description
ResourceBundleMergeHandlerHelper()

Method Summary

Modifier and Type	Method and Description
static boolean	autoMerge(org.w3c.dom.Document document, java.lang.String nonConflictKey, ResourceBundleWrapper.KeyInfo conflictTextNote, ResourceBundleMergeDiffDetails conflicts) Resolves the soft conflict cases(automerge) that may exist between Mainline and Sandbox tip.
static boolean	conflictMerge(org.w3c.dom.Document document, org.w3c.dom.Document branchPointDocument, ResourceBundleMergeResolverResult result, java.lang.String conflictKey, ResourceBundleWrapper.KeyInfo conflictTextNote) Resolves the hard conflict cases that may exist between Mainline and Sandbox tip.
static java.util.Map<java.lang.String,ResourceBundleMergeDiffDetails>	getCandidateMergeConflicts(ResourceBundleMergeDiffDetails MLDiff, ResourceBundleMergeDiffDetails SBDiff) Returns a Map containg the trans-unit key and the conflict details for that key after computing the delta between the MainlineMO and SandboxTipMO
static ResourceBundleMergeDiffDetails	getMOMapDiff(ResourceBundleMergeDiffDetails moInitial, ResourceBundleMergeDiffDetails moToCompare) Returns a data structure ResourceBundleMergeDiffDetails after computing the delta between the branchpoint MO and the MainlineMO or SandBoxTipMO
static void	logObjectMergeDetails(java.lang.String key, ResourceBundleMergeDiffDetails conflicts, int mode, oracle.mds.core.MetadataObject mainlineMO, ResourceBundleWrapper.KeyInfo SBPreMergeTextNote, oracle.mds.core.MetadataObject sbMO) Generates a report consisting of conflict/non-conflict changes done by the merge handler.

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

SANDBOX_BRANCH_POINT_MO

public static final java.lang.String SANDBOX_BRANCH_POINT_MO

See Also:

Constant Field Values

MAINLINE_MO

public static final java.lang.String MAINLINE_MO

See Also:

Constant Field Values

SANDBOX_MO

public static final java.lang.String SANDBOX_MO

See Also:

Constant Field Values

Constructor Detail

ResourceBundleMergeHandlerHelper

public ResourceBundleMergeHandlerHelper()

Method Detail

getMOMapDiff

public static ResourceBundleMergeDiffDetails getMOMapDiff(ResourceBundleMergeDiffDetails moInitial,
                                                          ResourceBundleMergeDiffDetails moToCompare)

Returns a data structure ResourceBundleMergeDiffDetails after computing the delta between the branchpoint MO and the MainlineMO or SandBoxTipMO

Parameters:

moInitial - - MO to comapre against

moToCompare - - MO to be compared

Returns:

data structure ResourceBundleMergeDiffDetails containing the delta changes for all trans-unit keys

getCandidateMergeConflicts

public static java.util.Map<java.lang.String,ResourceBundleMergeDiffDetails> getCandidateMergeConflicts(ResourceBundleMergeDiffDetails MLDiff,
                                                                                                        ResourceBundleMergeDiffDetails SBDiff)

Returns a Map containg the trans-unit key and the conflict details for that key after computing the delta between the MainlineMO and SandboxTipMO

Parameters:

MLDiff - - Mainline delta

SBDiff - - Sandbox delta

Returns:

- Map where the key is trans-unit key and the value is the delta of MainlineMO and SandboxTipMO

conflictMerge

public static boolean conflictMerge(org.w3c.dom.Document document,
                                    org.w3c.dom.Document branchPointDocument,
                                    ResourceBundleMergeResolverResult result,
                                    java.lang.String conflictKey,
                                    ResourceBundleWrapper.KeyInfo conflictTextNote)
                             throws java.lang.Exception

Resolves the hard conflict cases that may exist between Mainline and Sandbox tip. The hard conflicts cases are the real conflict where the handler needs to decide whether to keep the sandbox changes or the mainline changes.

Parameters:

document - - The document to be updated. It will be the Sandbox document retrieved from SandboxMO

conflictKey - - The trans-unit key for which the conflict needs to be resolved.

conflictTextNote - - The trans-unit <source> and <note> content, that will be used to update the Sandbox document. This is obtained from mainline document.

Returns:

true/false - A true value indicates that the merge was successfull and a false indicating it was unsuccessfull.

Throws:

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.

autoMerge

public static boolean autoMerge(org.w3c.dom.Document document,
                                java.lang.String nonConflictKey,
                                ResourceBundleWrapper.KeyInfo conflictTextNote,
                                ResourceBundleMergeDiffDetails conflicts)
                         throws java.lang.Exception

Resolves the soft conflict cases(automerge) that may exist between Mainline and Sandbox tip. This will be cases where there has been changes in mainline and sanbox for different trans-unit keys.The outcome should be to retain both the changes. So the mainline content will be copied over to sandbox and the sandbox content if changes will be retained as is.

Parameters:

document - - The document to be updated. It will be the Sandbox document retrieved from SandboxMO

nonConflictKey - - The changed keys from mainline and sandbox , but sandbox keys are not processed as nothing to do in case of sandbox changes and retained as is.

conflictTextNote - - The changed <source> and <note> 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.

Returns:

true/false - A true value indicates that the automerge was successfull and a false indicating it was unsuccessfull.

Throws:

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.

logObjectMergeDetails

public static void logObjectMergeDetails(java.lang.String key,
                                         ResourceBundleMergeDiffDetails conflicts,
                                         int mode,
                                         oracle.mds.core.MetadataObject mainlineMO,
                                         ResourceBundleWrapper.KeyInfo SBPreMergeTextNote,
                                         oracle.mds.core.MetadataObject sbMO)

Generates a report consisting of conflict/non-conflict changes done by the merge handler.

Parameters:

key - - trans-unit key to report

conflicts - - The conflict details which contains the delta and other details like conflict type, MO origin etc for a trans-unit key

mode - - The resolver mode set on the ResourceBundleMergeResolver(default being main wins).

mainlineMO - - Mainline MO

SBPreMergeTextNote - - Pre merge content of the sandbox MO to report the pre-refresh sandbox content.