Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.starrier</groupId>
<artifactId>commons</artifactId>
<version>0.0.1</version>
<version>0.0.2-SNAPSHOT</version>

<name>${project.groupId}:${project.artifactId}</name>
<description>common for Starrier</description>
Expand Down Expand Up @@ -39,7 +39,7 @@
<developers>
<developer>
<name>Starriers</name>
<email>starriers@starriers.org</email>
<email>starriers@starrier.org</email>
<organization>Starrier</organization>
<organizationUrl>https://github.com/Starrier</organizationUrl>
</developer>
Expand Down Expand Up @@ -160,7 +160,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.encoding>UTF-8</project.encoding>
<spring.boot.version>2.1.4.RELEASE</spring.boot.version>
<lombok.version>1.18.16</lombok.version>
<commons.lang3.version>3.8.1</commons.lang3.version>
<commons.codec.version>1.11</commons.codec.version>
<jjwt.version>0.9.1</jjwt.version>
Expand All @@ -186,11 +185,6 @@
<artifactId>annotations</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -330,12 +324,6 @@
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
<version>1.18.16</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
package org.starrier.common.constant;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

/**
* @author Starrier
* @date 2018/6/5.
*/
@Getter
@Setter
public class ResourceNameConstant {

public static final String BOOK = "book";
Expand All @@ -26,4 +20,15 @@ public class ResourceNameConstant {
private ResourceNameConstant() {
}

public static String getBOOK() {
return BOOK;
}

public static String getARTICLE() {
return ARTICLE;
}

public static String getCOMMENT() {
return COMMENT;
}
}
15 changes: 8 additions & 7 deletions src/main/java/org/starrier/common/page/PageConstant.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
package org.starrier.common.page;


import lombok.Getter;
import lombok.Setter;

/**
* @author Starrier
* @date 2018/6/5.
*/
@Getter
@Setter
public class PageConstant {

/**
Expand All @@ -25,9 +19,16 @@ public class PageConstant {
/**
* Prevent instantiation.
* <p>
* And if you need expose, {@link lombok.NoArgsConstructor} instead of if.
*/
private PageConstant() {
}

public static int getPAGE() {
return PAGE;
}

public static int getPerPage() {
return PER_PAGE;
}

}
50 changes: 39 additions & 11 deletions src/main/java/org/starrier/common/page/PaginatedResult.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
package org.starrier.common.page;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;

import java.io.Serializable;

/**
* @author Starrier
* @date 2019/1/9.
*/
@Accessors(chain = true)
@NoArgsConstructor
@Getter
@Setter
@ToString
public class PaginatedResult implements Serializable {

private static final long serialVersionUID = 6191745064790884707L;

private PaginatedResult(){}

/**
* Current page number
*/
Expand All @@ -35,4 +27,40 @@ public class PaginatedResult implements Serializable {
*/
private Object data;

public static long getSerialVersionUID() {
return serialVersionUID;
}

public int getCurrentPage() {
return currentPage;
}

public void setCurrentPage(int currentPage) {
this.currentPage = currentPage;
}

public int getTotalPage() {
return totalPage;
}

public void setTotalPage(int totalPage) {
this.totalPage = totalPage;
}

public Object getData() {
return data;
}

public void setData(Object data) {
this.data = data;
}

@Override
public String toString() {
return "PaginatedResult{" +
"currentPage=" + currentPage +
", totalPage=" + totalPage +
", data=" + data +
'}';
}
}
24 changes: 17 additions & 7 deletions src/main/java/org/starrier/common/page/ParameterInvalidItem.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package org.starrier.common.page;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.io.Serializable;

/**
Expand All @@ -12,13 +8,27 @@
* @author Starrier
* @date 2019/1/31.
*/
@Getter
@Setter
@NoArgsConstructor
public class ParameterInvalidItem implements Serializable {

private String fieldName;

private String message;

private ParameterInvalidItem(){}

public String getFieldName() {
return fieldName;
}

public void setFieldName(String fieldName) {
this.fieldName = fieldName;
}

public String getMessage() {
return message;
}

public void setMessage(String message) {
this.message = message;
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
package org.starrier.common.page;

import lombok.AllArgsConstructor;
import lombok.Setter;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.StringUtils;

/**
* @author Starrier
* @date 2018/6/5.
*/
@Setter
@Accessors(chain = true)
@AllArgsConstructor
public class ResourceNotFoundException extends RuntimeException {

private static final long serialVersionUID = -2565431806475335331L;
Expand All @@ -20,6 +14,11 @@ public class ResourceNotFoundException extends RuntimeException {

private final Long id;

public ResourceNotFoundException(String resourceName, Long id) {
this.resourceName = resourceName;
this.id = id;
}

@Override
public String getMessage() {
return StringUtils.capitalize(resourceName) + " with id " + id + " is not found.";
Expand Down
71 changes: 57 additions & 14 deletions src/main/java/org/starrier/common/result/Result.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package org.starrier.common.result;

import com.google.common.collect.Maps;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;

import java.io.Serializable;
import java.util.Map;
import java.util.Objects;

/**
* <p>Api Response Code Wrapper</p>
Expand All @@ -20,12 +14,6 @@
* @date 2018/11/11.
* @see Result is the enhanced and custom version of response.
*/
@Accessors(chain = true)
@Setter
@Getter
@ToString
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class Result implements Serializable {

private static final long serialVersionUID = -1709587390161841001L;
Expand All @@ -38,6 +26,8 @@ public class Result implements Serializable {

private Object data;

private Result(){
}
public Result(Integer errorCode, String errMessage) {
this.code = errorCode;
this.message = errMessage;
Expand All @@ -50,6 +40,13 @@ private Result(Builder builder) {
this.url = builder.url;
}

public Result(Integer code, String message, String url, Object data) {
this.code = code;
this.message = message;
this.url = url;
this.data = data;
}

public static Result success() {
Result result = new Result();
result.setResultCode(ResultCode.SUCCESS);
Expand Down Expand Up @@ -100,6 +97,26 @@ public static Builder builder() {
return new Builder();
}

public static long getSerialVersionUID() {
return serialVersionUID;
}

public String getMessage() {
return message;
}

private void setMessage(String message) {
this.message = message;
}

public String getUrl() {
return url;
}

public Object getData() {
return data;
}

public Integer getCode() {
return code;
}
Expand All @@ -119,7 +136,23 @@ public Map<String, Object> simple() {
return simple;
}

@ToString
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Result result = (Result) o;
return code.equals(result.code) &&
message.equals(result.message) &&
url.equals(result.url) &&
data.equals(result.data);
}

@Override
public int hashCode() {
return Objects.hash(code, message, url, data);
}


public static class Builder {
private Integer code;
private String message;
Expand Down Expand Up @@ -149,5 +182,15 @@ public Builder url(String url) {
public Result build() {
return new Result(this);
}

@Override
public String toString() {
return "Builder{" +
"code=" + code +
", message='" + message + '\'' +
", url='" + url + '\'' +
", data=" + data +
'}';
}
}
}
Loading