From d089b471fc26697569d01320e7a70d13e6c9779c Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Wed, 5 Feb 2014 02:10:12 -0300 Subject: [PATCH] remove classes of relationship --- .../wisemapping/dao/LabelMindmapManager.java | 14 ------ .../dao/LabelMindmapManagerImpl.java | 30 ------------ .../rest/LabelMindmapController.java | 37 --------------- .../rest/model/RestLabelMindmap.java | 47 ------------------- .../service/LabelMindmapService.java | 15 ------ .../service/LabelMindmapServiceImpl.java | 25 ---------- .../wisemapping/model/LabelMindmap.hbm.xml | 15 ------ .../main/webapp/WEB-INF/wisemapping-dao.xml | 1 - .../main/webapp/WEB-INF/wisemapping-model.xml | 3 -- .../main/webapp/WEB-INF/wisemapping-rest.xml | 1 - .../webapp/WEB-INF/wisemapping-service.xml | 16 ------- 11 files changed, 204 deletions(-) delete mode 100644 wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManager.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManagerImpl.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/rest/LabelMindmapController.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabelMindmap.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapService.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapServiceImpl.java delete mode 100644 wise-webapp/src/main/resources/com/wisemapping/model/LabelMindmap.hbm.xml diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManager.java b/wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManager.java deleted file mode 100644 index 8c5e3542..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManager.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.wisemapping.dao; - -import com.wisemapping.model.LabelMindmap; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public interface LabelMindmapManager { - - @Nullable - LabelMindmap getLabelMindmap(final int labelId, final int mindmapId); - - void removeLabelMindmap(@NotNull LabelMindmap labelMindmap); - -} diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManagerImpl.java deleted file mode 100644 index 587d5e3b..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/dao/LabelMindmapManagerImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.wisemapping.dao; - -import com.wisemapping.model.LabelMindmap; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -import java.util.List; - - -public class LabelMindmapManagerImpl extends HibernateDaoSupport - implements LabelMindmapManager { - - @Nullable - @Override - public LabelMindmap getLabelMindmap(int labelId, int mindmapId) { - LabelMindmap result = null; - List list = getHibernateTemplate().find("from com.wisemapping.model.LabelMindmap wisemapping where mindmap_id=? and label_id=? ", new Object[]{mindmapId, labelId}); - assert list.size() <= 1; - if (list != null && !list.isEmpty()) { - result = list.get(0); - } - return result; - } - - @Override - public void removeLabelMindmap(@NotNull LabelMindmap labelMindmap) { - getHibernateTemplate().delete(labelMindmap); - } -} diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/LabelMindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/LabelMindmapController.java deleted file mode 100644 index b2af4a9c..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/rest/LabelMindmapController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.wisemapping.rest; - - -import com.wisemapping.exceptions.LabelCouldNotFoundException; -import com.wisemapping.exceptions.LabelMindmapRelationshipNotFoundException; -import com.wisemapping.exceptions.WiseMappingException; -import com.wisemapping.model.LabelMindmap; -import com.wisemapping.rest.model.RestLabelMindmap; -import com.wisemapping.service.LabelMindmapService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - - -@Controller -public class LabelMindmapController extends BaseController { - - @Qualifier("labelMindmapService") - @Autowired - private LabelMindmapService labelMindmapService; - - @RequestMapping(method = RequestMethod.DELETE, value = "/labels/maps") - @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void removeLabelFromMindmap(@RequestBody RestLabelMindmap restLabelMindmap) throws WiseMappingException { - final int labelId = restLabelMindmap.getLabelId(); - final int mindmapId = restLabelMindmap.getMindmapId(); - final LabelMindmap relationship = labelMindmapService.getLabelMindmap(labelId, mindmapId); - if (relationship == null) { - throw new LabelMindmapRelationshipNotFoundException("Label Map relation could not be found. Label Id: " + labelId + ", Map Id: " + mindmapId); - } - labelMindmapService.removeLabelFromMindmap(relationship); - } - - -} diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabelMindmap.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabelMindmap.java deleted file mode 100644 index 3cc7bd1a..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabelMindmap.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.wisemapping.rest.model; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.wisemapping.model.LabelMindmap; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.jetbrains.annotations.NotNull; - -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; -import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.PUBLIC_ONLY; - -@JsonAutoDetect( - fieldVisibility = NONE, - setterVisibility = PUBLIC_ONLY, - isGetterVisibility = NONE, - getterVisibility = PUBLIC_ONLY -) -@JsonIgnoreProperties(ignoreUnknown = true) -public class RestLabelMindmap { - - @JsonIgnore - private LabelMindmap labelMindmap; - - public RestLabelMindmap() { - this(new LabelMindmap()); - } - - public RestLabelMindmap(@NotNull final LabelMindmap labelMindmap) { - this.labelMindmap = labelMindmap; - } - - public void setLabelId(final int labelId) { - this.labelMindmap.setLabelId(labelId); - } - - public int getLabelId() { - return this.labelMindmap.getLabelId(); - } - - public void setMindmapId(final int mindmapId) { - labelMindmap.setMindmapId(mindmapId); - } - - public int getMindmapId() { - return this.labelMindmap.getMindmapId(); - } - -} diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapService.java b/wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapService.java deleted file mode 100644 index 49b4dd2b..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wisemapping.service; - -import com.wisemapping.exceptions.WiseMappingException; -import com.wisemapping.model.Label; -import com.wisemapping.model.LabelMindmap; -import com.wisemapping.model.Mindmap; -import org.jetbrains.annotations.NotNull; - - -public interface LabelMindmapService { - - void removeLabelFromMindmap(@NotNull final LabelMindmap labelMindmap) throws WiseMappingException; - - LabelMindmap getLabelMindmap(int labelId, int mindmapId); -} diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapServiceImpl.java deleted file mode 100644 index e2f74cf4..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/service/LabelMindmapServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.wisemapping.service; - -import com.wisemapping.dao.LabelMindmapManager; -import com.wisemapping.exceptions.WiseMappingException; -import com.wisemapping.model.LabelMindmap; -import org.jetbrains.annotations.NotNull; - -public class LabelMindmapServiceImpl implements LabelMindmapService { - - private LabelMindmapManager labelMindmapManager; - - public void setLabelMindmapManager(LabelMindmapManager labelMindmapManager) { - this.labelMindmapManager = labelMindmapManager; - } - - @Override - public void removeLabelFromMindmap(@NotNull LabelMindmap labelMindmap) throws WiseMappingException { - this.labelMindmapManager.removeLabelMindmap(labelMindmap); - } - - @Override - public LabelMindmap getLabelMindmap(int labelId, int mindmapId) { - return this.labelMindmapManager.getLabelMindmap(labelId, mindmapId); - } -} diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/LabelMindmap.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/LabelMindmap.hbm.xml deleted file mode 100644 index 3d4b8749..00000000 --- a/wise-webapp/src/main/resources/com/wisemapping/model/LabelMindmap.hbm.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml index 2a423638..4f613d66 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml @@ -34,7 +34,6 @@ com/wisemapping/model/AccessAuditory.hbm.xml com/wisemapping/model/MindMapHistory.hbm.xml com/wisemapping/model/Label.hbm.xml - com/wisemapping/model/LabelMindmap.hbm.xml diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml index 5ce330f0..a6ed6058 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml @@ -18,8 +18,5 @@ - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml index ddc5cbc4..3271da01 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml @@ -45,7 +45,6 @@ com.wisemapping.rest.model.RestLogItem com.wisemapping.rest.model.RestLockInfo com.wisemapping.rest.model.RestLabel - com.wisemapping.rest.model.RestLabelMindmap diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml index 408cee50..923939a0 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml @@ -72,22 +72,6 @@ - - - - - - - - - - - - PROPAGATION_REQUIRED - - - -