You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:32 UTC
[27/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
index 1729a3f..6c22154 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
@@ -31,14 +31,14 @@ import demo.hw.server.UserImpl;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://server.hw.demo/", "HelloWorld");
- private static final QName PORT_NAME
+ private static final QName PORT_NAME
= new QName("http://server.hw.demo/", "HelloWorldPort");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
Service service = Service.create(SERVICE_NAME);
@@ -50,7 +50,7 @@ public final class Client {
// Add a port to the Service
service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, endpointAddress);
-
+
HelloWorld hw = service.getPort(HelloWorld.class);
System.out.println(hw.sayHi("World"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
index 70cf990..67c8af1 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
@@ -41,7 +41,7 @@ public interface HelloWorld {
/* Map passing
* JAXB also does not support Maps. It handles Lists great, but Maps are
* not supported directly. They also require use of a XmlAdapter to map
- * the maps into beans that JAXB can use.
+ * the maps into beans that JAXB can use.
*/
@XmlJavaTypeAdapter(IntegerUserMapAdapter.class)
Map<Integer, User> getUsers();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
index d4d0626..9f02674 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
public class IntegerUserMapAdapter extends XmlAdapter<IntegerUserMap, Map<Integer, User>> {
public IntegerUserMap marshal(Map<Integer, User> v) throws Exception {
IntegerUserMap map = new IntegerUserMap();
- for (Map.Entry<Integer, User> e : v.entrySet()) {
+ for (Map.Entry<Integer, User> e : v.entrySet()) {
IntegerUserMap.IntegerUserEntry iue = new IntegerUserMap.IntegerUserEntry();
iue.setUser(e.getValue());
iue.setId(e.getKey());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
index dbcbe53..11a751f 100644
--- a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
@@ -29,7 +29,7 @@ import demo.hw.server.HelloWorld;
public final class Client {
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
index 8da3b9f..6cc3ce1 100644
--- a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
+++ b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
@@ -50,10 +50,10 @@ public final class ServerJMS {
for (String arg : args) {
if ("-activemqbroker".equals(arg)) {
launchAmqBroker = true;
- }
+ }
if ("-jaxws".equals(arg)) {
jaxws = true;
- }
+ }
}
if (launchAmqBroker) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
index 4190e6d..f763908 100644
--- a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
@@ -25,7 +25,7 @@ import demo.hw.server.HelloWorld;
public final class Client {
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
index 7c1e679..bed4b13 100644
--- a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
@@ -19,7 +19,7 @@
package demo.hw.server;
public interface HelloWorld {
-
+
String sayHi(String text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
index 758a268..65abf4b 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
@@ -30,7 +30,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
// START SNIPPET: client
- ClassPathXmlApplicationContext context
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
HelloWorld client = (HelloWorld)context.getBean("client");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
index a2ce015..5e410f5 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
@@ -27,7 +27,7 @@ public class Server {
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerService.class);
- sf.setResourceProvider(CustomerService.class,
+ sf.setResourceProvider(CustomerService.class,
new SingletonResourceProvider(new CustomerService()));
sf.setAddress("http://localhost:9000/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
index 7147e2d..aa9f835 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
@@ -38,23 +38,23 @@ import httpsdemo.common.CustomerService;
public final class Client {
private static final String CLIENT_CONFIG_FILE = "ClientConfig.xml";
- private static final String BASE_SERVICE_URL =
+ private static final String BASE_SERVICE_URL =
"https://localhost:9000/customerservice/customers";
-
+
private Client() {
}
- public static void main(String args[]) throws Exception {
+ public static void main(String args[]) throws Exception {
String keyStoreLoc = "src/main/config/clientKeystore.jks";
KeyStore keyStore = KeyStore.getInstance("JKS");
keyStore.load(new FileInputStream(keyStoreLoc), "cspass".toCharArray());
- /*
+ /*
* Send HTTP GET request to query customer info using portable HttpClient
* object from Apache HttpComponents
*/
- SSLSocketFactory sf = new SSLSocketFactory(keyStore, "ckpass", keyStore);
+ SSLSocketFactory sf = new SSLSocketFactory(keyStore, "ckpass", keyStore);
Scheme httpsScheme = new Scheme("https", 9000, sf);
System.out.println("Sending HTTPS GET request to query customer info");
@@ -67,7 +67,7 @@ public final class Client {
HttpEntity entity = response.getEntity();
entity.writeTo(System.out);
httpclient.getConnectionManager().shutdown();
-
+
/*
* Send HTTP PUT request to update customer info, using CXF WebClient method
* Note: if need to use basic authentication, use the WebClient.create(baseAddress,
@@ -93,7 +93,7 @@ public final class Client {
customer = new Customer();
customer.setName("Jack");
resp = wc.post(customer);
-
+
System.out.println("\n");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
index c1af8f5..03cf4e1 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
@@ -36,11 +36,11 @@ public interface CustomerService {
@GET
@Path("/customers/{id}/")
Customer getCustomer(@PathParam("id") String id);
-
+
@PUT
@Path("/customers/")
Response updateCustomer(Customer customer);
-
+
@POST
@Path("/customers/")
Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
index 7d4a0c1..333d323 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
@@ -33,11 +33,11 @@ public class Server {
Bus bus = factory.createBus("ServerConfig.xml");
BusFactory.setDefaultBus(bus);
}
-
+
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerServiceImpl.class);
- sf.setResourceProvider(CustomerServiceImpl.class,
+ sf.setResourceProvider(CustomerServiceImpl.class,
new SingletonResourceProvider(new CustomerServiceImpl()));
sf.setAddress("https://localhost:9000/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
index 785689d..ebb4f5d 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
@@ -35,7 +35,7 @@ public class IdTokenService {
public Response getIdTokenFromForm(@Context IdTokenContext idTokenContext) {
return getIdToken(idTokenContext);
}
-
+
@GET
@Path("/token")
@Produces("text/html")
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
index 238ecb9..fc6db1b 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
@@ -25,15 +25,15 @@ public class BigQueryResponse {
private String userName;
private String searchWord;
private List<ShakespeareText> texts = new LinkedList<ShakespeareText>();
-
+
public BigQueryResponse() {
-
+
}
public BigQueryResponse(String userName, String searchWord) {
this.userName = userName;
this.searchWord = searchWord;
}
-
+
public String getUserName() {
return userName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
index aba941e..e625d03 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
@@ -47,25 +47,25 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
public final class BigQueryServer {
private BigQueryServer() {
}
-
+
public static void main(String[] args) throws Exception {
final String pc12File = args[0];
final String keySecret = args[1];
final String issuer = args[2];
final String projectId = args[3];
-
+
PrivateKey privateKey = loadPrivateKey(pc12File, keySecret);
-
-
+
+
ClientAccessToken accessToken = getAccessToken(privateKey, issuer);
-
- WebClient bigQueryClient = WebClient.create("https://www.googleapis.com/bigquery/v2/projects/"
+
+ WebClient bigQueryClient = WebClient.create("https://www.googleapis.com/bigquery/v2/projects/"
+ projectId + "/queries",
Collections.singletonList(new JsonMapObjectProvider()));
bigQueryClient.type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON);
-
+
List<ShakespeareText> texts = BigQueryService.getMatchingTexts(bigQueryClient, accessToken, "brave", "10");
-
+
System.out.println("Matching texts:");
for (ShakespeareText text : texts) {
System.out.println(text.getText() + ":" + text.getDate());
@@ -77,25 +77,25 @@ public final class BigQueryServer {
JwtClaims claims = new JwtClaims();
claims.setIssuer(issuer);
claims.setAudience("https://www.googleapis.com/oauth2/v3/token");
-
+
long issuedAt = OAuthUtils.getIssuedAt();
claims.setIssuedAt(issuedAt);
claims.setExpiryTime(issuedAt + 60 * 60);
claims.setProperty("scope", "https://www.googleapis.com/auth/bigquery.readonly");
-
+
JwtToken token = new JwtToken(headers, claims);
JwsJwtCompactProducer p = new JwsJwtCompactProducer(token);
String base64UrlAssertion = p.signWith(privateKey);
-
+
JwtBearerGrant grant = new JwtBearerGrant(base64UrlAssertion);
-
+
WebClient accessTokenService = WebClient.create("https://www.googleapis.com/oauth2/v3/token",
Arrays.asList(new OAuthJSONProvider(),
new AccessTokenGrantWriter()));
WebClient.getConfig(accessTokenService).getInInterceptors().add(new LoggingInInterceptor());
-
+
accessTokenService.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.APPLICATION_JSON);
-
+
return accessTokenService.post(grant, ClientAccessToken.class);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
index 72cc78f..01f2254 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
@@ -39,34 +39,34 @@ import org.apache.cxf.rs.security.oidc.rp.OidcClientTokenContext;
@Path("/")
public class BigQueryService {
- private static final String BQ_SELECT =
+ private static final String BQ_SELECT =
"SELECT corpus,corpus_date FROM publicdata:samples.shakespeare WHERE word=\\\"%s\\\"";
private static final String BQ_REQUEST = "{"
- + "\"kind\": \"bigquery#queryRequest\","
+ + "\"kind\": \"bigquery#queryRequest\","
+ "\"query\": \"%s\","
- + "\"maxResults\": %d"
+ + "\"maxResults\": %d"
+ "}";
-
+
@Context
private OidcClientTokenContext oidcContext;
private WebClient bigQueryClient;
-
+
@GET
@Path("/start")
@Produces("text/html")
public BigQueryStart startBigQuerySearch() {
return new BigQueryStart(getUserInfo());
}
-
+
@POST
@Path("/complete")
@Consumes("application/x-www-form-urlencoded")
@Produces("text/html")
- public BigQueryResponse completeBigQuerySearch(@FormParam("word") String searchWord,
+ public BigQueryResponse completeBigQuerySearch(@FormParam("word") String searchWord,
@FormParam("maxResults") String maxResults) {
-
+
ClientAccessToken accessToken = oidcContext.getToken();
-
+
BigQueryResponse bigQueryResponse = new BigQueryResponse(getUserInfo(), searchWord);
bigQueryResponse.setTexts(getMatchingTexts(bigQueryClient, accessToken, searchWord, maxResults));
return bigQueryResponse;
@@ -78,22 +78,22 @@ public class BigQueryService {
} else {
return oidcContext.getIdToken().getSubject();
}
-
+
}
public void setBigQueryClient(WebClient bigQueryClient) {
this.bigQueryClient = bigQueryClient;
}
-
- static List<ShakespeareText> getMatchingTexts(WebClient bqClient, ClientAccessToken accessToken,
+
+ static List<ShakespeareText> getMatchingTexts(WebClient bqClient, ClientAccessToken accessToken,
String searchWord, String maxResults) {
bqClient.authorization(accessToken);
String bigQuerySelect = String.format(BQ_SELECT, searchWord);
String bigQueryRequest = String.format(BQ_REQUEST, bigQuerySelect, Integer.parseInt(maxResults));
-
+
JsonMapObject jsonMap = bqClient.post(bigQueryRequest, JsonMapObject.class);
-
- List<ShakespeareText> texts = new LinkedList<ShakespeareText>();
+
+ List<ShakespeareText> texts = new LinkedList<ShakespeareText>();
List<Map<String, Object>> rows = CastUtils.cast((List<?>)jsonMap.getProperty("rows"));
if (rows != null) {
for (Map<String, Object> row : rows) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
index b49fef2..06b62d8 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
@@ -24,7 +24,7 @@ public class BigQueryStart {
public BigQueryStart(String userName) {
this.userName = userName;
}
-
+
public String getUserName() {
return userName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
index 95baa17..f887af5 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
@@ -22,7 +22,7 @@ public class ShakespeareText {
private String text;
private String date;
public ShakespeareText() {
-
+
}
public ShakespeareText(String text, String date) {
this.text = text;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
index 3ebbc31..25a0287 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
@@ -27,7 +27,7 @@ public class Server {
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerService.class);
- sf.setResourceProvider(CustomerService.class,
+ sf.setResourceProvider(CustomerService.class,
new SingletonResourceProvider(new CustomerService()));
sf.setAddress("http://localhost:9000/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 557cb1d..c58fb0e 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import com.wordnik.swagger.annotations.ApiImplicitParams;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -61,21 +61,21 @@ public class Sample {
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@ApiParam(value = "Page to fetch", required = true) @QueryParam("page") @DefaultValue("1") int page) {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -84,51 +84,51 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
public Response createItem(
@Context final UriInfo uriInfo,
@ApiParam(value = "item", required = true) final Item item) {
- items.put(item.getName(), item);
+ items.put(item.getName(), item);
return Response
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
public Item updateItem(
@ApiParam(value = "name", required = true) @PathParam("name") String name,
- @ApiParam(value = "value", required = true) @FormParam("value") String value) {
+ @ApiParam(value = "value", required = true) @FormParam("value") String value) {
Item item = new Item(name, value);
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
index 491fd43..b254839 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -38,14 +38,14 @@ public class Server {
final ServletHolder staticHolder = new ServletHolder(new DefaultServlet());
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
- context.addServlet(servletHolder, "/*");
+ context.addServlet(servletHolder, "/*");
context.setResourceBase(
getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
-
- servletHolder.setInitParameter("redirects-list",
+
+ servletHolder.setInitParameter("redirects-list",
"/ /index.html /.*[.]js /css/.* /images/.* lib/.* .*ico");
servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName());
servletHolder.setInitParameter("redirect-attributes", "javax.servlet.include.request_uri");
@@ -55,9 +55,9 @@ public class Server {
new String[] {
MultipartProvider.class.getName(),
JacksonJsonProvider.class.getName()
- }, ",")
- );
-
+ }, ",")
+ );
+
server.setHandler(context);
server.start();
server.join();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
index 22576af..a5131d6 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -34,18 +34,18 @@ public class Server {
org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9000);
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
- context.addServlet(servletHolder, "/*");
+ context.addServlet(servletHolder, "/*");
servletHolder.setInitParameter("jaxrs.serviceClasses", Sample.class.getName());
- servletHolder.setInitParameter("jaxrs.features",
+ servletHolder.setInitParameter("jaxrs.features",
Swagger2Feature.class.getName());
servletHolder.setInitParameter("jaxrs.providers", StringUtils.join(
new String[] {
MultipartProvider.class.getName(),
JacksonJsonProvider.class.getName(),
ApiOriginFilter.class.getName()
- }, ",")
+ }, ",")
);
server.setHandler(context);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
index 985bac2..7b74a71 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -27,7 +27,7 @@ public final class Server {
}
public static void main(String args[]) throws Exception {
- ApplicationContext appctxt =
+ ApplicationContext appctxt =
new ClassPathXmlApplicationContext(Server.class.getResource("/context.xml").toString());
System.out.println("Server ready...");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
index 5c08d53..4473624 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample2")
+@Path("/sample2")
@Api(value = "/sample2", description = "Sample2 JAX-RS service with Swagger documentation")
public class Sample2 {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample2 {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample2 {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample2 {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample2 {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample2 {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
index a75274c..87a593c 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
@@ -29,7 +29,7 @@ public class SampleServlet extends CXFNonSpringJaxrsServlet {
private static final long serialVersionUID = -1531317723099896635L;
@Override
- protected Application createApplicationInstance(String appClassName, ServletConfig servletConfig)
+ protected Application createApplicationInstance(String appClassName, ServletConfig servletConfig)
throws ServletException {
return new SampleApplication();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
index 72ff45f..ba584a5 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
@@ -36,84 +36,84 @@ public final class Client {
private Client() {
}
- public static void main(String args[]) throws Exception {
+ public static void main(String args[]) throws Exception {
final String url = "http://localhost:9000/catalog";
final HttpClient httpClient = new HttpClient();
-
+
uploadToCatalog(url, httpClient, "jsr339-jaxrs-2.0-final-spec.pdf");
uploadToCatalog(url, httpClient, "JavaWebSocketAPI_1.0_Final.pdf");
uploadToCatalog(url, httpClient, "apache-cxf-tika-lucene.odt");
-
- list(url, httpClient);
-
+
+ list(url, httpClient);
+
search(url, httpClient, "ct==java");
search(url, httpClient, "ct==websockets");
-
- search(url, httpClient, "ct==Java");
+
+ search(url, httpClient, "ct==Java");
search(url, httpClient, "ct==WebSockets");
-
+
search(url, httpClient, "ct==jaxrs,source==*jaxrs*");
search(url, httpClient, "ct==tika");
-
+
delete(url, httpClient);
}
- private static void list(final String url, final HttpClient httpClient)
+ private static void list(final String url, final HttpClient httpClient)
throws IOException, HttpException {
-
+
System.out.println("Sent HTTP GET request to query all books in catalog");
-
+
final GetMethod get = new GetMethod(url);
try {
int status = httpClient.executeMethod(get);
- if (status == 200) {
+ if (status == 200) {
System.out.println(get.getResponseBodyAsString());
}
} finally {
get.releaseConnection();
}
}
-
- private static void search(final String url, final HttpClient httpClient, final String expression)
+
+ private static void search(final String url, final HttpClient httpClient, final String expression)
throws IOException, HttpException {
-
+
System.out.println("Sent HTTP GET request to search the books in catalog: " + expression);
-
+
final GetMethod get = new GetMethod(url + "/search");
get.setQueryString("$filter=" + expression);
-
+
try {
int status = httpClient.executeMethod(get);
- if (status == 200) {
+ if (status == 200) {
System.out.println(get.getResponseBodyAsString());
}
} finally {
get.releaseConnection();
}
}
-
+
private static void uploadToCatalog(final String url, final HttpClient httpClient,
final String filename) throws IOException, HttpException {
-
+
System.out.println("Sent HTTP POST request to upload the file into catalog: " + filename);
-
+
final PostMethod post = new PostMethod(url);
final Part[] parts = {
new FilePart(filename,
- new ByteArrayPartSource(filename,
- IOUtils.readBytesFromStream(Client.class.getResourceAsStream("/" + filename))
- )
+ new ByteArrayPartSource(filename,
+ IOUtils.readBytesFromStream(Client.class.getResourceAsStream("/" + filename))
+ )
)
};
-
+
post.setRequestEntity(new MultipartRequestEntity(parts, post.getParams()));
-
+
try {
int status = httpClient.executeMethod(post);
- if (status == 201) {
+ if (status == 201) {
System.out.println(post.getResponseHeader("Location"));
- } else if (status == 409) {
+ } else if (status == 409) {
System.out.println("Document already exists: " + filename);
}
@@ -121,16 +121,16 @@ public final class Client {
post.releaseConnection();
}
}
-
- private static void delete(final String url, final HttpClient httpClient)
+
+ private static void delete(final String url, final HttpClient httpClient)
throws IOException, HttpException {
-
+
System.out.println("Sent HTTP DELETE request to remove all books from catalog");
-
- final DeleteMethod delete = new DeleteMethod(url);
+
+ final DeleteMethod delete = new DeleteMethod(url);
try {
int status = httpClient.executeMethod(delete);
- if (status == 200) {
+ if (status == 200) {
System.out.println(delete.getResponseBodyAsString());
}
} finally {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
index 87bd2c4..7c74882 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
@@ -90,47 +90,47 @@ import org.apache.tika.parser.pdf.PDFParser;
@Path("/catalog")
public class Catalog {
private final TikaLuceneContentExtractor extractor = new TikaLuceneContentExtractor(
- Arrays.< Parser >asList(new PDFParser(), new OpenDocumentParser()),
- new LuceneDocumentMetadata());
+ Arrays.< Parser >asList(new PDFParser(), new OpenDocumentParser()),
+ new LuceneDocumentMetadata());
private final Directory directory = new RAMDirectory();
- private final Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
- private final Storage storage;
+ private final Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
+ private final Storage storage;
private final LuceneQueryVisitor<SearchBean> visitor;
private final ExecutorService executor = Executors.newFixedThreadPool(
Runtime.getRuntime().availableProcessors());
-
+
public Catalog() throws IOException {
this(new Storage());
}
-
+
public Catalog(final Storage storage) throws IOException {
this.storage = storage;
this.visitor = createVisitor();
initIndex();
}
-
+
@POST
@CrossOriginResourceSharing(allowAllOrigins = true)
@Consumes("multipart/form-data")
- public void addBook(@Suspended final AsyncResponse response, @Context final UriInfo uri,
+ public void addBook(@Suspended final AsyncResponse response, @Context final UriInfo uri,
final MultipartBody body) {
-
+
executor.submit(new Runnable() {
public void run() {
for (final Attachment attachment: body.getAllAttachments()) {
final DataHandler handler = attachment.getDataHandler();
-
+
if (handler != null) {
final String source = handler.getName();
if (StringUtils.isEmpty(source)) {
response.resume(Response.status(Status.BAD_REQUEST).build());
return;
}
-
+
final LuceneDocumentMetadata metadata = new LuceneDocumentMetadata()
.withSource(source)
.withField("modified", Date.class);
-
+
try {
if (exists(source)) {
response.resume(Response.status(Status.CONFLICT).build());
@@ -140,66 +140,66 @@ public class Catalog {
final byte[] content = IOUtils.readBytesFromStream(handler.getInputStream());
storeAndIndex(metadata, content);
} catch (final Exception ex) {
- response.resume(Response.serverError().build());
- }
-
+ response.resume(Response.serverError().build());
+ }
+
if (response.isSuspended()) {
response.resume(Response.created(uri.getRequestUriBuilder().path(source).build())
.build());
}
- }
- }
-
+ }
+ }
+
if (response.isSuspended()) {
response.resume(Response.status(Status.BAD_REQUEST).build());
}
}
});
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
public JsonArray getBooks() throws IOException {
final IndexReader reader = DirectoryReader.open(directory);
final IndexSearcher searcher = new IndexSearcher(reader);
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
try {
final Query query = new MatchAllDocsQuery();
-
+
for (final ScoreDoc scoreDoc: searcher.search(query, 1000).scoreDocs) {
- final DocumentStoredFieldVisitor fieldVisitor =
- new DocumentStoredFieldVisitor(LuceneDocumentMetadata.SOURCE_FIELD);
-
+ final DocumentStoredFieldVisitor fieldVisitor =
+ new DocumentStoredFieldVisitor(LuceneDocumentMetadata.SOURCE_FIELD);
+
reader.document(scoreDoc.doc, fieldVisitor);
builder.add(fieldVisitor
.getDocument()
.getField(LuceneDocumentMetadata.SOURCE_FIELD)
.stringValue());
}
-
+
return builder.build();
} finally {
reader.close();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
@CrossOriginResourceSharing(allowAllOrigins = true)
@Path("/search")
- public Response findBook(@Context SearchContext searchContext,
+ public Response findBook(@Context SearchContext searchContext,
@Context final UriInfo uri) throws IOException {
-
+
final IndexReader reader = DirectoryReader.open(directory);
final IndexSearcher searcher = new IndexSearcher(reader);
final JsonArrayBuilder builder = Json.createArrayBuilder();
- try {
+ try {
visitor.reset();
visitor.visit(searchContext.getCondition(SearchBean.class));
-
- final Query query = visitor.getQuery();
+
+ final Query query = visitor.getQuery();
if (query != null) {
final TopDocs topDocs = searcher.search(query, 1000);
for (final ScoreDoc scoreDoc: topDocs.scoreDocs) {
@@ -207,7 +207,7 @@ public class Catalog {
final String source = document
.getField(LuceneDocumentMetadata.SOURCE_FIELD)
.stringValue();
-
+
builder.add(
Json.createObjectBuilder()
.add("source", source)
@@ -219,18 +219,18 @@ public class Catalog {
);
}
}
-
+
return Response.ok(builder.build()).build();
} finally {
reader.close();
}
}
-
+
@GET
@Path("/{source}")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
- public StreamingOutput getBook(@PathParam("source") final String source) throws IOException {
- return new StreamingOutput() {
+ public StreamingOutput getBook(@PathParam("source") final String source) throws IOException {
+ return new StreamingOutput() {
@Override
public void write(final OutputStream out) throws IOException, WebApplicationException {
try (InputStream in = storage.getDocument(source)) {
@@ -241,25 +241,25 @@ public class Catalog {
}
};
}
-
+
@DELETE
public Response delete() throws IOException {
final IndexWriter writer = getIndexWriter();
-
+
try {
storage.deleteAll();
writer.deleteAll();
writer.commit();
} finally {
writer.close();
- }
-
+ }
+
return Response.ok().build();
}
-
+
private void initIndex() throws IOException {
final IndexWriter writer = getIndexWriter();
-
+
try {
writer.commit();
} finally {
@@ -270,40 +270,40 @@ public class Catalog {
private IndexWriter getIndexWriter() throws IOException {
return new IndexWriter(directory, new IndexWriterConfig(Version.LUCENE_4_9, analyzer));
}
-
+
private LuceneQueryVisitor< SearchBean > createVisitor() {
final Map< String, Class< ? > > fieldTypes = new HashMap< String, Class< ? > >();
fieldTypes.put("modified", Date.class);
-
+
LuceneQueryVisitor<SearchBean> newVisitor = new LuceneQueryVisitor<SearchBean>(
"ct", "contents", analyzer);
newVisitor.setPrimitiveFieldTypeMap(fieldTypes);
-
+
return newVisitor;
}
-
+
private boolean exists(final String source) throws IOException {
final IndexReader reader = DirectoryReader.open(directory);
final IndexSearcher searcher = new IndexSearcher(reader);
- try {
+ try {
return searcher.search(new TermQuery(
new Term(LuceneDocumentMetadata.SOURCE_FIELD, source)), 1).totalHits > 0;
} finally {
reader.close();
}
}
-
+
private void storeAndIndex(final LuceneDocumentMetadata metadata, final byte[] content)
throws IOException {
-
+
try (BufferedInputStream in = new BufferedInputStream(new ByteArrayInputStream(content))) {
-
+
final Document document = extractor.extract(in, metadata);
- if (document != null) {
+ if (document != null) {
final IndexWriter writer = getIndexWriter();
-
- try {
+
+ try {
storage.addDocument(metadata.getSource(), content);
writer.addDocument(document);
writer.commit();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
index cdab6db..f14b7b4 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
@@ -39,13 +39,13 @@ public class Server {
final ServletHolder staticHolder = new ServletHolder(new DefaultServlet());
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
- context.addServlet(servletHolder, "/*");
+ context.addServlet(servletHolder, "/*");
context.setResourceBase(getClass().getResource("/browser").toURI().toString());
-
- servletHolder.setInitParameter("redirects-list",
+
+ servletHolder.setInitParameter("redirects-list",
"/ /index.html /js/fileinput.min.js /css/fileinput.min.css");
servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName());
servletHolder.setInitParameter("redirect-attributes", "javax.servlet.include.request_uri");
@@ -54,7 +54,7 @@ public class Server {
new String[] {
"search.query.parameter.name=$filter",
SearchUtils.DATE_FORMAT_PROPERTY + "=yyyy/MM/dd"
- }, " ")
+ }, " ")
);
servletHolder.setInitParameter("jaxrs.providers", StringUtils.join(
new String[] {
@@ -62,9 +62,9 @@ public class Server {
SearchContextProvider.class.getName(),
JsrJsonpProvider.class.getName(),
CrossOriginResourceSharingFilter.class.getName()
- }, ",")
- );
-
+ }, ",")
+ );
+
server.setHandler(context);
server.start();
server.join();