sigonasr2
/
user-database-checkpoint
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement all endpoints

Browse Source
master
Joshua Sigona 4 years ago
commit ca6d19bb82
13 changed files with 687 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      bin/.gitignore
  2. 26
      build.gradle
  3. BIN
      gradle/wrapper/gradle-wrapper.jar
  4. 5
      gradle/wrapper/gradle-wrapper.properties
  5. 185
      gradlew
  6. 104
      gradlew.bat
  7. 1
      settings.gradle
  8. 13
      src/main/java/com/example/demo/DemoApplication.java
  9. 62
      src/main/java/com/example/demo/User.java
  10. 260
      src/main/java/com/example/demo/UserController.java
  11. 10
      src/main/java/com/example/demo/UserRepository.java
  12. 6
      src/main/resources/application.properties
  13. 13
      src/test/java/com/example/demo/DemoApplicationTests.java

2
bin/.gitignore vendored
Unescape View File

@ -0,0 +1,2 @@
/main/
/test/

26
build.gradle
Unescape View File

@ -0,0 +1,26 @@
plugins {
id 'org.springframework.boot' version '2.3.1.RELEASE'
id 'io.spring.dependency-management' version '1.0.9.RELEASE'
id 'java'
}
group = 'com.example'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8'
repositories {
mavenCentral()
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}
compile('org.springframework.boot:spring-boot-starter-data-jpa:2.0.0.RELEASE')
runtime('mysql:mysql-connector-java:8.0.21')
}
test {
useJUnitPlatform()
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

5
gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

185
gradlew vendored
Unescape View File

@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or 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 UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
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
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$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 "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# 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
;;
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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

104
gradlew.bat vendored
Unescape View File

@ -0,0 +1,104 @@
@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%" == "0" goto init
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 init
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
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
: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 %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="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!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

1
settings.gradle
Unescape View File

@ -0,0 +1 @@
rootProject.name = 'user-database-checkpoint'

13
src/main/java/com/example/demo/DemoApplication.java
Unescape View File

@ -0,0 +1,13 @@
package com.example.demo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class DemoApplication {
public static void main(String[] args) {
SpringApplication.run(DemoApplication.class, args);
}
}

62
src/main/java/com/example/demo/User.java
Unescape View File

@ -0,0 +1,62 @@
package com.example.demo;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
@Entity
@Table(name="users")
@JsonInclude(JsonInclude.Include.NON_NULL)
public class User {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
Long id;
String password;
String email;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public User stripPassword() {
password=null;
return this;
}
public User patchProperties(User patchUser) {
for (Field f : this.getClass().getDeclaredFields()) {
try {
if (patchUser.getClass().getDeclaredField(f.getName())!=null
&& patchUser.getClass().getDeclaredField(f.getName()).get(patchUser)!=null) {
f.set(this, patchUser.getClass().getDeclaredField(f.getName()).get(patchUser));
}
} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
}
}
return this;
}
}

260
src/main/java/com/example/demo/UserController.java
Unescape View File

