Skip to content

Commit

Permalink
start JAX-RS compatibility per #15
Browse files Browse the repository at this point in the history
  • Loading branch information
zcourts committed Apr 21, 2014
1 parent 8b5c122 commit 2d2df69
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 131 deletions.
5 changes: 5 additions & 0 deletions http/server/s3/pom.xml
Expand Up @@ -15,6 +15,11 @@
<version>0.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
</dependency>
</dependencies>

</project>
10 changes: 4 additions & 6 deletions http/server/s3/src/main/java/io/higgs/http/server/demo/Api.java
Expand Up @@ -25,17 +25,17 @@
import io.higgs.http.server.params.SessionParam;
import io.higgs.http.server.params.ValidationResult;
import io.higgs.http.server.params.valid;
import io.higgs.http.server.resource.Consumes;
import io.higgs.http.server.resource.GET;
import io.higgs.http.server.resource.JsonData;
import io.higgs.http.server.resource.MediaType;
import io.higgs.http.server.resource.POST;
import io.higgs.http.server.resource.Produces;
import io.higgs.http.server.resource.template;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import io.netty.util.concurrent.EventExecutor;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Produces;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -94,7 +94,6 @@ public String acceptJson(JsonData data) {
@method("test/{string:[a-z0-9]+}/{num:[0-9]+}")
@template(fragments = {"header", "api", "footer"}, value = "")
@GET
@POST
public Object test(
//inject these named parameters
//for cookies, values can be a cookie String or a HttpCookie
Expand Down Expand Up @@ -151,7 +150,6 @@ public Map<Integer, Double> json(HttpRequest request) {

@Consumes({MediaType.APPLICATION_JSON})
@method("boom")
@GET
@POST
public Object boom2() {
//you can, and SHOULD return WebApplicationException
Expand Down
Expand Up @@ -8,12 +8,12 @@
import io.higgs.http.server.MethodParam;
import io.higgs.http.server.WebApplicationException;
import io.higgs.http.server.params.ValidationResult;
import io.higgs.http.server.resource.Consumes;
import io.higgs.http.server.resource.MediaType;
import io.higgs.http.server.resource.Produces;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.HttpResponseStatus;

import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.LinkedList;
Expand Down
Expand Up @@ -12,16 +12,16 @@
import io.higgs.http.server.params.QueryParam;
import io.higgs.http.server.params.SessionParam;
import io.higgs.http.server.params.valid;
import io.higgs.http.server.resource.DELETE;
import io.higgs.http.server.resource.GET;
import io.higgs.http.server.resource.HEAD;
import io.higgs.http.server.resource.OPTIONS;
import io.higgs.http.server.resource.POST;
import io.higgs.http.server.resource.PUT;
import io.higgs.http.server.resource.template;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.HEAD;
import javax.ws.rs.OPTIONS;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Queue;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,9 +1,8 @@
package io.higgs.ws.sockjs;

import io.higgs.core.method;
import io.higgs.http.server.resource.GET;
import io.higgs.http.server.resource.OPTIONS;

import javax.ws.rs.GET;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
Expand All @@ -16,7 +15,6 @@ public class SockJSProtocol {

private Random random = new Random();

@OPTIONS
@GET
public Map<String, Object> info() {
Map<String, Object> data = new HashMap<>();
Expand Down

0 comments on commit 2d2df69

Please sign in to comment.