From d2c53e0af92b56d54e748b27d6a9c4d4b0ce02da Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Mon, 3 Jul 2023 18:57:27 +0000 Subject: [PATCH] reorganize imports with -Pexamples --- .../examples/ClientLoginExampleBean.java | 6 ++--- .../webservice/examples/JAXBQueryExample.java | 16 +++++++----- .../examples/JacksonQueryExample.java | 26 ++++++++++--------- .../datawave/webservice/examples/Options.java | 4 ++- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/web-services/examples/client-login/src/main/java/datawave/webservice/examples/ClientLoginExampleBean.java b/web-services/examples/client-login/src/main/java/datawave/webservice/examples/ClientLoginExampleBean.java index 0f10f306e84..01a663be85d 100644 --- a/web-services/examples/client-login/src/main/java/datawave/webservice/examples/ClientLoginExampleBean.java +++ b/web-services/examples/client-login/src/main/java/datawave/webservice/examples/ClientLoginExampleBean.java @@ -14,13 +14,13 @@ import javax.security.auth.callback.NameCallback; import javax.security.auth.login.LoginContext; +import org.jboss.security.JSSESecurityDomain; +import org.jboss.security.auth.callback.ObjectCallback; + import datawave.security.user.UserOperationsBean; import datawave.security.util.DnUtils; import datawave.user.AuthorizationsListBase; -import org.jboss.security.JSSESecurityDomain; -import org.jboss.security.auth.callback.ObjectCallback; - /** * An example timer bean that shows how one would call a secured EJB from an unsecured context, such as a message-driven bean callback. */ diff --git a/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JAXBQueryExample.java b/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JAXBQueryExample.java index cc7327a5ca9..f0f84230728 100644 --- a/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JAXBQueryExample.java +++ b/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JAXBQueryExample.java @@ -11,13 +11,6 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; -import com.beust.jcommander.JCommander; -import com.beust.jcommander.ParameterException; -import datawave.webservice.query.result.EdgeQueryResponseBase; -import datawave.webservice.result.BaseQueryResponse; -import datawave.webservice.result.EventQueryResponseBase; -import datawave.webservice.result.GenericResponse; -import datawave.webservice.result.VoidResponse; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; @@ -32,6 +25,15 @@ import org.apache.http.message.BasicNameValuePair; import org.apache.http.ssl.SSLContextBuilder; +import com.beust.jcommander.JCommander; +import com.beust.jcommander.ParameterException; + +import datawave.webservice.query.result.EdgeQueryResponseBase; +import datawave.webservice.result.BaseQueryResponse; +import datawave.webservice.result.EventQueryResponseBase; +import datawave.webservice.result.GenericResponse; +import datawave.webservice.result.VoidResponse; + /** * An example showing a simple query to the DATAWAVE web service, using the client classes to simplify parsing the query response. */ diff --git a/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JacksonQueryExample.java b/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JacksonQueryExample.java index 0a0f5b017d2..b98a78e1904 100644 --- a/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JacksonQueryExample.java +++ b/web-services/examples/http-client/src/main/java/datawave/webservice/examples/JacksonQueryExample.java @@ -7,17 +7,8 @@ import java.util.ArrayList; import java.util.List; -import com.beust.jcommander.JCommander; -import com.beust.jcommander.ParameterException; -import com.fasterxml.jackson.databind.AnnotationIntrospector; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; -import datawave.webservice.query.result.EdgeQueryResponseBase; -import datawave.webservice.result.BaseQueryResponse; -import datawave.webservice.result.EventQueryResponseBase; -import datawave.webservice.result.GenericResponse; -import datawave.webservice.result.VoidResponse; +import javax.net.ssl.SSLContext; + import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; @@ -34,7 +25,18 @@ import org.apache.http.message.BasicNameValuePair; import org.apache.http.ssl.SSLContextBuilder; -import javax.net.ssl.SSLContext; +import com.beust.jcommander.JCommander; +import com.beust.jcommander.ParameterException; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; + +import datawave.webservice.query.result.EdgeQueryResponseBase; +import datawave.webservice.result.BaseQueryResponse; +import datawave.webservice.result.EventQueryResponseBase; +import datawave.webservice.result.GenericResponse; +import datawave.webservice.result.VoidResponse; /** * An example showing a simple query to the DATAWAVE web service, using the client classes to simplify parsing the query response. diff --git a/web-services/examples/http-client/src/main/java/datawave/webservice/examples/Options.java b/web-services/examples/http-client/src/main/java/datawave/webservice/examples/Options.java index b1382bd014c..c3069165b88 100644 --- a/web-services/examples/http-client/src/main/java/datawave/webservice/examples/Options.java +++ b/web-services/examples/http-client/src/main/java/datawave/webservice/examples/Options.java @@ -3,11 +3,13 @@ import java.util.ArrayList; import java.util.List; +import org.apache.http.message.BasicNameValuePair; + import com.beust.jcommander.IStringConverter; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; + import datawave.webservice.result.DefaultEventQueryResponse; -import org.apache.http.message.BasicNameValuePair; class Options { @Parameter(names = {"-b", "--baseURI"}, required = true, description = "The base URI for running queries.")