spring functionality added

1.1.1/.gitignore

@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/

1.1.1/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

1.1.1/mvnw

@@ -0,0 +1,225 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  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
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+echo $MAVEN_PROJECTBASEDIR
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

1.1.1/mvnw.cmd

@@ -0,0 +1,143 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

1.1.1/pom.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.tradingproject</groupId>
+	<artifactId>0.0.1</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>0.0.1</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.3.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jetbrains</groupId>
+			<artifactId>annotations</artifactId>
+			<version>16.0.2</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>

trader10/src/main/java/org/AlphaVantage/AlphaVantageConnector.java → 1.1.1/src/main/java/AlphaVantage/AlphaVantageConnector.java

@@ -1,4 +1,4 @@
-package org.AlphaVantage;
+package AlphaVantage;
 
 import org.AlphaVantage.input.ApiParameter;
 import org.AlphaVantage.input.ApiParameterBuilder;

trader10/src/main/java/org/AlphaVantage/ApiConnector.java → 1.1.1/src/main/java/AlphaVantage/ApiConnector.java

@@ -1,4 +1,4 @@
-package org.AlphaVantage;
+package AlphaVantage;
 
 import org.AlphaVantage.input.ApiParameter;
 

trader10/src/main/java/org/AlphaVantage/BatchStockQuotes.java → 1.1.1/src/main/java/AlphaVantage/BatchStockQuotes.java

@@ -1,6 +1,6 @@
-package org.AlphaVantage;
+package AlphaVantage;
 
-import org.AlphaVantage.input.Function;
+import AlphaVantage.input.Function;
 import org.AlphaVantage.input.Symbols;
 import org.AlphaVantage.output.AlphaVantageException;
 import org.AlphaVantage.output.quote.BatchStockQuotesResponse;

trader10/src/main/java/org/AlphaVantage/DigitalCurrencies.java → 1.1.1/src/main/java/AlphaVantage/DigitalCurrencies.java

@@ -1,7 +1,7 @@
-package org.AlphaVantage;
+package AlphaVantage;
 
-import org.AlphaVantage.input.Function;
-import org.AlphaVantage.input.Symbol;
+import AlphaVantage.input.Function;
+import AlphaVantage.input.Symbol;
 import org.AlphaVantage.input.digitalcurrencies.Market;
 import org.AlphaVantage.output.digitalcurrencies.Daily;
 import org.AlphaVantage.output.digitalcurrencies.IntraDay;

trader10/src/main/java/org/AlphaVantage/ForeignExchange.java → 1.1.1/src/main/java/AlphaVantage/ForeignExchange.java

@@ -1,6 +1,7 @@
-package org.AlphaVantage;
+package AlphaVantage;
 
-import org.AlphaVantage.input.Function;
+import AlphaVantage.ApiConnector;
+import AlphaVantage.input.Function;
 import org.AlphaVantage.input.exchange.FromCurrency;
 import org.AlphaVantage.input.exchange.ToCurrency;
 import org.AlphaVantage.output.AlphaVantageException;

trader10/src/main/java/org/AlphaVantage/SectorPerformances.java → 1.1.1/src/main/java/AlphaVantage/SectorPerformances.java

@@ -1,6 +1,6 @@
-package org.AlphaVantage;
+package AlphaVantage;
 
