From a7a053c349bbb744748d8cf86821345f5de25cc6 Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Fri, 24 Feb 2017 22:54:43 +0100 Subject: [PATCH] cleanup - removing unused imports and dependecies --- .../midpoint/model/impl/ModelRestService.java | 62 ++++++++++++------- .../model/impl/rest/MidpointXmlProvider.java | 18 ++---- testing/rest/pom.xml | 6 +- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java index 1090f767fdf..6dc086192fa 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java @@ -38,51 +38,69 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; -import com.evolveum.midpoint.model.api.*; -import com.evolveum.midpoint.model.api.validator.ResourceValidator; -import com.evolveum.midpoint.model.api.validator.Scope; -import com.evolveum.midpoint.model.api.validator.ValidationResult; -import com.evolveum.midpoint.model.impl.util.RestServiceUtil; -import com.evolveum.midpoint.prism.Item; -import com.evolveum.midpoint.prism.PrismValue; -import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.prism.query.builder.QueryBuilder; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; -import com.evolveum.midpoint.schema.constants.SchemaConstants; -import com.evolveum.midpoint.task.api.TaskManager; -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.xml.ns._public.common.api_types_3.*; -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import com.evolveum.midpoint.xml.ns._public.model.model_3.ExecuteScriptsResponseType; -import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ItemListType; -import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ScriptingExpressionType; -import com.evolveum.prism.xml.ns._public.types_3.RawType; import org.apache.commons.lang.Validate; import org.apache.cxf.jaxrs.ext.MessageContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.evolveum.midpoint.model.api.ModelCompareOptions; +import com.evolveum.midpoint.model.api.ModelDiagnosticService; +import com.evolveum.midpoint.model.api.ModelExecuteOptions; +import com.evolveum.midpoint.model.api.ModelInteractionService; +import com.evolveum.midpoint.model.api.ModelService; +import com.evolveum.midpoint.model.api.ScriptExecutionResult; +import com.evolveum.midpoint.model.api.ScriptingService; +import com.evolveum.midpoint.model.api.validator.ResourceValidator; +import com.evolveum.midpoint.model.api.validator.Scope; +import com.evolveum.midpoint.model.api.validator.ValidationResult; import com.evolveum.midpoint.model.impl.rest.PATCH; import com.evolveum.midpoint.model.impl.security.SecurityHelper; +import com.evolveum.midpoint.model.impl.util.RestServiceUtil; +import com.evolveum.midpoint.prism.Item; import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.prism.PrismObject; +import com.evolveum.midpoint.prism.PrismValue; import com.evolveum.midpoint.prism.delta.ItemDelta; +import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.prism.query.QueryJaxbConvertor; +import com.evolveum.midpoint.prism.query.builder.QueryBuilder; import com.evolveum.midpoint.schema.DeltaConvertor; +import com.evolveum.midpoint.schema.GetOperationOptions; +import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.schema.constants.MidPointConstants; import com.evolveum.midpoint.schema.constants.ObjectTypes; +import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; +import com.evolveum.midpoint.task.api.TaskManager; import com.evolveum.midpoint.util.MiscUtil; import com.evolveum.midpoint.util.exception.ConfigurationException; 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.api_types_3.CompareResultType; +import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectListType; +import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectModificationType; +import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ScriptOutputsType; +import com.evolveum.midpoint.xml.ns._public.common.api_types_3.SingleScriptOutputType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsPolicyType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.LogFileContentType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectShadowChangeDescriptionType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; +import com.evolveum.midpoint.xml.ns._public.model.model_3.ExecuteScriptsResponseType; +import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ItemListType; +import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ScriptingExpressionType; import com.evolveum.prism.xml.ns._public.query_3.QueryType; +import com.evolveum.prism.xml.ns._public.types_3.RawType; /** * @author katkav diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java index 3f8fad253f3..fdf40027ec4 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java @@ -3,10 +3,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.StringReader; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import java.util.Collection; import java.util.List; import javax.ws.rs.Consumes; @@ -17,29 +15,25 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; -import com.evolveum.midpoint.prism.*; -import com.evolveum.midpoint.util.logging.LoggingUtils; - -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.jaxrs.provider.AbstractConfigurableProvider; -import org.apache.cxf.jaxrs.provider.JAXBElementProvider; import org.springframework.beans.factory.annotation.Autowired; -import com.evolveum.midpoint.prism.delta.ItemDelta; -import com.evolveum.midpoint.schema.DeltaConvertor; +import com.evolveum.midpoint.prism.PrismConstants; +import com.evolveum.midpoint.prism.PrismContext; +import com.evolveum.midpoint.prism.PrismObject; +import com.evolveum.midpoint.prism.PrismParser; +import com.evolveum.midpoint.prism.PrismSerializer; import com.evolveum.midpoint.schema.result.OperationResult; 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.api_types_3.ObjectModificationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; @Produces({"application/xml", "application/*+xml", "text/xml", "application/yaml", "application/x-yaml", "text/yaml", "text/x-yaml", "application/json"}) diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml index 82a81d0f8da..e061d21df72 100644 --- a/testing/rest/pom.xml +++ b/testing/rest/pom.xml @@ -233,9 +233,9 @@ javax.ws.rs-api - org.codehaus.jackson - jackson-jaxrs - 1.9.0 + commons-io + commons-io + 2.0.1 test