From b3666e10d3bf6a61b335c6d9cb23efd1722ce7ed Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Fri, 19 Jun 2020 12:14:25 +0200 Subject: [PATCH] Remove 'transient' modifiers on autowired fields These are most probably not needed, as the respective components will never be serialized. --- .../model/impl/ModelObjectResolver.java | 1 + .../impl/controller/ModelController.java | 6 ++--- .../impl/controller/ModelDiagController.java | 2 +- .../ModelInteractionServiceImpl.java | 2 +- .../impl/controller/SchemaTransformer.java | 2 +- .../impl/expr/MidpointFunctionsImpl.java | 2 +- .../model/impl/lens/ChangeExecutor.java | 2 +- .../midpoint/model/impl/lens/Clockwork.java | 6 ++--- .../impl/lens/ClockworkConflictResolver.java | 2 +- .../impl/lens/OperationExecutionRecorder.java | 2 +- .../model/impl/lens/PersonaProcessor.java | 2 +- .../impl/lens/projector/ContextLoader.java | 2 +- .../focus/AssignmentHolderProcessor.java | 2 +- .../focus/ObjectTemplateProcessor.java | 2 +- .../model/impl/migrator/Migrator.java | 23 ++----------------- 15 files changed, 20 insertions(+), 38 deletions(-) diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java index eb8efc7bbe3..bff6faac4cd 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java @@ -54,6 +54,7 @@ /** * @author semancik * + * TODO decide on transient autowired fields */ @Component public class ModelObjectResolver implements ObjectResolver { diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java index c52d0eaaf3e..60a51466bb1 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java @@ -125,8 +125,8 @@ public class ModelController implements ModelService, TaskService, WorkflowServi @Autowired private PrismContext prismContext; @Autowired private ProvisioningService provisioning; @Autowired private ModelObjectResolver objectResolver; - @Autowired private transient ImportAccountsFromResourceTaskHandler importAccountsFromResourceTaskHandler; - @Autowired private transient ObjectImporter objectImporter; + @Autowired private ImportAccountsFromResourceTaskHandler importAccountsFromResourceTaskHandler; + @Autowired private ObjectImporter objectImporter; @Autowired private HookRegistry hookRegistry; @Autowired private TaskManager taskManager; @Autowired private ScriptingExpressionEvaluator scriptingExpressionEvaluator; @@ -144,7 +144,7 @@ public class ModelController implements ModelService, TaskService, WorkflowServi @Autowired private ChangeNotificationDispatcher dispatcher; @Autowired @Qualifier("cacheRepositoryService") - private transient RepositoryService cacheRepositoryService; + private RepositoryService cacheRepositoryService; @Autowired(required = false) // not required in all circumstances private WorkflowManager workflowManager; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java index fbe4f86cd0c..f0228c3781d 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelDiagController.java @@ -78,7 +78,7 @@ public class ModelDiagController implements ModelDiagnosticService { @Autowired @Qualifier("repositoryService") - private transient RepositoryService repositoryService; + private RepositoryService repositoryService; @Autowired private ProvisioningService provisioningService; @Autowired private SecurityEnforcer securityEnforcer; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java index 2f6af93a9cd..b76c80d423a 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java @@ -169,7 +169,7 @@ public class ModelInteractionServiceImpl implements ModelInteractionService { @Autowired private ObjectMerger objectMerger; @Autowired @Qualifier("cacheRepositoryService") - private transient RepositoryService cacheRepositoryService; + private RepositoryService cacheRepositoryService; @Autowired private ReferenceResolver referenceResolver; @Autowired private SystemObjectCache systemObjectCache; @Autowired private ArchetypeManager archetypeManager; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java index ce6cb005c38..3c741b9906f 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java @@ -70,7 +70,7 @@ public class SchemaTransformer { private static final String OP_APPLY_SCHEMAS_AND_SECURITY = SchemaTransformer.class.getName() + ".applySchemasAndSecurity"; private static final String OP_APPLY_SCHEMAS_AND_SECURITY_TO_OBJECT = SchemaTransformer.class.getName() + ".applySchemasAndSecurityToObject"; - @Autowired @Qualifier("cacheRepositoryService") private transient RepositoryService cacheRepositoryService; + @Autowired @Qualifier("cacheRepositoryService") private RepositoryService cacheRepositoryService; @Autowired private SecurityEnforcer securityEnforcer; @Autowired private SystemObjectCache systemObjectCache; @Autowired private ArchetypeManager archetypeManager; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java index 7d29fcb8869..ab9fb7fe0db 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java @@ -121,7 +121,7 @@ public class MidpointFunctionsImpl implements MidpointFunctions { @Autowired private ModelObjectResolver modelObjectResolver; @Autowired private ProvisioningService provisioningService; @Autowired private SecurityContextManager securityContextManager; - @Autowired private transient Protector protector; + @Autowired private Protector protector; @Autowired private OrgStructFunctionsImpl orgStructFunctions; @Autowired private LinkedObjectsFunctions linkedObjectsFunctions; @Autowired private WorkflowService workflowService; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java index 5b3b0257255..23c613d53ba 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java @@ -104,7 +104,7 @@ public class ChangeExecutor { @Autowired private TaskManager taskManager; @Autowired(required = false) private WorkflowManager workflowManager; // not available e.g. during tests - @Autowired @Qualifier("cacheRepositoryService") private transient RepositoryService cacheRepositoryService; + @Autowired @Qualifier("cacheRepositoryService") private RepositoryService cacheRepositoryService; @Autowired private ProvisioningService provisioning; @Autowired private PrismContext prismContext; @Autowired private ExpressionFactory expressionFactory; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java index 01bf0a1038c..9f67da79883 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java @@ -89,8 +89,8 @@ public class Clockwork { @Autowired private ChangeExecutor changeExecutor; @Autowired private Clock clock; @Autowired private SystemObjectCache systemObjectCache; - @Autowired private transient ProvisioningService provisioningService; - @Autowired private transient ChangeNotificationDispatcher changeNotificationDispatcher; + @Autowired private ProvisioningService provisioningService; + @Autowired private ChangeNotificationDispatcher changeNotificationDispatcher; @Autowired private PersonaProcessor personaProcessor; @Autowired private PrismContext prismContext; @Autowired private TaskManager taskManager; @@ -111,7 +111,7 @@ public class Clockwork { @Autowired @Qualifier("cacheRepositoryService") - private transient RepositoryService repositoryService; + private RepositoryService repositoryService; private static final int DEFAULT_MAX_CLICKS = 200; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkConflictResolver.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkConflictResolver.java index 1ee8d911005..7b101c49924 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkConflictResolver.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkConflictResolver.java @@ -46,7 +46,7 @@ public class ClockworkConflictResolver { @Autowired private Clockwork clockwork; @Autowired private ContextFactory contextFactory; - @Autowired @Qualifier("cacheRepositoryService") private transient RepositoryService repositoryService; + @Autowired @Qualifier("cacheRepositoryService") private RepositoryService repositoryService; @Autowired private PrismContext prismContext; private static final int DEFAULT_MAX_CONFLICT_RESOLUTION_ATTEMPTS = 1; // synchronize with common-core-3.xsd diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationExecutionRecorder.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationExecutionRecorder.java index 1131e63fa65..bd5067071d1 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationExecutionRecorder.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationExecutionRecorder.java @@ -52,7 +52,7 @@ public class OperationExecutionRecorder { @Autowired private Clock clock; @Autowired private SystemObjectCache systemObjectCache; @Autowired private PrismContext prismContext; - @Autowired @Qualifier("cacheRepositoryService") private transient RepositoryService repositoryService; + @Autowired @Qualifier("cacheRepositoryService") private RepositoryService repositoryService; private static final int DEFAULT_NUMBER_OF_RESULTS_TO_KEEP = 5; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java index ba7de45e590..7e9490baf5c 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java @@ -74,7 +74,7 @@ public class PersonaProcessor { private ObjectResolver objectResolver; @Autowired @Qualifier("cacheRepositoryService") - private transient RepositoryService repositoryService; + private RepositoryService repositoryService; @Autowired private ContextFactory contextFactory; @Autowired private Clockwork clockwork; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java index 9bf264c1d89..c6e02a62c51 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java @@ -83,7 +83,7 @@ public class ContextLoader implements ProjectorProcessor { @Autowired @Qualifier("cacheRepositoryService") - private transient RepositoryService cacheRepositoryService; + private RepositoryService cacheRepositoryService; @Autowired private SystemObjectCache systemObjectCache; @Autowired private ArchetypeManager archetypeManager; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java index 6d7981d4f20..03fd9e1ab54 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentHolderProcessor.java @@ -75,7 +75,7 @@ public class AssignmentHolderProcessor implements ProjectorProcessor { @Autowired @Qualifier("cacheRepositoryService") - private transient RepositoryService cacheRepositoryService; + private RepositoryService cacheRepositoryService; @ProcessorMethod public void processFocus(LensContext context, String activityDescription, XMLGregorianCalendar now, diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java index 91bcaa88589..5eeed99ec2e 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java @@ -87,7 +87,7 @@ public class ObjectTemplateProcessor implements ProjectorProcessor { @Autowired @Qualifier("cacheRepositoryService") - private transient RepositoryService cacheRepositoryService; + private RepositoryService cacheRepositoryService; @Autowired private MappingSetEvaluator mappingSetEvaluator; @Autowired private MatchingRuleRegistry matchingRuleRegistry; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/migrator/Migrator.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/migrator/Migrator.java index 4a2548a6905..23da3147e1a 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/migrator/Migrator.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/migrator/Migrator.java @@ -8,27 +8,15 @@ import java.util.ArrayList; import java.util.List; - import javax.xml.namespace.QName; +import org.springframework.stereotype.Component; + import com.evolveum.midpoint.model.impl.lens.LensContext; -import com.evolveum.midpoint.model.impl.lens.LensFocusContext; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.delta.ItemDelta; -import com.evolveum.midpoint.repo.api.RepositoryService; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.logging.LoggingUtils; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Component; /** * @author semancik @@ -37,13 +25,6 @@ @Component public class Migrator { - private static final Trace LOGGER = TraceManager.getTrace(Migrator.class); - - @Autowired private PrismContext prismContext; - @Autowired - @Qualifier("cacheRepositoryService") - private transient RepositoryService repositoryService; - public PrismObject migrate(PrismObject original) { Class origType = original.getCompileTimeClass(); if (ObjectTemplateType.class.isAssignableFrom(origType)) {