-import org.AlphaVantage.input.Function;
+import AlphaVantage.input.Function;
 import org.AlphaVantage.output.sectorperformances.Sectors;
 
 /**

trader10/src/main/java/org/AlphaVantage/TechnicalIndicators.java → 1.1.1/src/main/java/AlphaVantage/TechnicalIndicators.java

@@ -1,13 +1,74 @@
-package org.AlphaVantage;
+package AlphaVantage;
+
+import AlphaVantage.input.Function;
+import AlphaVantage.input.Symbol;
+import org.AlphaVantage.input.technicalindicators.Interval;
+import org.AlphaVantage.output.technicalindicators.ADX;
+import org.AlphaVantage.output.technicalindicators.AD;
+import org.AlphaVantage.output.technicalindicators.ADXR;
+import org.AlphaVantage.output.technicalindicators.APO;
+import org.AlphaVantage.output.technicalindicators.AROON;
+import org.AlphaVantage.output.technicalindicators.AROONOSC;
+import org.AlphaVantage.output.technicalindicators.ATR;
+import org.AlphaVantage.output.technicalindicators.BBANDS;
+import org.AlphaVantage.output.technicalindicators.BOP;
+import org.AlphaVantage.output.technicalindicators.CCI;
+import org.AlphaVantage.output.technicalindicators.CMO;
+import org.AlphaVantage.output.technicalindicators.DEMA;
+import org.AlphaVantage.output.technicalindicators.DX;
+import org.AlphaVantage.output.technicalindicators.EMA;
+import org.AlphaVantage.output.technicalindicators.HT_DCPERIOD;
+import org.AlphaVantage.output.technicalindicators.HT_DCPHASE;
+import org.AlphaVantage.output.technicalindicators.HT_PHASOR;
+import org.AlphaVantage.output.technicalindicators.HT_SINE;
+import org.AlphaVantage.output.technicalindicators.HT_TRENDLINE;
+import org.AlphaVantage.output.technicalindicators.HT_TRENDMODE;
+import org.AlphaVantage.output.technicalindicators.KAMA;
+import org.AlphaVantage.output.technicalindicators.MACD;
+import org.AlphaVantage.output.technicalindicators.MACDEXT;
+import org.AlphaVantage.output.technicalindicators.MAMA;
+import org.AlphaVantage.output.technicalindicators.MFI;
+import org.AlphaVantage.output.technicalindicators.MIDPOINT;
+import org.AlphaVantage.output.technicalindicators.MIDPRICE;
+import org.AlphaVantage.output.technicalindicators.MINUS_DI;
+import org.AlphaVantage.output.technicalindicators.MINUS_DM;
+import org.AlphaVantage.output.technicalindicators.MOM;
+import org.AlphaVantage.output.technicalindicators.NATR;
+import org.AlphaVantage.output.technicalindicators.OBV;
+import org.AlphaVantage.output.technicalindicators.PLUS_DI;
+import org.AlphaVantage.output.technicalindicators.PLUS_DM;
+import org.AlphaVantage.output.technicalindicators.PPO;
+import org.AlphaVantage.output.technicalindicators.ROC;
+import org.AlphaVantage.output.technicalindicators.ROCR;
+import org.AlphaVantage.output.technicalindicators.RSI;
+import org.AlphaVantage.output.technicalindicators.SAR;
+import org.AlphaVantage.output.technicalindicators.SMA;
+import org.AlphaVantage.output.technicalindicators.STOCH;
+import org.AlphaVantage.output.technicalindicators.STOCHF;
+import org.AlphaVantage.output.technicalindicators.STOCHRSI;
+import org.AlphaVantage.output.technicalindicators.T3;
+import org.AlphaVantage.output.technicalindicators.TEMA;
+import org.AlphaVantage.output.technicalindicators.TRANGE;
+import org.AlphaVantage.output.technicalindicators.TRIMA;
+import org.AlphaVantage.output.technicalindicators.TRIX;
+import org.AlphaVantage.output.technicalindicators.ULTOSC;
+import org.AlphaVantage.output.technicalindicators.WILLR;
+import org.AlphaVantage.output.technicalindicators.WMA;
+import org.AlphaVantage.input.technicalindicators.TimePeriod;
+import org.AlphaVantage.input.technicalindicators.SeriesType;
+import org.AlphaVantage.input.technicalindicators.FastPeriod;
+import org.AlphaVantage.input.technicalindicators.SlowPeriod;
+import org.AlphaVantage.input.technicalindicators.SignalPeriod;
+
+
+
+
+
+
+
+import org.jetbrains.annotations.Nullable;
 
-import org.AlphaVantage.input.Function;
-import org.AlphaVantage.input.Symbol;
-import org.AlphaVantage.input.technicalindicators.*;
-import org.AlphaVantage.output.technicalindicators.*;
-import org.AlphaVantage.input.technicalindicators.*;
-import org.AlphaVantage.output.technicalindicators.*;
 
-import javax.annotation.Nullable;
 
 // TODO add optional in docs to optional values
 
@@ -34,9 +95,9 @@ public class TechnicalIndicators {
    * @param interval   the interval between two consecutive data points in the time series {@link Interval}.
    * @return {@link AD} indicator data.
    */
