Fix theme updation error

src/main/java/run/halo/app/controller/admin/api/ThemeController.java

@@ -178,38 +178,43 @@ public ThemeProperty fetchTheme(@RequestParam("uri") String uri) {
         return themeService.fetch(uri);
     }
 
-    @PostMapping("fetchingBranches")
+    @PostMapping(value = {"fetchingBranches", "/fetching/git/branches"})
     @ApiOperation("Fetches all branches")
+    @Deprecated
     public List<ThemeProperty> fetchBranches(@RequestParam("uri") String uri) {
         return themeService.fetchBranches(uri);
     }
 
     @PostMapping("fetchingReleases")
     @ApiOperation("Fetches all releases")
+    @Deprecated
     public List<ThemeProperty> fetchReleases(@RequestParam("uri") String uri) {
         return themeService.fetchReleases(uri);
     }
 
     @GetMapping("fetchingRelease")
     @ApiOperation("Fetches a specific release")
+    @Deprecated
     public ThemeProperty fetchRelease(@RequestParam("uri") String uri, @RequestParam("tag") String tagName) {
         return themeService.fetchRelease(uri, tagName);
     }
 
     @GetMapping("fetchBranch")
     @ApiOperation("Fetch specific branch")
+    @Deprecated
     public ThemeProperty fetchBranch(@RequestParam("uri") String uri, @RequestParam("branch") String branchName) {
         return themeService.fetchBranch(uri, branchName);
     }
 
     @GetMapping("fetchLatestRelease")
     @ApiOperation("Fetch latest release")
+    @Deprecated
     public ThemeProperty fetchLatestRelease(@RequestParam("uri") String uri) {
         return themeService.fetchLatestRelease(uri);
     }
 
     @PutMapping("fetching/{themeId}")
-    @ApiOperation("Upgrades theme by remote")
+    @ApiOperation("Upgrades theme from remote")
     public ThemeProperty updateThemeByFetching(@PathVariable("themeId") String themeId) {
         return themeService.update(themeId);
     }

src/main/java/run/halo/app/core/ControllerLogAop.java

