diff --git a/apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java b/apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java index caa7785cc417cceda1152c3c5768cab1ceaf067f..c697a30ff4b2b1f753961ba511aaf944daa81b7f 100644 --- a/apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java +++ b/apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java @@ -1,9 +1,11 @@ package com.ctrip.apollo.portal.controller; +import java.util.Date; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -19,14 +21,17 @@ public class AppController { private AppRepository appRepository; @RequestMapping("") - public Page list() { - Pageable pageable = new PageRequest(0, 10); + public Page list(@PageableDefault(size = 50) Pageable pageable) { return appRepository.findAll(pageable); } @RequestMapping(value = "", method = RequestMethod.POST) public App create() { App ramdomApp = new App(); + ramdomApp.setId(String.valueOf(System.currentTimeMillis())); + ramdomApp.setName("new app " + System.currentTimeMillis()); + ramdomApp.setOwner("owner " + System.currentTimeMillis()); + ramdomApp.setCreateTimestamp(new Date()); return appRepository.save(ramdomApp); } } diff --git a/apollo-portal/src/main/java/com/ctrip/apollo/portal/entities/App.java b/apollo-portal/src/main/java/com/ctrip/apollo/portal/entities/App.java index 85988e8611450e2c19218a994fbfe1c7822066c8..23db542263cf8a6ef3b782d545dcffb234bb17a2 100644 --- a/apollo-portal/src/main/java/com/ctrip/apollo/portal/entities/App.java +++ b/apollo-portal/src/main/java/com/ctrip/apollo/portal/entities/App.java @@ -7,10 +7,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import lombok.Data; - @Entity -@Data public class App implements Serializable { /** @@ -38,4 +35,60 @@ public class App implements Serializable { @Column private Date lastUpdatedTimestamp; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getOwner() { + return owner; + } + + public void setOwner(String owner) { + this.owner = owner; + } + + public String getOwnerPhone() { + return ownerPhone; + } + + public void setOwnerPhone(String ownerPhone) { + this.ownerPhone = ownerPhone; + } + + public String getOwnerMail() { + return ownerMail; + } + + public void setOwnerMail(String ownerMail) { + this.ownerMail = ownerMail; + } + + public Date getCreateTimestamp() { + return createTimestamp; + } + + public void setCreateTimestamp(Date createTimestamp) { + this.createTimestamp = createTimestamp; + } + + public Date getLastUpdatedTimestamp() { + return lastUpdatedTimestamp; + } + + public void setLastUpdatedTimestamp(Date lastUpdatedTimestamp) { + this.lastUpdatedTimestamp = lastUpdatedTimestamp; + } } diff --git a/pom.xml b/pom.xml index cdf5a6be116d9e8bd2637f1dee6298a3c3eee991..b7311abdca91fd43823ea7e864915220758cd8af 100644 --- a/pom.xml +++ b/pom.xml @@ -15,13 +15,6 @@ apollo-portal apollo-assembly - - - org.projectlombok - lombok - true - - @@ -47,11 +40,6 @@ mysql-connector-java 5.1.38 - - org.projectlombok - lombok - 1.16.8 - com.h2database