@ -0,0 +1,260 @@
package com.example.demo;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import javax.imageio.ImageIO;
import javax.websocket.server.PathParam;
@RestController
public class UserController {
UserRepository database;
public UserController(UserRepository database) {
this.database=database;
}
@GetMapping("/users")
public Iterable<User> _1(){
Iterable<User> data = database.findAll();
data.forEach((item)->{item.stripPassword();}); //Hide passwords.
return data;
}
@GetMapping("/users/{id}")
public User _1(@PathVariable Long id){
return database.findById(id).orElse(new User()).stripPassword();
}
@PatchMapping("/users/{id}")
public ResponseEntity<User> _1(@PathVariable Long id,
@RequestBody User user){
Optional<User> u = database.findById(id);
if (u.isPresent()) {
User u2 = u.get();
u2.patchProperties(user);
u2.id=id; //We're not allowed to patch the Id. Set it back.
return ResponseEntity.ok(database.save(u2).stripPassword());
} else {
return ResponseEntity.badRequest().body(null);
}
}
@DeleteMapping("/users/{id}")
public UserCount _2(@PathVariable Long id){
if (database.existsById(id)) {
database.deleteById(id);
}
return new UserCount().set(database.count());
}
@PostMapping("/users/authenticate")
public AuthenticationStatus _2(@RequestBody User user){
List<User> u = database.findByPasswordAndEmail(user.password, user.email);
return new AuthenticationStatus((u.size()>0),(u.size()>0)?u.get(0):null).filter();
}
@JsonInclude(JsonInclude.Include.NON_NULL)
@RequestMapping
static class AuthenticationStatus{
boolean authenticated;
User user;
AuthenticationStatus(boolean auth,User u) {
this.authenticated=auth;
this.user=u;
}
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
public AuthenticationStatus filter() {
if (authenticated) {
user.stripPassword();
return this;
} else {
user=null; //Strip the user object entirely. Not authenticated.
return this;
}
}
public boolean isAuthenticated() {
return authenticated;
}
public void setAuthenticated(boolean authenticated) {
this.authenticated = authenticated;
}
}
@RequestMapping
static class UserCount{
Long count;
public Long getCount() {
return count;
}
public void setCount(Long count) {
this.count = count;
}
public UserCount set(Long count) {
setCount(count);
return this;
}
}
@PostMapping("/users")
public ResponseEntity<User> _1(@RequestBody User user){
User u = user;
if (u.email!=null && u.password!=null && u.id==null/*Cannot specify an id. This is POST'ing only.*/) {
database.save(u);
return ResponseEntity.ok(u.stripPassword());
} else {
return ResponseEntity.badRequest().body(null);
}
}
public static void downloadFileFromUrl(String url, String file) throws IOException{
File filer = new File(file);
filer.createNewFile();
URL website = new URL(url);
HttpURLConnection connection = (HttpURLConnection) website.openConnection();
/*for (String s : connection.getHeaderFields().keySet()) {
System.out.println(s+": "+connection.getHeaderFields().get(s));
}*/
connection.setRequestMethod("GET");
//connection.setRequestProperty("Content-Type", "application/json");
try {
ReadableByteChannel rbc = Channels.newChannel(connection.getInputStream());
FileOutputStream fos = new FileOutputStream(file);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
} catch (ConnectException e) {
System.out.println("Failed to connect, moving on...");
}
}
public double CalculateArea(double width,double height) {
return width*height;
}
public double CalculateArea(double radius) {
return Math.PI*Math.pow(radius, 2);
}
@PostMapping("/math/area")
public String areaDisplay(
@RequestParam Map<String,String> map) {
if (map.containsKey("type")) {
if (map.get("type").equalsIgnoreCase("circle")) {
if (map.containsKey("radius")) {
return new StringBuilder("Area of a circle with a radius of ")
.append(map.get("radius"))
.append(" is "+CalculateArea(Double.parseDouble(map.get("radius"))))
.toString();
}
}else if(map.get("type").equalsIgnoreCase("rectangle")) {
if (map.containsKey("width") && map.containsKey("height")) {
return new StringBuilder("Area of a ")
.append(map.get("width")).append("x")
.append(map.get("height"))
.append(" rectangle is "+CalculateArea(Double.parseDouble(map.get("width")),Double.parseDouble(map.get("height"))))
.toString();
}
}
}
return "Invalid";
}
@GetMapping("/math/volume/{l}/{w}/{h}")
public String volumeDisplay(
@PathVariable(value="l") String length,
@PathVariable(value="w") String width,
@PathVariable(value="h") String height) {
return new StringBuilder("The volume of a ")
.append(length).append("x")
.append(width).append("x")
.append(height)
.append(" rectangle is ")
.append(Integer.parseInt(length)*Integer.parseInt(width)*Integer.parseInt(height))
.toString();
}
@GetMapping("/math/calculate")
public String piDisplay(@RequestParam(value="operation",required=false) String operation,
@RequestParam(value="x") String x,
@RequestParam(value="y") String y) {
int val1=Integer.parseInt(x);
int val2=Integer.parseInt(y);
switch (operation) {
case "subtract":{
return Integer.toString(val1-val2);
}
case "multiply":{
return Integer.toString(val1*val2);
}
case "divide":{
return Integer.toString(val1/val2);
}
default:{
return Integer.toString(val1+val2);
}
}
}
@PostMapping("/math/sum")
public String sumDisplay(@RequestParam Map<String,String> keys) {
int sum = 0;
for (String i : keys.keySet()) {
sum += Integer.parseInt(keys.get(i));
}
return Integer.toString(sum);
}
@GetMapping("/math/pi")
public String piDisplay() {
return Double.toString(Math.PI);
}
@GetMapping("/image")
public HashMap<String,String> helloWorld(@RequestParam("url") String url){
try {
downloadFileFromUrl("http://pbs.twimg.com/media/EdKE8xzVcCEf1qd.jpg","temp");
BufferedImage img = ImageIO.read(new File("temp"));
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
}

10
src/main/java/com/example/demo/UserRepository.java
Unescape View File

@ -0,0 +1,10 @@
package com.example.demo;
import java.util.Date;
import java.util.List;
import org.springframework.data.repository.CrudRepository;
public interface UserRepository extends CrudRepository<User,Long>{
List<User> findByPasswordAndEmail(String pw,String email);
}

6
src/main/resources/application.properties
Unescape View File

@ -0,0 +1,6 @@
spring.datasource.url=jdbc:mysql://localhost/playground?serverTimezone=UTC
spring.datasource.username=sigonasr2
spring.datasource.password=
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.jpa.hibernate.ddl-auto=update
spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect

13
src/test/java/com/example/demo/DemoApplicationTests.java
Unescape View File

@ -0,0 +1,13 @@
package com.example.demo;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class DemoApplicationTests {
@Test
void contextLoads() {
}
}
Write Preview
Loading…
Cancel
Save