Skip to content

Commit

Permalink
Changing subType to subtype
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed May 14, 2018
1 parent d40ee8d commit 5fe7f13
Show file tree
Hide file tree
Showing 28 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
View file
Expand Up @@ -21,5 +21,5 @@
<authorization>
<action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#all</action>
</authorization>
<subType>system</subType>
<subtype>system</subtype>
</role>
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
View file
Expand Up @@ -221,5 +221,5 @@
</owner>
</object>
</authorization>
<subType>system</subType>
<subtype>system</subtype>
</role>
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
View file
Expand Up @@ -130,5 +130,5 @@
<item>riskLevel</item>
<item>serviceType</item>
</authorization>
<subType>system</subType>
<subtype>system</subtype>
</role>
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml
View file
Expand Up @@ -100,5 +100,5 @@
<item>riskLevel</item>
<item>serviceType</item>
</authorization>
<subType>system</subType>
<subtype>system</subtype>
</role>
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
View file
Expand Up @@ -83,5 +83,5 @@
<item>roleMembershipRef</item>
<item>delegatedRef</item>
</authorization>
<subType>system</subType>
<subtype>system</subtype>
</role>
4 changes: 2 additions & 2 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
View file
Expand Up @@ -176,7 +176,7 @@ public static <O extends ObjectType> List<String> determineSubTypes(PrismObject<
return null;
}

