Projects information

Chunk

Conflicting content
// First value found wins if (value != null) { <<<<<<< HEAD ======= assignedFrom = "property: '" + propertyName + "'"; >>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd logger.info("Assigning value [{}] for [{}] on [{}#{}()]", new Object[] { value, propertyName, method.getDeclaringClass().getName(), method.getName() }); break;

Conflicting content

            // First value found wins
            if (value != null) {
<<<<<<< HEAD
=======
                assignedFrom = "property: '" + propertyName + "'";
>>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd
                logger.info("Assigning value [{}] for [{}] on [{}#{}()]",
                            new Object[] { value, propertyName, method.getDeclaringClass().getName(), method.getName() });
                break;

Solution content
// First value found wins if (value != null) { assignedFrom = "property: '" + propertyName + "'"; logger.info("Assigning value [{}] for [{}] on [{}#{}()]", new Object[] { value, propertyName, method.getDeclaringClass().getName(), method.getName() }); break;

Solution content

            // First value found wins
            if (value != null) {
                assignedFrom = "property: '" + propertyName + "'";
                logger.info("Assigning value [{}] for [{}] on [{}#{}()]",
                            new Object[] { value, propertyName, method.getDeclaringClass().getName(), method.getName() });
                break;

File
ConfigurationObjectFactory.java

Developer's decision
Version 2

Kind of conflict
Variable

Chunk

Conflicting content
if (value == null) { if (hasDefault) { value = method.getAnnotation(Default.class).value(); <<<<<<< HEAD ======= assignedFrom = "annotation: @Default"; >>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd logger.info("Assigning default value [{}] for {} on [{}#{}()]", new Object[] { value, propertyNames, method.getDeclaringClass().getName(), method.getName() });

Conflicting content

        if (value == null) {
            if (hasDefault) {
                value = method.getAnnotation(Default.class).value();
<<<<<<< HEAD
=======
                assignedFrom = "annotation: @Default";
>>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd

                logger.info("Assigning default value [{}] for {} on [{}#{}()]",
                            new Object[] { value, propertyNames, method.getDeclaringClass().getName(), method.getName() });

Solution content
if (value == null) { if (hasDefault) { value = method.getAnnotation(Default.class).value(); assignedFrom = "annotation: @Default"; logger.info("Assigning default value [{}] for {} on [{}#{}()]", new Object[] { value, propertyNames, method.getDeclaringClass().getName(), method.getName() });

Solution content

        if (value == null) {
            if (hasDefault) {
                value = method.getAnnotation(Default.class).value();
                assignedFrom = "annotation: @Default";

                logger.info("Assigning default value [{}] for {} on [{}#{}()]",
                            new Object[] { value, propertyNames, method.getDeclaringClass().getName(), method.getName() });

File
ConfigurationObjectFactory.java

Developer's decision
Version 2

Kind of conflict
Variable

Chunk

Conflicting content
else if (hasDefaultNull) { logger.info("Assigning null default value for {} on [{}#{}()]", new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() }); <<<<<<< HEAD ======= assignedFrom = "annotation: @DefaultNull"; >>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd } else { // Final try: Is the method is actually callable?

Conflicting content

            else if (hasDefaultNull) {
                logger.info("Assigning null default value for {} on [{}#{}()]",
                            new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() });
<<<<<<< HEAD
=======
                assignedFrom = "annotation: @DefaultNull";
>>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd
            }
            else {
                // Final try: Is the method is actually callable?

Solution content
else if (hasDefaultNull) { logger.info("Assigning null default value for {} on [{}#{}()]", new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() }); assignedFrom = "annotation: @DefaultNull"; } else { // Final try: Is the method is actually callable?

Solution content

            else if (hasDefaultNull) {
                logger.info("Assigning null default value for {} on [{}#{}()]",
                            new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() });
                assignedFrom = "annotation: @DefaultNull";
            }
            else {
                // Final try: Is the method is actually callable?

File
ConfigurationObjectFactory.java

Developer's decision
Version 2

Kind of conflict
Variable

Chunk

Conflicting content
// Final try: Is the method is actually callable? if (!Modifier.isAbstract(method.getModifiers())) { useMethod = true; <<<<<<< HEAD ======= assignedFrom = "method: '" + method.getName() + "()'"; >>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd logger.info("Using method itself for {} on [{}#{}()]", new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() }); }

Conflicting content

                // Final try: Is the method is actually callable?
                if (!Modifier.isAbstract(method.getModifiers())) {
                    useMethod = true;
<<<<<<< HEAD
=======
                    assignedFrom = "method: '" + method.getName() + "()'";
>>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd
                    logger.info("Using method itself for {} on [{}#{}()]",
                                new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() });
                }

Solution content
// Final try: Is the method is actually callable? if (!Modifier.isAbstract(method.getModifiers())) { useMethod = true; assignedFrom = "method: '" + method.getName() + "()'"; logger.info("Using method itself for {} on [{}#{}()]", new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() }); }

Solution content

                // Final try: Is the method is actually callable?
                if (!Modifier.isAbstract(method.getModifiers())) {
                    useMethod = true;
                    assignedFrom = "method: '" + method.getName() + "()'";
                    logger.info("Using method itself for {} on [{}#{}()]",
                                new Object[] { propertyNames, method.getDeclaringClass().getName(), method.getName() });
                }

File
ConfigurationObjectFactory.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
} final Object finalValue = bully.coerce(method.getGenericReturnType(), value, method.getAnnotation(Separator.class)); <<<<<<< HEAD callbacks.add(new ConfigMagicFixedValue(finalValue, useMethod)); ======= callbacks.add(new ConfigMagicFixedValue(method, assignedFrom, finalValue, useMethod)); >>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd } private String applyReplacements(String propertyName, Map mappedReplacements)

Conflicting content

        }

        final Object finalValue = bully.coerce(method.getGenericReturnType(), value, method.getAnnotation(Separator.class));
<<<<<<< HEAD
        callbacks.add(new ConfigMagicFixedValue(finalValue, useMethod));
=======
        callbacks.add(new ConfigMagicFixedValue(method, assignedFrom, finalValue, useMethod));
>>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd
    }

    private String applyReplacements(String propertyName, Map mappedReplacements)

Solution content
} final Object finalValue = bully.coerce(method.getGenericReturnType(), value, method.getAnnotation(Separator.class)); callbacks.add(new ConfigMagicFixedValue(method, assignedFrom, finalValue, useMethod)); } private String applyReplacements(String propertyName, Map mappedReplacements)

Solution content

        }

        final Object finalValue = bully.coerce(method.getGenericReturnType(), value, method.getAnnotation(Separator.class));
        callbacks.add(new ConfigMagicFixedValue(method, assignedFrom, finalValue, useMethod));
    }
    private String applyReplacements(String propertyName, Map mappedReplacements)

File
ConfigurationObjectFactory.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content
private ConfigMagicFixedValue(final Method method, final String assignedFrom, final Object value, final boolean callSuper) { <<<<<<< HEAD ======= this.method = method; this.assignedFrom = assignedFrom; >>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd // This is a workaround for broken cglib if (callSuper) { this.handler = new InvokeSuperHandler();

Conflicting content

        private ConfigMagicFixedValue(final Method method, final String assignedFrom, final Object value, final boolean callSuper)
        {
<<<<<<< HEAD
=======
            this.method = method;
            this.assignedFrom = assignedFrom;

>>>>>>> 9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd
            // This is a workaround for broken cglib
            if (callSuper) {
                this.handler = new InvokeSuperHandler();

Solution content
private ConfigMagicFixedValue(final Method method, final String assignedFrom, final Object value, final boolean callSuper) { this.method = method; this.assignedFrom = assignedFrom; // This is a workaround for broken cglib if (callSuper) { this.handler = new InvokeSuperHandler();

Solution content

        private ConfigMagicFixedValue(final Method method, final String assignedFrom, final Object value, final boolean callSuper)
        {
            this.method = method;
            this.assignedFrom = assignedFrom;

            // This is a workaround for broken cglib
            if (callSuper) {
                this.handler = new InvokeSuperHandler();

File
ConfigurationObjectFactory.java

Developer's decision
Version 2

Kind of conflict
Variable

Projects >> config-magic >>a7953193ae2e296565ecee2809830b5abb3a3bb7