Better method name in RefinedObjectClassDefinition (getCredentialsOut…

…bound -> getPasswordOutbound)
Evolveum · Oct 13, 2015 · 16403c3 · 16403c3
1 parent c333343
commit 16403c3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java b/...ain/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
@@ -222,12 +222,12 @@ public ResourceObjectReferenceType getBaseContext() {
 		return structuralObjectClassDefinition.getBaseContext();
 	}
 
-	public List<MappingType> getCredentialsInbound() {
-		return structuralObjectClassDefinition.getCredentialsInbound();
+	public List<MappingType> getPasswordInbound() {
+		return structuralObjectClassDefinition.getPasswordInbound();
 	}
 
-	public MappingType getCredentialsOutbound() {
-		return structuralObjectClassDefinition.getCredentialsOutbound();
+	public MappingType getPasswordOutbound() {
+		return structuralObjectClassDefinition.getPasswordOutbound();
 	}
 
 	public AttributeFetchStrategyType getPasswordFetchStrategy() {

diff --git a/...rc/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java b/...rc/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
@@ -394,13 +394,13 @@ public Collection<? extends QName> getNamesOfAttributesWithInboundExpressions()
 	}
 
     @Override
-	public List<MappingType> getCredentialsInbound() {
-		return refinedObjectClassDefinition.getCredentialsInbound();
+	public List<MappingType> getPasswordInbound() {
+		return refinedObjectClassDefinition.getPasswordInbound();
 	}
 
     @Override
-	public MappingType getCredentialsOutbound() {
-		return refinedObjectClassDefinition.getCredentialsOutbound();
+	public MappingType getPasswordOutbound() {
+		return refinedObjectClassDefinition.getPasswordOutbound();
 	}
 
     @Override

diff --git a/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java b/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
@@ -783,7 +783,7 @@ public Collection<? extends QName> getNamesOfAttributesWithInboundExpressions()
         return attrNames;
     }
 
-    public List<MappingType> getCredentialsInbound() {
+    public List<MappingType> getPasswordInbound() {
 
     	ResourcePasswordDefinitionType password = getPasswordDefinition();
 
@@ -794,7 +794,7 @@ public List<MappingType> getCredentialsInbound() {
         return password.getInbound();
     }
 
-	public MappingType getCredentialsOutbound() {
+	public MappingType getPasswordOutbound() {
 
 		ResourcePasswordDefinitionType password = getPasswordDefinition();
 

diff --git a/...l/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java b/...l/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
@@ -173,7 +173,7 @@ private <F extends FocusType> void processProjectionPassword(LensContext<F> cont
           return;
         }
 
-        MappingType outboundMappingType = refinedAccountDef.getCredentialsOutbound();
+        MappingType outboundMappingType = refinedAccountDef.getPasswordOutbound();
 
         if (outboundMappingType == null) {
             LOGGER.trace("No outbound definition in password definition in credentials in account type {}, skipping credentials processing", rat);

diff --git a/...-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java b/...-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
@@ -315,7 +315,7 @@ private <F extends FocusType> void processInboundExpressionsForProjection(LensCo
 //   		 we don't need to do inbound if account was deleted
 			return;
 		}
-        processSpecialPropertyInbound(accountDefinition.getCredentialsInbound(), SchemaConstants.PATH_PASSWORD_VALUE,
+        processSpecialPropertyInbound(accountDefinition.getPasswordInbound(), SchemaConstants.PATH_PASSWORD_VALUE,
         		context.getFocusContext().getObjectNew(), projContext, accountDefinition, context, task, now, result);
 
         processSpecialPropertyInbound(accountDefinition.getActivationBidirectionalMappingType(ActivationType.F_ADMINISTRATIVE_STATUS), SchemaConstants.PATH_ACTIVATION_ADMINISTRATIVE_STATUS,

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
@@ -492,8 +492,8 @@ public void test150GetGuybrushRefinedObjectClassDef() throws Exception {
 		display("Refined object class", rOCDef);
 		assertNotNull("Null config", rOCDef);
 
-		display("Password credentials outbound", rOCDef.getCredentialsOutbound());
-		assertNotNull("Assert not null", rOCDef.getCredentialsOutbound());
+		display("Password credentials outbound", rOCDef.getPasswordOutbound());
+		assertNotNull("Assert not null", rOCDef.getPasswordOutbound());
 	}
 
 	@Test