diff --git a/.gitignore b/.gitignore index fe0af9c..51651b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /.gradle/ /.idea/ -/build/ \ No newline at end of file +build \ No newline at end of file diff --git a/examples/chat/build.gradle b/examples/chat/build.gradle new file mode 100644 index 0000000..c5984f6 --- /dev/null +++ b/examples/chat/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'application' + id 'org.openjfx.javafxplugin' version '0.0.9' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation rootProject +} + +javafx { + version = "11" + modules = [ 'javafx.controls', 'javafx.fxml' ] +} + +mainClassName = 'io.github.chronosxyz.JGUN.examples.chat.Main' \ No newline at end of file diff --git a/examples/chat/build/classes/java/main/io/github/chronosxyz/JGUN/examples/chat/FXMLController.class b/examples/chat/build/classes/java/main/io/github/chronosxyz/JGUN/examples/chat/FXMLController.class new file mode 100644 index 0000000..2f5e854 Binary files /dev/null and b/examples/chat/build/classes/java/main/io/github/chronosxyz/JGUN/examples/chat/FXMLController.class differ diff --git a/examples/chat/build/classes/java/main/io/github/chronosxyz/JGUN/examples/chat/Main.class b/examples/chat/build/classes/java/main/io/github/chronosxyz/JGUN/examples/chat/Main.class new file mode 100644 index 0000000..4dc57b1 Binary files /dev/null and b/examples/chat/build/classes/java/main/io/github/chronosxyz/JGUN/examples/chat/Main.class differ diff --git a/examples/chat/build/distributions/chat.tar b/examples/chat/build/distributions/chat.tar new file mode 100644 index 0000000..9f4c6cd Binary files /dev/null and b/examples/chat/build/distributions/chat.tar differ diff --git a/examples/chat/build/distributions/chat.zip b/examples/chat/build/distributions/chat.zip new file mode 100644 index 0000000..27e414d Binary files /dev/null and b/examples/chat/build/distributions/chat.zip differ diff --git a/examples/chat/build/libs/chat.jar b/examples/chat/build/libs/chat.jar new file mode 100644 index 0000000..d498c94 Binary files /dev/null and b/examples/chat/build/libs/chat.jar differ diff --git a/examples/chat/build/resources/main/io/github/chronosxyz/JGUN/examples/chat/scene.fxml b/examples/chat/build/resources/main/io/github/chronosxyz/JGUN/examples/chat/scene.fxml new file mode 100644 index 0000000..00e0612 --- /dev/null +++ b/examples/chat/build/resources/main/io/github/chronosxyz/JGUN/examples/chat/scene.fxml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/examples/chat/build/scripts/chat b/examples/chat/build/scripts/chat new file mode 100755 index 0000000..4128f4b --- /dev/null +++ b/examples/chat/build/scripts/chat @@ -0,0 +1,233 @@ +#!/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. +# + +############################################################################## +# +# chat 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 chat +# +# 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 CHAT_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="chat" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and CHAT_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# 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/lib/chat.jar:$APP_HOME/lib/javafx-fxml-11-linux.jar:$APP_HOME/lib/javafx-controls-11-linux.jar:$APP_HOME/lib/javafx-controls-11.jar:$APP_HOME/lib/javafx-graphics-11-linux.jar:$APP_HOME/lib/javafx-graphics-11.jar:$APP_HOME/lib/javafx-base-11-linux.jar:$APP_HOME/lib/javafx-base-11.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 CHAT_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 $CHAT_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 -- \ + -classpath "$CLASSPATH" \ + io.github.chronosxyz.JGUN.examples.chat.Main \ + "$@" + +# 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 $CHAT_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/examples/chat/build/scripts/chat.bat b/examples/chat/build/scripts/chat.bat new file mode 100644 index 0000000..051f9c0 --- /dev/null +++ b/examples/chat/build/scripts/chat.bat @@ -0,0 +1,89 @@ +@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 chat 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 CHAT_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "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%\lib\chat.jar;%APP_HOME%\lib\javafx-fxml-11-linux.jar;%APP_HOME%\lib\javafx-controls-11-linux.jar;%APP_HOME%\lib\javafx-controls-11.jar;%APP_HOME%\lib\javafx-graphics-11-linux.jar;%APP_HOME%\lib\javafx-graphics-11.jar;%APP_HOME%\lib\javafx-base-11-linux.jar;%APP_HOME%\lib\javafx-base-11.jar + + +@rem Execute chat +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %CHAT_OPTS% -classpath "%CLASSPATH%" io.github.chronosxyz.JGUN.examples.chat.Main %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable CHAT_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%CHAT_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/chat/build/tmp/compileJava/previous-compilation-data.bin b/examples/chat/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000..1133209 Binary files /dev/null and b/examples/chat/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/examples/chat/build/tmp/jar/MANIFEST.MF b/examples/chat/build/tmp/jar/MANIFEST.MF new file mode 100644 index 0000000..58630c0 --- /dev/null +++ b/examples/chat/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/examples/chat/src/main/java/io/github/chronosxyz/JGUN/examples/chat/FXMLController.java b/examples/chat/src/main/java/io/github/chronosxyz/JGUN/examples/chat/FXMLController.java new file mode 100644 index 0000000..22b8c4e --- /dev/null +++ b/examples/chat/src/main/java/io/github/chronosxyz/JGUN/examples/chat/FXMLController.java @@ -0,0 +1,20 @@ +package io.github.chronosxyz.JGUN.examples.chat; + +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.Label; + +import java.net.URL; +import java.util.ResourceBundle; + +public class FXMLController implements Initializable { + @FXML + private Label label; + + @Override + public void initialize(URL url, ResourceBundle rb) { + String javaVersion = System.getProperty("java.version"); + String javafxVersion = System.getProperty("javafx.version"); + label.setText("Hello, JavaFX " + javafxVersion + "\nRunning on Java " + javaVersion + "."); + } +} \ No newline at end of file diff --git a/examples/chat/src/main/java/io/github/chronosxyz/JGUN/examples/chat/Main.java b/examples/chat/src/main/java/io/github/chronosxyz/JGUN/examples/chat/Main.java new file mode 100644 index 0000000..5cd8aa6 --- /dev/null +++ b/examples/chat/src/main/java/io/github/chronosxyz/JGUN/examples/chat/Main.java @@ -0,0 +1,28 @@ +package io.github.chronosxyz.JGUN.examples.chat; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; +import javafx.stage.Stage; + + +public class Main extends Application { + + @Override + public void start(Stage stage) throws Exception { + Parent root = FXMLLoader.load(getClass().getResource("scene.fxml")); + + Scene scene = new Scene(root); +// scene.getStylesheets().add(getClass().getResource("styles.css").toExternalForm()); + + stage.setTitle("JavaFX and Gradle"); + stage.setScene(scene); + stage.show(); + } + + public static void main(String[] args) { + launch(args); + } + +} \ No newline at end of file diff --git a/examples/chat/src/main/resources/io/github/chronosxyz/JGUN/examples/chat/scene.fxml b/examples/chat/src/main/resources/io/github/chronosxyz/JGUN/examples/chat/scene.fxml new file mode 100644 index 0000000..00e0612 --- /dev/null +++ b/examples/chat/src/main/resources/io/github/chronosxyz/JGUN/examples/chat/scene.fxml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index ea95be5..d173b17 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,4 @@ rootProject.name = 'JGUN' +include 'examples:chat' +findProject(':examples:chat')?.name = 'chat' diff --git a/src/main/java/io/github/chronosx88/JGUN/api/PathReference.java b/src/main/java/io/github/chronosx88/JGUN/api/PathReference.java index 791d635..8c66c7b 100644 --- a/src/main/java/io/github/chronosx88/JGUN/api/PathReference.java +++ b/src/main/java/io/github/chronosx88/JGUN/api/PathReference.java @@ -13,7 +13,6 @@ import io.github.chronosx88.JGUN.storage.StorageManager; import java.util.*; import java.util.concurrent.*; -import java.util.stream.Stream; public class PathReference { private final List path = new ArrayList<>(); diff --git a/src/main/java/io/github/chronosx88/JGUN/api/graph/NodeBuilder.java b/src/main/java/io/github/chronosx88/JGUN/api/graph/NodeBuilder.java index b7a2181..96faea3 100644 --- a/src/main/java/io/github/chronosx88/JGUN/api/graph/NodeBuilder.java +++ b/src/main/java/io/github/chronosx88/JGUN/api/graph/NodeBuilder.java @@ -6,7 +6,6 @@ import io.github.chronosx88.JGUN.models.graph.NodeValue; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.List; import java.util.UUID; public class NodeBuilder { diff --git a/src/main/java/io/github/chronosx88/JGUN/examples/MainClient.java b/src/main/java/io/github/chronosx88/JGUN/examples/MainClient.java deleted file mode 100644 index 749f4b6..0000000 --- a/src/main/java/io/github/chronosx88/JGUN/examples/MainClient.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.github.chronosx88.JGUN.examples; - -import io.github.chronosx88.JGUN.api.Gun; -import io.github.chronosx88.JGUN.api.graph.ArrayBuilder; -import io.github.chronosx88.JGUN.api.graph.NodeBuilder; -import io.github.chronosx88.JGUN.models.Result; -import io.github.chronosx88.JGUN.network.NetworkNode; -import io.github.chronosx88.JGUN.storage.MemoryStorage; -import io.github.chronosx88.JGUN.storage.Storage; - -import java.net.Inet4Address; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.util.concurrent.ExecutionException; - -public class MainClient { - public static void main(String[] args) throws URISyntaxException, UnknownHostException, ExecutionException, InterruptedException { - Storage storage = new MemoryStorage(); - NetworkNode peer = new NetworkNode(Inet4Address.getByAddress(new byte[]{127, 0, 0, 1}), 5054, storage); - Gun gun = new Gun(storage, peer); - - Result result = gun.get("person").put(new NodeBuilder() - .add("firstName", "Test") - .build()).get(); - System.out.println(result); - - result = gun.get("person").get("address").put(new NodeBuilder() - .add("city", "Dallas") - .build()).get(); - System.out.println(result); - - result = gun.get("person").get("homeAddress").put(gun.get("person").get("address")).get(); - System.out.println(result); - - result = gun.get("person").get("homeAddress").put(new NodeBuilder() - .add("city", "New YORK CITY") - .build()).get(); - System.out.println(result); - } -} diff --git a/src/main/java/io/github/chronosx88/JGUN/examples/MainClientServer.java b/src/main/java/io/github/chronosx88/JGUN/examples/MainClientServer.java deleted file mode 100644 index 98309e7..0000000 --- a/src/main/java/io/github/chronosx88/JGUN/examples/MainClientServer.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.github.chronosx88.JGUN.examples; - -//public class MainClientServer { -// public static void main(String[] args) { -// GunSuperPeer gunSuperNode = new GunSuperPeer(21334, new MemoryStorage()); -// gunSuperNode.start(); -// Runnable task = () -> { -// Gun gun = null; -// try { -// gun = new Gun(Inet4Address.getByAddress(new byte[]{127, 0, 0, 1}), 21334, new MemoryStorage()); -// } catch (UnknownHostException e) { -// e.printStackTrace(); -// } -// gun.get("random").on(data -> { -// if(data != null) { -// System.out.println("New change in \"random\"! " + data.toString(2)); -// } -// }); -// gun.get("random").get("dVFtzE9CL").on(data -> { -// if(data != null) { -// System.out.println("New change in \"random/dVFtzE9CL\"! " + data.toString(2)); -// } else { -// System.out.println("Now random/dVFtzE9CL is null!"); -// } -// -// }); -// gun.get("random").get("dVFtzE9CL").map(((key, value) -> { -// System.out.println("[Map] New change in \"random/dVFtzE9CL\"! " + key + " : " + value.toString()); -// })); -// gun.get("random").map(((key, value) -> { -// System.out.println("[Map] New change in \"random\"! " + key + " : " + value); -// })); -// System.out.println("[FuturePut] Success: " + gun.get("random").get("dVFtzE9CL").put(new JSONObject().put("hello", "world")).await()); -// System.out.println("[FuturePut] Putting an item again: " + gun.get("random").get("dVFtzE9CL").put(new JSONObject().put("hello", "123")).await()); -// System.out.println("Deleting an item random/dVFtzE9CL"); -// gun.get("random").get("dVFtzE9CL").put(null).await(); -// gun.get("random").put(new JSONObject().put("hello", "world")).await(); -// }; -// -// Executor executorService = Executors.newSingleThreadExecutor(); -// executorService.execute(task); -// } -//} diff --git a/src/main/java/io/github/chronosx88/JGUN/examples/MainServer.java b/src/main/java/io/github/chronosx88/JGUN/examples/MainServer.java deleted file mode 100644 index 683911f..0000000 --- a/src/main/java/io/github/chronosx88/JGUN/examples/MainServer.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.github.chronosx88.JGUN.examples; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; -import io.github.chronosx88.JGUN.api.Gun; -import io.github.chronosx88.JGUN.api.NodeChangeListener; -import io.github.chronosx88.JGUN.api.graph.ArrayBuilder; -import io.github.chronosx88.JGUN.api.graph.NodeBuilder; -import io.github.chronosx88.JGUN.models.Result; -import io.github.chronosx88.JGUN.models.graph.Node; -import io.github.chronosx88.JGUN.network.GatewayNetworkNode; -import io.github.chronosx88.JGUN.network.NetworkNode; -import io.github.chronosx88.JGUN.storage.MemoryStorage; -import io.github.chronosx88.JGUN.storage.Storage; - -import java.net.Inet4Address; -import java.util.concurrent.ExecutionException; - -public class MainServer { - public static void main(String[] args) throws ExecutionException, InterruptedException { - Storage storage = new MemoryStorage(); - GatewayNetworkNode peer = new GatewayNetworkNode(5054, storage); - Gun gun = new Gun(storage, peer); - Result result = gun.get("person").put(new NodeBuilder() - .add("firstName", "John") - .add("lastName", "Smith") - .add("age", 25) - .add("address", new NodeBuilder() - .add("streetAddress", "21 2nd Street") - .add("city", "New York") - .add("state", "NY") - .add("postalCode", "10021")) - .add("phoneNumber", new ArrayBuilder() - .add(new NodeBuilder() - .add("type", "home") - .add("number", "212 555-1234")) - .add(new NodeBuilder() - .add("type", "fax") - .add("number", "646 555-4567"))) - .build()).get(); - ObjectMapper mapper = new ObjectMapper(); - mapper.registerModule(new Jdk8Module()); - gun.get("person").on(node -> { - try { - System.out.println(mapper.writeValueAsString(node)); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - }); - gun.get("person").get("address").on(node -> { - try { - System.out.println(mapper.writeValueAsString(node)); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - }); - System.out.println(result.isOk()); - } -} diff --git a/src/main/java/io/github/chronosx88/JGUN/models/NetworkMessage.java b/src/main/java/io/github/chronosx88/JGUN/models/NetworkMessage.java index 49b302b..82cfc33 100644 --- a/src/main/java/io/github/chronosx88/JGUN/models/NetworkMessage.java +++ b/src/main/java/io/github/chronosx88/JGUN/models/NetworkMessage.java @@ -1,13 +1,7 @@ package io.github.chronosx88.JGUN.models; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.github.chronosx88.JGUN.models.acks.Ack; -import io.github.chronosx88.JGUN.models.acks.GetAck; -import io.github.chronosx88.JGUN.models.requests.GetRequest; -import io.github.chronosx88.JGUN.models.requests.PutRequest; import lombok.Data; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/io/github/chronosx88/JGUN/models/graph/MemoryGraph.java b/src/main/java/io/github/chronosx88/JGUN/models/graph/MemoryGraph.java index cef1ec4..705522d 100644 --- a/src/main/java/io/github/chronosx88/JGUN/models/graph/MemoryGraph.java +++ b/src/main/java/io/github/chronosx88/JGUN/models/graph/MemoryGraph.java @@ -3,9 +3,7 @@ package io.github.chronosx88.JGUN.models.graph; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Builder; import lombok.Data; -import lombok.extern.jackson.Jacksonized; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeMetadata.java b/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeMetadata.java index 81f004e..7138083 100644 --- a/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeMetadata.java +++ b/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeMetadata.java @@ -5,7 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.extern.jackson.Jacksonized; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeValueDeserializer.java b/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeValueDeserializer.java index 0d980ef..c2f95b9 100644 --- a/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeValueDeserializer.java +++ b/src/main/java/io/github/chronosx88/JGUN/models/graph/NodeValueDeserializer.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.databind.JsonNode; import io.github.chronosx88.JGUN.models.graph.values.*; import java.io.IOException; -import java.util.ArrayList; public class NodeValueDeserializer extends JsonDeserializer { @Override diff --git a/src/main/java/io/github/chronosx88/JGUN/storage/StorageManager.java b/src/main/java/io/github/chronosx88/JGUN/storage/StorageManager.java index 4212d03..409d7c3 100644 --- a/src/main/java/io/github/chronosx88/JGUN/storage/StorageManager.java +++ b/src/main/java/io/github/chronosx88/JGUN/storage/StorageManager.java @@ -9,7 +9,6 @@ import io.github.chronosx88.JGUN.models.graph.NodeValue; import io.github.chronosx88.JGUN.models.graph.values.NodeLinkValue; import io.github.chronosx88.JGUN.models.requests.GetRequestParams; import io.github.chronosx88.JGUN.network.NetworkManager; -import io.github.chronosx88.JGUN.utils.Pair; import java.util.ArrayList; import java.util.List;