Projects >> candlepin >>53c4188f18e6d5c7641995753e251b389e4bffbf

Chunk
Conflicting content 
import org.apache.log4j.Logger;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
<<<<<<< HEAD

import org.fedoraproject.candlepin.cert.BouncyCastlePKI;
=======
import java.util.List;
import java.util.Random;

import org.apache.log4j.Logger;
import org.fedoraproject.candlepin.cert.util.BouncyCastlePKI;
import org.fedoraproject.candlepin.cert.util.X509ExtensionWrapper;
>>>>>>> 495d8883a3e64b6741b89b55ec44357a09f3be98
import org.fedoraproject.candlepin.model.Consumer;
import org.fedoraproject.candlepin.model.ConsumerIdentityCertificate;
import org.fedoraproject.candlepin.model.ConsumerIdentityCertificateCurator;
Solution content 
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import org.apache.log4j.Logger;
import org.fedoraproject.candlepin.cert.BouncyCastlePKI;
import java.util.List;
import java.util.Random;

import org.apache.log4j.Logger;
import org.fedoraproject.candlepin.cert.util.BouncyCastlePKI;
import org.fedoraproject.candlepin.cert.util.X509ExtensionWrapper;
import org.fedoraproject.candlepin.model.Consumer;
import org.fedoraproject.candlepin.model.ConsumerIdentityCertificate;
import org.fedoraproject.candlepin.model.ConsumerIdentityCertificateCurator;
File
DefaultIdentityCertServiceAdapter.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    // Seeded with this(System.currentTimeMillis()
    private static Logger log = Logger
        .getLogger(DefaultIdentityCertServiceAdapter.class);
    private BouncyCastlePKI pki;
<<<<<<< HEAD
    private static Logger log = Logger.getLogger(DefaultIdentityCertServiceAdapter.class);
=======
    private ConsumerIdentityCertificateCurator consumerIdentityCertificateCurator;
    Random random = new Random();
>>>>>>> 495d8883a3e64b6741b89b55ec44357a09f3be98

    @Inject
    public DefaultIdentityCertServiceAdapter(BouncyCastlePKI pki,
Solution content 
    @Inject
    private static Logger log = Logger
        .getLogger(DefaultIdentityCertServiceAdapter.class);
    private BouncyCastlePKI pki;
    private static Logger log = Logger.getLogger(DefaultIdentityCertServiceAdapter.class);
    private ConsumerIdentityCertificateCurator consumerIdentityCertificateCurator;
    // Seeded with this(System.currentTimeMillis()
    Random random = new Random();
    public DefaultIdentityCertServiceAdapter(BouncyCastlePKI pki,
File
DefaultIdentityCertServiceAdapter.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
            Date startDate = new Date();
            Date endDate = getFutureDate(1);

<<<<<<< HEAD
            // TODO:  Come up with a scheme for generating these!
            //        Just an arbitrary static number atm
            BigInteger serialNumber = BigInteger.valueOf(36208234);
            X509Certificate x509cert = this.pki.createX509Certificate(consumer.getUuid(), 
                null, startDate, endDate, serialNumber);
=======
            ConsumerIdentityCertificate certificate = consumerIdentityCertificateCurator
                .find(consumer.getId());

            if (certificate != null)
                return certificate;
            final List extensions = null;//Collections                .emptyList();

            BigInteger serialNumber = BigInteger.valueOf(random.nextInt());
            while (consumerIdentityCertificateCurator
                .lookupBySerialNumber(serialNumber) != null) {
                serialNumber = BigInteger.valueOf(random.nextLong());
            }

            X509Certificate x509cert = this.pki.createX509Certificate(consumer
                .getUuid(), extensions, startDate, endDate, serialNumber);
>>>>>>> 495d8883a3e64b6741b89b55ec44357a09f3be98

            ConsumerIdentityCertificate identityCert = new ConsumerIdentityCertificate();
            identityCert.setPem(x509cert.getEncoded());
Solution content 
            Date startDate = new Date();
            Date endDate = getFutureDate(1);

            ConsumerIdentityCertificate certificate = consumerIdentityCertificateCurator
                .find(consumer.getId());

            if (certificate != null)
                return certificate;
            final List extensions = null;//Collections                .emptyList();

            BigInteger serialNumber = BigInteger.valueOf(random.nextInt());
            while (consumerIdentityCertificateCurator
                .lookupBySerialNumber(serialNumber) != null) {
                serialNumber = BigInteger.valueOf(random.nextLong());
            }

            X509Certificate x509cert = this.pki.createX509Certificate(consumer
                .getUuid(), extensions, startDate, endDate, serialNumber);

            ConsumerIdentityCertificate identityCert = new ConsumerIdentityCertificate();
            identityCert.setPem(x509cert.getEncoded());
File
DefaultIdentityCertServiceAdapter.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Variable
While statement
Chunk
Conflicting content 
                .create(identityCert);

            return identityCert;
<<<<<<< HEAD
        } catch (Exception e) {
            throw new RuntimeException(e);
=======
        }
        catch (Exception e) {
            String msg = e.getMessage();
            log.error(msg, e);
            return null;
>>>>>>> 495d8883a3e64b6741b89b55ec44357a09f3be98
        }
    }
Solution content 
                .create(identityCert);

            return identityCert;
        }catch (Exception e) {
            String msg = e.getMessage();
            log.error(msg, e);
            return null;
        }
    }
File
DefaultIdentityCertServiceAdapter.java
Developer's decision
Version 2
Kind of conflict
Catch clause
Method invocation
Return statement
Throw statement
Variable