List<String> subtypes = object.asObjectable().getSubType();
List<String> subtypes = object.asObjectable().getSubtype();
if (!subtypes.isEmpty()) {
return subtypes;
}
Expand Down Expand Up @@ -208,7 +208,7 @@ public static <O extends ObjectType> boolean hasSubtype(PrismObject<O> object, S

public static <O extends ObjectType> void setSubtype(PrismObject<O> object, List<String> subtypes) {

List<String> objSubtypes = object.asObjectable().getSubType();
List<String> objSubtypes = object.asObjectable().getSubtype();
if (!objSubtypes.isEmpty()) {
objSubtypes.clear();
}
Expand Down
14 changes: 7 additions & 7 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Expand Up @@ -192,7 +192,7 @@
</xsd:annotation>
</xsd:element>

<xsd:element name="subType" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
<xsd:element name="subtype" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
<p>
Expand All @@ -202,7 +202,7 @@
</p>
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ObjectType.subType</a:displayName>
<a:displayName>ObjectType.subtype</a:displayName>
<a:displayOrder>15</a:displayOrder>
</xsd:appinfo>
</xsd:annotation>
Expand Down Expand Up @@ -4154,7 +4154,7 @@
Therefore it can be used to distinguish employees from customers, etc.
</p>
<p>
DEPRECATED: Use ObjectType.subType
DEPRECATED: Use ObjectType.subtype
</p>
</xsd:documentation>
<xsd:appinfo>
Expand Down Expand Up @@ -12263,7 +12263,7 @@
</ul>
</p>
<p>
DEPRECATED: use ObjectType.subType
DEPRECATED: use ObjectType.subtype
</p>
</xsd:documentation>
<xsd:appinfo>
Expand Down Expand Up @@ -12721,7 +12721,7 @@
</ul>
</p>
<p>
DEPRECATED: Use ObjectType.subType
DEPRECATED: Use ObjectType.subtype
</p>
</xsd:documentation>
<xsd:appinfo>
Expand Down Expand Up @@ -12855,7 +12855,7 @@
</ul>
</p>
<p>
DEPRECATED: Use ObjectType.subType
DEPRECATED: Use ObjectType.subtype
</p>
</xsd:documentation>
<xsd:appinfo>
Expand Down Expand Up @@ -14397,7 +14397,7 @@
<xsd:documentation>
Specification of the subtype of the object to apply this template to.
If no subtype is specified then this definition will be applied to all subtypes.
The subtype is compared against the subType property but it is also compared to the
The subtype is compared against the subtype property but it is also compared to the
deprecated employeeType, roleType, orgType and serviceType properties.
</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
View file
Expand Up @@ -705,7 +705,7 @@ private Collection<RoleSelectionSpecEntry> createSingleDisplayableValueCollectio
}

private RoleSelectionSpecEntry getRoleSelectionSpecEq(EqualFilter<String> eqFilter) throws SchemaException {
if (QNameUtil.match(RoleType.F_ROLE_TYPE, eqFilter.getElementName()) || QNameUtil.match(RoleType.F_SUB_TYPE, eqFilter.getElementName())) {
if (QNameUtil.match(RoleType.F_ROLE_TYPE, eqFilter.getElementName()) || QNameUtil.match(RoleType.F_SUBTYPE, eqFilter.getElementName())) {
List<PrismPropertyValue<String>> ppvs = eqFilter.getValues();
if (ppvs.size() > 1) {
throw new SchemaException("More than one value in roleType search filter");
Expand Down
4 changes: 2 additions & 2 deletions model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
View file
Expand Up @@ -1295,7 +1295,7 @@ public void test185ModifyUserGuybrushSubtypeMarooned() throws Exception {

// WHEN
displayWhen(TEST_NAME);
modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUB_TYPE, task, result, SUBTYPE_MAROONED);
modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUBTYPE, task, result, SUBTYPE_MAROONED);

// THEN
displayThen(TEST_NAME);
Expand Down Expand Up @@ -1324,7 +1324,7 @@ public void test189ModifyUserGuybrushSubtypeNone() throws Exception {

// WHEN
displayWhen(TEST_NAME);
modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUB_TYPE, task, result);
modifyUserReplace(USER_GUYBRUSH_OID, UserType.F_SUBTYPE, task, result);

// THEN
displayThen(TEST_NAME);
Expand Down
12 changes: 6 additions & 6 deletions ...ntest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
View file
Expand Up @@ -1304,10 +1304,10 @@ public void test220AutzJackRoleExpressionNoConstCenter() throws Exception {

assertSearchDeny(RoleType.class, null, null);
assertSearchDeny(RoleType.class,
queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("business").build(),
queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("business").build(),
null);
assertSearchDeny(RoleType.class,
queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("application").build(),
queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("application").build(),
null);

assertGlobalStateUntouched();
Expand Down Expand Up @@ -1348,9 +1348,9 @@ public void test222AutzJackRoleExpressionConstCenterBusiness() throws Exception

assertSearch(RoleType.class, null, 3);
assertSearch(RoleType.class,
queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("business").build(), 3);
queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("business").build(), 3);
assertSearchDeny(RoleType.class,
queryFor(RoleType.class).item(RoleType.F_SUB_TYPE).eq("application").build(),
queryFor(RoleType.class).item(RoleType.F_SUBTYPE).eq("application").build(),
null);

assertGlobalStateUntouched();
Expand Down Expand Up @@ -1958,7 +1958,7 @@ public void test260AutzJackLimitedRoleAdministrator() throws Exception {
display("Exclusion role edit schema", roleExclusionEditSchema);
assertItemFlags(roleExclusionEditSchema, RoleType.F_NAME, true, true, true);
assertItemFlags(roleExclusionEditSchema, RoleType.F_DESCRIPTION, true, true, true);
assertItemFlags(roleExclusionEditSchema, RoleType.F_SUB_TYPE, true, true, true);
assertItemFlags(roleExclusionEditSchema, RoleType.F_SUBTYPE, true, true, true);
assertItemFlags(roleExclusionEditSchema, RoleType.F_LIFECYCLE_STATE, true, true, true);
assertItemFlags(roleExclusionEditSchema, RoleType.F_METADATA, false, false, false);

Expand Down Expand Up @@ -2219,7 +2219,7 @@ public void test264AutzJackLimitedReadRoleAdministrator() throws Exception {
display("Exclusion role edit schema", roleEmptyEditSchema);
assertItemFlags(roleEmptyEditSchema, RoleType.F_NAME, true, true, true);
assertItemFlags(roleEmptyEditSchema, RoleType.F_DESCRIPTION, true, true, true);
assertItemFlags(roleEmptyEditSchema, RoleType.F_SUB_TYPE, true, true, true);
assertItemFlags(roleEmptyEditSchema, RoleType.F_SUBTYPE, true, true, true);
assertItemFlags(roleEmptyEditSchema, RoleType.F_LIFECYCLE_STATE, true, true, true);
assertItemFlags(roleEmptyEditSchema, RoleType.F_METADATA, false, false, false);

Expand Down
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/common/role-persona-admin.xml
View file
Expand Up @@ -25,6 +25,6 @@
<objectMappingRef oid="894ea1a8-2c0a-11e7-a950-ff2047b0c053"/>
</personaConstruction>
</inducement>
<subType>personaRole</subType>
<subtype>personaRole</subtype>
<requestable>true</requestable>
</role>
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-application-1.xml
View file
Expand Up @@ -19,5 +19,5 @@
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
<name>Application Role One</name>
<ownerRef oid="c0c010c0-d34d-b33f-f00d-111111111111" type="UserType"/>
<subType>application</subType>
<subtype>application</subtype>
</role>
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-application-2.xml
View file
Expand Up @@ -18,5 +18,5 @@
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
<name>Application Role Two</name>
<subType>application</subType>
<subtype>application</subtype>
</role>
4 changes: 2 additions & 2 deletions model/model-intest/src/test/resources/security/role-approver.xml
View file
Expand Up @@ -97,7 +97,7 @@
<item>identifier</item>
<item>description</item>
<item>riskLevel</item>
<item>subType</item>
<item>subtype</item>
</authorization>
<authorization>
<name>orgs-read</name>
Expand Down Expand Up @@ -131,5 +131,5 @@
<item>riskLevel</item>
<item>serviceType</item>
</authorization>
<subType>system</subType>
<subtype>system</subtype>
</role>
6 changes: 3 additions & 3 deletions model/model-intest/src/test/resources/security/role-assign-application-roles.xml
View file
Expand Up @@ -44,7 +44,7 @@
<filter>
<q:or>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>application</q:value>
</q:equal>
<q:equal>
Expand All @@ -56,7 +56,7 @@
<q:equal>
<!-- This role type does not even exists.
But it does not change the result and it replicates MID-2549 -->
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>nonexistent</q:value>
</q:equal>
</q:or>
Expand All @@ -74,7 +74,7 @@
<filter>
<q:or>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>application</q:value>
</q:equal>
</q:or>
Expand Down
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-assign-non-application-roles.xml
View file
Expand Up @@ -30,7 +30,7 @@
<filter>
<q:not>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>application</q:value>
</q:equal>
</q:not>
Expand Down
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-business-1.xml
View file
Expand Up @@ -20,5 +20,5 @@
<name>Business Role One</name>
<requestable>true</requestable>
<ownerRef oid="c0c010c0-d34d-b33f-f00d-111111111111" type="UserType"/>
<subType>business</subType>
<subtype>business</subtype>
</role>
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-business-2.xml
View file
Expand Up @@ -19,5 +19,5 @@
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
<name>Business Role Two</name>
<requestable>false</requestable>
<subType>business</subType>
<subtype>business</subtype>
</role>
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-business-3.xml
View file
Expand Up @@ -19,5 +19,5 @@
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
<name>Business Role Three</name>
<requestable>true</requestable>
<subType>business</subType>
<subtype>business</subtype>
</role>
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-end-user-requestable-abstractroles.xml
View file
Expand Up @@ -142,5 +142,5 @@
</filter>
</target>
</authorization>
<subType>system</subType>
<subtype>system</subtype>
</role>
2 changes: 1 addition & 1 deletion model/model-intest/src/test/resources/security/role-expression-read-roles.xml
View file
Expand Up @@ -24,7 +24,7 @@
<type>RoleType</type>
<filter>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<expression>
<!-- Make sure empty value of costCenter does not allow any access. -->
<queryInterpretationOfNoValue>filterNone</queryInterpretationOfNoValue>
Expand Down
6 changes: 3 additions & 3 deletions model/model-intest/src/test/resources/security/role-limited-read-role-administrator.xml
View file
Expand Up @@ -35,7 +35,7 @@
</object>
<item>name</item>
<item>description</item>
<item>subType</item>
<item>subtype</item>
<item>lifecycleState</item>
<item>requestable</item>
<item>delegable</item>
Expand All @@ -57,7 +57,7 @@
</object>
<item>name</item>
<item>description</item>
<item>subType</item>
<item>subtype</item>
<item>lifecycleState</item>
<item>requestable</item>
<item>delegable</item>
Expand All @@ -71,7 +71,7 @@
</object>
<item>name</item>
<item>description</item>
<item>subType</item>
<item>subtype</item>
<item>lifecycleState</item>
<item>requestable</item>
<item>delegable</item>
Expand Down
6 changes: 3 additions & 3 deletions model/model-intest/src/test/resources/security/role-limited-role-administrator.xml
View file
Expand Up @@ -34,7 +34,7 @@
</object>
<item>name</item>
<item>description</item>
<item>subType</item>
<item>subtype</item>
<item>lifecycleState</item>
<item>requestable</item>
<item>delegable</item>
Expand All @@ -49,7 +49,7 @@
</object>
<item>name</item>
<item>description</item>
<item>subType</item>
<item>subtype</item>
<item>lifecycleState</item>
<item>requestable</item>
<item>delegable</item>
Expand All @@ -64,7 +64,7 @@
</object>
<item>name</item>
<item>description</item>
<item>subType</item>
<item>subtype</item>
<item>lifecycleState</item>
<item>requestable</item>
<item>delegable</item>
Expand Down
6 changes: 3 additions & 3 deletions model/model-intest/src/test/resources/security/role-persona-management.xml
View file
Expand Up @@ -65,7 +65,7 @@
<type>RoleType</type>
<filter>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>personaRole</q:value>
</q:equal>
</filter>
Expand All @@ -79,7 +79,7 @@
<type>UserType</type>
<filter>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>admin</q:value>
</q:equal>
</filter>
Expand All @@ -95,7 +95,7 @@
<type>UserType</type>
<filter>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>admin</q:value>
</q:equal>
</filter>
Expand Down
4 changes: 2 additions & 2 deletions model/model-intest/src/test/resources/security/role-read-some-roles.xml
View file
Expand Up @@ -28,11 +28,11 @@
<filter>
<q:or>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>application</q:value>
</q:equal>
<q:equal>
<q:path>subType</q:path>
<q:path>subtype</q:path>
<q:value>business</q:value>
</q:equal>
</q:or>
Expand Down

0 comments on commit 5fe7f13

Please sign in to comment.