Minor java 8 refactors.

This commit is contained in:
Paulo Gustavo Veiga 2015-07-25 13:17:53 -03:00
parent 4acc9ec50f
commit 4acdc0b994
3 changed files with 12 additions and 25 deletions

View File

@ -63,10 +63,10 @@ public class FreemindExporter
export(map.getUnzipXml(), outputStream); export(map.getUnzipXml(), outputStream);
} }
public void export(byte[] xml, @NotNull OutputStream outputStream) throws ExportException { public void export(@NotNull byte[] xml, @NotNull OutputStream outputStream) throws ExportException {
objectFactory = new com.wisemapping.jaxb.freemind.ObjectFactory(); objectFactory = new com.wisemapping.jaxb.freemind.ObjectFactory();
nodesMap = new HashMap<String, Node>(); nodesMap = new HashMap<>();
final com.wisemapping.jaxb.wisemap.Map mindmapMap; final com.wisemapping.jaxb.wisemap.Map mindmapMap;
try { try {
@ -124,15 +124,7 @@ public class FreemindExporter
} }
JAXBUtils.saveMap(freemindMap, outputStream); JAXBUtils.saveMap(freemindMap, outputStream);
} catch (JAXBException e) { } catch (JAXBException | SAXException | IOException | ParserConfigurationException e) {
throw new ExportException(e);
} catch (UnsupportedEncodingException e) {
throw new ExportException(e);
} catch (SAXException e) {
throw new ExportException(e);
} catch (ParserConfigurationException e) {
throw new ExportException(e);
} catch (IOException e) {
throw new ExportException(e); throw new ExportException(e);
} }
} }

View File

@ -53,10 +53,8 @@ public final class Mailer {
public void sendEmail(final String from, final String to, final String subject, final Map model, public void sendEmail(final String from, final String to, final String subject, final Map model,
@NotNull final String templateMail) { @NotNull final String templateMail) {
final MimeMessagePreparator preparator =
new MimeMessagePreparator() { this.mailSender.send(mimeMessage -> {
public void prepare(MimeMessage mimeMessage)
throws Exception {
final MimeMessageHelper message = new MimeMessageHelper(mimeMessage); final MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
message.setTo(to); message.setTo(to);
message.setFrom(from); message.setFrom(from);
@ -64,10 +62,7 @@ public final class Mailer {
final String messageBody = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, "/mail/" + templateMail, model); final String messageBody = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, "/mail/" + templateMail, model);
message.setText(messageBody, true); message.setText(messageBody, true);
} });
};
this.mailSender.send(preparator);
} }
public void setMailSender(JavaMailSender mailer) { public void setMailSender(JavaMailSender mailer) {

View File

@ -215,7 +215,7 @@ public class MindmapIcons {
private static void load() { private static void load() {
try { try {
if (iconsByFamily == null) { if (iconsByFamily == null) {
iconsByFamily = new TreeMap<IconFamily, List<MindmapIcon>>(); iconsByFamily = new TreeMap<>();
Field[] fields = MindmapIcons.class.getDeclaredFields(); Field[] fields = MindmapIcons.class.getDeclaredFields();
for (Field field : fields) { for (Field field : fields) {