various refactoring

added haslist
added separate config file for client and server
This commit is contained in:
2015-04-07 08:06:03 +02:00
parent ee2071c5fa
commit 8a867831fb
20 changed files with 249 additions and 187 deletions

View File

@@ -1,29 +1,17 @@
import com.thoughtworks.xstream.XStream;
import model.PkgData;
import org.jboss.resteasy.annotations.interception.ServerInterceptor;
import org.jboss.resteasy.core.ResourceMethodInvoker;
import org.jboss.resteasy.core.ServerResponse;
import org.jpacrepo.model.PkgData;
import org.jboss.resteasy.plugins.providers.RegisterBuiltin;
import org.jboss.resteasy.plugins.providers.jackson.ResteasyJacksonProvider;
import org.jboss.resteasy.spi.Failure;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.jboss.resteasy.spi.interception.PreProcessInterceptor;
import org.jboss.resteasy.spi.metadata.ResourceMethod;
import org.junit.Test;
import pacbase.Parser;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.ext.Provider;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.util.logging.Logger;
/**
* Created by walter on 29/03/15.
@@ -56,23 +44,17 @@ public class ClientTest
{
ResteasyProviderFactory instance = ResteasyProviderFactory.getInstance();
RegisterBuiltin.register(instance);
instance.registerProvider(ResteasyJacksonProvider.class);
Client client = ClientBuilder.newClient();
UriBuilder builder = UriBuilder.fromUri("http://localhost:8080/").path("jpacrepo-1.0/rest/pkg/upload");
builder.matrixParam("filename", "k290-fnkeyctl-1.2-1-x86_64.pkg.tar.xz");
WebTarget target = client.target(builder.build());
FileInputStream fis = new FileInputStream(new File("/tmp/k290-fnkeyctl-1.2-1-x86_64.pkg.tar.xz"));
FileInputStream fis = new FileInputStream(new File("/tmp/ciao/k290-fnkeyctl-1.2-1-x86_64.pkg.tar.xz"));
byte[] data = new byte[fis.available()];
fis.read(data);
Entity<byte[]> e = Entity.entity(data, MediaType.APPLICATION_OCTET_STREAM);
Entity<FileInputStream> e = Entity.entity(fis, MediaType.APPLICATION_OCTET_STREAM);
Invocation invocation = target.request().buildPost(e);
System.out.println(target.request().toString());
Response response = invocation.invoke();
System.out.println(response.getStatusInfo());
if (response.getStatusInfo() == Response.Status.OK)
{
System.out.println(response.getStatusInfo());
}
assert Response.Status.CREATED.getStatusCode() == response.getStatus();
}
}

View File

@@ -1,10 +1,10 @@
import model.PkgData;
import org.jpacrepo.model.PkgData;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.apache.commons.io.filefilter.RegexFileFilter;
import org.junit.Test;
import pacbase.Parser;
import service.PacmanService;
import org.jpacrepo.pacbase.Parser;
import org.jpacrepo.service.PacmanService;
import javax.naming.*;
import java.io.File;