oracle.adfinternal.resourcebundle.merge.handler

Class ResourceBundleMergeHandler

java.lang.Object

oracle.mds.sandbox.merge.MergeHandler

oracle.adfinternal.resourcebundle.merge.handler.ResourceBundleMergeHandler

public class ResourceBundleMergeHandler
extends oracle.mds.sandbox.merge.MergeHandler

Merge handler to resolve conflicts for .xlf documents(resourcebundle) in MDS during sandbox "refresh" operations. MDS will call this handler based on the resourcebundle xsd declaration whenever there is a conflict in MDS for the .xlf documents found during refresh operation of the sandbox. Some Examples of a merge conflict report after successfull sandbox refresh operation for xliff artifacts(considering main wins): The sandboxValue column display the pre-refesh sandbox value.

Sandbox and mainline both modified the same key <ul>RBPrePopulatedKey-6 </ul> with different text and note ( hard conflict case) Summary :: Key RBPrePopulatedKey-6 modified with different text and note in Mainline and SandBox objectName :: /xliffBundles/override/AppOverrideBundle_en_US.xlf#RBPrePopulatedKey-6 objectType :: ResourceBundle changeType :: MODIFIED Conflict :: true elementPath :: /xliffBundles/override/AppOverrideBundle_en_US.xlf mainlineValue :: UpdateTextML_4-1444858892275 ; Note Text-1444858892275 sandboxValue :: UpdateTextSB_4-1444858892199 ; Note Text-1444858892199 result :: USE_MAINLINE objectId :: /xliffBundles/override/AppOverrideBundle_en_US.xlf#RBPrePopulatedKey-6 loggedBy :: oracle.adfinternal.resourcebundle.merge.handler.ResourceBundleMergeHandler changeDate :: Wed Oct 14 14:41:32 PDT 2015 Key <ul> RBPrePopulatedKey-10 </ul> deleted in Mainline , but updated with different text in sandbox ( hard conflict case) Summary :: Key RBPrePopulatedKey-10 deleted in Mainline objectName :: /xliffBundles/override/AppOverrideBundle_en_US.xlf#RBPrePopulatedKey-10 objectType :: ResourceBundle changeType :: REMOVED Conflict :: true elementPath :: /xliffBundles/override/AppOverrideBundle_en_US.xlf mainlineValue :: null ; null sandboxValue :: RBPrePopulatedText-1444858893483 ; null result :: USE_MAINLINE objectId :: /xliffBundles/override/AppOverrideBundle_en_US.xlf#RBPrePopulatedKey-10 loggedBy :: oracle.adfinternal.resourcebundle.merge.handler.ResourceBundleMergeHandler changeDate :: Wed Oct 14 14:41:33 PDT 2015 New Key <ul> RBPrePopulatedKey-2 </ul> added in Sandbox and some other key added/updated/deleted from Mainline(automerge case) Summary :: New Key RBPrePopulatedKey-2 added in Sandbox objectName :: /xliffBundles/override/AppOverrideBundle_en_US.xlf#RBPrePopulatedKey-2 objectType :: ResourceBundle changeType :: ADDED Conflict :: false elementPath :: /xliffBundles/override/AppOverrideBundle_en_US.xlf mainlineValue :: RBPrePopulatedText- ; Note Text sandboxValue :: AutoMergeTextSB_2-1444932048951 ; Note Text-1444932048951 result :: USE_MAINLINE objectId :: /xliffBundles/override/AppOverrideBundle_en_US.xlf#RBPrePopulatedKey-2 loggedBy :: oracle.adfinternal.resourcebundle.merge.handler.ResourceBundleMergeHandler changeDate :: Thu Oct 15 11:00:49 PDT 2015

Nested Class Summary

Nested classes/interfaces inherited from class oracle.mds.sandbox.merge.MergeHandler

oracle.mds.sandbox.merge.MergeHandler.ConflictFilter

Constructor Summary

Constructors

Constructor and Description
ResourceBundleMergeHandler()

Method Summary

Modifier and Type	Method and Description
oracle.mds.sandbox.merge.MergeHandler.ConflictFilter	getConflictFilter() Returns the filter type.
java.lang.String	getDescription() Returns description of the handler for user to figure out which handler is resolving the conflicts.
java.lang.String	getIdentifier() Returns identifier of the handler.
float	getOrder() Returns the order in which the handler will be invoked.
void	merge(oracle.mds.sandbox.merge.MergeContext mergeContext) Implement the merge conflict resolution logic here for sandbox conflicts during sandbox "refresh" operations.

