garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

annotations not needed anymore

Browse Source
This commit is contained in:
Athou
2013-08-12 13:42:18 +02:00
parent 5b5d5cca1c
commit 5ef8fd18ca
13 changed files with 2 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -15,7 +15,6 @@ import javax.persistence.criteria.Root;
import javax.persistence.criteria.SetJoin;
import javax.persistence.criteria.Subquery;
import javax.persistence.metamodel.SingularAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.StringUtils;
@@ -114,7 +113,6 @@ public class FeedDAO extends GenericDAO<Feed> {
}
@XmlRootElement
public static enum DuplicateMode {
NORMALIZED_URL(Feed_.normalizedUrlHash), LAST_CONTENT(Feed_.lastContentHash), PUSH_TOPIC(Feed_.pushTopicHash);
private SingularAttribute<Feed, String> path;

5
src/main/java/com/commafeed/backend/model/ApplicationSettings.java
View File

@@ -3,9 +3,6 @@ package com.commafeed.backend.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Getter;
import lombok.Setter;
@@ -15,8 +12,6 @@ import org.apache.log4j.Level;
@Entity
@Table(name = "APPLICATIONSETTINGS")
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
public class ApplicationSettings extends AbstractModel {

4
src/main/java/com/commafeed/backend/model/UserSettings.java
View File

@@ -10,7 +10,6 @@ import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Getter;
import lombok.Setter;
@@ -27,17 +26,14 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
@Setter
public class UserSettings extends AbstractModel {
@XmlRootElement
public enum ReadingMode {
all, unread
}
@XmlRootElement
public enum ReadingOrder {
asc, desc
}
@XmlRootElement
public enum ViewMode {
title, expanded
}

6
src/main/java/com/commafeed/frontend/model/Category.java
View File

@@ -3,10 +3,6 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.google.common.collect.Lists;
@@ -14,8 +10,6 @@ import com.wordnik.swagger.annotations.ApiClass;
import com.wordnik.swagger.annotations.ApiProperty;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("Entry details")
@Data
public class Category implements Serializable {

6
src/main/java/com/commafeed/frontend/model/Entries.java
View File

@@ -3,10 +3,6 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.google.common.collect.Lists;
@@ -14,8 +10,6 @@ import com.wordnik.swagger.annotations.ApiClass;
import com.wordnik.swagger.annotations.ApiProperty;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("List of entries with some metadata")
@Data
public class Entries implements Serializable {

6
src/main/java/com/commafeed/frontend/model/Entry.java
View File

@@ -4,10 +4,6 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.Date;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.commafeed.backend.feeds.FeedUtils;
@@ -22,8 +18,6 @@ import com.wordnik.swagger.annotations.ApiClass;
import com.wordnik.swagger.annotations.ApiProperty;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("Entry details")
@Data
public class Entry implements Serializable {

8
src/main/java/com/commafeed/frontend/model/FeedCount.java
View File

@@ -3,17 +3,13 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.commafeed.backend.model.Feed;
import com.google.common.collect.Lists;
import com.wordnik.swagger.annotations.ApiClass;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("Feed count")
@Data
public class FeedCount implements Serializable {

6
src/main/java/com/commafeed/frontend/model/FeedInfo.java
View File

@@ -2,17 +2,11 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.wordnik.swagger.annotations.ApiClass;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("Feed details")
@Data
public class FeedInfo implements Serializable {

6
src/main/java/com/commafeed/frontend/model/ServerInfo.java
View File

@@ -3,18 +3,12 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.google.common.collect.Maps;
import com.wordnik.swagger.annotations.ApiClass;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("Server infos")
@Data
public class ServerInfo implements Serializable {

6
src/main/java/com/commafeed/frontend/model/Settings.java
View File

@@ -2,18 +2,12 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.wordnik.swagger.annotations.ApiClass;
import com.wordnik.swagger.annotations.ApiProperty;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("User settings")
@Data
public class Settings implements Serializable {

6
src/main/java/com/commafeed/frontend/model/Subscription.java
View File

@@ -3,10 +3,6 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.Date;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.commafeed.backend.feeds.FeedUtils;
@@ -17,8 +13,6 @@ import com.wordnik.swagger.annotations.ApiClass;
import com.wordnik.swagger.annotations.ApiProperty;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("User information")
@Data
public class Subscription implements Serializable {

6
src/main/java/com/commafeed/frontend/model/UnreadCount.java
View File

@@ -3,17 +3,11 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.Date;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.wordnik.swagger.annotations.ApiClass;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("Unread count")
@Data
public class UnreadCount implements Serializable {

6
src/main/java/com/commafeed/frontend/model/UserModel.java
View File

@@ -3,18 +3,12 @@ package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.Date;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import lombok.Data;
import com.wordnik.swagger.annotations.ApiClass;
import com.wordnik.swagger.annotations.ApiProperty;
@SuppressWarnings("serial")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ApiClass("User information")
@Data
public class UserModel implements Serializable {