Skip to content

Commit

Permalink
#128: jdk11: various fixes (webtest, rest, ...)
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/services/core/webtest/pom.xml
#	src/services/core/webtest/src/main/resources/log4j.xml
#	src/services/core/webtest/src/main/webapp/WEB-INF/web.xml
#	src/services/modules/rest/test/pom.xml
  • Loading branch information
@etj
etj committed Mar 1, 2024
1 parent 92069ba commit fe5b075
Show file tree
Hide file tree
Showing 7 changed files with 306 additions and 241 deletions.
26 changes: 12 additions & 14 deletions ...ervices-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,36 +236,34 @@ public long count(RuleFilter filter) {
// =========================================================================
// Search stuff

private Search buildRuleSearch(Search searchCriteria, RuleFilter filter) {
private Search buildRuleSearch(Search search, RuleFilter filter) {


if(filter != null) {
addStringCriteria(searchCriteria, "username", filter.getUser());
addStringCriteria(searchCriteria, "rolename", filter.getRole());
addCriteria(searchCriteria, "instance", filter.getInstance());
addStringCriteria(search, "username", filter.getUser());
addStringCriteria(search, "rolename", filter.getRole());
addCriteria(search, search.addJoin("instance"), filter.getInstance());

addStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
addStringCriteria(search, "workspace", filter.getWorkspace());
}

return searchCriteria;
return search;
}



//=========================================================================

private Search buildFixedRuleSearch(RuleFilter filter) {
Search searchCriteria = ruleDAO.createSearch();
Search search = ruleDAO.createSearch();

if(filter != null) {
addFixedStringCriteria(searchCriteria, "username", filter.getUser());
addFixedStringCriteria(searchCriteria, "rolename", filter.getRole());
addFixedCriteria(searchCriteria, "instance", filter.getInstance());
addFixedStringCriteria(search, "username", filter.getUser());
addFixedStringCriteria(search, "rolename", filter.getRole());
addFixedCriteria(search, search.addJoin("instance"), filter.getInstance());

addFixedStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
addFixedStringCriteria(search, "workspace", filter.getWorkspace());
}

return searchCriteria;
return search;
}

// ==========================================================================
Expand Down
43 changes: 22 additions & 21 deletions ...ore/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ public void deleteRulesByRole(String rolename) throws NotFoundServiceEx {
@Override
public void deleteRulesByInstance(long instanceId) throws NotFoundServiceEx {
Search searchCriteria = ruleDAO.createSearch();
searchCriteria.addFilterEqual("instance.id", instanceId);
Search.JoinInfo instance = searchCriteria.addJoin("instance");
searchCriteria.addFilterEqual(instance, "id", instanceId);

List<Rule> list = ruleDAO.search(searchCriteria);
for (Rule rule : list) {
Expand Down Expand Up @@ -313,39 +314,39 @@ public long count(RuleFilter filter) {
// Search stuff

private Search buildRuleSearch(RuleFilter filter) {
Search searchCriteria = ruleDAO.createSearch();
Search search = ruleDAO.createSearch();

if(filter != null) {
addStringCriteria(searchCriteria, "username", filter.getUser());
addStringCriteria(searchCriteria, "rolename", filter.getRole());
addCriteria(searchCriteria, "instance", filter.getInstance());

addStringCriteria(searchCriteria, "service", filter.getService()); // see class' javadoc
addStringCriteria(searchCriteria, "request", filter.getRequest()); // see class' javadoc
addStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
addStringCriteria(searchCriteria, "layer", filter.getLayer());
addStringCriteria(search, "username", filter.getUser());
addStringCriteria(search, "rolename", filter.getRole());
addCriteria(search, search.addJoin("instance"), filter.getInstance());

addStringCriteria(search, "service", filter.getService()); // see class' javadoc
addStringCriteria(search, "request", filter.getRequest()); // see class' javadoc
addStringCriteria(search, "workspace", filter.getWorkspace());
addStringCriteria(search, "layer", filter.getLayer());
}

return searchCriteria;
return search;
}

//=========================================================================

private Search buildFixedRuleSearch(RuleFilter filter) {
Search searchCriteria = ruleDAO.createSearch();
Search search = ruleDAO.createSearch();

if(filter != null) {
addFixedStringCriteria(searchCriteria, "username", filter.getUser());
addFixedStringCriteria(searchCriteria, "rolename", filter.getRole());
addFixedCriteria(searchCriteria, "instance", filter.getInstance());

addFixedStringCriteria(searchCriteria, "service", filter.getService()); // see class' javadoc
addFixedStringCriteria(searchCriteria, "request", filter.getRequest()); // see class' javadoc
addFixedStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
addFixedStringCriteria(searchCriteria, "layer", filter.getLayer());
addFixedStringCriteria(search, "username", filter.getUser());
addFixedStringCriteria(search, "rolename", filter.getRole());
addFixedCriteria(search, search.addJoin("instance"), filter.getInstance());

addFixedStringCriteria(search, "service", filter.getService()); // see class' javadoc
addFixedStringCriteria(search, "request", filter.getRequest()); // see class' javadoc
addFixedStringCriteria(search, "workspace", filter.getWorkspace());
addFixedStringCriteria(search, "layer", filter.getLayer());
}

return searchCriteria;
return search;
}


Expand Down
35 changes: 15 additions & 20 deletions ...es/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,32 +98,32 @@ List<T> filterByAddress(RuleFilter filter, List<T> rules)
*
* We're dealing with IDs here, so <U>we'll suppose that the related object id field is called "id"</U>.
*/
public static void addCriteria(Search search, String fieldName, RuleFilter.IdNameFilter filter) {
public static void addCriteria(Search search, Search.JoinInfo join, RuleFilter.IdNameFilter filter) {
switch (filter.getType()) {
case ANY:
break; // no filtering

case DEFAULT:
search.addFilterNull(fieldName);
search.addFilterNull(join.getField());
break;

case IDVALUE:
if(filter.isIncludeDefault()) {
search.addFilterOr(
search.isNull(fieldName),
search.isEqual(fieldName + ".id", filter.getId()));
search.isNull(join.getField()),
search.isEqual(join, "id", filter.getId()));
} else {
search.addFilterEqual(fieldName + ".id", filter.getId());
search.addFilterEqual(join , "id", filter.getId());
}
break;

case NAMEVALUE:
if(filter.isIncludeDefault()) {
search.addFilterOr(
search.isNull(fieldName),
search.isEqual(fieldName + ".name", filter.getName()));
search.isNull(join.getField()),
search.isEqual(join, "name", filter.getName()));
} else {
search.addFilterEqual(fieldName + ".name", filter.getName());
search.addFilterEqual(join, "name", filter.getName());
}
break;

Expand Down Expand Up @@ -173,37 +173,34 @@ public static void addStringCriteria(Search search, String fieldName, RuleFilter
}





/**
* Add criteria for <B>searching</B>.
*
* We're dealing with IDs here, so <U>we'll suppose that the related object id field is called "id"</U>.
*/
public static void addFixedCriteria(Search search, String fieldName, RuleFilter.IdNameFilter filter) {
public static void addFixedCriteria(Search search, Search.JoinInfo join, RuleFilter.IdNameFilter filter) {
switch (filter.getType()) {
case ANY:
throw new BadRequestServiceEx(fieldName + " should be a fixed search and can't be ANY");
throw new BadRequestServiceEx(join.getField() + " should be a fixed search and can't be ANY");

case DEFAULT:
search.addFilterNull(fieldName);
search.addFilterNull(join.getField());
break;

case IDVALUE:
if(filter.isIncludeDefault()) {
throw new BadRequestServiceEx(fieldName + " should be a fixed search");
throw new BadRequestServiceEx(join.getField() + " should be a fixed search");
} else {
search.addFilterEqual(fieldName + ".id", filter.getId());
search.addFilterEqual(join, "id", filter.getId());
}
break;

case NAMEVALUE:
if(filter.isIncludeDefault()) {
throw new BadRequestServiceEx(fieldName + " should be a fixed search");
throw new BadRequestServiceEx(join.getField() + " should be a fixed search");

} else {
search.addFilterEqual(fieldName + ".name", filter.getName());
search.addFilterEqual(join, "name", filter.getName());
}
break;

Expand All @@ -213,8 +210,6 @@ public static void addFixedCriteria(Search search, String fieldName, RuleFilter.
}




public static void addFixedStringCriteria(Search search, String fieldName, RuleFilter.TextFilter filter) {
switch (filter.getType()) {
case ANY:
Expand Down
Loading

0 comments on commit fe5b075

Please sign in to comment.