@@ -32,11 +32,15 @@
 @Slf4j
 public class ControllerLogAop {
 
+    @Pointcut("@within(org.springframework.web.bind.annotation.RestController)")
+    public void restController() {
+    }
+
     @Pointcut("@within(org.springframework.stereotype.Controller)")
     public void controller() {
     }
 
-    @Around("controller()")
+    @Around("controller() || restController()")
     public Object controller(ProceedingJoinPoint joinPoint) throws Throwable {
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         final Method method = signature.getMethod();

src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java

@@ -9,6 +9,7 @@
  * Theme property.
  *
  * @author ryanwang
+ * @author johnniang
  * @date 2019-03-22
  */
 @Data
@@ -32,13 +33,18 @@ public class ThemeProperty {
     /**
      * Theme remote branch.(default is master)
      */
-    private String branch;
+    private String branch = "master";
 
     /**
      * Theme repo url.
      */
     private String repo;
 
+    /**
+     * Theme update strategy. Default is branch.
+     */
+    private UpdateStrategy updateStrategy = UpdateStrategy.BRANCH;
+
     /**
      * Theme description.
      */
@@ -116,8 +122,13 @@ public int hashCode() {
         return Objects.hash(id);
     }
 
+    /**
+     * Theme author info.
+     *
+     * @author johnniang
+     */
     @Data
-    private static class Author {
+    public static class Author {
 
         /**
          * Author name.
@@ -134,4 +145,22 @@ private static class Author {
          */
         private String avatar;
     }
+
+    /**
+     * Theme update strategy.
+     *
+     * @author johnniang
+     */
+    public enum UpdateStrategy {
+
+        /**
+         * Update from specific branch
+         */
+        BRANCH,
+
+        /**
+         * Update from latest release, only available if the repo is a github repo
+         */
+        RELEASE;
+    }
 }

src/main/java/run/halo/app/mail/AbstractMailService.java

@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Consumer;
 
 /**
  * Abstract mail service.
@@ -29,10 +30,15 @@
 public abstract class AbstractMailService implements MailService {
 
     private static final int DEFAULT_POOL_SIZE = 5;
+
     protected final OptionService optionService;
+
     private JavaMailSender cachedMailSender;
+
     private MailProperties cachedMailProperties;
+
     private String cachedFromName;
+
     @Nullable
     private ExecutorService executorService;
 
@@ -48,7 +54,7 @@ public ExecutorService getExecutorService() {
         return executorService;
     }
 
-    public void setExecutorService(ExecutorService executorService) {
+    public void setExecutorService(@Nullable ExecutorService executorService) {
         this.executorService = executorService;
     }
 
@@ -73,7 +79,7 @@ public void testConnection() {
      *
      * @param callback mime message callback.
      */
-    protected void sendMailTemplate(@Nullable Callback callback) {
+    protected void sendMailTemplate(@Nullable Consumer<MimeMessageHelper> callback) {
         if (callback == null) {
             log.info("Callback is null, skip to send email");
             return;
@@ -99,7 +105,7 @@ protected void sendMailTemplate(@Nullable Callback callback) {
             // set from-name
             messageHelper.setFrom(getFromAddress(mailSender));
             // handle message set separately
-            callback.handle(messageHelper);
+            callback.accept(messageHelper);
 
             // get mime message
             MimeMessage mimeMessage = messageHelper.getMimeMessage();
@@ -121,9 +127,9 @@ protected void sendMailTemplate(@Nullable Callback callback) {
      * @param callback   callback message handler
      * @param tryToAsync if the send procedure should try to asynchronous
      */
-    protected void sendMailTemplate(boolean tryToAsync, @Nullable Callback callback) {
+    protected void sendMailTemplate(boolean tryToAsync, @Nullable Consumer<MimeMessageHelper> callback) {
         ExecutorService executorService = getExecutorService();
-        if (tryToAsync && executorService != null) {
+        if (tryToAsync) {
             // send mail asynchronously
             executorService.execute(() -> sendMailTemplate(callback));
         } else {
@@ -222,16 +228,4 @@ protected void clearCache() {
         log.debug("Cleared all mail caches");
     }
 
-    /**
-     * Message callback.
-     */
-    protected interface Callback {
-        /**
-         * Handle message set.
-         *
-         * @param messageHelper mime message helper
-         * @throws Exception if something goes wrong
-         */
-        void handle(@NonNull MimeMessageHelper messageHelper) throws Exception;
-    }
 }

src/main/java/run/halo/app/mail/MailServiceImpl.java

@@ -1,14 +1,18 @@
 package run.halo.app.mail;
 
 import freemarker.template.Template;
+import freemarker.template.TemplateException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationListener;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
 import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 import run.halo.app.event.options.OptionUpdatedEvent;
 import run.halo.app.service.OptionService;
 
+import javax.mail.MessagingException;
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Map;
@@ -35,32 +39,46 @@ public MailServiceImpl(FreeMarkerConfigurer freeMarker,
     @Override
     public void sendTextMail(String to, String subject, String content) {
         sendMailTemplate(true, messageHelper -> {
-            messageHelper.setSubject(subject);
-            messageHelper.setTo(to);
-            messageHelper.setText(content);
+            try {
+                messageHelper.setSubject(subject);
+                messageHelper.setTo(to);
+                messageHelper.setText(content);
+            } catch (MessagingException e) {
+                throw new RuntimeException("Failed to set message subject, to or test!", e);
+            }
         });
     }
 
     @Override
     public void sendTemplateMail(String to, String subject, Map<String, Object> content, String templateName) {
         sendMailTemplate(true, messageHelper -> {
             // build message content with freemarker
-            Template template = freeMarker.getConfiguration().getTemplate(templateName);
-            String contentResult = FreeMarkerTemplateUtils.processTemplateIntoString(template, content);
+            try {
+                Template template = freeMarker.getConfiguration().getTemplate(templateName);
+                String contentResult = FreeMarkerTemplateUtils.processTemplateIntoString(template, content);
+                messageHelper.setSubject(subject);
+                messageHelper.setTo(to);
+                messageHelper.setText(contentResult, true);
+            } catch (IOException | TemplateException e) {
+                throw new RuntimeException("Failed to convert template to html!", e);
+            } catch (MessagingException e) {
+                throw new RuntimeException("Failed to set message subject, to or test", e);
+            }
 
-            messageHelper.setSubject(subject);
-            messageHelper.setTo(to);
-            messageHelper.setText(contentResult, true);
         });
     }
 
     @Override
     public void sendAttachMail(String to, String subject, Map<String, Object> content, String templateName, String attachFilePath) {
         sendMailTemplate(true, messageHelper -> {
-            messageHelper.setSubject(subject);
-            messageHelper.setTo(to);
-            Path attachmentPath = Paths.get(attachFilePath);
-            messageHelper.addAttachment(attachmentPath.getFileName().toString(), attachmentPath.toFile());
+            try {
+                messageHelper.setSubject(subject);
+                messageHelper.setTo(to);
+                Path attachmentPath = Paths.get(attachFilePath);
+                messageHelper.addAttachment(attachmentPath.getFileName().toString(), attachmentPath.toFile());
+            } catch (MessagingException e) {
+                throw new RuntimeException("Failed to set message subject, to or test", e);
+            }
         });
     }
 
@@ -69,9 +87,8 @@ public void testConnection() {
         super.testConnection();
     }
 
-
     @Override
-    public void onApplicationEvent(OptionUpdatedEvent event) {
+    public void onApplicationEvent(@NonNull OptionUpdatedEvent event) {
         // clear the cached java mail sender
         clearCache();
     }

src/main/java/run/halo/app/service/ThemeService.java

@@ -303,6 +303,7 @@ public interface ThemeService {
      * @throws IOException IOException
      */
     @NonNull
+    @Deprecated
     ThemeProperty add(@NonNull Path themeTmpPath) throws IOException;
 
     /**
@@ -321,6 +322,7 @@ public interface ThemeService {
      * @return theme property
      */
     @NonNull
+    @Deprecated
     ThemeProperty fetchLatestRelease(@NonNull String uri);
 
     /**
@@ -330,6 +332,7 @@ public interface ThemeService {
      * @return list of theme properties
      */
     @NonNull
+    @Deprecated
     List<ThemeProperty> fetchBranches(@NonNull String uri);
 
     /**
@@ -339,6 +342,7 @@ public interface ThemeService {
      * @return list of theme properties
      */
     @NonNull
+    @Deprecated
     List<ThemeProperty> fetchReleases(@NonNull String uri);
 
     /**
@@ -349,6 +353,7 @@ public interface ThemeService {
      * @return theme property
      */
     @NonNull
+    @Deprecated
     ThemeProperty fetchRelease(@NonNull String uri, @NonNull String tagName);
 
     /**
@@ -359,6 +364,7 @@ public interface ThemeService {
      * @return theme property
      */
     @NonNull
+    @Deprecated
     ThemeProperty fetchBranch(@NonNull String uri, @NonNull String branchName);
 
     /**