-  public AD ad(String symbol, Interval interval) {
+  public org.AlphaVantage.output.technicalindicators.AD ad(String symbol, org.AlphaVantage.input.technicalindicators.Interval interval) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.AD, interval);
-    return AD.from(interval, json);
+    return org.AlphaVantage.output.technicalindicators.AD.from(interval, json);
   }
 
   /**
@@ -48,12 +109,12 @@ public class TechnicalIndicators {
    * @param slowPeriod the time period of the fast EMA, default 10 {@link SlowPeriod}.
    * @return {@link ADOSC} indicator data.
    */
-  public ADOSC adosc(String symbol,
-                     Interval interval,
-                     @Nullable FastPeriod fastPeriod,
-                     @Nullable SlowPeriod slowPeriod) {
+  public org.AlphaVantage.output.technicalindicators.ADOSC adosc(String symbol,
+                                                                 Interval interval,
+                                                                 @Nullable org.AlphaVantage.input.technicalindicators.FastPeriod fastPeriod,
+                                                                 @Nullable org.AlphaVantage.input.technicalindicators.SlowPeriod slowPeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.ADOSC, interval, fastPeriod);
-    return ADOSC.from(interval, json);
+    return org.AlphaVantage.output.technicalindicators.ADOSC.from(interval, json);
   }
 
   /**
@@ -64,9 +125,9 @@ public class TechnicalIndicators {
    * @param timePeriod Number of data points used to calculate each moving average value. Positive integers are accepted {@link TimePeriod}.
    * @return {@link ADX} indicator data.
    */
-  public ADX adx(String symbol, Interval interval, TimePeriod timePeriod) {
+  public org.AlphaVantage.output.technicalindicators.ADX adx(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.ADX, timePeriod, interval);
-    return ADX.from(interval, json);
+    return org.AlphaVantage.output.technicalindicators.ADX.from(interval, json);
   }
 
   /**
@@ -77,7 +138,7 @@ public class TechnicalIndicators {
    * @param timePeriod Number of data points used to calculate each moving average value. Positive integers are accepted {@link TimePeriod}.
    * @return {@link ADX} indicator data.
    */
-  public ADXR adxr(String symbol, Interval interval, TimePeriod timePeriod) {
+  public org.AlphaVantage.output.technicalindicators.ADXR adxr(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.ADXR, timePeriod, interval);
     return ADXR.from(interval, json);
   }
@@ -95,10 +156,10 @@ public class TechnicalIndicators {
    */
   public APO apo(String symbol,
                  Interval interval,
-                 SeriesType seriesType,
-                 @Nullable FastPeriod fastPeriod,
-                 @Nullable SlowPeriod slowPeriod,
-                 @Nullable MaType maType) {
+                 org.AlphaVantage.input.technicalindicators.SeriesType seriesType,
+                 @Nullable org.AlphaVantage.input.technicalindicators.FastPeriod fastPeriod,
+                 @Nullable org.AlphaVantage.input.technicalindicators.SlowPeriod slowPeriod,
+                 @Nullable org.AlphaVantage.input.technicalindicators.MaType maType) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.APO, interval, seriesType, fastPeriod, slowPeriod, maType);
     return APO.from(interval, json);
   }
