oracle.adfinternal.share.merge.handler

Class ConnectionsMergeHandler

java.lang.Object

oracle.mds.sandbox.merge.MergeHandler

oracle.adfinternal.share.merge.handler.ConnectionsMergeHandler

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

Merge handler to resolve conflicts for connections.xml documents in MDS during sandbox "refresh" operations. MDS will call this handler based on the references xsd declaration whenever there is a conflict in MDS for the connections.xml documents found during refresh operation of the sandbox. In case the same connection is modified in SB and ML, based on the resolver mode the content of the entire conflicting reference element will be replaced in the sandbox. Some Examples of a merge conflict report after successfull sandbox refresh operation for connections.xml artifacts(considering main wins): The sandboxValue column display the pre-refesh sandbox value.

Sandbox and mainline both modified the same URLconnection

TestURLConn

with different URL ( hard conflict case) Summary :: Connection TestURLConn{SEPARATOR}oracle.adf.model.connection.url.HttpURLConnection modified with different content in Mainline and SandBox objectName :: /META-INF/connections.xml#TestURLConn{SEPARATOR}oracle.adf.model.connection.url.HttpURLConnection objectType :: Connections changeType :: MODIFIED Conflict :: true mainlineValue :: sandboxValue :: result :: USE_MAINLINE objectId :: /META-INF/connections.xml#TestURLConn{SEPARATOR}oracle.adf.model.connection.url.HttpURLConnection loggedBy :: oracle.adfinternal.share.merge.handler.ConnectionsMergeHandler changeDate :: Fri Nov 20 14:09:28 PST 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
ConnectionsMergeHandler()

Method Summary

Modifier and Type	Method and Description
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 oracle.mds.sandbox.merge.MergeHandler

getConflictFilter

Methods inherited from class java.lang.Object

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

Constructor Detail

ConnectionsMergeHandler

public ConnectionsMergeHandler()

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.

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.

Specified by:

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

Returns:

The order value

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. If the base is not stub , the MO will be the base MO and the conflict processing will follow the usual path. 5. Get the layername, layer value for the customization conflicts. 6. Use a dummy CC class(ConnectionsDummyCC) to construct a MO using the above values for branchpoint,sandboxtip and mainline using the 3 MDS sessions. 7. Do a 3 way comparison of the MO docs 7a. Comparison of BranchpointMO and MainlineMO -> MainlineDelta 7b. Comparison of BranchpointMO and SandboxMO -> SandboxDelta 7c. Comparison of MainlineDelta and SandboxDelta 8. Iterate through each of the conflicts found in 7c and merge them using a resolver. 9.A connections 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 connections resolver is set in ADfSessionOptions,the connections 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 connections) 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