Remove obsolete object managers (emulated, wf)

Evolveum · Sep 13, 2019 · ad421e7 · ad421e7
1 parent dc6e0ec
commit ad421e7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 172 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
@@ -128,7 +128,7 @@ public ObjectTypes superType() {
 	}
 
 	public enum ObjectManager {
-        PROVISIONING, TASK_MANAGER, MODEL, WORKFLOW, REPOSITORY, EMULATED
+        PROVISIONING, TASK_MANAGER, MODEL, REPOSITORY
     }
 
 	@NotNull private final QName type;

diff --git a/...-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/DashboardServiceImpl.java b/...-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/DashboardServiceImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0 

diff --git a/...mpl/src/main/java/com/evolveum/midpoint/model/impl/controller/EmulatedSearchProvider.java b/...mpl/src/main/java/com/evolveum/midpoint/model/impl/controller/EmulatedSearchProvider.java
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
@@ -148,8 +148,6 @@ public class ModelController implements ModelService, TaskService, WorkflowServi
 	@Autowired private SchemaTransformer schemaTransformer;
 	@Autowired private ObjectMerger objectMerger;
 	@Autowired private SystemObjectCache systemObjectCache;
-	@Autowired private EmulatedSearchProvider emulatedSearchProvider;
-	@Autowired private CacheRegistry cacheRegistry;
 	@Autowired private ClockworkMedic clockworkMedic;
 	@Autowired private ChangeNotificationDispatcher dispatcher;
 	@Autowired
@@ -787,10 +785,7 @@ public <T extends ObjectType> SearchResultList<PrismObject<T>> searchObjects(Cla
                     QNameUtil.setTemporarilyTolerateUndeclaredPrefixes(true);
                 }
                 switch (searchProvider) {
-	                case EMULATED: 
-	                	list = emulatedSearchProvider.searchObjects(type, processedQuery, options, result);
-	                	break;
-                    case REPOSITORY: 
+                    case REPOSITORY:
                     	list = cacheRepositoryService.searchObjects(type, processedQuery, options, result);
                     	break;
                     case PROVISIONING: 
@@ -928,8 +923,8 @@ public <T extends Containerable> SearchResultList<T> searchContainers(
 				if (GetOperationOptions.isRaw(rootOptions)) {       // MID-2218
 					QNameUtil.setTemporarilyTolerateUndeclaredPrefixes(true);
 				}
+				//noinspection SwitchStatementWithTooFewBranches
 				switch (ctx.manager) {
-					case EMULATED: list = emulatedSearchProvider.searchContainers(type, query, options, result); break;
 					case REPOSITORY: list = cacheRepositoryService.searchContainers(type, query, options, result); break;
 					default: throw new IllegalStateException();
 				}
@@ -1176,7 +1171,6 @@ private void processSearchException(Throwable e, GetOperationOptions rootOptions
             case REPOSITORY: message = "Couldn't search objects in repository"; break;
             case PROVISIONING: message = "Couldn't search objects in provisioning"; break;
             case TASK_MANAGER: message = "Couldn't search objects in task manager"; break;
-			case WORKFLOW: message = "Couldn't search objects in workflow engine"; break;
             default: message = "Couldn't search objects"; break;    // should not occur
         }
 		LoggingUtils.logUnexpectedException(LOGGER, message, e);