@@ -111,7 +172,7 @@ public class TechnicalIndicators {
    * @param timePeriod Number of data points used to calculate each moving average value. Positive integers are accepted {@link TimePeriod}.
    * @return {@link AROON} indicator data.
    */
-  public AROON aroon(String symbol, Interval interval, TimePeriod timePeriod) {
+  public AROON aroon(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.AROON, interval, timePeriod);
     return AROON.from(interval, json);
   }
@@ -124,7 +185,7 @@ public class TechnicalIndicators {
    * @param timePeriod Number of data points used to calculate each moving average value. Positive integers are accepted {@link TimePeriod}.
    * @return {@link AROONOSC} indicator data.
    */
-  public AROONOSC aroonosc(String symbol, Interval interval, TimePeriod timePeriod) {
+  public AROONOSC aroonosc(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.AROONOSC, interval, timePeriod);
     return AROONOSC.from(interval, json);
   }
@@ -137,7 +198,7 @@ public class TechnicalIndicators {
    * @param timePeriod Number of data points used to calculate each moving average value. Positive integers are accepted {@link TimePeriod}.
    * @return {@link ATR} indicator data.
    */
-  public ATR atr(String symbol, Interval interval, TimePeriod timePeriod) {
+  public ATR atr(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.ATR, interval, timePeriod);
     return ATR.from(interval, json);
   }
@@ -155,11 +216,11 @@ public class TechnicalIndicators {
    */
   public BBANDS bbands(String symbol,
                        Interval interval,
-                       TimePeriod timePeriod,
-                       SeriesType seriesType,
-                       @Nullable NBDevUp nbDevUp,
-                       @Nullable NBDevDn nbDevDn,
-                       @Nullable MaType maType) {
+                       org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod,
+                       org.AlphaVantage.input.technicalindicators.SeriesType seriesType,
+                       @Nullable org.AlphaVantage.input.technicalindicators.NBDevUp nbDevUp,
+                       @Nullable org.AlphaVantage.input.technicalindicators.NBDevDn nbDevDn,
+                       @Nullable org.AlphaVantage.input.technicalindicators.MaType maType) {
     String json = apiConnector.getRequest(new Symbol(symbol),
             Function.BBANDS,
             interval,
@@ -191,7 +252,7 @@ public class TechnicalIndicators {
    * @param timePeriod Number of data points used to calculate each moving average value. Positive integers are accepted {@link TimePeriod}.
    * @return {@link CCI} indicator data.
    */
-  public CCI cci(String symbol, Interval interval, TimePeriod timePeriod) {
+  public CCI cci(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.CCI, interval, timePeriod);
     return CCI.from(interval, json);
   }
@@ -205,7 +266,7 @@ public class TechnicalIndicators {
    * @param seriesType The desired price type in the time series {@link SeriesType}.
    * @return {@link CMO} indicator data.
    */
-  public CMO cmo(String symbol, Interval interval, TimePeriod timePeriod, SeriesType seriesType) {
+  public CMO cmo(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod, org.AlphaVantage.input.technicalindicators.SeriesType seriesType) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.CMO, timePeriod, interval, seriesType);
     return CMO.from(interval, json);
   }
@@ -219,7 +280,7 @@ public class TechnicalIndicators {
    * @param seriesType The desired price type in the time series {@link SeriesType}.
    * @return {@link DEMA} indicator data.
    */
-  public DEMA dema(String symbol, Interval interval, TimePeriod timePeriod, SeriesType seriesType) {
+  public DEMA dema(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod, org.AlphaVantage.input.technicalindicators.SeriesType seriesType) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.DEMA, timePeriod, interval, seriesType);
     return DEMA.from(interval, json);
   }
@@ -232,7 +293,7 @@ public class TechnicalIndicators {
    * @param timePeriod Number of data points used to calculate each moving average value. Positive integers are accepted {@link TimePeriod}.
    * @return {@link DX} indicator data.
    */
-  public DX dx(String symbol, Interval interval, TimePeriod timePeriod) {
+  public DX dx(String symbol, Interval interval, org.AlphaVantage.input.technicalindicators.TimePeriod timePeriod) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.DX, interval, timePeriod);
     return DX.from(interval, json);
   }
@@ -246,7 +307,7 @@ public class TechnicalIndicators {
    * @param seriesType The desired price type in the time series {@link SeriesType}.
    * @return {@link EMA} indicator data.
    */
-  public EMA ema(String symbol, Interval interval, TimePeriod timePeriod, SeriesType seriesType) {
+  public EMA ema(String symbol, Interval interval, TimePeriod timePeriod, org.AlphaVantage.input.technicalindicators.SeriesType seriesType) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.EMA, timePeriod, interval, seriesType);
     return EMA.from(interval, json);
   }
@@ -359,7 +420,7 @@ public class TechnicalIndicators {
                    Interval interval,
                    TimePeriod timePeriod,
                    SeriesType seriesType,
-                   @Nullable FastPeriod fastPeriod,
+                   @Nullable org.AlphaVantage.input.technicalindicators.FastPeriod fastPeriod,
                    @Nullable SlowPeriod slowPeriod,
                    @Nullable SignalPeriod signalPeriod) {
     String json = apiConnector.getRequest(
@@ -394,9 +455,9 @@ public class TechnicalIndicators {
                       @Nullable FastPeriod fastPeriod,
                       @Nullable SlowPeriod slowPeriod,
                       @Nullable SignalPeriod signalPeriod,
-                      @Nullable FastMaType fastMaType,
-                      @Nullable SlowMaType slowMaType,
-                      @Nullable SignalMaType signalMaType) {
+                      @Nullable org.AlphaVantage.input.technicalindicators.FastMaType fastMaType,
+                      @Nullable org.AlphaVantage.input.technicalindicators.SlowMaType slowMaType,
+                      @Nullable org.AlphaVantage.input.technicalindicators.SignalMaType signalMaType) {
     String json = apiConnector.getRequest(
             new Symbol(symbol),
             Function.MACDEXT,
@@ -426,8 +487,8 @@ public class TechnicalIndicators {
                    Interval interval,
                    TimePeriod timePeriod,
                    SeriesType seriesType,
-                   @Nullable FastLimit fastLimit,
-                   @Nullable SlowLimit slowLimit) {
+                   @Nullable org.AlphaVantage.input.technicalindicators.FastLimit fastLimit,
+                   @Nullable org.AlphaVantage.input.technicalindicators.SlowLimit slowLimit) {
     String json = apiConnector.getRequest(
             new Symbol(symbol),
             Function.MAMA,
@@ -586,7 +647,7 @@ public class TechnicalIndicators {
                  SeriesType seriesType,
                  @Nullable FastPeriod fastPeriod,
                  @Nullable SlowPeriod slowPeriod,
-                 @Nullable MaType maType) {
+                 @Nullable org.AlphaVantage.input.technicalindicators.MaType maType) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.PPO, interval, seriesType, fastPeriod, slowPeriod, maType);
     return PPO.from(interval, json);
   }
@@ -644,8 +705,8 @@ public class TechnicalIndicators {
    */
   public SAR sar(String symbol,
                  Interval interval,
-                 @Nullable Acceleration acceleration,
-                 @Nullable Maximum maximum) {
+                 @Nullable org.AlphaVantage.input.technicalindicators.Acceleration acceleration,
+                 @Nullable org.AlphaVantage.input.technicalindicators.Maximum maximum) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.SAR, interval, acceleration, maximum);
     return SAR.from(interval, json);
   }
@@ -678,11 +739,11 @@ public class TechnicalIndicators {
    */
   public STOCH stoch(String symbol,
                      Interval interval,
-                     @Nullable FastKPeriod fastKPeriod,
-                     @Nullable SlowKPeriod slowKPeriod,
-                     @Nullable SlowDPeriod slowDPeriod,
-                     @Nullable SlowKMaType slowKMaType,
-                     @Nullable SlowDMaType slowDMaType) {
+                     @Nullable org.AlphaVantage.input.technicalindicators.FastKPeriod fastKPeriod,
+                     @Nullable org.AlphaVantage.input.technicalindicators.SlowKPeriod slowKPeriod,
+                     @Nullable org.AlphaVantage.input.technicalindicators.SlowDPeriod slowDPeriod,
+                     @Nullable org.AlphaVantage.input.technicalindicators.SlowKMaType slowKMaType,
+                     @Nullable org.AlphaVantage.input.technicalindicators.SlowDMaType slowDMaType) {
     String json = apiConnector.getRequest(
             new Symbol(symbol),
             Function.STOCH,
@@ -708,9 +769,9 @@ public class TechnicalIndicators {
    */
   public STOCHF stochf(String symbol,
                        Interval interval,
-                       @Nullable FastKPeriod fastKPeriod,
-                       @Nullable FastDPeriod fastDPeriod,
-                       @Nullable FastDMaType fastDMaType) {
+                       @Nullable org.AlphaVantage.input.technicalindicators.FastKPeriod fastKPeriod,
+                       @Nullable org.AlphaVantage.input.technicalindicators.FastDPeriod fastDPeriod,
+                       @Nullable org.AlphaVantage.input.technicalindicators.FastDMaType fastDMaType) {
     String json = apiConnector.getRequest(
             new Symbol(symbol),
             Function.STOCHF,
@@ -738,9 +799,9 @@ public class TechnicalIndicators {
                            Interval interval,
                            TimePeriod timePeriod,
                            SeriesType seriesType,
-                           @Nullable FastKPeriod fastKPeriod,
-                           @Nullable FastDPeriod fastDPeriod,
-                           @Nullable FastDMaType fastDMaType) {
+                           @Nullable org.AlphaVantage.input.technicalindicators.FastKPeriod fastKPeriod,
+                           @Nullable org.AlphaVantage.input.technicalindicators.FastDPeriod fastDPeriod,
+                           @Nullable org.AlphaVantage.input.technicalindicators.FastDMaType fastDMaType) {
     String json = apiConnector.getRequest(
             new Symbol(symbol),
             Function.STOCHRSI,
@@ -833,9 +894,9 @@ public class TechnicalIndicators {
    */
   public ULTOSC ultosc(String symbol,
                        Interval interval,
-                       @Nullable TimePeriod1 timePeriod1,
-                       @Nullable TimePeriod2 timePeriod2,
-                       @Nullable TimePeriod3 timePeriod3) {
+                       @Nullable org.AlphaVantage.input.technicalindicators.TimePeriod1 timePeriod1,
+                       @Nullable org.AlphaVantage.input.technicalindicators.TimePeriod2 timePeriod2,
+                       @Nullable org.AlphaVantage.input.technicalindicators.TimePeriod3 timePeriod3) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.ULTOSC, timePeriod1, timePeriod2, timePeriod3);
     return ULTOSC.from(interval, json);
   }

trader10/src/main/java/org/AlphaVantage/TimeSeries.java → 1.1.1/src/main/java/AlphaVantage/TimeSeries.java

@@ -1,11 +1,10 @@
-package org.AlphaVantage;
+package AlphaVantage;
 
-import org.AlphaVantage.input.Function;
-import org.AlphaVantage.input.Symbol;
+import AlphaVantage.input.Function;
+import AlphaVantage.input.Symbol;
 import org.AlphaVantage.input.timeseries.Interval;
 import org.AlphaVantage.input.timeseries.OutputSize;
 import org.AlphaVantage.output.JsonParser;
-import org.AlphaVantage.output.timeseries.*;
 
 /**
  * The Stock Time Series Data provides realtime and historical equity data in 4 different temporal resolutions:
@@ -31,9 +30,9 @@ public class TimeSeries {
    * @param outputSize the specification of the amount of returned data points {@link OutputSize}
    * @return {@link IntraDay} time series data
    */
-  public IntraDay intraDay(String symbol, Interval interval, OutputSize outputSize)  {
+  public org.AlphaVantage.output.timeseries.IntraDay intraDay(String symbol, Interval interval, OutputSize outputSize)  {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_INTRADAY, interval, outputSize);
-    return IntraDay.from(interval, json);
+    return org.AlphaVantage.output.timeseries.IntraDay.from(interval, json);
   }
 
   /**
@@ -43,9 +42,9 @@ public class TimeSeries {
    * @param interval the interval between two consecutive data points in the time series {@link Interval}
    * @return {@link IntraDay} time series data
    */
-  public IntraDay intraDay(String symbol, Interval interval)  {
+  public org.AlphaVantage.output.timeseries.IntraDay intraDay(String symbol, Interval interval)  {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_INTRADAY, interval);
-    return IntraDay.from(interval, json);
+    return org.AlphaVantage.output.timeseries.IntraDay.from(interval, json);
   }
 
   /**
@@ -55,9 +54,9 @@ public class TimeSeries {
    * @param outputSize the specification of the amount of returned data points {@link OutputSize}
    * @return {@link Daily} time series data
    */
-  public Daily daily(String symbol, OutputSize outputSize)  {
+  public org.AlphaVantage.output.timeseries.Daily daily(String symbol, OutputSize outputSize)  {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_DAILY, outputSize);
-    return Daily.from(json);
+    return org.AlphaVantage.output.timeseries.Daily.from(json);
   }
 
   /**
@@ -66,9 +65,9 @@ public class TimeSeries {
    * @param symbol the stock symbol to lookup
    * @return {@link Daily} time series data
    */
-  public Daily daily(String symbol) {
+  public org.AlphaVantage.output.timeseries.Daily daily(String symbol) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_DAILY);
-    return Daily.from(json);
+    return org.AlphaVantage.output.timeseries.Daily.from(json);
   }
 
   /**
@@ -78,9 +77,9 @@ public class TimeSeries {
    * @param outputSize the specification of the amount of returned data points {@link OutputSize}
    * @return {@link DailyAdjusted} time series data
    */
-  public DailyAdjusted dailyAdjusted(String symbol, OutputSize outputSize) {
+  public org.AlphaVantage.output.timeseries.DailyAdjusted dailyAdjusted(String symbol, OutputSize outputSize) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_DAILY_ADJUSTED, outputSize);
-    return DailyAdjusted.from(json);
+    return org.AlphaVantage.output.timeseries.DailyAdjusted.from(json);
   }
 
   /**
@@ -89,9 +88,9 @@ public class TimeSeries {
    * @param symbol the stock symbol to lookup
    * @return {@link DailyAdjusted} time series data
    */
-  public DailyAdjusted dailyAdjusted(String symbol)  {
+  public org.AlphaVantage.output.timeseries.DailyAdjusted dailyAdjusted(String symbol)  {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_DAILY_ADJUSTED);
-    return DailyAdjusted.from(json);
+    return org.AlphaVantage.output.timeseries.DailyAdjusted.from(json);
   }
 
   /**
@@ -100,9 +99,9 @@ public class TimeSeries {
    * @param symbol the stock symbol to lookup
    * @return {@link Weekly} time series data
    */
-  public Weekly weekly(String symbol)  {
+  public org.AlphaVantage.output.timeseries.Weekly weekly(String symbol)  {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_WEEKLY);
-    return Weekly.from(json);
+    return org.AlphaVantage.output.timeseries.Weekly.from(json);
   }
 
   /**
@@ -111,9 +110,9 @@ public class TimeSeries {
    * @param symbol the stock symbol to lookup
    * @return {@link WeeklyAdjusted} time series data
    */
-  public WeeklyAdjusted weeklyAdjusted(String symbol)  {
+  public org.AlphaVantage.output.timeseries.WeeklyAdjusted weeklyAdjusted(String symbol)  {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_WEEKLY_ADJUSTED);
-    return WeeklyAdjusted.from(json);
+    return org.AlphaVantage.output.timeseries.WeeklyAdjusted.from(json);
   }
 
   /**
@@ -122,9 +121,9 @@ public class TimeSeries {
    * @param symbol the stock symbol to lookup
    * @return {@link Monthly} time series data
    */
-  public Monthly monthly(String symbol)  {
+  public org.AlphaVantage.output.timeseries.Monthly monthly(String symbol)  {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_MONTHLY);
-    return Monthly.from(json);
+    return org.AlphaVantage.output.timeseries.Monthly.from(json);
   }
 
   /**
@@ -133,9 +132,9 @@ public class TimeSeries {
    * @param symbol the stock symbol to lookup
    * @return {@link MonthlyAdjusted} time series data
    */
-  public MonthlyAdjusted monthlyAdjusted(String symbol) {
+  public org.AlphaVantage.output.timeseries.MonthlyAdjusted monthlyAdjusted(String symbol) {
     String json = apiConnector.getRequest(new Symbol(symbol), Function.TIME_SERIES_MONTHLY_ADJUSTED);
-    return MonthlyAdjusted.from(json);
+    return org.AlphaVantage.output.timeseries.MonthlyAdjusted.from(json);
   }
 
 }

trader10/src/main/java/org/AlphaVantage/input/ApiParameterBuilder.java → 1.1.1/src/main/java/AlphaVantage/input/ApiParameterBuilder.java

@@ -1,6 +1,7 @@
 package org.AlphaVantage.input;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
+
 
 /**
  * Builder for api parameters.
@@ -18,7 +19,7 @@ public class ApiParameterBuilder {
    * @param apiParameter the api parameter to append to the url.
    * @return an instance of this builder.
    */
-  public void append(@Nullable ApiParameter apiParameter) {
+  public void append(@Nullable org.AlphaVantage.input.ApiParameter apiParameter) {
     if (apiParameter != null) {
       append(apiParameter.getKey(), apiParameter.getValue());
     }

trader10/src/main/java/org/AlphaVantage/input/Function.java → 1.1.1/src/main/java/AlphaVantage/input/Function.java

@@ -1,9 +1,9 @@
-package org.AlphaVantage.input;
+package AlphaVantage.input;
 
 /**
  * The function parameter for the api calls.
  */
-public enum Function implements ApiParameter {
+public enum Function implements org.AlphaVantage.input.ApiParameter {
 
   // Time Series functions
   TIME_SERIES_INTRADAY("TIME_SERIES_INTRADAY"),

trader10/src/main/java/org/AlphaVantage/input/Symbol.java → 1.1.1/src/main/java/AlphaVantage/input/Symbol.java

@@ -1,9 +1,9 @@
-package org.AlphaVantage.input;
+package AlphaVantage.input;
 
 /**
  * The symbol parameter for the technical indicators/time series api call.
  */
-public class Symbol implements ApiParameter {
+public class Symbol implements org.AlphaVantage.input.ApiParameter {
   private String symbol;
 
   public Symbol(String symbol) {

trader10/src/main/java/org/AlphaVantage/input/Symbols.java → 1.1.1/src/main/java/AlphaVantage/input/Symbols.java

@@ -3,7 +3,7 @@ package org.AlphaVantage.input;
 /**
  * The symbols parameter for the batch stock quotes api call.
  */
-public class Symbols implements ApiParameter {
+public class Symbols implements org.AlphaVantage.input.ApiParameter {
   private String[] symbols;
 
   public Symbols(String... symbols) {

trader10/src/main/java/org/AlphaVantage/output/quote/BatchStockQuotesResponse.java → 1.1.1/src/main/java/AlphaVantage/output/quote/BatchStockQuotesResponse.java

@@ -5,7 +5,6 @@ import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 import org.AlphaVantage.output.JsonParser;
 import org.AlphaVantage.output.quote.data.StockQuote;
-import org.AlphaVantage.BatchStockQuotes;
 import org.AlphaVantage.output.AlphaVantageException;
 
 import java.lang.reflect.Type;