From d29b7b675929573dde2429a6344f9e082237802c Mon Sep 17 00:00:00 2001
From: "Fuentes Serna Juan Mariano (ID SIS)" <juanf@bs-mbpr28.d.ethz.ch>
Date: Mon, 5 Feb 2018 16:51:32 +0100
Subject: [PATCH] microservice refactoring
---
microservice-server/conf/config.json | 4 ++--
.../java/ch/ethz/sis/microservices/.DS_Store | Bin 0 -> 6148 bytes
.../{download => }/api/configuration/Config.java | 2 +-
.../api/configuration/ServiceConfig.java | 2 +-
.../ch/ethz/sis/microservices/server/.DS_Store | Bin 0 -> 6148 bytes
.../server/json/JSONObjectMapper.java | 2 +-
.../server/json/jackson/JacksonObjectMapper.java | 4 ++--
.../server/logging/LogFactory.java | 2 +-
.../server/logging/LogFactoryFactory.java | 2 +-
.../server/logging/LogManager.java | 2 +-
.../{download => }/server/logging/Logger.java | 2 +-
.../server/logging/log4j/Log4J2LogFactory.java | 6 +++---
.../server/logging/log4j/Log4JLogger.java | 4 ++--
.../{download => }/server/services/Service.java | 4 ++--
.../store/AbstractFileServiceHandler.java | 8 ++++----
.../server/services/store/DownloadHandler.java | 6 +++---
.../server/services/store/FileInfoHandler.java | 8 ++++----
.../server/startup/HttpClient.java | 2 +-
.../{download => }/server/startup/Main.java | 14 +++++++-------
.../server/startup/ServerLauncher.java | 12 ++++++------
.../ch/ethz/sis/microservices/server/.DS_Store | Bin 0 -> 6148 bytes
.../sis/microservices/server/services/.DS_Store | Bin 0 -> 6148 bytes
.../server/services/store/.DS_Store | Bin 0 -> 6148 bytes
.../services/store/AbstractFileServiceTest.java | 8 ++++----
.../services/store/DownloadHandlerTest.java | 2 +-
.../services/store/FileInfoHandlerTest.java | 2 +-
26 files changed, 49 insertions(+), 49 deletions(-)
create mode 100644 microservice-server/src/main/java/ch/ethz/sis/microservices/.DS_Store
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/api/configuration/Config.java (72%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/api/configuration/ServiceConfig.java (79%)
create mode 100644 microservice-server/src/main/java/ch/ethz/sis/microservices/server/.DS_Store
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/json/JSONObjectMapper.java (78%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/json/jackson/JacksonObjectMapper.java (89%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/logging/LogFactory.java (55%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/logging/LogFactoryFactory.java (76%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/logging/LogManager.java (89%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/logging/Logger.java (82%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/logging/log4j/Log4J2LogFactory.java (54%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/logging/log4j/Log4JLogger.java (92%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/services/Service.java (71%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/services/store/AbstractFileServiceHandler.java (96%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/services/store/DownloadHandler.java (83%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/services/store/FileInfoHandler.java (83%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/startup/HttpClient.java (97%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/startup/Main.java (65%)
rename microservice-server/src/main/java/ch/ethz/sis/microservices/{download => }/server/startup/ServerLauncher.java (75%)
create mode 100644 microservice-server/src/test/java/ch/ethz/sis/microservices/server/.DS_Store
create mode 100644 microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/.DS_Store
create mode 100644 microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/.DS_Store
rename microservice-server/src/{main/java/ch/ethz/sis/microservices/download => test/java/ch/ethz/sis/microservices}/server/services/store/AbstractFileServiceTest.java (84%)
rename microservice-server/src/{main/java/ch/ethz/sis/microservices/download => test/java/ch/ethz/sis/microservices}/server/services/store/DownloadHandlerTest.java (83%)
rename microservice-server/src/{main/java/ch/ethz/sis/microservices/download => test/java/ch/ethz/sis/microservices}/server/services/store/FileInfoHandlerTest.java (83%)
diff --git a/microservice-server/conf/config.json b/microservice-server/conf/config.json
index 44f4444e74b..07d1a974a84 100644
--- a/microservice-server/conf/config.json
+++ b/microservice-server/conf/config.json
@@ -2,7 +2,7 @@
"port" : 8080,
"services" : [
{
- "className" : "ch.ethz.sis.microservices.download.server.services.store.FileInfoHandler",
+ "className" : "ch.ethz.sis.microservices.server.services.store.FileInfoHandler",
"url" : "/file-information",
"parameters" : {
"openbis-url" : "http://localhost:8888/openbis/openbis/rmi-application-server-v3",
@@ -13,7 +13,7 @@
}
},
{
- "className" : "ch.ethz.sis.microservices.download.server.services.store.DownloadHandler",
+ "className" : "ch.ethz.sis.microservices.server.services.store.DownloadHandler",
"url" : "/download",
"parameters" : {
"openbis-url" : "http://localhost:8888/openbis/openbis/rmi-application-server-v3",
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/.DS_Store b/microservice-server/src/main/java/ch/ethz/sis/microservices/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I
literal 0
HcmV?d00001
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/Config.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/Config.java
similarity index 72%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/Config.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/Config.java
index 0dbc2068f6c..a5dc538fdb3 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/Config.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/Config.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.api.configuration;
+package ch.ethz.sis.microservices.api.configuration;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/ServiceConfig.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/ServiceConfig.java
similarity index 79%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/ServiceConfig.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/ServiceConfig.java
index cf7545ef5b7..bd173c2835c 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/ServiceConfig.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/ServiceConfig.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.api.configuration;
+package ch.ethz.sis.microservices.api.configuration;
import java.util.HashMap;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/server/.DS_Store b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I
literal 0
HcmV?d00001
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/JSONObjectMapper.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/JSONObjectMapper.java
similarity index 78%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/JSONObjectMapper.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/JSONObjectMapper.java
index 20682273fb3..83eaf3e9cfc 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/JSONObjectMapper.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/JSONObjectMapper.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.json;
+package ch.ethz.sis.microservices.server.json;
import java.io.FileInputStream;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/jackson/JacksonObjectMapper.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/jackson/JacksonObjectMapper.java
similarity index 89%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/jackson/JacksonObjectMapper.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/jackson/JacksonObjectMapper.java
index 8821bac0747..3b94a6fbf26 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/jackson/JacksonObjectMapper.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/jackson/JacksonObjectMapper.java
@@ -1,11 +1,11 @@
-package ch.ethz.sis.microservices.download.server.json.jackson;
+package ch.ethz.sis.microservices.server.json.jackson;
import java.io.FileInputStream;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import ch.ethz.sis.microservices.download.server.json.JSONObjectMapper;
+import ch.ethz.sis.microservices.server.json.JSONObjectMapper;
public class JacksonObjectMapper implements JSONObjectMapper
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactory.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactory.java
similarity index 55%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactory.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactory.java
index c2ae5ee24a7..b0695fc6656 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactory.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactory.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public interface LogFactory {
<T> Logger getLogger(Class<T> clazz);
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactoryFactory.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactoryFactory.java
similarity index 76%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactoryFactory.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactoryFactory.java
index 23d94da8251..43eae4473b9 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactoryFactory.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactoryFactory.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public class LogFactoryFactory {
public LogFactory create(String logFactoryClass) throws Exception {
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogManager.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogManager.java
similarity index 89%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogManager.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogManager.java
index c1ef4400567..1f96db4a711 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogManager.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogManager.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public class LogManager {
private static LogFactory factory;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/Logger.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/Logger.java
similarity index 82%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/Logger.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/Logger.java
index 3e9c2742a41..93c296a11e8 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/Logger.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/Logger.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public interface Logger {
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4J2LogFactory.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4J2LogFactory.java
similarity index 54%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4J2LogFactory.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4J2LogFactory.java
index 27cd6b6881f..5d43e3a32a2 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4J2LogFactory.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4J2LogFactory.java
@@ -1,9 +1,9 @@
-package ch.ethz.sis.microservices.download.server.logging.log4j;
+package ch.ethz.sis.microservices.server.logging.log4j;
import org.apache.logging.log4j.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.LogFactory;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
+import ch.ethz.sis.microservices.server.logging.LogFactory;
+import ch.ethz.sis.microservices.server.logging.Logger;
public class Log4J2LogFactory implements LogFactory
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4JLogger.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4JLogger.java
similarity index 92%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4JLogger.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4JLogger.java
index a605ec7a512..39a9eace264 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4JLogger.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4JLogger.java
@@ -1,11 +1,11 @@
-package ch.ethz.sis.microservices.download.server.logging.log4j;
+package ch.ethz.sis.microservices.server.logging.log4j;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.spi.AbstractLogger;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
-class Log4JLogger extends ExtendedLoggerWrapper implements ch.ethz.sis.microservices.download.server.logging.Logger
+class Log4JLogger extends ExtendedLoggerWrapper implements ch.ethz.sis.microservices.server.logging.Logger
{
private final String FQCN;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/Service.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/Service.java
similarity index 71%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/Service.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/Service.java
index 0e9f65b8ab9..c38c32983ef 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/Service.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/Service.java
@@ -1,8 +1,8 @@
-package ch.ethz.sis.microservices.download.server.services;
+package ch.ethz.sis.microservices.server.services;
import javax.servlet.http.HttpServlet;
-import ch.ethz.sis.microservices.download.api.configuration.ServiceConfig;
+import ch.ethz.sis.microservices.api.configuration.ServiceConfig;
public abstract class Service extends HttpServlet
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceHandler.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceHandler.java
similarity index 96%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceHandler.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceHandler.java
index 3d86baae82a..6a7ade53e68 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceHandler.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceHandler.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.io.IOException;
import java.nio.file.Files;
@@ -11,9 +11,9 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
-import ch.ethz.sis.microservices.download.server.services.Service;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
+import ch.ethz.sis.microservices.server.services.Service;
import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ContentCopy;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandler.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/DownloadHandler.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandler.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/DownloadHandler.java
index 375970a2b1c..3395c0d1e83 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandler.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/DownloadHandler.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.io.IOException;
import java.nio.file.Files;
@@ -7,8 +7,8 @@ import java.nio.file.Path;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
public class DownloadHandler extends AbstractFileServiceHandler
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandler.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandler.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandler.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandler.java
index e7f267f5ba3..016494ca535 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandler.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandler.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.io.IOException;
import java.nio.file.Path;
@@ -8,9 +8,9 @@ import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
-import ch.ethz.sis.microservices.download.server.json.jackson.JacksonObjectMapper;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
+import ch.ethz.sis.microservices.server.json.jackson.JacksonObjectMapper;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
public class FileInfoHandler extends AbstractFileServiceHandler
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/HttpClient.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
similarity index 97%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/HttpClient.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
index f4a35f881bf..ce95d4f4bb9 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/HttpClient.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.startup;
+package ch.ethz.sis.microservices.server.startup;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/Main.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
similarity index 65%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/Main.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
index 544ba43ad40..2fc922e26a4 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/Main.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
@@ -1,13 +1,13 @@
-package ch.ethz.sis.microservices.download.server.startup;
+package ch.ethz.sis.microservices.server.startup;
import java.io.File;
import java.io.FileInputStream;
-import ch.ethz.sis.microservices.download.api.configuration.Config;
-import ch.ethz.sis.microservices.download.server.json.jackson.JacksonObjectMapper;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
-import ch.ethz.sis.microservices.download.server.logging.log4j.Log4J2LogFactory;
+import ch.ethz.sis.microservices.api.configuration.Config;
+import ch.ethz.sis.microservices.server.json.jackson.JacksonObjectMapper;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
+import ch.ethz.sis.microservices.server.logging.log4j.Log4J2LogFactory;
public class Main
{
@@ -26,7 +26,7 @@ public class Main
File configFile;
if (args.length < 1)
{
- configFile = new File("config.json");
+ configFile = new File("./conf/config.json");
logger.info("No arguments given, starting with default config file: " + (configFile.getAbsolutePath()));
} else
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/ServerLauncher.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/ServerLauncher.java
similarity index 75%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/ServerLauncher.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/ServerLauncher.java
index 6f44aa5a330..e1196a9e23a 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/ServerLauncher.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/ServerLauncher.java
@@ -1,14 +1,14 @@
-package ch.ethz.sis.microservices.download.server.startup;
+package ch.ethz.sis.microservices.server.startup;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import ch.ethz.sis.microservices.download.api.configuration.Config;
-import ch.ethz.sis.microservices.download.api.configuration.ServiceConfig;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
-import ch.ethz.sis.microservices.download.server.services.Service;
+import ch.ethz.sis.microservices.api.configuration.Config;
+import ch.ethz.sis.microservices.api.configuration.ServiceConfig;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
+import ch.ethz.sis.microservices.server.services.Service;
public class ServerLauncher
{
diff --git a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/.DS_Store b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I
literal 0
HcmV?d00001
diff --git a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/.DS_Store b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I
literal 0
HcmV?d00001
diff --git a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/.DS_Store b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ead2009953af184cbc64f6aa27ab9ecfdc3e0470
GIT binary patch
literal 6148
zcmeHKO-}+b5Pd}s7%v<-?jKO%KiCjVJQy$P8DUugg<Z0{VB%^2hkw>L(*_~PK@TLD
znWXdD`DmxFWJ>|K-fDaev;nl(1RLj6KZy9H?MWk81f9+?M~)%JxTQ8Z1qS5oI_UG<
z-jQMZ{4$>794QJsQkST3g;$>I8pCBZx?7c1!Q4+g(I-(Qy7aFYk>Q1XnKR*dL2t%v
z@h=&dV?sToeSsN06WVinBx*!Ui2?fw*PhWTa}QWs&YU-nmds4lHle>_uFR6?yuOaL
zj#FG}Zozt`x-Lfr<GRf8yOC;jH?$>~Qm6Dy@u9I&$KkofH)c)SoXHBZ()W6PB-P1^
z;;(ccDf@q8{XVe%>k~VLpQ6=h3>X7PWPo?JNbAC*X=A_`Fa|aZ$oC;)6O04a9`(~f
zrB482lV%n6<t-sOQNTE0?U5de^QlCi>cSJl`E=T&5ElomJ^FMwU77QQm0ftDI9;9g
zNW<Y`kEV?QV_=toGe2z0{eN@#{lA-JBV)iA_*V?LX8)nz<CenRy0<yGYa_O2HW7)d
mJ#JFi(W{uTaus*jRA`T+LyQB~9%-T29|5JolreBr2EG7sPHkcU
literal 0
HcmV?d00001
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceTest.java b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
similarity index 84%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceTest.java
rename to microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
index 5f730802d5a..3652c69da61 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceTest.java
+++ b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
@@ -1,11 +1,11 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.util.HashMap;
import java.util.Map;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.log4j.Log4J2LogFactory;
-import ch.ethz.sis.microservices.download.server.startup.HttpClient;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.log4j.Log4J2LogFactory;
+import ch.ethz.sis.microservices.server.startup.HttpClient;
import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandlerTest.java b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/DownloadHandlerTest.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandlerTest.java
rename to microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/DownloadHandlerTest.java
index 3bdcb393c32..0fd062dafd9 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandlerTest.java
+++ b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/DownloadHandlerTest.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
public class DownloadHandlerTest
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandlerTest.java b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandlerTest.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandlerTest.java
rename to microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandlerTest.java
index 87043e1b793..0c74198e293 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandlerTest.java
+++ b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandlerTest.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
public class FileInfoHandlerTest
{
--
GitLab