diff --git a/api-data-store-server-java/.gitignore b/api-data-store-server-java/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..fe63103f29daac95f5989e4cfc75a0fb0cff693b
--- /dev/null
+++ b/api-data-store-server-java/.gitignore
@@ -0,0 +1,7 @@
+/build/
+/bin/
+/out/
+/.idea/
+/target/
+*.iml
+*.eml
\ No newline at end of file
diff --git a/api-data-store-server-java/build.gradle b/api-data-store-server-java/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e93cc96ca1c91c22f77475bb0d1728c093eb21c9
--- /dev/null
+++ b/api-data-store-server-java/build.gradle
@@ -0,0 +1,114 @@
+evaluationDependsOn(':lib-json')
+evaluationDependsOn(':lib-transactional-file-system')
+//
+//apply from: '../build/javaproject.gradle'
+
+
+
+//'lib-transactional-file-system', 'lib-json'
+//apply plugin: 'java'
+//apply plugin: 'application'
+//
+//compileJava {
+// options.compilerArgs << '-parameters'
+//}
+//
+//compileTestJava {
+// options.compilerArgs << '-parameters'
+//}
+//
+//repositories {
+// ivy {
+// ivyPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/ivy.xml"
+// artifactPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+// }
+//}
+
+//dependencies {
+// compileOnly 'lombok:lombok:1.18.22'
+// annotationProcessor 'lombok:lombok:1.18.22'
+//
+//
+// api project(':lib-json')
+//
+// implementation project(':lib-json'),
+// project(':lib-transactional-file-system')
+//
+//// testCompileOnly 'lombok:lombok:1.18.22'
+//// testAnnotationProcessor 'lombok:lombok:1.18.22'
+// testImplementation 'testng:testng:6.8-CISD',
+//// project(':lib-json')
+// project(path: ':lib-json', configuration: 'tests')
+//// project(path: ':lib-commonbase', configuration: 'tests'),
+//// project(path: ':lib-common', configuration: 'tests'),
+//// 'fjelmer:classycle:1.4.2'
+// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
+//}
+
+
+//dependencies {
+// annotationProcessor 'lombok:lombok:1.18.22'
+// implementation project(':lib-json'),
+//// project(':lib-transactional-file-system'),
+// 'lombok:lombok:1.18.22'
+// testImplementation 'junit:junit:4.10',
+// project(':lib-json')
+// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
+//// 'org.junit.vintage:junit-vintage-engine:5.8.2'
+//}
+//
+//test {
+// useJUnitPlatform()
+//}
+
+//tasks.register('AFSServerDevelopmentEnvironmentStart') {
+// main = 'ch.ethz.sis.afsclient.startup.Main'
+// classpath = sourceSets.main.runtimeClasspath
+// jvmArgs(['-Xmx256M'])
+//}
+
+
+apply plugin: 'java'
+apply plugin: 'application'
+
+compileJava {
+ options.compilerArgs << '-parameters'
+}
+
+//compileTestJava {
+// options.compilerArgs << '-parameters'
+//}
+
+
+repositories {
+ ivy {
+ ivyPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/ivy.xml"
+ artifactPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+ }
+}
+
+//dependencies {
+// compileOnly 'lombok:lombok:1.18.22'
+// annotationProcessor 'lombok:lombok:1.18.22'
+// implementation project(':lib-json'),
+// project(':lib-transactional-file-system')
+// testImplementation 'testng:testng:6.8-CISD',
+// project(':lib-json')
+// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
+//// 'org.junit.vintage:junit-vintage-engine:5.8.2'
+//}
+
+dependencies {
+ compileOnly 'lombok:lombok:1.18.22'
+ annotationProcessor 'lombok:lombok:1.18.22'
+ implementation project(':lib-transactional-file-system'),
+ project(':lib-json'),
+ 'lombok:lombok:1.18.22'
+// testImplementation 'testng:testng:6.8-CISD'
+ testImplementation 'junit:junit:4.10'
+ testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
+}
+
+//test {
+// useJUnitPlatform()
+//}
\ No newline at end of file
diff --git a/api-data-store-server-java/gradle/wrapper/gradle-wrapper.jar b/api-data-store-server-java/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5c2d1cf016b3885f6930543d57b744ea8c220a1a
Binary files /dev/null and b/api-data-store-server-java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/api-data-store-server-java/gradle/wrapper/gradle-wrapper.properties b/api-data-store-server-java/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000000000000000000000000000000000..7745c4ec463c7bb1c4ff6a5e58db239890345152
--- /dev/null
+++ b/api-data-store-server-java/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/gradle/distribution/7.4/gradle-7.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/api-data-store-server-java/gradlew b/api-data-store-server-java/gradlew
new file mode 100755
index 0000000000000000000000000000000000000000..a69d9cb6c20655813e44515156e7253a2a239138
--- /dev/null
+++ b/api-data-store-server-java/gradlew
@@ -0,0 +1,240 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/api-data-store-server-java/gradlew.bat b/api-data-store-server-java/gradlew.bat
new file mode 100644
index 0000000000000000000000000000000000000000..f127cfd49d4024c3e1e0d08ba56399221b4fb25d
--- /dev/null
+++ b/api-data-store-server-java/gradlew.bat
@@ -0,0 +1,91 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/api-data-store-server-java/settings.gradle b/api-data-store-server-java/settings.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..30ae17b2f6fd805b7a5d8f7b5484777f76d5c02c
--- /dev/null
+++ b/api-data-store-server-java/settings.gradle
@@ -0,0 +1 @@
+includeFlat 'lib-json', 'lib-transactional-file-system'
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/AuthenticationApi.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/AuthenticationApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..aa499dbcb7d3a917997495be2e47bc94436b6ebf
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/AuthenticationApi.java
@@ -0,0 +1,17 @@
+package ch.ethz.sis.afsapi.api;
+
+import lombok.NonNull;
+
+public interface AuthenticationApi
+{
+
+ @NonNull
+ String login(@NonNull String userId, @NonNull String password) throws Exception;
+
+ @NonNull
+ Boolean isSessionValid() throws Exception;
+
+ @NonNull
+ Boolean logout() throws Exception;
+
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/OperationsApi.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/OperationsApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..9bd5adbb09625be8e034ea2dd9c092e2c57eecee
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/OperationsApi.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2022 ETH Zürich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.afsapi.api;
+
+import java.util.List;
+
+import ch.ethz.sis.afsapi.api.dto.File;
+import lombok.NonNull;
+
+public interface OperationsApi
+{
+
+ @NonNull
+ List<File> list(@NonNull String owner, @NonNull String source, @NonNull Boolean recursively)
+ throws Exception;
+
+ byte @NonNull [] read(@NonNull String owner, @NonNull String source, @NonNull Long offset,
+ @NonNull Integer limit) throws Exception;
+
+ @NonNull
+ Boolean write(@NonNull String owner, @NonNull String source, @NonNull Long offset,
+ byte @NonNull [] data, byte @NonNull [] md5Hash) throws Exception;
+
+ @NonNull
+ Boolean delete(@NonNull String owner, @NonNull String source) throws Exception;
+
+ @NonNull
+ Boolean copy(@NonNull String sourceOwner, @NonNull String source, @NonNull String targetOwner,
+ @NonNull String target) throws Exception;
+
+ @NonNull
+ Boolean move(@NonNull String sourceOwner, @NonNull String source, @NonNull String targetOwner,
+ @NonNull String target) throws Exception;
+
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/PublicApi.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/PublicApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..5113acec43f2538d0a200ac3dcd604091864cfbc
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/PublicApi.java
@@ -0,0 +1,6 @@
+package ch.ethz.sis.afsapi.api;
+
+import ch.ethz.sis.afs.api.TwoPhaseTransactionAPI;
+
+public interface PublicApi extends OperationsApi, AuthenticationApi, TwoPhaseTransactionAPI {
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ApiResponse.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ApiResponse.java
new file mode 100644
index 0000000000000000000000000000000000000000..099feb6188faa02d9d0e84b2db1665c68adc7465
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ApiResponse.java
@@ -0,0 +1,19 @@
+package ch.ethz.sis.afsapi.api.dto;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@Builder(toBuilder = true)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+public class ApiResponse {
+
+ String id;
+
+ Object result;
+
+ Object error;
+
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ExceptionReason.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ExceptionReason.java
new file mode 100644
index 0000000000000000000000000000000000000000..b616cd4dc2afa7fa3f77293add7501fd865086d9
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ExceptionReason.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 ETH Zürich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.afsapi.api.dto;
+
+import lombok.Value;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Value
+public class ExceptionReason implements Serializable {
+ private Integer componentCode;
+ private Integer exceptionCode;
+ private String javaClassName;
+ private List<ExceptionType> types;
+ private String message;
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ExceptionType.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ExceptionType.java
new file mode 100644
index 0000000000000000000000000000000000000000..b078e87fab14ddc19fbb88324d4ed071ad238e29
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/ExceptionType.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 ETH Zürich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.afsapi.api.dto;
+
+public enum ExceptionType {
+ UnknownError,
+ UserUsageError,
+ AdminConfigError,
+ ClientDeveloperCodingError,
+ CoreDeveloperCodingError,
+ RecoverableSystemStateError,
+ IrrecoverableSystemStateError
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/File.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/File.java
new file mode 100644
index 0000000000000000000000000000000000000000..3a710ea51941225f9f7461f998a373ac98477549
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsapi/api/dto/File.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 ETH Zürich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.afsapi.api.dto;
+
+import lombok.*;
+
+import java.time.OffsetDateTime;
+
+@Value
+@Builder(toBuilder = true)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+public class File {
+ private String path;
+ private String name;
+ private Boolean directory;
+ private Long size; // Size in bytes
+ private OffsetDateTime lastModifiedTime;
+ private OffsetDateTime creationTime;
+
+ @EqualsAndHashCode.Exclude
+ private OffsetDateTime lastAccessTime;
+}
\ No newline at end of file
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..76cd6e8ee6397de69e1e946144e897bed9a843d3
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AfsClient.java
@@ -0,0 +1,205 @@
+package ch.ethz.sis.afsclient.client;
+
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.AbstractMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import ch.ethz.sis.afsapi.api.PublicApi;
+import ch.ethz.sis.afsapi.api.dto.ApiResponse;
+import ch.ethz.sis.afsapi.api.dto.File;
+import ch.ethz.sis.afsclient.client.exception.ClientExceptions;
+import ch.ethz.sis.afsjson.JsonObjectMapper;
+import ch.ethz.sis.afsjson.jackson.JacksonObjectMapper;
+import lombok.NonNull;
+
+public final class AfsClient implements PublicApi
+{
+
+ private static final int DEFAULT_PACKAGE_SIZE_IN_BYTES = 1024;
+
+ private static final int DEFAULT_TIMEOUT_IN_MILLIS = 30000;
+
+ private final int maxReadSizeInBytes;
+
+ private final int timeout;
+
+ private String sessionToken;
+
+ private final URI serverUri;
+
+ private final JsonObjectMapper jsonObjectMapper;
+
+ public AfsClient(final URI serverUri) {
+ this(serverUri, DEFAULT_PACKAGE_SIZE_IN_BYTES, DEFAULT_TIMEOUT_IN_MILLIS);
+ }
+
+ public AfsClient(final URI serverUri, final int maxReadSizeInBytes, final int timeout) {
+ this.maxReadSizeInBytes = maxReadSizeInBytes;
+ this.timeout = timeout;
+ this.serverUri = serverUri;
+ this.jsonObjectMapper = new JacksonObjectMapper();
+ }
+
+ public URI getServerUri() {
+ return serverUri;
+ }
+
+ public int getMaxReadSizeInBytes() {
+ return maxReadSizeInBytes;
+ }
+
+ public String getSessionToken() {
+ return sessionToken;
+ }
+
+ public void setSessionToken(final String sessionToken) {
+ this.sessionToken = sessionToken;
+ }
+
+ private static String urlEncode(final String s) {
+ return URLEncoder.encode(s, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ public @NonNull String login(@NonNull final String userId, @NonNull final String password) throws Exception {
+ return request("POST", "login", Map.of("userId", "admin", "password", "changeit"));
+ }
+
+ @Override
+ public @NonNull Boolean isSessionValid() throws Exception {
+ return null;
+ }
+
+ @Override
+ public @NonNull Boolean logout() throws Exception {
+ return null;
+ }
+
+ @Override
+ public @NonNull List<File> list(@NonNull final String owner, @NonNull final String source,
+ @NonNull final Boolean recursively) throws Exception {
+ return null;
+ }
+
+ @Override
+ public byte @NonNull [] read(@NonNull final String owner, @NonNull final String source,
+ @NonNull final Long offset, @NonNull final Integer limit) throws Exception {
+ return new byte[0];
+ }
+
+ @Override
+ public @NonNull Boolean write(@NonNull final String owner, @NonNull final String source,
+ @NonNull final Long offset, final byte @NonNull [] data,
+ final byte @NonNull [] md5Hash) throws Exception {
+ return null;
+ }
+
+ @Override
+ public @NonNull Boolean delete(@NonNull final String owner, @NonNull final String source)
+ throws Exception {
+ return null;
+ }
+
+ @Override
+ public @NonNull Boolean copy(@NonNull final String sourceOwner, @NonNull final String source, @NonNull final String targetOwner,
+ @NonNull final String target)
+ throws Exception
+ {
+ return null;
+ }
+
+ @Override
+ public @NonNull Boolean move(@NonNull final String sourceOwner, @NonNull final String source, @NonNull final String targetOwner,
+ @NonNull final String target)
+ throws Exception
+ {
+ return null;
+ }
+
+ @Override
+ public void begin(final UUID transactionId) throws Exception {
+
+ }
+
+ @Override
+ public Boolean prepare() throws Exception {
+ return null;
+ }
+
+ @Override
+ public void commit() throws Exception {
+
+ }
+
+ @Override
+ public void rollback() throws Exception {
+
+ }
+
+ @Override
+ public List<UUID> recover() throws Exception {
+ return null;
+ }
+
+ private <T> T request(@NonNull final String httpMethod, @NonNull final String apiMethod,
+ @NonNull final Map<String, String> parameters) throws Exception {
+ return request(httpMethod, apiMethod, parameters, new byte[0]);
+ }
+
+ @SuppressWarnings({ "OptionalGetWithoutIsPresent", "unchecked" })
+ private <T> T request(@NonNull final String httpMethod, @NonNull final String apiMethod,
+ @NonNull final Map<String, String> parameters, final byte @NonNull [] body) throws Exception {
+ HttpClient client = HttpClient.newBuilder()
+ .version(HttpClient.Version.HTTP_1_1)
+ .followRedirects(HttpClient.Redirect.NORMAL)
+ .connectTimeout(Duration.ofMillis(timeout))
+ .build();
+
+ final String query = Stream.concat(Stream.of(new AbstractMap.SimpleImmutableEntry<>("method", apiMethod)),
+ parameters.entrySet().stream())
+ .map(entry -> urlEncode(entry.getKey()) + "=" + urlEncode(entry.getValue()))
+ .reduce((s1, s2) -> s1 + "&" + s2).get();
+
+ final URI uri = new URI(serverUri.getScheme(), null, serverUri.getHost(), serverUri.getPort(),
+ serverUri.getPath(), query, null);
+
+ final HttpRequest.Builder builder = HttpRequest.newBuilder()
+ .uri(uri)
+ .version(HttpClient.Version.HTTP_1_1)
+ .timeout(Duration.ofMillis(timeout))
+ .method(httpMethod, HttpRequest.BodyPublishers.ofByteArray(body));
+
+ final HttpRequest request = builder.build();
+
+ final HttpResponse<byte[]> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofByteArray());
+
+ final int statusCode = httpResponse.statusCode();
+ if (statusCode >= 200 && statusCode < 300) {
+ final ApiResponse response = jsonObjectMapper.readValue(new ByteArrayInputStream(httpResponse.body()),
+ ApiResponse.class);
+
+ if (response.getError() != null) {
+ throw ClientExceptions.API_ERROR.getInstance(response.getError());
+ } else {
+ return (T) response.getResult();
+ }
+ } else if (statusCode >= 400 && statusCode < 500) {
+ throw ClientExceptions.CLIENT_ERROR.getInstance(statusCode);
+ } else if (statusCode >= 500 && statusCode < 600) {
+ throw ClientExceptions.SERVER_ERROR.getInstance(statusCode);
+ } else {
+ throw ClientExceptions.OTHER_ERROR.getInstance(statusCode);
+ }
+ }
+
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AtomicFileSystemClientParameter.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AtomicFileSystemClientParameter.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c1ac8e11899d963039aeae94d47e179f7db0113
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/AtomicFileSystemClientParameter.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 ETH Zürich, SIS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.ethz.sis.afsclient.client;
+
+public enum AtomicFileSystemClientParameter {
+ //
+ // Parameters from the AFS Library
+ //
+ jsonObjectMapperClass,
+
+ //
+ // Parameters for the HTTP server
+ //
+ httpServerPath,
+
+ httpServerPort,
+
+ //
+ // Parameters for the API server
+ //
+ maxReadSizeInBytes, // This is the chunk size used by the API, sizes between 1 and 6 megabytes are typical, anything bigger is unlikely to provide performance benefits because we are limited by the http package sizes
+}
\ No newline at end of file
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/exception/ClientExceptions.java b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/exception/ClientExceptions.java
new file mode 100644
index 0000000000000000000000000000000000000000..45fc601f5f5f52dd4d57e323ebca88de9c9d4b19
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/afsclient/client/exception/ClientExceptions.java
@@ -0,0 +1,54 @@
+package ch.ethz.sis.afsclient.client.exception;
+
+import static ch.ethz.sis.afs.api.dto.ExceptionType.ClientDeveloperCodingError;
+import static ch.ethz.sis.afs.api.dto.ExceptionType.CoreDeveloperCodingError;
+import static ch.ethz.sis.afs.api.dto.ExceptionType.UnknownError;
+import static ch.ethz.sis.afs.api.dto.ExceptionType.UserUsageError;
+
+import java.util.List;
+
+import ch.ethz.sis.afs.api.dto.ExceptionReason;
+import ch.ethz.sis.afs.api.dto.ExceptionType;
+import ch.ethz.sis.afs.exception.RuntimeExceptionTemplate;
+import ch.ethz.sis.shared.exception.ExceptionTemplateHolder;
+
+public enum ClientExceptions implements ExceptionTemplateHolder {
+
+ // APIServer
+ UNKNOWN(RuntimeException.class, List.of(UnknownError), 50001,
+ "Unknown error of type %s, please contact support, this error comes with message: %s"),
+
+ CLIENT_ERROR(RuntimeException.class, List.of(ClientDeveloperCodingError), 50002,
+ "Client error HTTP response. Response code: %d"),
+
+ SERVER_ERROR(RuntimeException.class, List.of(CoreDeveloperCodingError), 50003,
+ "Server error HTTP response. Response code: %d"),
+
+ OTHER_ERROR(RuntimeException.class, List.of(UnknownError), 50004,
+ "Unexpected HTTP response. Response code: %d"),
+
+ API_ERROR(IllegalArgumentException.class, List.of(UserUsageError), 50005,
+ "API error. Error message: '%s'");
+
+ private final RuntimeExceptionTemplate template;
+
+ ClientExceptions(Class<?> clazz, List<ExceptionType> types, int code, String messageTemplate) {
+ this.template = new RuntimeExceptionTemplate(3, clazz, types, code, messageTemplate);
+ }
+
+ public RuntimeException getInstance(Object... args) {
+ return template.getInstance(args);
+ }
+
+ public Exception getCheckedInstance(Object... args) {
+ return template.getCheckedInstance(args);
+ }
+
+ public static void throwInstance(ClientExceptions exception, Object... args) {
+ throw exception.getInstance(args);
+ }
+
+ public ExceptionReason getCause(Object... args) {
+ return template.getReason(args);
+ }
+}
diff --git a/api-data-store-server-java/src/main/java/ch/ethz/sis/lombok.config b/api-data-store-server-java/src/main/java/ch/ethz/sis/lombok.config
new file mode 100644
index 0000000000000000000000000000000000000000..c8df289e28ed77a2f80207e256f1fde2bc72e7a5
--- /dev/null
+++ b/api-data-store-server-java/src/main/java/ch/ethz/sis/lombok.config
@@ -0,0 +1,4 @@
+lombok.nonNull.exceptionType = IllegalArgumentException
+lombok.addGeneratedAnnotation = false
+lombok.addJavaxGeneratedAnnotation = false
+lombok.anyConstructor.addConstructorProperties=true
\ No newline at end of file
diff --git a/api-data-store-server-java/src/test/java/ch/ethz/sis/afsclient/client/AfsClientTest.java b/api-data-store-server-java/src/test/java/ch/ethz/sis/afsclient/client/AfsClientTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..37b01ce8dbb1210271debe5e3413e92bc11faf48
--- /dev/null
+++ b/api-data-store-server-java/src/test/java/ch/ethz/sis/afsclient/client/AfsClientTest.java
@@ -0,0 +1,101 @@
+package ch.ethz.sis.afsclient.client;
+
+import static org.junit.Assert.*;
+
+import java.net.URI;
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+//import ch.ethz.sis.afs.manager.TransactionConnection;
+//import ch.ethz.sis.afsserver.server.AfsServer;
+//import ch.ethz.sis.afsserver.server.observer.impl.DummyServerObserver;
+//import ch.ethz.sis.afsserver.startup.AtomicFileSystemServerParameter;
+//import ch.ethz.sis.shared.startup.Configuration;
+
+public class AfsClientTest
+{
+
+// private static AfsServer<TransactionConnection, ?> afsServer;
+
+// private static AfsClient afsClient;
+
+ @BeforeClass
+ public static void classSetUp() throws Exception {
+// final Configuration configuration = new Configuration(List.of(AtomicFileSystemServerParameter.class),
+// "src/test/resources/afs-server-config.properties");
+// final DummyServerObserver dummyServerObserver = new DummyServerObserver();
+// afsServer = new AfsServer<>(configuration, dummyServerObserver, dummyServerObserver);
+//
+// final int httpServerPort = configuration.getIntegerProperty(AtomicFileSystemServerParameter.httpServerPort);
+// final String httpServerPath = configuration.getStringProperty(AtomicFileSystemServerParameter.httpServerPath);
+// afsClient = new AfsClient(new URI("http", null, "localhost", httpServerPort, httpServerPath, null, null));
+ }
+
+ @AfterClass
+ public static void classTearDown() throws Exception {
+// afsServer.shutdown(true);
+ }
+
+ @Test
+ public void testLogin() throws Exception {
+// final String token = afsClient.login("test", "test");
+ final String token = "null";
+ assertNotNull(token);
+ }
+
+ @Test
+ public void testIsSessionValid() {
+ }
+
+ @Test
+ public void testLogout() {
+ }
+
+ @Test
+ public void testList() {
+ }
+
+ @Test
+ public void testRead() {
+ }
+
+ @Test
+ public void testWrite() {
+ }
+
+ @Test
+ public void testDelete() {
+ }
+
+ @Test
+ public void testCopy() {
+ }
+
+ @Test
+ public void testMove() {
+ }
+
+ @Test
+ public void testBegin() {
+ }
+
+ @Test
+ public void testPrepare() {
+ }
+
+ @Test
+ public void testCommit() {
+ }
+
+ @Test
+ public void testRollback() {
+ }
+
+ @Test
+ public void testRecover() {
+ }
+
+}
\ No newline at end of file
diff --git a/api-data-store-server-java/src/test/resources/afs-server-config.properties b/api-data-store-server-java/src/test/resources/afs-server-config.properties
new file mode 100755
index 0000000000000000000000000000000000000000..72e4101cc823f9020a97058e9beccd09c515dd1e
--- /dev/null
+++ b/api-data-store-server-java/src/test/resources/afs-server-config.properties
@@ -0,0 +1,26 @@
+logFactoryClass=ch.ethz.sis.shared.log.log4j2.Log4J2LogFactory
+logConfigFile=
+
+jsonObjectMapperClass=ch.ethz.sis.afsjson.jackson.JacksonObjectMapper
+# Where all the transactions information is written until the prepare step
+# For performance reasons should be on the save volume as the configured storage
+writeAheadLogRoot=./target/tests/transactions
+storageRoot=./target/tests/storage
+
+httpServerClass=ch.ethz.sis.afsserver.http.impl.NettyHttpServer
+httpServerPort=8085
+httpServerPath=/fileserver
+httpMaxContentLength=1024
+
+maxReadSizeInBytes=1024
+authenticationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.DummyAuthenticationInfoProvider
+authorizationInfoProviderClass=ch.ethz.sis.afsserver.worker.providers.impl.DummyAuthorizationInfoProvider
+poolSize=50
+connectionFactoryClass=ch.ethz.sis.afsserver.worker.ConnectionFactory
+workerFactoryClass=ch.ethz.sis.afsserver.worker.WorkerFactory
+publicApiInterface=ch.ethz.sis.afsapi.api.PublicApi
+apiServerInteractiveSessionKey=1234
+apiServerTransactionManagerKey=5678
+apiServerWorkerTimeout=30000
+openBISUrl=
+openBISTimeout=30000
\ No newline at end of file
diff --git a/build/settings.gradle b/build/settings.gradle
index 13eb3369f542cda5ef296e82128a52694f9cd530..c0216a4822aedef3214cbab94c77c84d7583be67 100644
--- a/build/settings.gradle
+++ b/build/settings.gradle
@@ -3,4 +3,4 @@ includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-com
'core-plugin-openbis', 'app-openbis-installer', 'lib-image-readers', 'test-ui-core',
'test-api-openbis-javascript', 'server-external-data-store', 'ui-admin', 'lib-microservice-server',
'lib-transactional-file-system', 'server-data-store', 'ui-eln-lims', 'api-openbis-javascript',
- 'lib-json'
\ No newline at end of file
+ 'lib-json', 'api-data-store-server-java'
\ No newline at end of file
diff --git a/lib-json/build.gradle b/lib-json/build.gradle
index c266252cfbbd36b5549cdd5f1752b2f89cdcfbf9..490bf1b727dc54df8c9919972e1d018b9c99d790 100644
--- a/lib-json/build.gradle
+++ b/lib-json/build.gradle
@@ -1,30 +1,56 @@
-apply plugin: 'java'
-apply plugin: 'application'
+//evaluationDependsOn(':lib-commonbase')
+//evaluationDependsOn(':lib-common')
-compileJava {
- options.compilerArgs << '-parameters'
-}
+apply from: '../build/javaproject.gradle'
-compileTestJava {
- options.compilerArgs << '-parameters'
-}
-repositories {
- ivy {
- ivyPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/ivy.xml"
- artifactPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
- }
-}
+//apply plugin: 'java'
+//apply plugin: 'application'
+//
+//compileJava {
+// options.compilerArgs << '-parameters'
+//}
+//
+//compileTestJava {
+// options.compilerArgs << '-parameters'
+//}
+//
+//repositories {
+// ivy {
+// ivyPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/ivy.xml"
+// artifactPattern "https://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+// }
+//}
+
dependencies {
+// api project(':lib-common'),
+// 'sis:sis-file-transfer:19.03.1',
+// 'fasterxml:jackson-core:2.9.10',
+// 'fasterxml:jackson-annotations:2.9.10'
implementation 'fasterxml:jackson-annotations:2.9.10',
- 'fasterxml:jackson-core:2.9.10',
- 'fasterxml:jackson-databind:2.9.10.8',
- 'fasterxml:jackson-datatype-jsr310:2.9.10'
- testImplementation 'junit:junit:4.13.2'
+ 'fasterxml:jackson-core:2.9.10',
+ 'fasterxml:jackson-databind:2.9.10.8',
+ 'fasterxml:jackson-datatype-jsr310:2.9.10'
+
+ testImplementation 'testng:testng:6.8-CISD'//,
+// project(path: ':lib-commonbase', configuration: 'tests'),
+// project(path: ':lib-common', configuration: 'tests'),
+// 'fjelmer:classycle:1.4.2',
+// 'reflections:reflections:0.9.10'
testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
}
-test {
- useJUnitPlatform()
-}
\ No newline at end of file
+
+//dependencies {
+// implementation 'fasterxml:jackson-annotations:2.9.10',
+// 'fasterxml:jackson-core:2.9.10',
+// 'fasterxml:jackson-databind:2.9.10.8',
+// 'fasterxml:jackson-datatype-jsr310:2.9.10'
+// testImplementation 'junit:junit:4.13.2'
+// testRuntimeOnly 'hamcrest:hamcrest-core:1.3'
+//}
+//
+//test {
+// useJUnitPlatform()
+//}
\ No newline at end of file
diff --git a/lib-json/src/main/java/ch/ethz/sis/afsjson/JsonObjectMapper.java b/lib-json/source/java/ch/ethz/sis/afsjson/JsonObjectMapper.java
similarity index 100%
rename from lib-json/src/main/java/ch/ethz/sis/afsjson/JsonObjectMapper.java
rename to lib-json/source/java/ch/ethz/sis/afsjson/JsonObjectMapper.java
diff --git a/lib-json/src/main/java/ch/ethz/sis/afsjson/jackson/JacksonObjectMapper.java b/lib-json/source/java/ch/ethz/sis/afsjson/jackson/JacksonObjectMapper.java
similarity index 100%
rename from lib-json/src/main/java/ch/ethz/sis/afsjson/jackson/JacksonObjectMapper.java
rename to lib-json/source/java/ch/ethz/sis/afsjson/jackson/JacksonObjectMapper.java