Projects >> xp >>72e2d9ffe13cf23f14ded014245ee02182671df7

Chunk
Conflicting content 
    private final ImmutableList metaStepMixinNames;

<<<<<<< HEAD
    public ApplicationJson( final Application application, final boolean local, final SiteDescriptor siteDescriptor )
=======
    public ApplicationJson( final Application application, final SiteDescriptor siteDescriptor, final AuthDescriptor authDescriptor )
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16
    {
        this.application = application;
        this.local = local;
Solution content 
    private final ImmutableList metaStepMixinNames;

    public ApplicationJson( final Application application, final boolean local, final SiteDescriptor siteDescriptor, final AuthDescriptor authDescriptor )
    {
        this.application = application;
        this.local = local;
File
ApplicationJson.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
    private SiteService siteService;

<<<<<<< HEAD
    private MarketService marketService;
=======
    private AuthDescriptorService authDescriptorService;
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16

    @GET
    @Path("list")
Solution content 
    private SiteService siteService;

    private MarketService marketService;

    private AuthDescriptorService authDescriptorService;

    @GET
    @Path("list")
File
ApplicationResource.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
            final ApplicationKey applicationKey = application.getKey();
            if ( !ApplicationKey.from( "com.enonic.xp.admin.ui" ).equals( applicationKey ) )//Remove after 7.0.0 refactoring
            {
<<<<<<< HEAD
                json.add( application, this.applicationService.isLocalApplication( applicationKey ),
                          this.siteService.getDescriptor( applicationKey ) );
=======
                final SiteDescriptor siteDescriptor = this.siteService.getDescriptor( application.getKey() );
                final AuthDescriptor authDescriptor = this.authDescriptorService.getDescriptor( application.getKey() );

                json.add( application, siteDescriptor, authDescriptor );
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16
            }
        }
Solution content 
            final ApplicationKey applicationKey = application.getKey();
            if ( !ApplicationKey.from( "com.enonic.xp.admin.ui" ).equals( applicationKey ) )//Remove after 7.0.0 refactoring
            {
                final SiteDescriptor siteDescriptor = this.siteService.getDescriptor( application.getKey() );
                final AuthDescriptor authDescriptor = this.authDescriptorService.getDescriptor( application.getKey() );
                final boolean localApplication = this.applicationService.isLocalApplication( applicationKey )
                
                json.add( application, localApplication, siteDescriptor, authDescriptor );
            }
        }
File
ApplicationResource.java
Developer's decision
Manual
Kind of conflict
Other
Chunk
Conflicting content 
        final Application application = this.applicationService.getInstalledApplication( ApplicationKey.from( applicationKey ) );
        final boolean local = this.applicationService.isLocalApplication( ApplicationKey.from( applicationKey ) );
        final SiteDescriptor siteDescriptor = this.siteService.getDescriptor( ApplicationKey.from( applicationKey ) );
<<<<<<< HEAD
        return new ApplicationJson( application, local, siteDescriptor );
=======
        final AuthDescriptor authDescriptor = this.authDescriptorService.getDescriptor( ApplicationKey.from( applicationKey ) );
        return new ApplicationJson( application, siteDescriptor, authDescriptor );
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16
    }

    @POST
Solution content 
        final Application application = this.applicationService.getInstalledApplication( ApplicationKey.from( applicationKey ) );
        final boolean local = this.applicationService.isLocalApplication( ApplicationKey.from( applicationKey ) );
        final SiteDescriptor siteDescriptor = this.siteService.getDescriptor( ApplicationKey.from( applicationKey ) );
        final AuthDescriptor authDescriptor = this.authDescriptorService.getDescriptor( ApplicationKey.from( applicationKey ) );
        return new ApplicationJson( application, local, siteDescriptor, authDescriptor );
    }

    @POST
File
ApplicationResource.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
    }

    @Reference
<<<<<<< HEAD
    public void setMarketService( final MarketService marketService )
    {
        this.marketService = marketService;
=======
    public void setAuthDescriptorService( final AuthDescriptorService authDescriptorService )
    {
        this.authDescriptorService = authDescriptorService;
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16
    }
}
Solution content 
    }

    @Reference
    public void setAuthDescriptorService( final AuthDescriptorService authDescriptorService )
    {
        this.authDescriptorService = authDescriptorService;
    }
    @Reference
    public void setMarketService( final MarketService marketService )
    {
        this.marketService = marketService;
    }
}
File
ApplicationResource.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
        this.list = Lists.newArrayList();
    }

<<<<<<< HEAD
    public void add( final Application application, final boolean local, final SiteDescriptor siteDescriptor )
    {
        this.list.add( new ApplicationJson( application, local, siteDescriptor ) );
=======
    public void add( final Application application, final SiteDescriptor siteDescriptor, final AuthDescriptor authDescriptor )
    {
        this.list.add( new ApplicationJson( application, siteDescriptor, authDescriptor ) );
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16
    }

    public int getTotal()
Solution content 
        this.list = Lists.newArrayList();
    }

    public void add( final Application application, final boolean local, final SiteDescriptor siteDescriptor, final AuthDescriptor authDescriptor )
    {
        this.list.add( new ApplicationJson( application, local, siteDescriptor, authDescriptor ) );
    }

    public int getTotal()
