Projects >> email-preview >>81199b57a7dcae5e8ca6e41b6ec49ec6d3b368fa

Chunk
Conflicting content 
        }
	/**
	 * {@inheritDoc}
	 */
<<<<<<< HEAD
	public String encrypt(final String plaintext) {
      try {
	        return this.encryptor.encrypt(plaintext);
      } catch (EncryptionInitializationException e) {
          throw new EmailPreviewException("Encryption error. Verify an encryption password"
                  + " is configured in the email preview portlet's"
                  + " stringEncryptionService bean in applicationContent.xml", e);
      }
=======
	public String encrypt(String plaintext) {
        try {
		        return this.encryptor.encrypt(plaintext);
        } catch (EncryptionInitializationException e) {
            throw new StringEncryptionException("Encryption error. Verify an encryption password"
                    + " is configured in the email preview portlet's"
                    + " stringEncryptionService bean in applicationContent.xml", e);
>>>>>>> bfeddce4e1627288deddaeb6065d5e6c5125b8ac
	}
	
	/**
Solution content 
	/**
	 * {@inheritDoc}
	 */
	public String encrypt(final String plaintext) {
        try {
            return this.encryptor.encrypt(plaintext);
        } catch (EncryptionInitializationException e) {
            throw new StringEncryptionException("Encryption error. Verify an encryption password"
                    + " is configured in the email preview portlet's"
                    + " stringEncryptionService bean in applicationContent.xml", e);
        }
	}
	
	/**
File
JasyptPBEStringEncryptionServiceImpl.java
Developer's decision
Combination
Kind of conflict
Method signature
Try statement
Chunk
Conflicting content 
	/**
	 * {@inheritDoc}
	 */
<<<<<<< HEAD
	public String decrypt(final String cryptotet) {
      try {
	        return this.encryptor.decrypt(cryptotet);
      } catch (EncryptionInitializationException e) {
          throw new EmailPreviewException("Decryption error. Was encryption password"
                  + " changed in the email preview portlet's"
                  + " stringEncryptionService bean in applicationContent.xml?", e);
      }
    }

    @Override
    public void afterPropertiesSet() throws Exception {
        final String enc = this.encrypt(this.getClass().getName());
        Assert.notNull(enc, "String encryption service is not properly configured.");
        
        final String dec = this.decrypt(enc);
        Assert.notNull(dec, "String decryption service is not properly configured.");
        Assert.isTrue(dec.equals(this.getClass().getName()), "String decryption failed to decode the encrypted text " + enc);
=======
	public String decrypt(String cryptotet) {
        try {
		    return this.encryptor.decrypt(cryptotet);
        } catch (EncryptionInitializationException e) {
            throw new StringEncryptionException("Decryption error. Was encryption password"
                    + " changed in the email preview portlet's"
                    + " stringEncryptionService bean in applicationContent.xml?", e);
        }
>>>>>>> bfeddce4e1627288deddaeb6065d5e6c5125b8ac
    }
}
Solution content 
	/**
	 * {@inheritDoc}
	 */
	public String decrypt(final String cryptotet) {
      try {
	        return this.encryptor.decrypt(cryptotet);
      } catch (EncryptionInitializationException e) {
          throw new StringEncryptionException("Decryption error. Was encryption password"
                  + " changed in the email preview portlet's"
                  + " stringEncryptionService bean in applicationContent.xml?", e);
      }
    }

    @Override
    public void afterPropertiesSet() throws Exception {
        final String enc = this.encrypt(this.getClass().getName());
        Assert.notNull(enc, "String encryption service is not properly configured.");
        
        final String dec = this.decrypt(enc);
        Assert.notNull(dec, "String decryption service is not properly configured.");
        Assert.isTrue(dec.equals(this.getClass().getName()), "String decryption failed to decode the encrypted text " + enc);
    }

}
File
JasyptPBEStringEncryptionServiceImpl.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Try statement
Variable