Assert.equals(..), AbstractObject 추가

master
mjkhan21 6 months ago
parent a24cde0327
commit cc21084d89

@ -1,7 +1,5 @@
package cokr.xit.foundation;
import java.util.function.Supplier;
import cokr.xit.foundation.data.Convert;
/** .
@ -12,111 +10,7 @@ import cokr.xit.foundation.data.Convert;
* .
* @author mjkhan
*/
public class AbstractComponent {
/**lv rv .
* @param lv
* @param rv
* @return
* <ul><li>lv rv true</li>
* <li> false</li>
* </ul>
*/
protected static final boolean equals(Object lv, Object rv) {
return lv == rv ? true : lv != null && lv.equals(rv);
}
/**{@link Assert#isEmpty(Object)}
*/
protected static final boolean isEmpty(Object obj) {
return Assert.isEmpty(obj);
}
/**{@link Assert#ifEmpty(Object, Supplier)} 참고*/
protected static final <T> T ifEmpty(T t, Supplier<T> nt) {
return Assert.ifEmpty(t, nt);
}
/**{@link Assert#ifEmpty(Object, Object)} .
*/
protected static final <T> T ifEmpty(T t, T nt) {
return Assert.ifEmpty(t, nt);
}
/**obj ("") . obj String .
* @param obj
* @return
* <ul><li>obj ("")</li>
* <li> String obj</li>
* </ul>
*/
protected static final String blankIfEmpty(Object obj) {
return ifEmpty((String)obj, "");
}
/**{@link Assert#notEmpty(Object, String)} .
*/
protected static final <T> T notEmpty(T t, String name) {
return Assert.notEmpty(t, name);
}
/**See {@link Convert#toString(Object)}.*/
protected static final String toString(Object obj) {
return Convert.toString(obj);
}
/**See {@link Convert#toShort(Object)}.*/
protected static final short toShort(Object obj) {
return Convert.toShort(obj);
}
/**See {@link Convert#toInt(Object)}.*/
protected static final int toInt(Object obj) {
return Convert.toInt(obj);
}
/**See {@link Convert#toLong(Object)}.*/
protected static final long toLong(Object obj) {
return Convert.toLong(obj);
}
/**See {@link Convert#toDouble(Object)}.*/
protected static final double toDouble(Object obj) {
return Convert.toDouble(obj);
}
/**See {@link Convert#toFloat(Object)}.*/
protected static final float toFloat(Object obj) {
return Convert.toFloat(obj);
}
/**See {@link Convert#toByte(Object)}.*/
protected static final byte toByte(Object obj) {
return Convert.toByte(obj);
}
/**See {@link Convert#toBoolean(Object)}.*/
protected static final boolean toBoolean(Object obj) {
return Convert.toBoolean(obj);
}
/**{@link Assert#rootCause(Throwable)}
*/
protected static final Throwable rootCause(Throwable t) {
return Assert.rootCause(t);
}
/**{@link ApplicationException#get(Throwable)}
*/
protected static final ApplicationException applicationException(Throwable t) {
return ApplicationException.get(t);
}
/**{@link Assert#runtimeException(Throwable)}
*/
protected static final RuntimeException runtimeException(Throwable t) {
return Assert.runtimeException(t);
}
public class AbstractComponent extends AbstractObject {
/**klass Log .
* @param klass Log
* @return Log
@ -131,13 +25,4 @@ public class AbstractComponent {
protected Log log() {
return log(getClass());
}
/** .
* @param <T> AbstractComponent
* @return
*/
@SuppressWarnings("unchecked")
protected <T extends AbstractComponent> T self() {
return (T)this;
}
}

@ -14,7 +14,7 @@ package cokr.xit.foundation;
* </ul>
* @author mjkhan
*/
public abstract class AbstractEntity {
public abstract class AbstractEntity extends AbstractObject {
private String createdBy;
private String createdAt;
private String modifiedBy;
@ -151,13 +151,4 @@ public abstract class AbstractEntity {
public void setUseYN(String useYN) {
this.useYN = useYN;
}
/** .
* @param <T> AbstractEntity
* @return
*/
@SuppressWarnings("unchecked")
protected <T extends AbstractEntity> T self() {
return (T)this;
}
}

@ -0,0 +1,122 @@
package cokr.xit.foundation;
import java.util.function.Supplier;
import cokr.xit.foundation.data.Convert;
/** .
* <p>AbstractObject
* <ul><li>{@link Assert}</li>
* <li>{@link Convert}</li>
* </ul>
* .
* @author mjkhan
*/
public class AbstractObject {
/**{@link Assert#equals(Object, Object)}
*/
protected static final boolean equals(Object lv, Object rv) {
return Assert.equals(lv, rv);
}
/**{@link Assert#isEmpty(Object)}
*/
protected static final boolean isEmpty(Object obj) {
return Assert.isEmpty(obj);
}
/**{@link Assert#ifEmpty(Object, Supplier)} 참고*/
protected static final <T> T ifEmpty(T t, Supplier<T> nt) {
return Assert.ifEmpty(t, nt);
}
/**{@link Assert#ifEmpty(Object, Object)} .
*/
protected static final <T> T ifEmpty(T t, T nt) {
return Assert.ifEmpty(t, nt);
}
/**obj ("") . obj String .
* @param obj
* @return
* <ul><li>obj ("")</li>
* <li> String obj</li>
* </ul>
*/
protected static final String blankIfEmpty(Object obj) {
return ifEmpty((String)obj, "");
}
/**{@link Assert#notEmpty(Object, String)} .
*/
protected static final <T> T notEmpty(T t, String name) {
return Assert.notEmpty(t, name);
}
/**See {@link Convert#toString(Object)}.*/
protected static final String toString(Object obj) {
return Convert.toString(obj);
}
/**See {@link Convert#toShort(Object)}.*/
protected static final short toShort(Object obj) {
return Convert.toShort(obj);
}
/**See {@link Convert#toInt(Object)}.*/
protected static final int toInt(Object obj) {
return Convert.toInt(obj);
}
/**See {@link Convert#toLong(Object)}.*/
protected static final long toLong(Object obj) {
return Convert.toLong(obj);
}
/**See {@link Convert#toDouble(Object)}.*/
protected static final double toDouble(Object obj) {
return Convert.toDouble(obj);
}
/**See {@link Convert#toFloat(Object)}.*/
protected static final float toFloat(Object obj) {
return Convert.toFloat(obj);
}
/**See {@link Convert#toByte(Object)}.*/
protected static final byte toByte(Object obj) {
return Convert.toByte(obj);
}
/**See {@link Convert#toBoolean(Object)}.*/
protected static final boolean toBoolean(Object obj) {
return Convert.toBoolean(obj);
}
/**{@link Assert#rootCause(Throwable)}
*/
protected static final Throwable rootCause(Throwable t) {
return Assert.rootCause(t);
}
/**{@link ApplicationException#get(Throwable)}
*/
protected static final ApplicationException applicationException(Throwable t) {
return ApplicationException.get(t);
}
/**{@link Assert#runtimeException(Throwable)}
*/
protected static final RuntimeException runtimeException(Throwable t) {
return Assert.runtimeException(t);
}
/** .
* @param <T> AbstractComponent
* @return
*/
@SuppressWarnings("unchecked")
protected <T extends AbstractObject> T self() {
return (T)this;
}
}

@ -9,6 +9,18 @@ import java.util.function.Supplier;
public class Assert {
private Assert() {}
/**lv rv .
* @param lv
* @param rv
* @return
* <ul><li>lv rv true</li>
* <li> false</li>
* </ul>
*/
public static final boolean equals(Object lv, Object rv) {
return lv == rv || lv != null && lv.equals(rv);
}
/**obj null, , collection, .
* @param obj
* @return
@ -112,6 +124,11 @@ public class Assert {
* </p>
*/
public static interface Support {
/** {@link Assert#equals(Object, Object)} 참고 */
default boolean equals(Object lv, Object rv) {
return Assert.equals(lv, rv);
}
/** {@link Assert#isEmpty(Object)} 참고 */
default boolean isEmpty(Object obj) {
return Assert.isEmpty(obj);

@ -85,7 +85,7 @@ public abstract class AbstractServiceBean extends EgovAbstractServiceImpl {
* </ul>
*/
protected static final boolean equals(Object lv, Object rv) {
return lv == rv ? true : lv != null && lv.equals(rv);
return Assert.equals(lv, rv);
}
/**{@link Assert#isEmpty(Object)}

@ -9,152 +9,4 @@ package cokr.xit.foundation.component;
*/
public class QueryRequest extends ServiceRequest {
private static final long serialVersionUID = 1L;
private String by;
private String term;
private String orderBy;
private int pageNum;
private int fetchSize;
private boolean
fetchAll,
includeAll;
private String download;
/** .
* @return
*/
public String getBy() {
return ifEmpty(by, () -> null);
}
/** .
* @param by
* @return QueryRequest
*/
public <T extends QueryRequest> T setBy(String by) {
this.by = by;
return self();
}
/** .
* @return
*/
public String getTerm() {
return ifEmpty(term, () -> null);
}
/** .
* @param term
* @return QueryRequest
*/
public <T extends QueryRequest> T setTerm(String term) {
this.term = term;
return self();
}
/** .
* @return
*/
public String getOrderBy() {
return orderBy;
}
/** .
* @param orderBy
* @return QueryRequest
*/
public <T extends QueryRequest> T setOrderBy(String orderBy) {
this.orderBy = orderBy;
return self();
}
/** .
* @return dataStart
*/
public int getPageNum() {
return Math.max(pageNum, 1);
// return isEmpty(download) ? pageNum : 0;
}
/** .
* @param pageNum
* @return QueryRequest
*/
public <T extends QueryRequest> T setPageNum(int pageNum) {
this.pageNum = pageNum;
return self();
}
/** .
* @return fetchSize
*/
public int getFetchSize() {
return fetchSize;
}
/** .
* @param fetchSize
* @return QueryRequest
*/
public <T extends QueryRequest> T setFetchSize(int fetchSize) {
this.fetchSize = fetchSize;
return self();
}
/** .
* @return fetchAll
* <ul><li> true</li>
* <li> false</li>
* </ul>
*/
public boolean fetchAll() {
return fetchAll;
}
/** .
* @param fetchAll
* <ul><li> true</li>
* <li> false</li>
* </ul>
*/
public <T extends QueryRequest> T setFetchAll(boolean fetchAll) {
this.fetchAll = fetchAll;
return self();
}
/** .
* @return includeAll
*/
public boolean isIncludeAll() {
return includeAll;
}
/** .
* @param includeAll
*/
public <T extends QueryRequest> T setIncludeAll(boolean includeAll) {
this.includeAll = includeAll;
return self();
}
/** .
* @return download
* <ul><li> - "xls"</li>
* <li> </li>
* </ul>
*/
public String getDownload() {
return download;
}
/** .
* @param download
* <ul><li> - "xls"</li>
* <li> </li>
* </ul>
* @return QueryRequest
*/
public <T extends QueryRequest> T setDownload(String download) {
this.download = download;
return self();
}
}

@ -12,7 +12,17 @@ import cokr.xit.foundation.AbstractComponent;
public abstract class ServiceRequest extends AbstractComponent implements Serializable {
private static final long serialVersionUID = 1L;
private String type;
private String
type,
by,
term,
orderBy;
private int pageNum;
private int fetchSize;
private boolean
fetchAll,
includeAll;
private String download;
/** . .
* @return
@ -30,6 +40,145 @@ public abstract class ServiceRequest extends AbstractComponent implements Serial
return self();
}
/** .
* @return
*/
public String getBy() {
return ifEmpty(by, () -> null);
}
/** .
* @param by
* @return
*/
public <T extends ServiceRequest> T setBy(String by) {
this.by = by;
return self();
}
/** .
* @return
*/
public String getTerm() {
return ifEmpty(term, () -> null);
}
/** .
* @param term
* @return
*/
public <T extends ServiceRequest> T setTerm(String term) {
this.term = term;
return self();
}
/** .
* @return
*/
public String getOrderBy() {
return orderBy;
}
/** .
* @param orderBy
* @return
*/
public <T extends ServiceRequest> T setOrderBy(String orderBy) {
this.orderBy = orderBy;
return self();
}
/** .
* @return dataStart
*/
public int getPageNum() {
return Math.max(pageNum, 1);
// return isEmpty(download) ? pageNum : 0;
}
/** .
* @param pageNum
* @return
*/
public <T extends ServiceRequest> T setPageNum(int pageNum) {
this.pageNum = pageNum;
return self();
}
/** .
* @return fetchSize
*/
public int getFetchSize() {
return fetchSize;
}
/** .
* @param fetchSize
* @return
*/
public <T extends ServiceRequest> T setFetchSize(int fetchSize) {
this.fetchSize = fetchSize;
return self();
}
/** .
* @return fetchAll
* <ul><li> true</li>
* <li> false</li>
* </ul>
*/
public boolean fetchAll() {
return fetchAll;
}
/** .
* @param fetchAll
* <ul><li> true</li>
* <li> false</li>
* </ul>
*/
public <T extends ServiceRequest> T setFetchAll(boolean fetchAll) {
this.fetchAll = fetchAll;
return self();
}
/** .
* @return includeAll
*/
public boolean isIncludeAll() {
return includeAll;
}
/** .
* @param includeAll
*/
public <T extends ServiceRequest> T setIncludeAll(boolean includeAll) {
this.includeAll = includeAll;
return self();
}
/** .
* @return download
* <ul><li> - "xls"</li>
* <li> </li>
* </ul>
*/
public String getDownload() {
return download;
}
/** .
* @param download
* <ul><li> - "xls"</li>
* <li> </li>
* </ul>
* @return
*/
public <T extends ServiceRequest> T setDownload(String download) {
this.download = download;
return self();
}
/** .<br />
* RuntimeException .
*/

@ -1,7 +1,5 @@
package cokr.xit.foundation.component;
import java.io.Serializable;
import cokr.xit.foundation.AbstractComponent;
import cokr.xit.foundation.data.DataObject;
@ -10,9 +8,7 @@ import cokr.xit.foundation.data.DataObject;
* .
* @author mjkhan
*/
public class ServiceResponse extends AbstractComponent implements Serializable {
private static final long serialVersionUID = 1L;
public class ServiceResponse extends AbstractComponent {
private int affected;
private String
code,

@ -33,30 +33,24 @@ public class DataObject extends StringMap<Object> {
caseSensitiveKey(false);
}
/**lv rv .
* @param lv
* @param rv
* @return
* <ul><li>lv rv true</li>
* <li> false</li>
* </ul>
/**{@link Assert#equals(Object, Object)} .
*/
protected static boolean equals(Object lv, Object rv) {
return lv == rv ? true : lv != null && lv.equals(rv);
return Assert.equals(lv, rv);
}
/**{@link Assert#isEmpty(Object) Assert.isEmpty(...)} .
/**{@link Assert#isEmpty(Object)} .
*/
protected static boolean isEmpty(Object obj) {
return Assert.isEmpty(obj);
}
/**{@link Assert#ifEmpty(Object, Supplier) Assert.ifEmpty(...)} 참고*/
/**{@link Assert#ifEmpty(Object, Supplier)} 참고*/
protected static <T> T ifEmpty(T t, Supplier<T> nt) {
return Assert.ifEmpty(t, nt);
}
/**{@link Assert#notEmpty(Object, String) Assert.notEmpty(...)} .
/**{@link Assert#notEmpty(Object, String)} .
*/
protected static <T> T notEmpty(T t, String name) {
return Assert.notEmpty(t, name);

Loading…
Cancel
Save