File
ListApplicationJson.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
    private SiteService siteService;

<<<<<<< HEAD
    private MarketService marketService;
=======
    private AuthDescriptorService authDescriptorService;
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16

    @Test
    public void get_application_list()
Solution content 
    private SiteService siteService;

    private MarketService marketService;

    private AuthDescriptorService authDescriptorService;

    @Test
    public void get_application_list()
File
ApplicationResourceTest.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
    {
        this.applicationService = Mockito.mock( ApplicationService.class );
        this.siteService = Mockito.mock( SiteService.class );
<<<<<<< HEAD
        this.marketService = Mockito.mock( MarketService.class );
=======
        this.authDescriptorService = Mockito.mock( AuthDescriptorService.class );
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16

        final ApplicationResource resource = new ApplicationResource();
        resource.setApplicationService( this.applicationService );
Solution content 
    {
        this.applicationService = Mockito.mock( ApplicationService.class );
        this.siteService = Mockito.mock( SiteService.class );
        this.marketService = Mockito.mock( MarketService.class );
        this.authDescriptorService = Mockito.mock( AuthDescriptorService.class );

        final ApplicationResource resource = new ApplicationResource();
        resource.setApplicationService( this.applicationService );
File
ApplicationResourceTest.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        final ApplicationResource resource = new ApplicationResource();
        resource.setApplicationService( this.applicationService );
        resource.setSiteService( this.siteService );
<<<<<<< HEAD
        resource.setMarketService( this.marketService );
=======
        resource.setAuthDescriptorService( this.authDescriptorService );
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16

        return resource;
    }
Solution content 
        final ApplicationResource resource = new ApplicationResource();
        resource.setApplicationService( this.applicationService );
        resource.setSiteService( this.siteService );
        resource.setMarketService( this.marketService );
        resource.setAuthDescriptorService( this.authDescriptorService );

        return resource;
    }
File
ApplicationResourceTest.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
import com.enonic.xp.app.ApplicationKey;
import com.enonic.xp.context.ContextBuilder;
<<<<<<< HEAD
=======
import com.enonic.xp.data.PropertySet;
import com.enonic.xp.data.PropertyTree;
import com.enonic.xp.index.ChildOrder;
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16
import com.enonic.xp.node.CreateNodeParams;
import com.enonic.xp.node.NodePath;
import com.enonic.xp.node.NodeService;
Solution content 
import com.enonic.xp.app.ApplicationKey;
import com.enonic.xp.context.ContextBuilder;
import com.enonic.xp.data.PropertySet;
import com.enonic.xp.data.PropertyTree;
import com.enonic.xp.index.ChildOrder;
import com.enonic.xp.node.CreateNodeParams;
import com.enonic.xp.node.NodePath;
import com.enonic.xp.node.NodeService;
File
SecurityInitializer.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.osgi.service.component.annotations.ReferencePolicy;

import com.google.common.base.Strings;
<<<<<<< HEAD
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
=======
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16

import com.enonic.xp.branch.Branch;
import com.enonic.xp.content.ContentPath;
Solution content 
import org.osgi.service.component.annotations.ReferencePolicy;

import com.google.common.base.Strings;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;

import com.enonic.xp.branch.Branch;
import com.enonic.xp.content.ContentPath;
File
PortalServlet.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.enonic.xp.portal.impl.exception.ExceptionMapper;
import com.enonic.xp.portal.impl.exception.ExceptionRenderer;
import com.enonic.xp.portal.impl.serializer.ResponseSerializer;
<<<<<<< HEAD
import com.enonic.xp.portal.impl.websocket.WebSocketContext;
import com.enonic.xp.portal.impl.websocket.WebSocketContextFactory;
import com.enonic.xp.portal.websocket.WebSocketConfig;
import com.enonic.xp.portal.websocket.WebSocketEndpoint;
import com.enonic.xp.web.HttpMethod;
import com.enonic.xp.web.servlet.ServletRequestUrlHelper;
=======
>>>>>>> 5c6f3668cd925609636414119b59fbd7ca65ba16

@Component(immediate = true, service = Servlet.class,
    property = {"osgi.http.whiteboard.servlet.pattern=/portal/*"})
Solution content 
import com.enonic.xp.portal.impl.exception.ExceptionMapper;
import com.enonic.xp.portal.impl.exception.ExceptionRenderer;
import com.enonic.xp.portal.impl.serializer.ResponseSerializer;
import com.enonic.xp.portal.impl.websocket.WebSocketContext;
import com.enonic.xp.portal.impl.websocket.WebSocketContextFactory;
import com.enonic.xp.portal.websocket.WebSocketConfig;
import com.enonic.xp.portal.websocket.WebSocketEndpoint;
import com.enonic.xp.web.HttpMethod;
import com.enonic.xp.web.servlet.ServletRequestUrlHelper;

@Component(immediate = true, service = Servlet.class,
    property = {"osgi.http.whiteboard.servlet.pattern=/portal/*"})
File
PortalServlet.java
Developer's decision
Version 1
Kind of conflict
Import