Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Approval Batch, prep better JUnit
[aaf/authz.git]
/
auth
/
auth-core
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
auth
/
layer
/
Result.java
diff --git
a/auth/auth-core/src/main/java/org/onap/aaf/auth/layer/Result.java
b/auth/auth-core/src/main/java/org/onap/aaf/auth/layer/Result.java
index
3e68e3a
..
9d7347a
100644
(file)
--- a/
auth/auth-core/src/main/java/org/onap/aaf/auth/layer/Result.java
+++ b/
auth/auth-core/src/main/java/org/onap/aaf/auth/layer/Result.java
@@
-34,7
+34,7
@@
import java.util.Set;
*/
public class Result<RV> {
private static final String SUCCESS = "Success";
*/
public class Result<RV> {
private static final String SUCCESS = "Success";
- public static final
String[] EMPTY_VARS = new String
[0];
+ public static final
Object[] EMPTY_VARS = new Object
[0];
public final static int OK=0,
ERR_Security = 1,
public final static int OK=0,
ERR_Security = 1,
@@
-51,9
+51,9
@@
public class Result<RV> {
public RV value;
public final int status;
public final String details;
public RV value;
public final int status;
public final String details;
- public final
String
[] variables;
+ public final
Object
[] variables;
- public Result(RV value, int status, String details,
String[]
variables) {
+ public Result(RV value, int status, String details,
Object ...
variables) {
this.value = value;
if (value==null) {
specialCondition|=EMPTY_LIST;
this.value = value;
if (value==null) {
specialCondition|=EMPTY_LIST;
@@
-77,7
+77,7
@@
public class Result<RV> {
* @return
*/
public static<R> Result<R> ok(R value) {
* @return
*/
public static<R> Result<R> ok(R value) {
- return new Result<R>(value,OK,SUCCESS,
null
);
+ return new Result<R>(value,OK,SUCCESS,
EMPTY_VARS
);
}
/**
}
/**
@@
-86,7
+86,7
@@
public class Result<RV> {
* @return
*/
public static<R> Result<R[]> ok(R value[]) {
* @return
*/
public static<R> Result<R[]> ok(R value[]) {
- return new Result<R[]>(value,OK,SUCCESS,
null
).emptyList(value.length==0);
+ return new Result<R[]>(value,OK,SUCCESS,
EMPTY_VARS
).emptyList(value.length==0);
}
/**
}
/**
@@
-95,7
+95,7
@@
public class Result<RV> {
* @return
*/
public static<R> Result<Set<R>> ok(Set<R> value) {
* @return
*/
public static<R> Result<Set<R>> ok(Set<R> value) {
- return new Result<Set<R>>(value,OK,SUCCESS,
null
).emptyList(value.size()==0);
+ return new Result<Set<R>>(value,OK,SUCCESS,
EMPTY_VARS
).emptyList(value.size()==0);
}
/**
}
/**
@@
-104,7
+104,7
@@
public class Result<RV> {
* @return
*/
public static<R> Result<List<R>> ok(List<R> value) {
* @return
*/
public static<R> Result<List<R>> ok(List<R> value) {
- return new Result<List<R>>(value,OK,SUCCESS,
null
).emptyList(value.size()==0);
+ return new Result<List<R>>(value,OK,SUCCESS,
EMPTY_VARS
).emptyList(value.size()==0);
}
/**
}
/**
@@
-113,7
+113,7
@@
public class Result<RV> {
* @return
*/
public static<R> Result<Collection<R>> ok(Collection<R> value) {
* @return
*/
public static<R> Result<Collection<R>> ok(Collection<R> value) {
- return new Result<Collection<R>>(value,OK,SUCCESS,
null
).emptyList(value.size()==0);
+ return new Result<Collection<R>>(value,OK,SUCCESS,
EMPTY_VARS
).emptyList(value.size()==0);
}
}
@@
-122,7
+122,7
@@
public class Result<RV> {
* @return
*/
public static Result<Void> ok() {
* @return
*/
public static Result<Void> ok() {
- return new Result<Void>(null,OK,SUCCESS,
null
);
+ return new Result<Void>(null,OK,SUCCESS,
EMPTY_VARS
);
}
/**
}
/**
@@
-143,7
+143,7
@@
public class Result<RV> {
* @param variables
* @return
*/
* @param variables
* @return
*/
- public static<R> Result<R> err(int status, String details,
String
... variables) {
+ public static<R> Result<R> err(int status, String details,
Object
... variables) {
return new Result<R>(null,status,details,variables);
}
return new Result<R>(null,status,details,variables);
}
@@
-172,7
+172,7
@@
public class Result<RV> {
* @param details
* @return
*/
* @param details
* @return
*/
- public static<R> Result<R> create(R value, int status, String details,
String
... vars) {
+ public static<R> Result<R> create(R value, int status, String details,
Object
... vars) {
return new Result<R>(value,status,details,vars);
}
return new Result<R>(value,status,details,vars);
}
@@
-275,8
+275,6
@@
public class Result<RV> {
* @return
*/
public boolean isOKhasData() {
* @return
*/
public boolean isOKhasData() {
- System.out.println("specialCondition:"+specialCondition);
- System.out.println("specialCondition:"+(specialCondition & EMPTY_LIST));
return status == OK && (specialCondition & EMPTY_LIST) != EMPTY_LIST;
}
return status == OK && (specialCondition & EMPTY_LIST) != EMPTY_LIST;
}
@@
-324,7
+322,7
@@
public class Result<RV> {
default: sb.append("Error");
}
sb.append(" - ");
default: sb.append("Error");
}
sb.append(" - ");
- sb.append(String.format(details,
(Object[])
variables));
+ sb.append(String.format(details, variables));
return sb.toString();
}
}
return sb.toString();
}
}