add plugin moved to service

rest-api/src/main/java/lcsb/mapviewer/api/plugins/PluginController.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.validator.routines.UrlValidator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +60,32 @@ public class PluginController extends BaseController {
       @RequestParam(value = "isPublic", defaultValue = "false") boolean isPublic,
       @RequestParam(value = "isDefault", required = false) Boolean isDefault,
       @RequestParam(value = "url", defaultValue = "") String url) throws QueryException {
-    return pluginRest.createPlugin(hash, name, version, url, isPublic, isDefault);
+    if (!new UrlValidator(UrlValidator.ALLOW_LOCAL_URLS).isValid(url)) {
+      throw new QueryException("Invalid url: " + url);
+    }
+    Plugin plugin = pluginService.getByHash(hash);
+    if (plugin != null) {
+      plugin.addUrl(url);
+      plugin.setPublic(plugin.isPublic() || isPublic);
+      if (isDefault != null) {
+        plugin.setDefault(isDefault);
+      }
+      pluginService.update(plugin);
+    } else {
+      plugin = new Plugin();
+      plugin.setHash(hash);
+      plugin.setName(name);
+      plugin.setVersion(version);
+      plugin.setPublic(isPublic);
+      if (isDefault != null) {
+        plugin.setDefault(isDefault);
+      }
+      if (!url.isEmpty()) {
+        plugin.addUrl(url);
+      }
+      pluginService.add(plugin);
+    }
+    return plugin;
   }
 
   @PreAuthorize("hasAuthority('IS_ADMIN')")

rest-api/src/main/java/lcsb/mapviewer/api/plugins/PluginRestImpl.java

@@ -39,36 +39,6 @@ public class PluginRestImpl extends BaseRestImpl {
     this.pluginDataEntryDao = pluginDataEntryDao;
   }
 
-  public Plugin createPlugin(String hash, String name, String version, String url, boolean isPublic,
-      Boolean isDefault) throws QueryException {
-    if (!new UrlValidator(UrlValidator.ALLOW_LOCAL_URLS).isValid(url)) {
-      throw new QueryException("Invalid url: " + url);
-    }
-    Plugin plugin = pluginDao.getByHash(hash);
-    if (plugin != null) {
-      plugin.addUrl(url);
-      plugin.setPublic(plugin.isPublic() || isPublic);
-      if (isDefault != null) {
-        plugin.setDefault(isDefault);
-      }
-      pluginDao.update(plugin);
-    } else {
-      plugin = new Plugin();
-      plugin.setHash(hash);
-      plugin.setName(name);
-      plugin.setVersion(version);
-      plugin.setPublic(isPublic);
-      if (isDefault != null) {
-        plugin.setDefault(isDefault);
-      }
-      if (!url.isEmpty()) {
-        plugin.addUrl(url);
-      }
-      pluginDao.add(plugin);
-    }
-    return plugin;
-  }
-
   public PluginDataEntry createPluginDataEntry(String hash, User user, String key, String value)
       throws QueryException {
     Plugin plugin = pluginDao.getByHash(hash);

service/src/main/java/lcsb/mapviewer/services/impl/PluginService.java

@@ -65,4 +65,14 @@ public class PluginService implements IPluginService {
   public void delete(PluginDataEntry entry) {
     pluginDataEntryDao.delete(entry);
   }
+
+  @Override
+  public void update(Plugin plugin) {
+    pluginDao.update(plugin);
+  }
+
+  @Override
+  public void add(Plugin plugin) {
+    pluginDao.add(plugin);
+  }
 }

service/src/main/java/lcsb/mapviewer/services/interfaces/IPluginService.java

@@ -18,4 +18,8 @@ public interface IPluginService {
 
   void delete(PluginDataEntry entry);
 
+  void update(Plugin plugin);
+
+  void add(Plugin plugin);
+
 }