Methods inherited from class java.lang.Object

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

Constructor Detail

ResourceBundleMergeHandler

public ResourceBundleMergeHandler()

Method Detail

getDescription

public java.lang.String getDescription()

Returns description of the handler for user to figure out which handler is resolving the conflicts.

Specified by:

getDescription in class oracle.mds.sandbox.merge.MergeHandler

Returns:

The handler description

getIdentifier

public java.lang.String getIdentifier()

Returns identifier of the handler. Its generally the app id but in resourcebundle since we wouldn't know called by which app it will return NULL_APP_ID.

Specified by:

getIdentifier in class oracle.mds.sandbox.merge.MergeHandler

Returns:

the handler identifier

getOrder

public float getOrder()

Returns the order in which the handler will be invoked. Since resourcebundle handler is lowest in the stack and should be invoked last, it will return 0.99f.

Specified by:

getOrder in class oracle.mds.sandbox.merge.MergeHandler

Returns:

The order value

getConflictFilter

public oracle.mds.sandbox.merge.MergeHandler.ConflictFilter getConflictFilter()

Returns the filter type. For resourcebundle it should return all the conflicts even outside of the pinned layer of the sandbox for resolving conflicts of string editor global search/replace use-case.

Overrides:

getConflictFilter in class oracle.mds.sandbox.merge.MergeHandler

Returns:

ConflictFilter

merge

public void merge(oracle.mds.sandbox.merge.MergeContext mergeContext)

Implement the merge conflict resolution logic here for sandbox conflicts during sandbox "refresh" operations. At the end of this method , all the merge conflicts for the xlf documents will be either resolved or unresolved(should not happen as the handler is supposed to resolve all the conflicts). If all the conflicts are resolved for the sandbox then the sandbox can be published . If there is a single unresolved conflict the sandbox cannot be published and the user need to look at the conflict report to figure out why the conflict resolution failed and after resolving the issue, retry the refresh operation. The logic of conflict resolution is as below : MDS provides a mergecontext , from which 3 MDS sessions obtained. a. Sandbox branch point, b. Mainline at refresh target label c. Sandbox tip 1. Get all the conflicts from mergecontext. 2. Get the respective MORef for the conflicts. 3. Get the MOpart for mainline and sandbox. 4. Check if the MO part is stub and mark the conflict as resolved(resourcebundle mds base docs are all stubs in customization mode). If the base is not stub(for FusionAppsOverrideBundle cases) , the MO will be the base MO and the conflict processing will follow the usual path. 5. Get the layername, layer value, cachehint for the customization conflicts. 6. Use a dummy CC class(ResourceBundleCC) to construct a MO using the above values for branchpoint,sandboxtip and mainline using the 3 MDS sessions. 7. The above will ensure that the handler will be able to look for CC layers outside of the sandbox pinned CC layer(string editor use-case). 8. Do a 3 way comparison of the MO docs 8a. Comparison of BranchpointMO and MainlineMO -> MainlineDelta 8b. Comparison of BranchpointMO and SandboxMO -> SandboxDelta 8c. Comparison of MainlineDelta and SandboxDelta 9. Iterate through each of the conflicts found in 8c and merge them using a resolver. 10.A resourcebundle resolver can be set in the ADFSessionOptions by a higher level merge handler and will be able to set the conflict resolution mode, which can be one of the below values : MAINLINE_WINS - In this case the mainline content is copied over to sandbox (default choice) SANDBOX_WINS - In this case the sandbox content is retained. In case no resourcebundle resolver is set in ADfSessionOptions,the resourcebundle merge handler will create one and the default mode will be set to MAINLINE_WINS. The ADfSessionOptions choice is there if there is a need to override the default MAINLINE_WINS behavior. For both the above cases there can be AUTOMERGE scenario's where there are no real conflicts(like both sandbox and mainline added/updated/deleted different trans-units) and the changes from both sandbox and mainline is retained by copying the mainline changes over to sandbox. 11.As each conflict gets resolved, the conflict resolution and the action taken are recorded using the logging mechanism in a report. 12. Once all the conflicts are resolved , the mergecontext will be set as resolved.

Specified by:

merge in class oracle.mds.sandbox.merge.MergeHandler

Parameters:

mergeContext - - The MDS MergeContext