From 53aaea7583475ee988bed08819d2f6ffa6ca4f59 Mon Sep 17 00:00:00 2001 From: floriankammermann Date: Sat, 2 Apr 2016 21:32:22 +0200 Subject: [PATCH 1/4] changed package, module name to org.swisspush --- .../reststorage/CollectionResource.java | 2 +- .../reststorage/DocumentResource.java | 2 +- .../reststorage/EventBusAdapter.java | 2 +- .../reststorage/FileSystemStorage.java | 2 +- .../reststorage/MimeTypeResolver.java | 2 +- .../swisspush}/reststorage/RedisStorage.java | 2 +- .../swisspush}/reststorage/Resource.java | 2 +- .../reststorage/RestStorageHandler.java | 89 +++++++++---------- .../reststorage/RestStorageMod.java | 2 +- .../swisspush}/reststorage/Storage.java | 2 +- .../swisspush}/reststorage/UrlParser.java | 2 +- .../reststorage/util/StatusCode.java | 2 +- .../reststorage/AbstractTestCase.java | 4 +- .../swisspush}/reststorage/CleanupTest.java | 2 +- .../swisspush}/reststorage/CrudTest.java | 2 +- .../swisspush}/reststorage/EtagTest.java | 2 +- .../reststorage/ExpirationTest.java | 2 +- .../swisspush}/reststorage/JedisFactory.java | 2 +- .../swisspush}/reststorage/OffsetTest.java | 2 +- .../swisspush}/reststorage/PathLevelTest.java | 2 +- .../swisspush}/reststorage/RedirectTest.java | 2 +- .../RedisEmbeddedConfiguration.java | 2 +- .../reststorage/StorageExpandTest.java | 2 +- .../lua/AbstractLuaScriptTest.java | 6 +- .../lua/RedisCleanupLuaScriptTests.java | 4 +- .../lua/RedisDelLuaScriptTests.java | 2 +- .../lua/RedisGetLuaScriptTests.java | 2 +- .../lua/RedisPutLuaScriptTests.java | 2 +- .../lua/RedisStorageExpandLuaScriptTests.java | 2 +- 29 files changed, 75 insertions(+), 78 deletions(-) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/CollectionResource.java (76%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/DocumentResource.java (92%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/EventBusAdapter.java (96%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/FileSystemStorage.java (99%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/MimeTypeResolver.java (97%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/RedisStorage.java (97%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/Resource.java (96%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/RestStorageHandler.java (86%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/RestStorageMod.java (98%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/Storage.java (93%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/UrlParser.java (94%) rename src/main/java/{li/chee/vertx => org/swisspush}/reststorage/util/StatusCode.java (95%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/AbstractTestCase.java (89%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/CleanupTest.java (98%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/CrudTest.java (97%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/EtagTest.java (97%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/ExpirationTest.java (96%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/JedisFactory.java (94%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/OffsetTest.java (97%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/PathLevelTest.java (96%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/RedirectTest.java (94%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/RedisEmbeddedConfiguration.java (93%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/StorageExpandTest.java (99%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/lua/AbstractLuaScriptTest.java (97%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/lua/RedisCleanupLuaScriptTests.java (96%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/lua/RedisDelLuaScriptTests.java (97%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/lua/RedisGetLuaScriptTests.java (97%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/lua/RedisPutLuaScriptTests.java (97%) rename src/test/java/{li/chee/vertx => org/swisspush}/reststorage/lua/RedisStorageExpandLuaScriptTests.java (99%) diff --git a/src/main/java/li/chee/vertx/reststorage/CollectionResource.java b/src/main/java/org/swisspush/reststorage/CollectionResource.java similarity index 76% rename from src/main/java/li/chee/vertx/reststorage/CollectionResource.java rename to src/main/java/org/swisspush/reststorage/CollectionResource.java index 88da5dc..0f7ea0f 100644 --- a/src/main/java/li/chee/vertx/reststorage/CollectionResource.java +++ b/src/main/java/org/swisspush/reststorage/CollectionResource.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import java.util.List; diff --git a/src/main/java/li/chee/vertx/reststorage/DocumentResource.java b/src/main/java/org/swisspush/reststorage/DocumentResource.java similarity index 92% rename from src/main/java/li/chee/vertx/reststorage/DocumentResource.java rename to src/main/java/org/swisspush/reststorage/DocumentResource.java index ccb645c..9db9ad9 100644 --- a/src/main/java/li/chee/vertx/reststorage/DocumentResource.java +++ b/src/main/java/org/swisspush/reststorage/DocumentResource.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.core.Handler; import io.vertx.core.streams.ReadStream; diff --git a/src/main/java/li/chee/vertx/reststorage/EventBusAdapter.java b/src/main/java/org/swisspush/reststorage/EventBusAdapter.java similarity index 96% rename from src/main/java/li/chee/vertx/reststorage/EventBusAdapter.java rename to src/main/java/org/swisspush/reststorage/EventBusAdapter.java index 0723b46..173ccd3 100644 --- a/src/main/java/li/chee/vertx/reststorage/EventBusAdapter.java +++ b/src/main/java/org/swisspush/reststorage/EventBusAdapter.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.netty.handler.codec.http.QueryStringDecoder; import io.vertx.core.*; diff --git a/src/main/java/li/chee/vertx/reststorage/FileSystemStorage.java b/src/main/java/org/swisspush/reststorage/FileSystemStorage.java similarity index 99% rename from src/main/java/li/chee/vertx/reststorage/FileSystemStorage.java rename to src/main/java/org/swisspush/reststorage/FileSystemStorage.java index 2ec4796..2b12b69 100644 --- a/src/main/java/li/chee/vertx/reststorage/FileSystemStorage.java +++ b/src/main/java/org/swisspush/reststorage/FileSystemStorage.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.core.Handler; import io.vertx.core.Vertx; diff --git a/src/main/java/li/chee/vertx/reststorage/MimeTypeResolver.java b/src/main/java/org/swisspush/reststorage/MimeTypeResolver.java similarity index 97% rename from src/main/java/li/chee/vertx/reststorage/MimeTypeResolver.java rename to src/main/java/org/swisspush/reststorage/MimeTypeResolver.java index 7da8f5b..1f02414 100644 --- a/src/main/java/li/chee/vertx/reststorage/MimeTypeResolver.java +++ b/src/main/java/org/swisspush/reststorage/MimeTypeResolver.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/li/chee/vertx/reststorage/RedisStorage.java b/src/main/java/org/swisspush/reststorage/RedisStorage.java similarity index 97% rename from src/main/java/li/chee/vertx/reststorage/RedisStorage.java rename to src/main/java/org/swisspush/reststorage/RedisStorage.java index 994183b..490a925 100644 --- a/src/main/java/li/chee/vertx/reststorage/RedisStorage.java +++ b/src/main/java/org/swisspush/reststorage/RedisStorage.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.core.Handler; import io.vertx.core.Vertx; diff --git a/src/main/java/li/chee/vertx/reststorage/Resource.java b/src/main/java/org/swisspush/reststorage/Resource.java similarity index 96% rename from src/main/java/li/chee/vertx/reststorage/Resource.java rename to src/main/java/org/swisspush/reststorage/Resource.java index cd60dfe..853ed29 100644 --- a/src/main/java/li/chee/vertx/reststorage/Resource.java +++ b/src/main/java/org/swisspush/reststorage/Resource.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.core.Handler; diff --git a/src/main/java/li/chee/vertx/reststorage/RestStorageHandler.java b/src/main/java/org/swisspush/reststorage/RestStorageHandler.java similarity index 86% rename from src/main/java/li/chee/vertx/reststorage/RestStorageHandler.java rename to src/main/java/org/swisspush/reststorage/RestStorageHandler.java index fecd9d3..70cdb4a 100644 --- a/src/main/java/li/chee/vertx/reststorage/RestStorageHandler.java +++ b/src/main/java/org/swisspush/reststorage/RestStorageHandler.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.core.Handler; import io.vertx.core.Vertx; @@ -9,6 +9,7 @@ import io.vertx.core.logging.Logger; import io.vertx.core.streams.Pump; import io.vertx.ext.web.Router; +import org.swisspush.reststorage.util.StatusCode; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -16,8 +17,6 @@ import java.util.Map; import java.util.Map.Entry; -import static li.chee.vertx.reststorage.util.StatusCode.*; - public class RestStorageHandler implements Handler { private static final String EXPIRE_AFTER_HEADER = "x-expire-after"; @@ -59,7 +58,7 @@ public RestStorageHandler(Vertx vertx, final Logger log, final Storage storage, } ctx.response().headers().add(CONTENT_LENGTH, "" + documentResource.length); ctx.response().headers().add(CONTENT_TYPE, "application/json; charset=utf-8"); - ctx.response().setStatusCode(OK.getStatusCode()); + ctx.response().setStatusCode(StatusCode.OK.getStatusCode()); final Pump pump = Pump.pump(documentResource.readStream, ctx.response()); documentResource.readStream.endHandler(nothing -> { documentResource.closeHandler.handle(null); @@ -98,10 +97,10 @@ public void handle(Buffer event) { storage.storageExpand(path, etag, subResourceNames, resource -> { if(resource.invalid){ - ctx.response().setStatusCode(INTERNAL_SERVER_ERROR.getStatusCode()); - ctx.response().setStatusMessage(INTERNAL_SERVER_ERROR.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.INTERNAL_SERVER_ERROR.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.INTERNAL_SERVER_ERROR.getStatusMessage()); - String message = INTERNAL_SERVER_ERROR.getStatusMessage(); + String message = StatusCode.INTERNAL_SERVER_ERROR.getStatusMessage(); if(resource.invalidMessage != null){ message = resource.invalidMessage; } @@ -110,8 +109,8 @@ public void handle(Buffer event) { } if (!resource.modified) { - ctx.response().setStatusCode(NOT_MODIFIED.getStatusCode()); - ctx.response().setStatusMessage(NOT_MODIFIED.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.NOT_MODIFIED.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.NOT_MODIFIED.getStatusMessage()); ctx.response().headers().set(ETAG_HEADER, etag); ctx.response().headers().add(CONTENT_LENGTH, "0"); ctx.response().end(); @@ -142,9 +141,9 @@ public void handle(Buffer event) { if (log.isTraceEnabled()) { log.trace("RestStorageHandler Could not find resource: " + ctx.request().uri()); } - ctx.response().setStatusCode(NOT_FOUND.getStatusCode()); - ctx.response().setStatusMessage(NOT_FOUND.getStatusMessage()); - ctx.response().end(NOT_FOUND.toString()); + ctx.response().setStatusCode(StatusCode.NOT_FOUND.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.NOT_FOUND.getStatusMessage()); + ctx.response().end(StatusCode.NOT_FOUND.toString()); } }); } @@ -169,8 +168,8 @@ public void handle(Resource resource) { } if (!resource.modified) { - ctx.response().setStatusCode(NOT_MODIFIED.getStatusCode()); - ctx.response().setStatusMessage(NOT_MODIFIED.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.NOT_MODIFIED.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.NOT_MODIFIED.getStatusMessage()); ctx.response().headers().set(ETAG_HEADER, etag); ctx.response().headers().add(CONTENT_LENGTH, "0"); ctx.response().end(); @@ -190,8 +189,8 @@ public void handle(Resource resource) { if (log.isTraceEnabled()) { log.trace("RestStorageHandler accept contains text/html and ends with /"); } - ctx.response().setStatusCode(FOUND.getStatusCode()); - ctx.response().setStatusMessage(FOUND.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.FOUND.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.FOUND.getStatusMessage()); ctx.response().headers().add("Location", ctx.request().uri() + "/"); ctx.response().end(); } else if (html) { @@ -204,8 +203,8 @@ public void handle(Resource resource) { if (log.isTraceEnabled()) { log.trace("RestStorageHandler query contains follow=off"); } - ctx.response().setStatusCode(FOUND.getStatusCode()); - ctx.response().setStatusMessage(FOUND.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.FOUND.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.FOUND.getStatusMessage()); ctx.response().headers().add("Location", (ctx.request().uri()) + collection.items.get(0).name); ctx.response().end(); return; @@ -257,8 +256,8 @@ public void handle(Resource resource) { if (log.isTraceEnabled()) { log.trace("RestStorageHandler DocumentResource ends with /"); } - ctx.response().setStatusCode(FOUND.getStatusCode()); - ctx.response().setStatusMessage(FOUND.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.FOUND.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.FOUND.getStatusMessage()); ctx.response().headers().add("Location", ctx.request().uri().substring(0, ctx.request().uri().length() - 1)); ctx.response().end(); } else { @@ -269,8 +268,8 @@ public void handle(Resource resource) { if (ctx.request().headers().names().contains("Accept") && ctx.request().headers().get("Accept").contains("text/html")) { String editor = editors.get(mimeType.split(";")[0]); if (editor != null) { - ctx.response().setStatusCode(FOUND.getStatusCode()); - ctx.response().setStatusMessage(FOUND.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.FOUND.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.FOUND.getStatusMessage()); String editorString = editor.replaceAll("\\$path", path); ctx.response().headers().add("Location", editorString); ctx.response().end(); @@ -297,9 +296,9 @@ public void handle(Resource resource) { if (log.isTraceEnabled()) { log.trace("RestStorageHandler Could not find resource: " + ctx.request().uri()); } - ctx.response().setStatusCode(NOT_FOUND.getStatusCode()); - ctx.response().setStatusMessage(NOT_FOUND.getStatusMessage()); - ctx.response().end(NOT_FOUND.toString()); + ctx.response().setStatusCode(StatusCode.NOT_FOUND.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.NOT_FOUND.getStatusMessage()); + ctx.response().end(StatusCode.NOT_FOUND.toString()); } } @@ -329,7 +328,7 @@ private List sortedNames(CollectionResource collection) { expire = Long.parseLong(ctx.request().headers().get(EXPIRE_AFTER_HEADER)); } catch (NumberFormatException nfe) { ctx.request().resume(); - ctx.response().setStatusCode(BAD_REQUEST.getStatusCode()); + ctx.response().setStatusCode(StatusCode.BAD_REQUEST.getStatusCode()); ctx.response().setStatusMessage("Invalid expire after parameter: " + ctx.request().headers().get(EXPIRE_AFTER_HEADER)); ctx.response().end(ctx.response().getStatusMessage()); log.error("Expire after header, invalid value: " + ctx.response().getStatusMessage()); @@ -349,8 +348,8 @@ public void handle(Resource resource) { ctx.request().resume(); if (!resource.modified) { - ctx.response().setStatusCode(NOT_MODIFIED.getStatusCode()); - ctx.response().setStatusMessage(NOT_MODIFIED.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.NOT_MODIFIED.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.NOT_MODIFIED.getStatusMessage()); ctx.response().headers().set(ETAG_HEADER, etag); ctx.response().headers().add(CONTENT_LENGTH, "0"); ctx.response().end(); @@ -358,22 +357,22 @@ public void handle(Resource resource) { } if (!resource.exists && resource instanceof DocumentResource) { - ctx.response().setStatusCode(METHOD_NOT_ALLOWED.getStatusCode()); - ctx.response().setStatusMessage(METHOD_NOT_ALLOWED.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.METHOD_NOT_ALLOWED.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.METHOD_NOT_ALLOWED.getStatusMessage()); ctx.response().headers().add("Allow", "GET, DELETE"); ctx.response().end(); } if (resource instanceof CollectionResource) { - ctx.response().setStatusCode(METHOD_NOT_ALLOWED.getStatusCode()); - ctx.response().setStatusMessage(METHOD_NOT_ALLOWED.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.METHOD_NOT_ALLOWED.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.METHOD_NOT_ALLOWED.getStatusMessage()); ctx.response().headers().add("Allow", "GET, DELETE"); ctx.response().end(); } if (resource instanceof DocumentResource) { final DocumentResource documentResource = (DocumentResource) resource; documentResource.errorHandler = error -> { - ctx.response().setStatusCode(BAD_REQUEST.getStatusCode()); - ctx.response().setStatusMessage(BAD_REQUEST.getStatusMessage()); + ctx.response().setStatusCode(StatusCode.BAD_REQUEST.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.BAD_REQUEST.getStatusMessage()); ctx.response().end(error); }; documentResource.endHandler = event -> ctx.response().end(); @@ -394,9 +393,9 @@ public void handle(Resource resource) { } storage.delete(path, resource -> { if (!resource.exists) { - ctx.request().response().setStatusCode(NOT_FOUND.getStatusCode()); - ctx.request().response().setStatusMessage(NOT_FOUND.getStatusMessage()); - ctx.request().response().end(NOT_FOUND.toString()); + ctx.request().response().setStatusCode(StatusCode.NOT_FOUND.getStatusCode()); + ctx.request().response().setStatusMessage(StatusCode.NOT_FOUND.getStatusMessage()); + ctx.request().response().end(StatusCode.NOT_FOUND.toString()); } else { ctx.request().response().end(); } @@ -407,9 +406,9 @@ public void handle(Resource resource) { if (log.isTraceEnabled()) { log.trace("RestStorageHandler resource not found: " + ctx.request().uri()); } - ctx.response().setStatusCode(NOT_FOUND.getStatusCode()); - ctx.response().setStatusMessage(NOT_FOUND.getStatusMessage()); - ctx.response().end(NOT_FOUND.toString()); + ctx.response().setStatusCode(StatusCode.NOT_FOUND.getStatusCode()); + ctx.response().setStatusMessage(StatusCode.NOT_FOUND.getStatusMessage()); + ctx.response().end(StatusCode.NOT_FOUND.toString()); }); router.routeWithRegex(".*").handler(ctx -> respondWithNotAllowed(ctx.request())); @@ -442,14 +441,14 @@ public OffsetLimit(int offset, int limit) { } private void respondWithNotAllowed(HttpServerRequest request) { - request.response().setStatusCode(METHOD_NOT_ALLOWED.getStatusCode()); - request.response().setStatusMessage(METHOD_NOT_ALLOWED.getStatusMessage()); - request.response().end(METHOD_NOT_ALLOWED.toString()); + request.response().setStatusCode(StatusCode.METHOD_NOT_ALLOWED.getStatusCode()); + request.response().setStatusMessage(StatusCode.METHOD_NOT_ALLOWED.getStatusMessage()); + request.response().end(StatusCode.METHOD_NOT_ALLOWED.toString()); } private void respondWithBadRequest(HttpServerRequest request, String responseMessage) { - request.response().setStatusCode(BAD_REQUEST.getStatusCode()); - request.response().setStatusMessage(BAD_REQUEST.getStatusMessage()); + request.response().setStatusCode(StatusCode.BAD_REQUEST.getStatusCode()); + request.response().setStatusMessage(StatusCode.BAD_REQUEST.getStatusMessage()); request.response().end(responseMessage); } diff --git a/src/main/java/li/chee/vertx/reststorage/RestStorageMod.java b/src/main/java/org/swisspush/reststorage/RestStorageMod.java similarity index 98% rename from src/main/java/li/chee/vertx/reststorage/RestStorageMod.java rename to src/main/java/org/swisspush/reststorage/RestStorageMod.java index f8d9d08..c47c743 100644 --- a/src/main/java/li/chee/vertx/reststorage/RestStorageMod.java +++ b/src/main/java/org/swisspush/reststorage/RestStorageMod.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.core.AbstractVerticle; import io.vertx.core.Future; diff --git a/src/main/java/li/chee/vertx/reststorage/Storage.java b/src/main/java/org/swisspush/reststorage/Storage.java similarity index 93% rename from src/main/java/li/chee/vertx/reststorage/Storage.java rename to src/main/java/org/swisspush/reststorage/Storage.java index e08dc85..6d004b6 100644 --- a/src/main/java/li/chee/vertx/reststorage/Storage.java +++ b/src/main/java/org/swisspush/reststorage/Storage.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.core.Handler; diff --git a/src/main/java/li/chee/vertx/reststorage/UrlParser.java b/src/main/java/org/swisspush/reststorage/UrlParser.java similarity index 94% rename from src/main/java/li/chee/vertx/reststorage/UrlParser.java rename to src/main/java/org/swisspush/reststorage/UrlParser.java index 27e4d8b..6d108f7 100644 --- a/src/main/java/li/chee/vertx/reststorage/UrlParser.java +++ b/src/main/java/org/swisspush/reststorage/UrlParser.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; public class UrlParser { diff --git a/src/main/java/li/chee/vertx/reststorage/util/StatusCode.java b/src/main/java/org/swisspush/reststorage/util/StatusCode.java similarity index 95% rename from src/main/java/li/chee/vertx/reststorage/util/StatusCode.java rename to src/main/java/org/swisspush/reststorage/util/StatusCode.java index b25e2d5..269d2cc 100644 --- a/src/main/java/li/chee/vertx/reststorage/util/StatusCode.java +++ b/src/main/java/org/swisspush/reststorage/util/StatusCode.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage.util; +package org.swisspush.reststorage.util; /** * Enum for HTTP status codes diff --git a/src/test/java/li/chee/vertx/reststorage/AbstractTestCase.java b/src/test/java/org/swisspush/reststorage/AbstractTestCase.java similarity index 89% rename from src/test/java/li/chee/vertx/reststorage/AbstractTestCase.java rename to src/test/java/org/swisspush/reststorage/AbstractTestCase.java index 6fac04e..51c29ee 100644 --- a/src/test/java/li/chee/vertx/reststorage/AbstractTestCase.java +++ b/src/test/java/org/swisspush/reststorage/AbstractTestCase.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; @@ -60,7 +60,7 @@ public void setUp(TestContext context) { storageConfig.put("storageAddress", "rest-storage"); storageConfig.put("redisHost", "localhost"); storageConfig.put("redisPort", 6379); - vertx.deployVerticle("li.chee.vertx.reststorage.RestStorageMod", new DeploymentOptions().setConfig(storageConfig), context.asyncAssertSuccess(stringAsyncResult1 -> { + vertx.deployVerticle("RestStorageMod", new DeploymentOptions().setConfig(storageConfig), context.asyncAssertSuccess(stringAsyncResult1 -> { // standard code: will called @Before every test RestAssured.basePath = ""; })); diff --git a/src/test/java/li/chee/vertx/reststorage/CleanupTest.java b/src/test/java/org/swisspush/reststorage/CleanupTest.java similarity index 98% rename from src/test/java/li/chee/vertx/reststorage/CleanupTest.java rename to src/test/java/org/swisspush/reststorage/CleanupTest.java index b13869a..658ee82 100644 --- a/src/test/java/li/chee/vertx/reststorage/CleanupTest.java +++ b/src/test/java/org/swisspush/reststorage/CleanupTest.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import com.jayway.restassured.http.ContentType; import io.vertx.ext.unit.Async; diff --git a/src/test/java/li/chee/vertx/reststorage/CrudTest.java b/src/test/java/org/swisspush/reststorage/CrudTest.java similarity index 97% rename from src/test/java/li/chee/vertx/reststorage/CrudTest.java rename to src/test/java/org/swisspush/reststorage/CrudTest.java index b14c656..5bf88f9 100644 --- a/src/test/java/li/chee/vertx/reststorage/CrudTest.java +++ b/src/test/java/org/swisspush/reststorage/CrudTest.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import com.jayway.restassured.RestAssured; import io.vertx.ext.unit.Async; diff --git a/src/test/java/li/chee/vertx/reststorage/EtagTest.java b/src/test/java/org/swisspush/reststorage/EtagTest.java similarity index 97% rename from src/test/java/li/chee/vertx/reststorage/EtagTest.java rename to src/test/java/org/swisspush/reststorage/EtagTest.java index 4975dee..d381eee 100644 --- a/src/test/java/li/chee/vertx/reststorage/EtagTest.java +++ b/src/test/java/org/swisspush/reststorage/EtagTest.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; diff --git a/src/test/java/li/chee/vertx/reststorage/ExpirationTest.java b/src/test/java/org/swisspush/reststorage/ExpirationTest.java similarity index 96% rename from src/test/java/li/chee/vertx/reststorage/ExpirationTest.java rename to src/test/java/org/swisspush/reststorage/ExpirationTest.java index 3d14f41..0c9c774 100644 --- a/src/test/java/li/chee/vertx/reststorage/ExpirationTest.java +++ b/src/test/java/org/swisspush/reststorage/ExpirationTest.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; diff --git a/src/test/java/li/chee/vertx/reststorage/JedisFactory.java b/src/test/java/org/swisspush/reststorage/JedisFactory.java similarity index 94% rename from src/test/java/li/chee/vertx/reststorage/JedisFactory.java rename to src/test/java/org/swisspush/reststorage/JedisFactory.java index 50f4bc9..67ee530 100644 --- a/src/test/java/li/chee/vertx/reststorage/JedisFactory.java +++ b/src/test/java/org/swisspush/reststorage/JedisFactory.java @@ -6,7 +6,7 @@ * ------------------------------------------------------------------------------------------------ */ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import redis.clients.jedis.Jedis; diff --git a/src/test/java/li/chee/vertx/reststorage/OffsetTest.java b/src/test/java/org/swisspush/reststorage/OffsetTest.java similarity index 97% rename from src/test/java/li/chee/vertx/reststorage/OffsetTest.java rename to src/test/java/org/swisspush/reststorage/OffsetTest.java index ed96b44..7eb8528 100644 --- a/src/test/java/li/chee/vertx/reststorage/OffsetTest.java +++ b/src/test/java/org/swisspush/reststorage/OffsetTest.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; diff --git a/src/test/java/li/chee/vertx/reststorage/PathLevelTest.java b/src/test/java/org/swisspush/reststorage/PathLevelTest.java similarity index 96% rename from src/test/java/li/chee/vertx/reststorage/PathLevelTest.java rename to src/test/java/org/swisspush/reststorage/PathLevelTest.java index 98ee89a..a7f4cd9 100644 --- a/src/test/java/li/chee/vertx/reststorage/PathLevelTest.java +++ b/src/test/java/org/swisspush/reststorage/PathLevelTest.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import com.jayway.restassured.RestAssured; import io.vertx.ext.unit.Async; diff --git a/src/test/java/li/chee/vertx/reststorage/RedirectTest.java b/src/test/java/org/swisspush/reststorage/RedirectTest.java similarity index 94% rename from src/test/java/li/chee/vertx/reststorage/RedirectTest.java rename to src/test/java/org/swisspush/reststorage/RedirectTest.java index 47e6483..4fda717 100644 --- a/src/test/java/li/chee/vertx/reststorage/RedirectTest.java +++ b/src/test/java/org/swisspush/reststorage/RedirectTest.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import com.jayway.restassured.RestAssured; import com.jayway.restassured.http.ContentType; diff --git a/src/test/java/li/chee/vertx/reststorage/RedisEmbeddedConfiguration.java b/src/test/java/org/swisspush/reststorage/RedisEmbeddedConfiguration.java similarity index 93% rename from src/test/java/li/chee/vertx/reststorage/RedisEmbeddedConfiguration.java rename to src/test/java/org/swisspush/reststorage/RedisEmbeddedConfiguration.java index ebab4a6..49abb84 100644 --- a/src/test/java/li/chee/vertx/reststorage/RedisEmbeddedConfiguration.java +++ b/src/test/java/org/swisspush/reststorage/RedisEmbeddedConfiguration.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import redis.embedded.RedisExecProvider; import redis.embedded.RedisServer; diff --git a/src/test/java/li/chee/vertx/reststorage/StorageExpandTest.java b/src/test/java/org/swisspush/reststorage/StorageExpandTest.java similarity index 99% rename from src/test/java/li/chee/vertx/reststorage/StorageExpandTest.java rename to src/test/java/org/swisspush/reststorage/StorageExpandTest.java index 83db6e4..28ccb1a 100644 --- a/src/test/java/li/chee/vertx/reststorage/StorageExpandTest.java +++ b/src/test/java/org/swisspush/reststorage/StorageExpandTest.java @@ -6,7 +6,7 @@ * ------------------------------------------------------------------------------------------------ */ -package li.chee.vertx.reststorage; +package org.swisspush.reststorage; import com.jayway.restassured.RestAssured; import com.jayway.restassured.http.ContentType; diff --git a/src/test/java/li/chee/vertx/reststorage/lua/AbstractLuaScriptTest.java b/src/test/java/org/swisspush/reststorage/lua/AbstractLuaScriptTest.java similarity index 97% rename from src/test/java/li/chee/vertx/reststorage/lua/AbstractLuaScriptTest.java rename to src/test/java/org/swisspush/reststorage/lua/AbstractLuaScriptTest.java index a23b6bb..cd24273 100644 --- a/src/test/java/li/chee/vertx/reststorage/lua/AbstractLuaScriptTest.java +++ b/src/test/java/org/swisspush/reststorage/lua/AbstractLuaScriptTest.java @@ -6,11 +6,11 @@ * ------------------------------------------------------------------------------------------------ */ -package li.chee.vertx.reststorage.lua; +package org.swisspush.reststorage.lua; import io.vertx.ext.unit.junit.VertxUnitRunner; -import li.chee.vertx.reststorage.JedisFactory; -import li.chee.vertx.reststorage.RedisEmbeddedConfiguration; +import org.swisspush.reststorage.JedisFactory; +import org.swisspush.reststorage.RedisEmbeddedConfiguration; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/src/test/java/li/chee/vertx/reststorage/lua/RedisCleanupLuaScriptTests.java b/src/test/java/org/swisspush/reststorage/lua/RedisCleanupLuaScriptTests.java similarity index 96% rename from src/test/java/li/chee/vertx/reststorage/lua/RedisCleanupLuaScriptTests.java rename to src/test/java/org/swisspush/reststorage/lua/RedisCleanupLuaScriptTests.java index cd6bcc4..dd701ec 100644 --- a/src/test/java/li/chee/vertx/reststorage/lua/RedisCleanupLuaScriptTests.java +++ b/src/test/java/org/swisspush/reststorage/lua/RedisCleanupLuaScriptTests.java @@ -1,10 +1,8 @@ -package li.chee.vertx.reststorage.lua; +package org.swisspush.reststorage.lua; -import li.chee.vertx.reststorage.RedisEmbeddedConfiguration; import org.apache.commons.lang.text.StrSubstitutor; import org.apache.commons.lang.time.DurationFormatUtils; import org.junit.*; -import redis.clients.jedis.Jedis; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/test/java/li/chee/vertx/reststorage/lua/RedisDelLuaScriptTests.java b/src/test/java/org/swisspush/reststorage/lua/RedisDelLuaScriptTests.java similarity index 97% rename from src/test/java/li/chee/vertx/reststorage/lua/RedisDelLuaScriptTests.java rename to src/test/java/org/swisspush/reststorage/lua/RedisDelLuaScriptTests.java index c2111a7..e1533b4 100644 --- a/src/test/java/li/chee/vertx/reststorage/lua/RedisDelLuaScriptTests.java +++ b/src/test/java/org/swisspush/reststorage/lua/RedisDelLuaScriptTests.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage.lua; +package org.swisspush.reststorage.lua; import org.junit.Test; diff --git a/src/test/java/li/chee/vertx/reststorage/lua/RedisGetLuaScriptTests.java b/src/test/java/org/swisspush/reststorage/lua/RedisGetLuaScriptTests.java similarity index 97% rename from src/test/java/li/chee/vertx/reststorage/lua/RedisGetLuaScriptTests.java rename to src/test/java/org/swisspush/reststorage/lua/RedisGetLuaScriptTests.java index d81808d..e19566c 100644 --- a/src/test/java/li/chee/vertx/reststorage/lua/RedisGetLuaScriptTests.java +++ b/src/test/java/org/swisspush/reststorage/lua/RedisGetLuaScriptTests.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage.lua; +package org.swisspush.reststorage.lua; import org.junit.Test; diff --git a/src/test/java/li/chee/vertx/reststorage/lua/RedisPutLuaScriptTests.java b/src/test/java/org/swisspush/reststorage/lua/RedisPutLuaScriptTests.java similarity index 97% rename from src/test/java/li/chee/vertx/reststorage/lua/RedisPutLuaScriptTests.java rename to src/test/java/org/swisspush/reststorage/lua/RedisPutLuaScriptTests.java index ba8ff71..81cab8a 100644 --- a/src/test/java/li/chee/vertx/reststorage/lua/RedisPutLuaScriptTests.java +++ b/src/test/java/org/swisspush/reststorage/lua/RedisPutLuaScriptTests.java @@ -1,4 +1,4 @@ -package li.chee.vertx.reststorage.lua; +package org.swisspush.reststorage.lua; import io.vertx.core.json.JsonObject; import org.junit.Test; diff --git a/src/test/java/li/chee/vertx/reststorage/lua/RedisStorageExpandLuaScriptTests.java b/src/test/java/org/swisspush/reststorage/lua/RedisStorageExpandLuaScriptTests.java similarity index 99% rename from src/test/java/li/chee/vertx/reststorage/lua/RedisStorageExpandLuaScriptTests.java rename to src/test/java/org/swisspush/reststorage/lua/RedisStorageExpandLuaScriptTests.java index 944d82f..4d3c139 100644 --- a/src/test/java/li/chee/vertx/reststorage/lua/RedisStorageExpandLuaScriptTests.java +++ b/src/test/java/org/swisspush/reststorage/lua/RedisStorageExpandLuaScriptTests.java @@ -6,7 +6,7 @@ * ------------------------------------------------------------------------------------------------ */ -package li.chee.vertx.reststorage.lua; +package org.swisspush.reststorage.lua; import org.apache.commons.lang3.StringUtils; import org.junit.Test; From 1a888b4b721e6948d8ca4dd89da2974b4e122ff3 Mon Sep 17 00:00:00 2001 From: floriankammermann Date: Sat, 2 Apr 2016 21:32:31 +0200 Subject: [PATCH 2/4] changed package, module name to org.swisspush --- gradle.properties | 2 +- gradle/vertx.gradle | 4 ++-- src/main/resources/mod.json | 2 +- src/test/java/org/swisspush/reststorage/AbstractTestCase.java | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 006b7e1..3803bd1 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -modowner=li.chee.vertx +modowner=org.swisspush modname=rest-storage version=2.0.3-SNAPSHOT diff --git a/gradle/vertx.gradle b/gradle/vertx.gradle index 0d75095..08aadab 100755 --- a/gradle/vertx.gradle +++ b/gradle/vertx.gradle @@ -250,7 +250,7 @@ def loadProperties(String sourceFileName) { def propFile = new File(sourceFileName) if (propFile.canRead()) { config.load(new FileInputStream(propFile)) - for (Map.Entry property in config) { + for (def property in config) { project.ext[property.key] = property.value; } } @@ -266,4 +266,4 @@ plugins.withType(IdeaPlugin) { scopes.RUNTIME.minus += [ configurations.provided ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/mod.json b/src/main/resources/mod.json index fd0e369..fbc56f2 100755 --- a/src/main/resources/mod.json +++ b/src/main/resources/mod.json @@ -1,3 +1,3 @@ { - "main": "li.chee.vertx.reststorage.RestStorageMod" + "main": "org.swisspush.reststorage.RestStorageMod" } diff --git a/src/test/java/org/swisspush/reststorage/AbstractTestCase.java b/src/test/java/org/swisspush/reststorage/AbstractTestCase.java index 51c29ee..fbfeffa 100644 --- a/src/test/java/org/swisspush/reststorage/AbstractTestCase.java +++ b/src/test/java/org/swisspush/reststorage/AbstractTestCase.java @@ -60,7 +60,8 @@ public void setUp(TestContext context) { storageConfig.put("storageAddress", "rest-storage"); storageConfig.put("redisHost", "localhost"); storageConfig.put("redisPort", 6379); - vertx.deployVerticle("RestStorageMod", new DeploymentOptions().setConfig(storageConfig), context.asyncAssertSuccess(stringAsyncResult1 -> { + RestStorageMod restStorageMod = new RestStorageMod(); + vertx.deployVerticle(restStorageMod, new DeploymentOptions().setConfig(storageConfig), context.asyncAssertSuccess(stringAsyncResult1 -> { // standard code: will called @Before every test RestAssured.basePath = ""; })); From 21f9dc2961156e3fe264251cc64997997cfa5367 Mon Sep 17 00:00:00 2001 From: floriankammermann Date: Sat, 2 Apr 2016 21:40:21 +0200 Subject: [PATCH 3/4] increased version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3803bd1..9078641 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ modowner=org.swisspush modname=rest-storage -version=2.0.3-SNAPSHOT +version=2.1.0 gradleVersion=2.3 vertxVersion=3.2.0 From fe64523b4ab63717870d5c640a4d203eea320fac Mon Sep 17 00:00:00 2001 From: floriankammermann Date: Sat, 2 Apr 2016 22:06:25 +0200 Subject: [PATCH 4/4] changed signing, didn't work after upgrading gradle --- gradle/maven.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gradle/maven.gradle b/gradle/maven.gradle index bfbc22c..87943a4 100755 --- a/gradle/maven.gradle +++ b/gradle/maven.gradle @@ -22,10 +22,11 @@ apply plugin: 'signing' // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // maven task configuration +ext.isReleaseVersion = !version.endsWith("SNAPSHOT") + signing { - if (project.hasProperty('signArchives')) { - sign configurations.archives - } + required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives } if (!project.hasProperty('repoUsername')) { @@ -79,6 +80,10 @@ uploadArchives { snapshotRepository(url: "$snapshotRepository") { authentication(userName: "$repoUsername", password: "$repoPassword") } + + if (isReleaseVersion) { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + } pom.project { name 'vertx-rest-storage'