Skip to content
Snippets Groups Projects
Commit 0d2e41e2 authored by buczekp's avatar buczekp
Browse files

[LMS-1163] fixed filter validator 

SVN: 12727
parent 0107ae95
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 24 deletions
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/validator/FilterValidator.java
+ 3
− 6
View file @ 0d2e41e2
......@@ -33,7 +33,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.RoleCode;
*/
public final class FilterValidator extends AbstractValidator<Filter>
{
// TODO 2009-09-09, IA: add tests
//
// IValidator
//
......@@ -48,11 +47,10 @@ public final class FilterValidator extends AbstractValidator<Filter>
private boolean isRegistrator(final PersonPE person, final Filter value)
{
// Comparison between PersonPE and Person will always return false!!!
// return person.equals(value.getRegistrator());
// FIXME 2009-09-22, Piotr Buczek: Person has no database instance code to compare with PersonPE
Person registrator = value.getRegistrator();
return person.getUserId().equals(registrator.getUserId());
return person.getUserId().equals(registrator.getUserId())
&& person.getDatabaseInstance().getCode().equals(
registrator.getDatabaseInstance().getCode());
}
public boolean isInstanceAdmin(final PersonPE person, final DatabaseInstance databaseInstance)
......@@ -60,7 +58,6 @@ public final class FilterValidator extends AbstractValidator<Filter>
final Set<RoleAssignmentPE> roleAssignments = person.getAllPersonRoles();
for (final RoleAssignmentPE roleAssignment : roleAssignments)
{
// TODO why do we use UUID instead of CODE if both are unique?
final DatabaseInstancePE roleInstance = roleAssignment.getDatabaseInstance();
if (roleInstance != null && roleInstance.getUuid().equals(databaseInstance.getUuid())
&& roleAssignment.getRole().equals(RoleCode.ADMIN))
......
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
+ 44
− 1
View file @ 0d2e41e2
......@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
/**
* The <i>GWT</i> equivalent to {@link PersonPE}.
*
* @author Franz-Josef Elmer
* @author Franz-Josef Elmer
*/
public class Person extends AbstractRegistrationHolder implements Comparable<Person>
{
......@@ -35,6 +35,8 @@ public class Person extends AbstractRegistrationHolder implements Comparable<Per
private String userId;
private DatabaseInstance databaseInstance;
public final String getFirstName()
{
return firstName;
......@@ -75,6 +77,43 @@ public class Person extends AbstractRegistrationHolder implements Comparable<Per
this.userId = code;
}
public DatabaseInstance getDatabaseInstance()
{
return databaseInstance;
}
public void setDatabaseInstance(DatabaseInstance databaseInstance)
{
this.databaseInstance = databaseInstance;
}
//
// Object
//
@Override
public boolean equals(Object obj)
{
assert getDatabaseInstance() != null;
if (obj == this)
{
return true;
}
if (obj instanceof Person == false)
{
return false;
}
final Person that = (Person) obj;
return getUserId().equals(that.getUserId())
&& getDatabaseInstance().equals(that.getDatabaseInstance());
}
@Override
public int hashCode()
{
return getUserId().hashCode();
}
@Override
public String toString()
{
......@@ -91,6 +130,10 @@ public class Person extends AbstractRegistrationHolder implements Comparable<Per
return result.toString();
}
//
// Comparable
//
public int compareTo(final Person o)
{
if (o == null)
......
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
+ 3
− 2
View file @ 0d2e41e2
......@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
/**
* A {@link Person} &lt;---&gt; {@link PersonPE} translator.
*
* @author Franz-Josef Elmer
* @author Franz-Josef Elmer
*/
public class PersonTranslator
{
......@@ -63,6 +63,8 @@ public class PersonTranslator
result.setLastName(StringEscapeUtils.escapeHtml(person.getLastName()));
result.setEmail(StringEscapeUtils.escapeHtml(person.getEmail()));
result.setUserId(StringEscapeUtils.escapeHtml(person.getUserId()));
result.setDatabaseInstance(DatabaseInstanceTranslator.translate(person
.getDatabaseInstance()));
result.setRegistrationDate(person.getRegistrationDate());
if (recursively)
{
......@@ -70,5 +72,4 @@ public class PersonTranslator
}
return result;
}
}
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+ 2
− 0
View file @ 0d2e41e2
......@@ -141,6 +141,7 @@ public final class CommonServerTest extends AbstractServerTestCase
{
final PersonPE systemPerson = new PersonPE();
systemPerson.setUserId(PersonPE.SYSTEM_USER_ID);
systemPerson.setDatabaseInstance(CommonTestUtils.createHomeDatabaseInstance());
return systemPerson;
}
......@@ -381,6 +382,7 @@ public final class CommonServerTest extends AbstractServerTestCase
assertEquals(person.getFirstName(), persons.get(0).getFirstName());
assertEquals(person.getLastName(), persons.get(0).getLastName());
assertEquals(person.getEmail(), persons.get(0).getEmail());
assertEquals(person.getDatabaseInstance(), persons.get(0).getDatabaseInstance());
assertEquals(1, persons.size());
context.assertIsSatisfied();
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBOTest.java
+ 2
− 5
View file @ 0d2e41e2
......@@ -70,9 +70,7 @@ public final class AuthorizationGroupBOTest extends AbstractBOTest
{
{
one(daoFactory).getHomeDatabaseInstance();
DatabaseInstancePE dbInstance =
CommonTestUtils
.createDatabaseInstance(CommonTestUtils.HOME_DATABASE_INSTANCE_CODE);
DatabaseInstancePE dbInstance = CommonTestUtils.createHomeDatabaseInstance();
will(returnValue(dbInstance));
one(groupFactory).create(newAuthorizationGroup,
ManagerTestTool.EXAMPLE_SESSION.tryGetPerson(), dbInstance);
......@@ -97,8 +95,7 @@ public final class AuthorizationGroupBOTest extends AbstractBOTest
{
final AuthorizationGroupBO bo = createBO();
final DatabaseInstancePE homeDb =
CommonTestUtils.createDatabaseInstance(CommonTestUtils.HOME_DATABASE_INSTANCE_CODE);
final DatabaseInstancePE homeDb = CommonTestUtils.createHomeDatabaseInstance();
final NewAuthorizationGroup newAuthorizationGroup = createNewAuthorizationGroup();
final AuthorizationGroupPE authGroupPE = createAuthorizationGroup();
context.checking(new Expectations()
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTableTest.java
+ 2
− 4
View file @ 0d2e41e2
......@@ -90,8 +90,7 @@ public final class MaterialTableTest extends AbstractBOTest
{
{
one(daoFactory).getHomeDatabaseInstance();
will(returnValue(CommonTestUtils
.createDatabaseInstance(CommonTestUtils.HOME_DATABASE_INSTANCE_CODE)));
will(returnValue(CommonTestUtils.createHomeDatabaseInstance()));
}
});
createMaterialTable().add(newMaterials, materialType);
......@@ -127,8 +126,7 @@ public final class MaterialTableTest extends AbstractBOTest
final MaterialPE material = new MaterialPE();
material.setCode(code);
material.setMaterialType(materialType);
material.setDatabaseInstance(CommonTestUtils
.createDatabaseInstance(CommonTestUtils.HOME_DATABASE_INSTANCE_CODE));
material.setDatabaseInstance(CommonTestUtils.createHomeDatabaseInstance());
material.setRegistrator(EXAMPLE_SESSION.tryGetPerson());
return material;
}
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
+ 1
− 2
View file @ 0d2e41e2
......@@ -198,8 +198,7 @@ public abstract class AbstractServerTestCase extends AssertJUnit
propertyTypeTable = context.mock(IPropertyTypeTable.class);
materialTable = context.mock(IMaterialTable.class);
homeDatabaseInstance =
CommonTestUtils.createDatabaseInstance(CommonTestUtils.HOME_DATABASE_INSTANCE_CODE);
homeDatabaseInstance = CommonTestUtils.createHomeDatabaseInstance();
context.checking(new Expectations()
{
{
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java
+ 10
− 4
View file @ 0d2e41e2
......@@ -156,6 +156,11 @@ public class CommonTestUtils
return databaseInstance;
}
public static DatabaseInstancePE createHomeDatabaseInstance()
{
return createDatabaseInstance(HOME_DATABASE_INSTANCE_CODE);
}
static public PersonPE createPersonFromPrincipal(final Principal principal)
{
final PersonPE person = new PersonPE();
......@@ -163,6 +168,7 @@ public class CommonTestUtils
person.setFirstName(principal.getFirstName());
person.setLastName(principal.getLastName());
person.setEmail(principal.getEmail());
person.setDatabaseInstance(createHomeDatabaseInstance());
return person;
}
......@@ -185,7 +191,7 @@ public class CommonTestUtils
{
final ExperimentTypePE sampleTypePE = new ExperimentTypePE();
sampleTypePE.setCode(EXPERIMENT_TYPE);
sampleTypePE.setDatabaseInstance(createDatabaseInstance(HOME_DATABASE_INSTANCE_CODE));
sampleTypePE.setDatabaseInstance(createHomeDatabaseInstance());
return sampleTypePE;
}
......@@ -200,7 +206,7 @@ public class CommonTestUtils
{
VocabularyPE vocabulary = new VocabularyPE();
vocabulary.setCode(fullCode);
vocabulary.setDatabaseInstance(createDatabaseInstance(HOME_DATABASE_INSTANCE_CODE));
vocabulary.setDatabaseInstance(createHomeDatabaseInstance());
if (terms != null)
{
vocabulary.setTerms(terms);
......@@ -220,7 +226,7 @@ public class CommonTestUtils
{
PropertyTypePE result = new PropertyTypePE();
result.setCode(fullCode);
result.setDatabaseInstance(createDatabaseInstance(HOME_DATABASE_INSTANCE_CODE));
result.setDatabaseInstance(createHomeDatabaseInstance());
result.setType(createDataType(type));
result.setVocabulary(vocabularyOrNull);
result.setMaterialType(materialTypeOrNull);
......@@ -312,7 +318,7 @@ public class CommonTestUtils
final MaterialTypePE type = new MaterialTypePE();
type.setCode(MATERIAL_TYPE_VIRUS);
type.setDatabaseInstance(createDatabaseInstance(HOME_DATABASE_INSTANCE_CODE));
type.setDatabaseInstance(createHomeDatabaseInstance());
return type;
}
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslatorTest.java
+ 1
− 0
View file @ 0d2e41e2
......@@ -112,6 +112,7 @@ public class ExternalDataTranslatorTest extends AssertJUnit
invalidationPE.setRegistrationDate(new Date(3));
PersonPE personPE = new PersonPE();
personPE.setUserId("user");
personPE.setDatabaseInstance(databaseInstancePE);
invalidationPE.setRegistrator(personPE);
samplePE.setInvalidation(invalidationPE);
externalDataPE.setSampleAcquiredFrom(samplePE);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment