From 41530992fa74042e16e3e18e13e4f3093bda31ae Mon Sep 17 00:00:00 2001 From: Young Won Date: Tue, 4 Aug 2020 20:43:42 -0700 Subject: [PATCH 1/8] 1st --- .../controllers/AnimalController.java | 4 ++ .../controllers/TelephoneController.java | 4 ++ .../java_zoo/controllers/ZooController.java | 4 ++ .../youngw417/java_zoo/models/Animal.java | 55 ++++++++++++++++ .../youngw417/java_zoo/models/Telephone.java | 65 +++++++++++++++++++ .../local/youngw417/java_zoo/models/Zoo.java | 61 +++++++++++++++++ .../youngw417/java_zoo/models/Zooanimals.java | 65 +++++++++++++++++++ .../java_zoo/repository/ZooRepository.java | 4 ++ .../java_zoo/services/ZooService.java | 4 ++ .../java_zoo/services/ZooServiceImpl.java | 4 ++ 10 files changed, 270 insertions(+) create mode 100644 src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java create mode 100644 src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java create mode 100644 src/main/java/local/youngw417/java_zoo/controllers/ZooController.java create mode 100644 src/main/java/local/youngw417/java_zoo/models/Animal.java create mode 100644 src/main/java/local/youngw417/java_zoo/models/Telephone.java create mode 100644 src/main/java/local/youngw417/java_zoo/models/Zoo.java create mode 100644 src/main/java/local/youngw417/java_zoo/models/Zooanimals.java create mode 100644 src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java create mode 100644 src/main/java/local/youngw417/java_zoo/services/ZooService.java create mode 100644 src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java diff --git a/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java b/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java new file mode 100644 index 00000000..2e63fbdd --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.controllers; + +public class AnimalController { +} diff --git a/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java b/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java new file mode 100644 index 00000000..681fa354 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.controllers; + +public class TelephoneController { +} diff --git a/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java b/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java new file mode 100644 index 00000000..89cf01ed --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.controllers; + +public class ZooController { +} diff --git a/src/main/java/local/youngw417/java_zoo/models/Animal.java b/src/main/java/local/youngw417/java_zoo/models/Animal.java new file mode 100644 index 00000000..1c006a59 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/models/Animal.java @@ -0,0 +1,55 @@ +package local.youngw417.java_zoo.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Table(name = "animals") +public class Animal { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long animalid; + + @Column(nullable = false) + private String animaltype; + + @OneToMany(mappedBy = "animal", cascade = CascadeType.ALL) + @JsonIgnoreProperties(value = "animals", allowSetters = true) + private Set zoos = new HashSet<>(); + + public Animal() { + } + + public Animal(String animaltype) { + + this.animaltype = animaltype; + } + + public long getAnimalid() { + return animalid; + } + + public void setAnimalid(long animalid) { + this.animalid = animalid; + } + + public String getAnimaltype() { + return animaltype; + } + + public void setAnimaltype(String animaltype) { + this.animaltype = animaltype; + } + + public Set getZoos() { + return zoos; + } + + public void setZoos(Set zoos) { + this.zoos = zoos; + } +} diff --git a/src/main/java/local/youngw417/java_zoo/models/Telephone.java b/src/main/java/local/youngw417/java_zoo/models/Telephone.java new file mode 100644 index 00000000..974edb8e --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/models/Telephone.java @@ -0,0 +1,65 @@ +package local.youngw417.java_zoo.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; + +@Entity +@Table(name = "telephones") +public class Telephone { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long phoneid; + + @Column(nullable = false) + private String phonetype; + + @Column(nullable = false) + private String phonenumber; + + @ManyToOne + @JoinColumn(name = "zooid") + @JsonIgnoreProperties(value = "telephones", allowSetters = true) + private Zoo zoo; + + public Telephone() { + } + + public Telephone(String phonetype, String phonenumber, Zoo zoo){ + this.phonetype = phonetype; + this.phonenumber = phonenumber; + this.zoo = zoo; + } + + public long getPhoneid() { + return phoneid; + } + + public void setPhoneid(long phoneid) { + this.phoneid = phoneid; + } + + public String getPhonetype() { + return phonetype; + } + + public void setPhonetype(String phonetype) { + this.phonetype = phonetype; + } + + public String getPhonenumber() { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) { + this.phonenumber = phonenumber; + } + + public Zoo getZoo() { + return zoo; + } + + public void setZoo(Zoo zoo) { + this.zoo = zoo; + } +} diff --git a/src/main/java/local/youngw417/java_zoo/models/Zoo.java b/src/main/java/local/youngw417/java_zoo/models/Zoo.java new file mode 100644 index 00000000..683fb0cb --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/models/Zoo.java @@ -0,0 +1,61 @@ +package local.youngw417.java_zoo.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +@Entity +@Table(name= "zoos") +public class Zoo { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long zooid; + + @Column(nullable = false, unique = true) + private String zooname; + + @OneToMany(mappedBy = "zoo", cascade = CascadeType.ALL, orphanRemoval = true) + @JsonIgnoreProperties(value = "zoo", allowSetters = true) + private List telephones = new ArrayList<>(); + + @OneToMany(mappedBy = "zoo", cascade = CascadeType.ALL) + @JsonIgnoreProperties(value = "zoos", allowSetters = true) + private Set animals = new HashSet<>(); + + + public Zoo() { + } + public Zoo(String zooname) { + this.zooname = zooname; + } + + public long getZooid() { + return zooid; + } + + public void setZooid(long zooid) { + this.zooid = zooid; + } + + public String getZooname() { + return zooname; + } + + public void setZooname(String zooname) { + this.zooname = zooname; + } + + public List getTelephones() { + return telephones; + } + + public void setTelephones(List telephones) { + this.telephones = telephones; + } +} + diff --git a/src/main/java/local/youngw417/java_zoo/models/Zooanimals.java b/src/main/java/local/youngw417/java_zoo/models/Zooanimals.java new file mode 100644 index 00000000..b38d92f8 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/models/Zooanimals.java @@ -0,0 +1,65 @@ +package local.youngw417.java_zoo.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Objects; + +@Entity +@Table(name = " zooanimals") +public class Zooanimals implements Serializable { + + @Id + @ManyToOne + @JoinColumn(name = "zooid") + @JsonIgnoreProperties(value = "animals", allowSetters = true) + private Zoo zoo; + + @Id + @ManyToOne + @JoinColumn(name = "animalid") + @JsonIgnoreProperties(value = "zoos", allowSetters = true) + private Animal animal; + + public Zooanimals() { + } + + public Zooanimals(Zoo zoo, Animal animal) { + this.animal = animal; + this.zoo = zoo; + } + + public Zoo getZoo() { + return zoo; + } + + public void setZoo(Zoo zoo) { + this.zoo = zoo; + } + + public Animal getAnimal() { + return animal; + } + + public void setAnimal(Animal animal) { + this.animal = animal; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Zooanimals)) return false; + + Zooanimals that = (Zooanimals) o; + + return ((this.zoo == null) ? 0 : this.zoo.getZooid()) == ((that.zoo == null) ? 0 : that.zoo.getZooid()) && + ((this.animal == null) ? 0 : this.animal.getAnimalid()) == ((that.animal == null ? 0 : that.animal.getAnimalid())); + } + + @Override + public int hashCode() { +// return Objects.hash(zoo, animal); + return 37; + } +} diff --git a/src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java b/src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java new file mode 100644 index 00000000..4ab2158d --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.repository; + +public interface ZooRepository { +} diff --git a/src/main/java/local/youngw417/java_zoo/services/ZooService.java b/src/main/java/local/youngw417/java_zoo/services/ZooService.java new file mode 100644 index 00000000..3cb15a91 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/services/ZooService.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.services; + +public interface ZooService { +} diff --git a/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java new file mode 100644 index 00000000..d5b7f2c6 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.services; + +public class ZooServiceImpl { +} From 1c043a866c89d70c12668b0f0f867c466efd00b4 Mon Sep 17 00:00:00 2001 From: Young Won Date: Tue, 4 Aug 2020 21:33:57 -0700 Subject: [PATCH 2/8] 2nd --- .mvn/wrapper/MavenWrapperDownloader.java | 118 +++++++ .mvn/wrapper/maven-wrapper.properties | 2 + HELP.md | 20 ++ mvnw | 310 ++++++++++++++++++ mvnw.cmd | 182 ++++++++++ pom.xml | 64 ++++ .../java_zoo/JavaZooApplication.java | 13 + src/main/resources/application.properties | 25 ++ .../java_zoo/JavaZooApplicationTests.java | 13 + target/classes/application.properties | 25 ++ 10 files changed, 772 insertions(+) create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 HELP.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/local/youngw417/java_zoo/JavaZooApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/local/youngw417/java_zoo/JavaZooApplicationTests.java create mode 100644 target/classes/application.properties diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..a45eb6ba --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present 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. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/HELP.md b/HELP.md new file mode 100644 index 00000000..d3bd922a --- /dev/null +++ b/HELP.md @@ -0,0 +1,20 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/maven-plugin/reference/html/#build-image) +* [Spring Web](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#boot-features-developing-web-applications) +* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#boot-features-jpa-and-spring-data) +* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#using-boot-devtools) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/) +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) + diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..a16b5431 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/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 +# +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven 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 Mingw, 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)`" +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 + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +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 + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +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 "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@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 https://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 Maven 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 keystroke 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 set title of command window +title %0 +@REM enable echoing by 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 + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%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% diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..710526c8 --- /dev/null +++ b/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.2.RELEASE + + + local.youngw417 + java_zoo + 0.0.1-SNAPSHOT + java_zoo + Demo project for Spring Boot + + + 14 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.h2database + h2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/local/youngw417/java_zoo/JavaZooApplication.java b/src/main/java/local/youngw417/java_zoo/JavaZooApplication.java new file mode 100644 index 00000000..40e3d037 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/JavaZooApplication.java @@ -0,0 +1,13 @@ +package local.youngw417.java_zoo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class JavaZooApplication { + + public static void main(String[] args) { + SpringApplication.run(JavaZooApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..a5575455 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,25 @@ +# Configurations useful for working with H2 +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console +# +# We set a port that is not frequently used +server.port=${PORT:2019} +# +# Feature that determines what happens when no accessors are found for a type +# (and there are no annotations to indicate it is meant to be serialized). +spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false +# +# keeps a transaction inside of the same entity manager +# This property register an EntityManager to the current thread, +# so you will have the same EntityManager until the web request is finished. +spring.jpa.open-in-view=true +# +# What do with the schema +# drop n create table again, good for testing +spring.jpa.hibernate.ddl-auto=create +spring.datasource.initialization-mode=always +# +# Good for production! +# spring.jpa.hibernate.ddl-auto=update +# since we have our data in SeedData, do not also load it from data.sql +# spring.datasource.initialization-mode=never diff --git a/src/test/java/local/youngw417/java_zoo/JavaZooApplicationTests.java b/src/test/java/local/youngw417/java_zoo/JavaZooApplicationTests.java new file mode 100644 index 00000000..5a79529a --- /dev/null +++ b/src/test/java/local/youngw417/java_zoo/JavaZooApplicationTests.java @@ -0,0 +1,13 @@ +package local.youngw417.java_zoo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class JavaZooApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/target/classes/application.properties b/target/classes/application.properties new file mode 100644 index 00000000..a5575455 --- /dev/null +++ b/target/classes/application.properties @@ -0,0 +1,25 @@ +# Configurations useful for working with H2 +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console +# +# We set a port that is not frequently used +server.port=${PORT:2019} +# +# Feature that determines what happens when no accessors are found for a type +# (and there are no annotations to indicate it is meant to be serialized). +spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false +# +# keeps a transaction inside of the same entity manager +# This property register an EntityManager to the current thread, +# so you will have the same EntityManager until the web request is finished. +spring.jpa.open-in-view=true +# +# What do with the schema +# drop n create table again, good for testing +spring.jpa.hibernate.ddl-auto=create +spring.datasource.initialization-mode=always +# +# Good for production! +# spring.jpa.hibernate.ddl-auto=update +# since we have our data in SeedData, do not also load it from data.sql +# spring.datasource.initialization-mode=never From c474553ea0ec81f73ff3148581bd29418efd7871 Mon Sep 17 00:00:00 2001 From: Young Won Date: Tue, 4 Aug 2020 22:03:03 -0700 Subject: [PATCH 3/8] zoo controller completed --- .../java_zoo/controllers/ZooController.java | 198 +++++++++++++++++- .../java_zoo/services/ZooService.java | 12 ++ 2 files changed, 209 insertions(+), 1 deletion(-) diff --git a/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java b/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java index 89cf01ed..7f6ba3a9 100644 --- a/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java +++ b/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java @@ -1,4 +1,200 @@ package local.youngw417.java_zoo.controllers; +import local.youngw417.java_zoo.models.Zoo; +import local.youngw417.java_zoo.services.ZooService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + public class ZooController { -} + + /** + * Using the User service to process user data + */ + @Autowired + private ZooService zooService; + + /** + * Returns a list of all users + *
Example: http://localhost:2019/users/users + * + * @return JSON list of all users with a status of OK + * @see UserService#findAll() UserService.findAll() + */ + @GetMapping(value = "/zoos", + produces = "application/json") + public ResponseEntity listAllZoos() + { + List myUsers = zooService.findAll(); + return new ResponseEntity<>(myUsers, + HttpStatus.OK); + } + + /** + * Returns a single user based off a user id number + *
Example: http://localhost:2019/users/user/7 + * + * @param userId The primary key of the user you seek + * @return JSON object of the user you seek + * @see UserService#findUserById(long) UserService.findUserById(long) + */ + @GetMapping(value = "/zoo/{zooid}", + produces = "application/json") + public ResponseEntity getZooById( + @PathVariable + Long zooid) + { + Zoo z = zooService.findZooById(zooid); + return new ResponseEntity<>(z, + HttpStatus.OK); + } + + /** + * Return a user object based on a given username + *
Example: http://localhost:2019/users/user/name/cinnamon + * + * @param userName the name of user (String) you seek + * @return JSON object of the user you seek + * @see UserService#findByName(String) UserService.findByName(String) + */ + @GetMapping(value = "/zoo/name/{zooName}", + produces = "application/json") + public ResponseEntity getZooByName( + @PathVariable + String zooName) + { + Zoo z = zooService.findByName(zooName); + return new ResponseEntity<>(z, + HttpStatus.OK); + } + + /** + * Returns a list of users whose username contains the given substring + *
Example: http://localhost:2019/users/user/name/like/da + * + * @param userName Substring of the username for which you seek + * @return A JSON list of users you seek + * @see UserService#findByNameContaining(String) UserService.findByNameContaining(String) + */ + @GetMapping(value = "/user/name/like/{zoorName}", + produces = "application/json") + public ResponseEntity getZooLikeName( + @PathVariable + String zooName) + { + List z = zooService.findByNameContaining(zooName); + return new ResponseEntity<>(z, + HttpStatus.OK); + } + + /** + * Given a complete User Object, create a new User record and accompanying useremail records + * and user role records. + *
Example: http://localhost:2019/users/user + * + * @param newuser A complete new user to add including emails and roles. + * roles must already exist. + * @return A location header with the URI to the newly created user and a status of CREATED + * @throws URISyntaxException Exception if something does not work in creating the location header + * @see UserService#save(User) UserService.save(User) + */ + @PostMapping(value = "/zoo", + consumes = "application/json") + public ResponseEntity addNewZoo( + @Validated + @RequestBody + Zoo newzoo) throws + URISyntaxException + { + newzoo.setZooid(0); + newzoo = zooService.save(newzoo); + + // set the location header for the newly created resource + HttpHeaders responseHeaders = new HttpHeaders(); + URI newUserURI = ServletUriComponentsBuilder.fromCurrentRequest() + .path("/{zooid}") + .buildAndExpand(newzoo.getZooid()) + .toUri(); + responseHeaders.setLocation(newUserURI); + + return new ResponseEntity<>(null, + responseHeaders, + HttpStatus.CREATED); + } + + /** + * Given a complete User Object + * Given the user id, primary key, is in the User table, + * replace the User record and Useremail records. + * Roles are handled through different endpoints + *
Example: http://localhost:2019/users/user/15 + * + * @param updateUser A complete User including all emails and roles to be used to + * replace the User. Roles must already exist. + * @param userid The primary key of the user you wish to replace. + * @return status of OK + * @see UserService#save(User) UserService.save(User) + */ + @PutMapping(value = "/zoo/{zooid}", + consumes = "application/json") + public ResponseEntity updateFullZoo( + @Validated + @RequestBody + Zoo updateZoo, + @PathVariable + long zooid) + { + updateZoo.setZooid(zooid); + zooService.save(updateZoo); + + return new ResponseEntity<>(HttpStatus.OK); + } + + /** + * Updates the user record associated with the given id with the provided data. Only the provided fields are affected. + * Roles are handled through different endpoints + * If an email list is given, it replaces the original emai list. + *
Example: http://localhost:2019/users/user/7 + * + * @param updateUser An object containing values for just the fields that are being updated. All other fields are left NULL. + * @param id The primary key of the user you wish to update. + * @return A status of OK + * @see UserService#update(User, long) UserService.update(User, long) + */ + @PatchMapping(value = "/zoo/{id}", + consumes = "application/json") + public ResponseEntity updateZoo( + @RequestBody + Zoo updateZoo, + @PathVariable + long id) + { + zooService.update(updateZoo, + id); + return new ResponseEntity<>(HttpStatus.OK); + } + + /** + * Deletes a given user along with associated emails and roles + *
Example: http://localhost:2019/users/user/14 + * + * @param id the primary key of the user you wish to delete + * @return Status of OK + */ + @DeleteMapping(value = "/zoo/{id}") + public ResponseEntity deleteZooById( + @PathVariable + long id) + { + zooService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/src/main/java/local/youngw417/java_zoo/services/ZooService.java b/src/main/java/local/youngw417/java_zoo/services/ZooService.java index 3cb15a91..eaa9447e 100644 --- a/src/main/java/local/youngw417/java_zoo/services/ZooService.java +++ b/src/main/java/local/youngw417/java_zoo/services/ZooService.java @@ -1,4 +1,16 @@ package local.youngw417.java_zoo.services; +import local.youngw417.java_zoo.models.Zoo; + +import java.util.List; + public interface ZooService { + + List findAll(); + Zoo findZooById(long zooid); + Zoo findByName(String name); + List findByNameContaining(String name); + Zoo save(Zoo zoo); + Zoo update(Zoo zoo, long id); + void delete(long id); } From 55676bf91cb96ac145d3024dd361bfb431c129f2 Mon Sep 17 00:00:00 2001 From: Young Won Date: Wed, 5 Aug 2020 00:25:56 -0700 Subject: [PATCH 4/8] zooSermviceimpl completed --- .../local/youngw417/java_zoo/models/Zoo.java | 8 + .../java_zoo/repository/ZooRepository.java | 10 +- .../java_zoo/services/ZooServiceImpl.java | 147 +++++++++++++++++- 3 files changed, 163 insertions(+), 2 deletions(-) diff --git a/src/main/java/local/youngw417/java_zoo/models/Zoo.java b/src/main/java/local/youngw417/java_zoo/models/Zoo.java index 683fb0cb..49b537a7 100644 --- a/src/main/java/local/youngw417/java_zoo/models/Zoo.java +++ b/src/main/java/local/youngw417/java_zoo/models/Zoo.java @@ -57,5 +57,13 @@ public List getTelephones() { public void setTelephones(List telephones) { this.telephones = telephones; } + + public Set getAnimals() { + return animals; + } + + public void setAnimals(Set animals) { + this.animals = animals; + } } diff --git a/src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java b/src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java index 4ab2158d..79c6d0fd 100644 --- a/src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java +++ b/src/main/java/local/youngw417/java_zoo/repository/ZooRepository.java @@ -1,4 +1,12 @@ package local.youngw417.java_zoo.repository; -public interface ZooRepository { +import local.youngw417.java_zoo.models.Zoo; +import org.springframework.data.repository.CrudRepository; + +import java.util.List; + +public interface ZooRepository extends CrudRepository { + + Zoo findByZooname(String zooname); + List findByZoonameContainingIgnoreCase(String name); } diff --git a/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java index d5b7f2c6..57916a2f 100644 --- a/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java +++ b/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java @@ -1,4 +1,149 @@ package local.youngw417.java_zoo.services; -public class ZooServiceImpl { +import local.youngw417.java_zoo.models.Animal; +import local.youngw417.java_zoo.models.Telephone; +import local.youngw417.java_zoo.models.Zoo; +import local.youngw417.java_zoo.models.Zooanimals; +import local.youngw417.java_zoo.repository.ZooRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.EntityNotFoundException; +import java.util.ArrayList; +import java.util.List; + +@Transactional +@Service(value = "zooService") +public class ZooServiceImpl implements ZooService{ + + @Autowired + private ZooRepository zoorepos; + + @Autowired + private AnimalService animalService; + + @Override + public List findAll() { + + List list = new ArrayList<>(); + /* + * findAll returns an iterator set. + * iterate over the iterator set and add each element to an array list. + */ + zoorepos.findAll() + .iterator() + .forEachRemaining(list::add); + return list; + } + + @Override + public Zoo findZooById(long zooid) { + EntityNotFoundException + + return zoorepos.findById(zooid) + .orElseThrow(() -> new EntityNotFoundException("Zoo id " + zooid + " not found!")); + } + @Override + public Zoo findByName(String name) { + Zoo myzoo = zoorepos.findByZooname(name.toLowerCase()); + if (myzoo == null) + { + throw new EntityNotFoundException("Zoo name " + name + " not found!"); + } + return myzoo; + } + + @Override + public List findByNameContaining(String name) { + return zoorepos.findByZoonameContainingIgnoreCase(name.toLowerCase()); + } + + @Transactional + @Override + public Zoo save(Zoo zoo) { + Zoo newZoo = new Zoo(); + + if (zoo.getZooid() != 0) + { + zoorepos.findById(zoo.getZooid()) + .orElseThrow(() -> new EntityNotFoundException("Zoo id " + zoo.getZooid() + " not found!")); + newZoo.setZooid(zoo.getZooid()); + } + + newZoo.setZooname(zoo.getZooname() + .toLowerCase()); + + + newZoo.getAnimals() + .clear(); + for (Zooanimals z : zoo.getAnimals()) + { + Animal newAnimal = animalService.findAnimalById(z.getAnimal().getAnimalid()); + + newZoo.getAnimals() + .add(new Zooanimals(newZoo, newAnimal)); + } + + newZoo.getTelephones() + .clear(); + for (Telephone te : zoo.getTelephones()) + { + newZoo.getTelephones() + .add(new Telephone(te.getPhonetype(),te.getPhonenumber(), + te.getZoo()); + } + + return zoorepos.save(newZoo); + } + + @Transactional + @Override + public Zoo update(Zoo zoo, long id) { + Zoo currentZoo = findZooById(id); + + if (zoo.getZooname() != null) + { + currentZoo.setZooname(zoo.getZooname() + .toLowerCase()); + } + + + + if (zoo.getAnimals() + .size() > 0) + { + currentZoo.getAnimals() + .clear(); + for (Zooanimals z : zoo.getAnimals()) + { + Animal newAnimal = animalService.findAnimalById(z.getAnimal().getAnimalid()); + + currentZoo.getAnimals() + .add(new Zooanimals(currentZoo, newAnimal)); + } + } + + if (Zoo.getTelephones() + .size() > 0) + { + currentZoo.getTelephones() + .clear(); + for (Telephone te : zoo.getTelephones()) + { + currentZoo.getTelephones() + .add(new Telephone(te.getPhonetype(), te.getPhonenumber(), + currentZoo)); + } + } + + @Transactional + @Override + public void delete(long id) { + zoorepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Zoo id " + id + " not found!")); + zoorepos.deleteById(id); + } + + } } From 331d481c04b098647c940efeae55a2dbbee7a6c6 Mon Sep 17 00:00:00 2001 From: Young Won Date: Wed, 5 Aug 2020 10:34:15 -0700 Subject: [PATCH 5/8] animalSeviceImpl completed --- .../controllers/AnimalController.java | 108 ++++++++++++++++ .../controllers/TelephoneController.java | 121 ++++++++++++++++++ .../java_zoo/repository/AnimalRepository.java | 8 ++ .../java_zoo/services/AnimalService.java | 42 ++++++ .../java_zoo/services/AnimalServiiceImpl.java | 101 +++++++++++++++ .../java_zoo/services/TelephoneService.java | 4 + .../services/TelephoneServiceImpl.java | 4 + 7 files changed, 388 insertions(+) create mode 100644 src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java create mode 100644 src/main/java/local/youngw417/java_zoo/services/AnimalService.java create mode 100644 src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java create mode 100644 src/main/java/local/youngw417/java_zoo/services/TelephoneService.java create mode 100644 src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java diff --git a/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java b/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java index 2e63fbdd..81f77f43 100644 --- a/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java +++ b/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java @@ -1,4 +1,112 @@ package local.youngw417.java_zoo.controllers; +import local.youngw417.java_zoo.models.Animal; +import local.youngw417.java_zoo.services.AnimalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.util.List; + public class AnimalController { + /** + * Using the Role service to process Role data + */ + @Autowired + AnimalService animalService; + + /** + * List of all roles + *
Example: http://localhost:2019/roles/roles + * + * @return JSON List of all the roles and their associated users + * @see RoleService#findAll() RoleService.findAll() + */ + @GetMapping(value = "/animals", + produces = "application/json") + public ResponseEntity listAnimals() + { + List allAnimals = animalService.findAll(); + return new ResponseEntity<>(allAnimals, + HttpStatus.OK); + } + + /** + * The Role referenced by the given primary key + *
Example: http://localhost:2019/roles/role/3 + * + * @param roleId The primary key (long) of the role you seek + * @return JSON object of the role you seek + * @see RoleService#findRoleById(long) RoleService.findRoleById(long) + */ + @GetMapping(value = "/animal/{animalid}", + produces = "application/json") + public ResponseEntity getAnimalById( + @PathVariable + Long animalid) + { + Animal a = animalService.findAnimalById(animalid); + return new ResponseEntity<>(r, + HttpStatus.OK); + } + + /** + * The Role with the given name + *
Example: http://localhost:2019/roles/role/name/data + * + * @param roleName The name of the role you seek + * @return JSON object of the role you seek + * @see RoleService#findByName(String) RoleService.findByName(String) + */ + @GetMapping(value = "/animal/name/{animalName}", + produces = "application/json") + public ResponseEntity getAnimalByName( + @PathVariable + String animalName) + { + Animal a = animalService.findByName(animalName); + return new ResponseEntity<>(a, + HttpStatus.OK); + } + + /** + * Given a complete Role object, create a new Role record + *
Example: http://localhost:2019/roles/role + * + * @param newRole A complete new Role object + * @return A location header with the URI to the newly created role and a status of CREATED + * @see RoleService#save(Role) RoleService.save(Role) + */ + @PostMapping(value = "/animal", + consumes = "application/json") + public ResponseEntity addNewAnimal( + @Validated + @RequestBody + Animal newAnimal) + { + // ids are not recognized by the Post method + newAnimal.setAnimalid(0); + newAnimal = animalService.save(newAnimal); + + // set the location header for the newly created resource + HttpHeaders responseHeaders = new HttpHeaders(); + URI newAnimalURI = ServletUriComponentsBuilder.fromCurrentRequest() + .path("/{animalid}") + .buildAndExpand(newAnimal.getAnimalid()) + .toUri(); + responseHeaders.setLocation(newAnimalURI); + + return new ResponseEntity<>(null, + responseHeaders, + HttpStatus.CREATED); + } } diff --git a/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java b/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java index 681fa354..2f37a7eb 100644 --- a/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java +++ b/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java @@ -1,4 +1,125 @@ package local.youngw417.java_zoo.controllers; +import local.youngw417.java_zoo.services.TelephoneService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +@RestController +@RequestMapping("/telephons") public class TelephoneController { + /** + * Using the Useremail service to process user, email combinations data + */ + @Autowired + TelephoneService telephoneService; + + /** + * List of all users emails + *
Example: http://localhost:2019/useremails/useremails + * + * @return JSON list of all users emails + */ + @GetMapping(value = "/useremails", + produces = "application/json") + public ResponseEntity listAllUseremails() + { + List allUserEmails = useremailService.findAll(); + return new ResponseEntity<>(allUserEmails, + HttpStatus.OK); + } + + /** + * Return the user email combination referenced by the given primary key + *
Example: http://localhost:2019/useremails/useremail/8 + * + * @param useremailId the primary key of the user email combination you seek + * @return JSON object of the user email combination you seek with a status of OK + */ + @GetMapping(value = "/useremail/{useremailId}", + produces = "application/json") + public ResponseEntity getUserEmailById( + @PathVariable + Long useremailId) + { + Useremail ue = useremailService.findUseremailById(useremailId); + return new ResponseEntity<>(ue, + HttpStatus.OK); + } + + /** + * Removes the given user email combination + *
Example: http://localhost:2019/useremails/useremail/8 + * + * @param useremailid the primary key of the user email combination you wish to remove + * @return Status of OK + */ + @DeleteMapping(value = "/useremail/{useremailid}") + public ResponseEntity deleteUserEmailById( + @PathVariable + long useremailid) + { + useremailService.delete(useremailid); + return new ResponseEntity<>(HttpStatus.OK); + } + + /** + * Change the email associated with the given user email combination + *
Example: http://localhost:2019/useremails/useremail/9/email/favbun@hops.local + * + * @param useremailid The primary key of the user email combination you wish to change + * @param emailaddress The new email (String) + * @return Status of OK + */ + @PutMapping("/useremail/{useremailid}/email/{emailaddress}") + public ResponseEntity updateUserEmail( + @PathVariable + long useremailid, + @PathVariable + String emailaddress) + { + useremailService.update(useremailid, + emailaddress); + return new ResponseEntity<>(HttpStatus.OK); + } + + /** + * Adds a new user email combination + * + * @param userid the user id of the new user email combination + * @param emailaddress the email address of the new user eamil combination + * @return A location header with the URI to the newly created user email combination and a status of CREATED + * @throws URISyntaxException Exception if something does not work in creating the location header + * @see UseremailService#save(long, String) UseremailService.save(long, String) + */ + @PostMapping(value = "/user/{userid}/email/{emailaddress}") + public ResponseEntity addNewUserEmail( + @PathVariable + long userid, + @PathVariable + String emailaddress) throws + URISyntaxException + { + Useremail newUserEmail = useremailService.save(userid, + emailaddress); + + // set the location header for the newly created resource + HttpHeaders responseHeaders = new HttpHeaders(); + URI newUserEmailURI = ServletUriComponentsBuilder.fromCurrentServletMapping() + .path("/useremails/useremail/{useremailid}") + .buildAndExpand(newUserEmail.getUseremailid()) + .toUri(); + responseHeaders.setLocation(newUserEmailURI); + + return new ResponseEntity<>(null, + responseHeaders, + HttpStatus.CREATED); + } } diff --git a/src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java b/src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java new file mode 100644 index 00000000..316e39dc --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java @@ -0,0 +1,8 @@ +package local.youngw417.java_zoo.repository; + +import local.youngw417.java_zoo.models.Animal; +import org.springframework.data.repository.CrudRepository; + +public interface AnimalRepository extends CrudRepository { + Animal findByNameIgnoreCase(String name); +} diff --git a/src/main/java/local/youngw417/java_zoo/services/AnimalService.java b/src/main/java/local/youngw417/java_zoo/services/AnimalService.java new file mode 100644 index 00000000..b23d85ca --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/services/AnimalService.java @@ -0,0 +1,42 @@ +package local.youngw417.java_zoo.services; + +import local.youngw417.java_zoo.models.Animal; + +import java.util.List; + +public interface AnimalService { + + List findAll(); + + /** + * Return the first Role matching the given primary key + * + * @param id The primary key (long) of the Role you seek + * @return The Role object you seek + */ + Animal findAnimalById(long id); + + /** + * Given a complete Role object, saved that Role object in the database. + * If a primary key is provided, the record is completely replaced + * If no primary key is provided, one is automatically generated and the record is added to the database. + *

+ * Note that Users are not added to Roles through this process + * + * @param role the role object to be saved + * @return the saved role object including any automatically generated fields + */ + Animal save(Animal animal); + + /** + * Find the first Role object matching the given name + * + * @param name The name (String) of the role you seek + * @return The Role object matching the given name + */ + Animal findByName(String name); + + public void deleteAll(); + + Animal update(long id, Animal animal); +} diff --git a/src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java new file mode 100644 index 00000000..5b940997 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java @@ -0,0 +1,101 @@ +package local.youngw417.java_zoo.services; + +import local.youngw417.java_zoo.models.Animal; +import local.youngw417.java_zoo.repository.AnimalRepository; +import local.youngw417.java_zoo.repository.ZooRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.EntityExistsException; +import javax.persistence.EntityNotFoundException; +import java.util.ArrayList; +import java.util.List; + +@Transactional +@Override +public class AnimalServiiceImpl implements AnimalService { + + @Autowired + AnimalRepository animalrepos; + + /** + * Connect this service to the User Model + */ + @Autowired + ZooRepository zoorepos; + + @Autowired + private UserAuditing userAuditing; + + @Override + public List findAll() + { + List list = new ArrayList<>(); + /* + * findAll returns an iterator set. + * iterate over the iterator set and add each element to an array list. + */ + animalrepos.findAll() + .iterator() + .forEachRemaining(list::add); + return list; +} + + + @Override + public Animal findAnimalById(long id) + { + return animalrepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Animal id " + id + " not found!")); + } + + @Override + public Animal findByName(String name) + { + Animal an = animalrepos.findByNameIgnoreCase(name); + + if (an != null) + { + return an; + } else + { + throw new EntityNotFoundException(name); + } +} + + @Transactional + @Override + public Animal save(Animal animal){ + + if (animal.getZoos() + .size() > 0) + { + throw new EntityExistsException("Zoo animals are not updated through Animal."); + } + + return animalrepos.save(animal); +} + + @Transactional + @Override + public void deleteAll() + { + animalrepos.deleteAll(); + } + + @Transactional + @Override + public Animal update(long id, Animal animal) { + if (animal.getName() == null){ + throw new EntityNotFoundException("No animal name found to update"); + } + + if (animal.getZoos().size() > 0){ + throw new EntityNotFoundException("Zoo are not updated through Animal. See endpoint POST: zoos/zoo/{zooid}/animal/{animalid}"); + } + + Animal newAnimal = findAnimalById(id); + animalrepos.updateAnimalName(userAuditing.getCurrentAuditor().get(), id, animal.getName()); + return newAnimal; + } +} diff --git a/src/main/java/local/youngw417/java_zoo/services/TelephoneService.java b/src/main/java/local/youngw417/java_zoo/services/TelephoneService.java new file mode 100644 index 00000000..e3fbbb16 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/services/TelephoneService.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.services; + +public interface TelephoneService { +} diff --git a/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java new file mode 100644 index 00000000..6e82faf5 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java @@ -0,0 +1,4 @@ +package local.youngw417.java_zoo.services; + +public class TelephoneServiceImpl { +} From 9450e575c3346010b6f043a09491e329a14885c3 Mon Sep 17 00:00:00 2001 From: Young Won Date: Wed, 5 Aug 2020 11:14:08 -0700 Subject: [PATCH 6/8] telephoneServiceImpl completed --- .../controllers/TelephoneController.java | 100 ++++++------------ .../youngw417/java_zoo/models/Telephone.java | 2 +- .../repository/TelephoneRepository.java | 7 ++ .../java_zoo/services/TelephoneService.java | 23 ++++ .../services/TelephoneServiceImpl.java | 75 ++++++++++++- 5 files changed, 139 insertions(+), 68 deletions(-) create mode 100644 src/main/java/local/youngw417/java_zoo/repository/TelephoneRepository.java diff --git a/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java b/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java index 2f37a7eb..57310299 100644 --- a/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java +++ b/src/main/java/local/youngw417/java_zoo/controllers/TelephoneController.java @@ -1,5 +1,6 @@ package local.youngw417.java_zoo.controllers; +import local.youngw417.java_zoo.models.Telephone; import local.youngw417.java_zoo.services.TelephoneService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; @@ -21,102 +22,69 @@ public class TelephoneController { @Autowired TelephoneService telephoneService; - /** - * List of all users emails - *
Example: http://localhost:2019/useremails/useremails - * - * @return JSON list of all users emails - */ - @GetMapping(value = "/useremails", + @GetMapping(value = "/telephones", produces = "application/json") - public ResponseEntity listAllUseremails() + public ResponseEntity listAllTelephones() { - List allUserEmails = useremailService.findAll(); - return new ResponseEntity<>(allUserEmails, + List allTelephones = telephoneService.findAll(); + return new ResponseEntity<>(allTelephones, HttpStatus.OK); } - /** - * Return the user email combination referenced by the given primary key - *
Example: http://localhost:2019/useremails/useremail/8 - * - * @param useremailId the primary key of the user email combination you seek - * @return JSON object of the user email combination you seek with a status of OK - */ - @GetMapping(value = "/useremail/{useremailId}", + + @GetMapping(value = "/telephone/{phoneid}", produces = "application/json") - public ResponseEntity getUserEmailById( + public ResponseEntity getTelephoneById( @PathVariable - Long useremailId) + Long phoneid) { - Useremail ue = useremailService.findUseremailById(useremailId); - return new ResponseEntity<>(ue, + Telephone te = telephoneService.findTelephoneById(phoneid); + return new ResponseEntity<>(te, HttpStatus.OK); } - /** - * Removes the given user email combination - *
Example: http://localhost:2019/useremails/useremail/8 - * - * @param useremailid the primary key of the user email combination you wish to remove - * @return Status of OK - */ - @DeleteMapping(value = "/useremail/{useremailid}") - public ResponseEntity deleteUserEmailById( + + @DeleteMapping(value = "/telephone/{phoneid}") + public ResponseEntity deleteTelephoneById( @PathVariable - long useremailid) + long phoneid) { - useremailService.delete(useremailid); + telephoneService.delete(phoneid); return new ResponseEntity<>(HttpStatus.OK); } - /** - * Change the email associated with the given user email combination - *
Example: http://localhost:2019/useremails/useremail/9/email/favbun@hops.local - * - * @param useremailid The primary key of the user email combination you wish to change - * @param emailaddress The new email (String) - * @return Status of OK - */ - @PutMapping("/useremail/{useremailid}/email/{emailaddress}") - public ResponseEntity updateUserEmail( + + @PutMapping("/telephone/{phoneid}/phone/{phonenumber}") + public ResponseEntity updatePhoneNumber( @PathVariable - long useremailid, + long phoneid, @PathVariable - String emailaddress) + String phonenumber) { - useremailService.update(useremailid, - emailaddress); + telephoneService.update(phoneid, + phonenumber); return new ResponseEntity<>(HttpStatus.OK); } - /** - * Adds a new user email combination - * - * @param userid the user id of the new user email combination - * @param emailaddress the email address of the new user eamil combination - * @return A location header with the URI to the newly created user email combination and a status of CREATED - * @throws URISyntaxException Exception if something does not work in creating the location header - * @see UseremailService#save(long, String) UseremailService.save(long, String) - */ - @PostMapping(value = "/user/{userid}/email/{emailaddress}") - public ResponseEntity addNewUserEmail( + + @PostMapping(value = "/zoo/{zooid}/phone/{phonenumber}") + public ResponseEntity addNewTelephoe( @PathVariable - long userid, + long zooid, @PathVariable - String emailaddress) throws + String phonenumber) throws URISyntaxException { - Useremail newUserEmail = useremailService.save(userid, - emailaddress); + Telephone newTelephone = telephoneService.save(zooid, + phonenumber); // set the location header for the newly created resource HttpHeaders responseHeaders = new HttpHeaders(); - URI newUserEmailURI = ServletUriComponentsBuilder.fromCurrentServletMapping() - .path("/useremails/useremail/{useremailid}") - .buildAndExpand(newUserEmail.getUseremailid()) + URI newTelephoneURI = ServletUriComponentsBuilder.fromCurrentServletMapping() + .path("/telephones/telephone/{phoneid}") + .buildAndExpand(newTelephone.getPhoneid()) .toUri(); - responseHeaders.setLocation(newUserEmailURI); + responseHeaders.setLocation(newTelephoneURI); return new ResponseEntity<>(null, responseHeaders, diff --git a/src/main/java/local/youngw417/java_zoo/models/Telephone.java b/src/main/java/local/youngw417/java_zoo/models/Telephone.java index 974edb8e..3dcad5e1 100644 --- a/src/main/java/local/youngw417/java_zoo/models/Telephone.java +++ b/src/main/java/local/youngw417/java_zoo/models/Telephone.java @@ -11,7 +11,7 @@ public class Telephone { @GeneratedValue(strategy = GenerationType.AUTO) private long phoneid; - @Column(nullable = false) + @Column private String phonetype; @Column(nullable = false) diff --git a/src/main/java/local/youngw417/java_zoo/repository/TelephoneRepository.java b/src/main/java/local/youngw417/java_zoo/repository/TelephoneRepository.java new file mode 100644 index 00000000..7ec3f7a9 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/repository/TelephoneRepository.java @@ -0,0 +1,7 @@ +package local.youngw417.java_zoo.repository; + +import local.youngw417.java_zoo.models.Telephone; +import org.springframework.data.repository.CrudRepository; + +public interface TelephoneRepository extends CrudRepository { +} diff --git a/src/main/java/local/youngw417/java_zoo/services/TelephoneService.java b/src/main/java/local/youngw417/java_zoo/services/TelephoneService.java index e3fbbb16..b210a293 100644 --- a/src/main/java/local/youngw417/java_zoo/services/TelephoneService.java +++ b/src/main/java/local/youngw417/java_zoo/services/TelephoneService.java @@ -1,4 +1,27 @@ package local.youngw417.java_zoo.services; +import local.youngw417.java_zoo.models.Telephone; + +import java.util.List; + public interface TelephoneService { + + + List findAll(); + + + Telephone findTelephoneById(long id); + + + void delete(long id); + + + Telephone update( + long phoneid, + String phonenumber); + + + Telephone save( + long zooid, + String phonenumber); } diff --git a/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java index 6e82faf5..cda69aa8 100644 --- a/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java +++ b/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java @@ -1,4 +1,77 @@ package local.youngw417.java_zoo.services; -public class TelephoneServiceImpl { +import local.youngw417.java_zoo.models.Telephone; +import local.youngw417.java_zoo.models.Zoo; +import local.youngw417.java_zoo.repository.TelephoneRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.EntityNotFoundException; +import java.util.ArrayList; +import java.util.List; + +public class TelephoneServiceImpl implements TelephoneService { + + @Autowired + private TelephoneRepository telephonerepos; + + /** + * Connects this servive to the User Service + */ + @Autowired + private ZooService zooService; + + @Override + public List findAll() { + List list = new ArrayList<>(); + + telephonerepos.findAll() + .iterator() + .forEachRemaining(list::add); + return list; + } + + @Override + public Telephone findTelephoneById(long id) { + return telephonerepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException("phone with id " + id + " Not Found!")); + } + + @Transactional + @Override + public void delete(long id) { + if (telephonerepos.findById(id) + .isPresent()) + { + telephonerepos.deleteById(id); + } else + { + throw new EntityNotFoundException("Telephone with id " + id + " Not Found!"); + } + } + + @Transactional + @Override + public Telephone update(long phoneid, String phonenumber) { + if (telephonerepos.findById(phoneid) + .isPresent()) + { + Telephone myphone = findTelephoneById(phoneid); + myphone.setPhonenumber(phonenumber); + return telephonerepos.save(myphone); + } else + { + throw new EntityNotFoundException("Telephone with id " + phoneid + " Not Found!"); + } + } + + @Transactional + @Override + public Telephone save(long zooid, String phonenumber) { + Zoo currentZoo = zooService.findZooById(zooid); + + Telephone newPhone = new Telephone(null, phonenumber, + currentZoo); + return telephonerepos.save(newPhone); + } } From 219d5aedaafcf2e7a614d023d74cf25cb107c854 Mon Sep 17 00:00:00 2001 From: Young Won Date: Wed, 5 Aug 2020 23:07:13 -0700 Subject: [PATCH 7/8] final version --- .../java_zoo/JavaZooApplication.java | 2 + .../config/H2ServerConfiguration.java | 64 +++++++++++++++++++ .../controllers/AnimalController.java | 28 +++++--- .../java_zoo/controllers/ZooController.java | 2 + .../youngw417/java_zoo/models/Animal.java | 4 +- .../youngw417/java_zoo/models/Auditable.java | 32 ++++++++++ .../youngw417/java_zoo/models/Telephone.java | 4 +- .../local/youngw417/java_zoo/models/Zoo.java | 4 +- .../youngw417/java_zoo/models/Zooanimals.java | 2 +- .../java_zoo/repository/AnimalRepository.java | 17 ++++- .../java_zoo/services/AnimalService.java | 5 +- .../java_zoo/services/AnimalServiiceImpl.java | 23 ++++--- .../services/TelephoneServiceImpl.java | 3 + .../java_zoo/services/ZooAuditing.java | 14 ++++ .../java_zoo/services/ZooServiceImpl.java | 30 ++++----- .../youngw417/java_zoo/views/AnimalCount.java | 7 ++ data.sql => src/main/resources/data.sql | 0 17 files changed, 199 insertions(+), 42 deletions(-) create mode 100644 src/main/java/local/youngw417/java_zoo/config/H2ServerConfiguration.java create mode 100644 src/main/java/local/youngw417/java_zoo/models/Auditable.java create mode 100644 src/main/java/local/youngw417/java_zoo/services/ZooAuditing.java create mode 100644 src/main/java/local/youngw417/java_zoo/views/AnimalCount.java rename data.sql => src/main/resources/data.sql (100%) diff --git a/src/main/java/local/youngw417/java_zoo/JavaZooApplication.java b/src/main/java/local/youngw417/java_zoo/JavaZooApplication.java index 40e3d037..591c06c3 100644 --- a/src/main/java/local/youngw417/java_zoo/JavaZooApplication.java +++ b/src/main/java/local/youngw417/java_zoo/JavaZooApplication.java @@ -2,7 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +@EnableJpaAuditing @SpringBootApplication public class JavaZooApplication { diff --git a/src/main/java/local/youngw417/java_zoo/config/H2ServerConfiguration.java b/src/main/java/local/youngw417/java_zoo/config/H2ServerConfiguration.java new file mode 100644 index 00000000..e0781045 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/config/H2ServerConfiguration.java @@ -0,0 +1,64 @@ +package local.youngw417.java_zoo.config; + +import org.h2.tools.Server; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.sql.SQLException; + +@Configuration +public class H2ServerConfiguration { + /** + * TCP port for remote connections, default 9092. + */ + @Value("${h2.tcp.port:9092}") + private String h2TcpPort; + + /** + * Web port, default 8082. + */ + @Value("${h2.web.port:8082}") + private String h2WebPort; + + /** + * TCP connection to connect with SQL clients to the embedded h2 database. + *

+ * Connect to "jdbc:h2:tcp://localhost:9092/mem:testdb", username "sa", password empty. + * + * @return The created TcpServer needed to access H2. + * @throws SQLException If the server cannot be created. + */ + @Bean + @ConditionalOnExpression("${h2.tcp.enabled:true}") + public Server h2TcpServer() throws + SQLException + { + return Server.createTcpServer("-tcp", + "-tcpAllowOthers", + "-tcpPort", + h2TcpPort) + .start(); + } + + /** + * Web console for the embedded h2 database. + *

+ * Go to http://localhost:8082 and connect to the database "jdbc:h2:mem:testdb", username "sa", password empty. + * + * @return The created web server needed to access H2. + * @throws SQLException If the server cannot be created. + */ + @Bean + @ConditionalOnExpression("${h2.web.enabled:true}") + public Server h2WebServer() throws + SQLException + { + return Server.createWebServer("-web", + "-webAllowOthers", + "-webPort", + h2WebPort) + .start(); + } +} diff --git a/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java b/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java index 81f77f43..6cf0aeaf 100644 --- a/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java +++ b/src/main/java/local/youngw417/java_zoo/controllers/AnimalController.java @@ -2,21 +2,22 @@ import local.youngw417.java_zoo.models.Animal; import local.youngw417.java_zoo.services.AnimalService; +import local.youngw417.java_zoo.views.AnimalCount; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import java.net.URI; import java.util.List; + +@RestController +@RequestMapping("/animals") public class AnimalController { /** * Using the Role service to process Role data @@ -55,7 +56,16 @@ public ResponseEntity getAnimalById( Long animalid) { Animal a = animalService.findAnimalById(animalid); - return new ResponseEntity<>(r, + return new ResponseEntity<>(a, + HttpStatus.OK); + } + + @GetMapping(value = "/animal/count", + produces = "application/json") + public ResponseEntity getAnimalCount() + { + List mycount = animalService.getAnimalCount(); + return new ResponseEntity<>(mycount, HttpStatus.OK); } @@ -67,13 +77,13 @@ public ResponseEntity getAnimalById( * @return JSON object of the role you seek * @see RoleService#findByName(String) RoleService.findByName(String) */ - @GetMapping(value = "/animal/name/{animalName}", + @GetMapping(value = "/animal/type/{animaltype}", produces = "application/json") - public ResponseEntity getAnimalByName( + public ResponseEntity getAnimalByType( @PathVariable - String animalName) + String animaltype) { - Animal a = animalService.findByName(animalName); + Animal a = animalService.findByAnimaltype(animaltype); return new ResponseEntity<>(a, HttpStatus.OK); } diff --git a/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java b/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java index 7f6ba3a9..012ddd0d 100644 --- a/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java +++ b/src/main/java/local/youngw417/java_zoo/controllers/ZooController.java @@ -14,6 +14,8 @@ import java.net.URISyntaxException; import java.util.List; +@RestController +@RequestMapping("/zoos") public class ZooController { /** diff --git a/src/main/java/local/youngw417/java_zoo/models/Animal.java b/src/main/java/local/youngw417/java_zoo/models/Animal.java index 1c006a59..91977a88 100644 --- a/src/main/java/local/youngw417/java_zoo/models/Animal.java +++ b/src/main/java/local/youngw417/java_zoo/models/Animal.java @@ -7,8 +7,8 @@ import java.util.Set; @Entity -@Table(name = "animals") -public class Animal { +@Table(name = "animal") +public class Animal extends Auditable{ @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/src/main/java/local/youngw417/java_zoo/models/Auditable.java b/src/main/java/local/youngw417/java_zoo/models/Auditable.java new file mode 100644 index 00000000..42b45c7d --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/models/Auditable.java @@ -0,0 +1,32 @@ +package local.youngw417.java_zoo.models; + +import org.springframework.data.annotation.CreatedBy; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedBy; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import org.springframework.stereotype.Component; + +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import java.util.Date; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) //any change in Entity will implements this +abstract class Auditable { + + @CreatedBy + protected String createdBy; + @CreatedDate + @Temporal(TemporalType.TIMESTAMP) + protected Date createdDate; + @LastModifiedBy + protected String lastModifiedBy; + @LastModifiedDate + @Temporal(TemporalType.TIMESTAMP) + protected Date lastModifiedDate; + + +} diff --git a/src/main/java/local/youngw417/java_zoo/models/Telephone.java b/src/main/java/local/youngw417/java_zoo/models/Telephone.java index 3dcad5e1..5fb3ca21 100644 --- a/src/main/java/local/youngw417/java_zoo/models/Telephone.java +++ b/src/main/java/local/youngw417/java_zoo/models/Telephone.java @@ -5,8 +5,8 @@ import javax.persistence.*; @Entity -@Table(name = "telephones") -public class Telephone { +@Table(name = "telephone") +public class Telephone extends Auditable{ @Id @GeneratedValue(strategy = GenerationType.AUTO) private long phoneid; diff --git a/src/main/java/local/youngw417/java_zoo/models/Zoo.java b/src/main/java/local/youngw417/java_zoo/models/Zoo.java index 49b537a7..0b3ea596 100644 --- a/src/main/java/local/youngw417/java_zoo/models/Zoo.java +++ b/src/main/java/local/youngw417/java_zoo/models/Zoo.java @@ -9,8 +9,8 @@ import java.util.Set; @Entity -@Table(name= "zoos") -public class Zoo { +@Table(name= "zoo") +public class Zoo extends Auditable{ @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/src/main/java/local/youngw417/java_zoo/models/Zooanimals.java b/src/main/java/local/youngw417/java_zoo/models/Zooanimals.java index b38d92f8..9a0732d7 100644 --- a/src/main/java/local/youngw417/java_zoo/models/Zooanimals.java +++ b/src/main/java/local/youngw417/java_zoo/models/Zooanimals.java @@ -8,7 +8,7 @@ @Entity @Table(name = " zooanimals") -public class Zooanimals implements Serializable { +public class Zooanimals extends Auditable implements Serializable { @Id @ManyToOne diff --git a/src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java b/src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java index 316e39dc..86abfca5 100644 --- a/src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java +++ b/src/main/java/local/youngw417/java_zoo/repository/AnimalRepository.java @@ -1,8 +1,23 @@ package local.youngw417.java_zoo.repository; +import local.youngw417.java_zoo.controllers.AnimalController; import local.youngw417.java_zoo.models.Animal; +import local.youngw417.java_zoo.views.AnimalCount; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import java.util.List; + public interface AnimalRepository extends CrudRepository { - Animal findByNameIgnoreCase(String name); + + + Animal findByAnimaltype(String type); + @Modifying + @Query(value = "UPDATE animal SET animaltype = :type, last_modified_by = :uname, last_modified_date = CURRENT_TIMESTAMP WHERE animalid = :animalid", nativeQuery = true) + void updateAnimalType(String uname, long animalid, String type); + + @Query(value = "SELECT animaltype as type, count(animalid) as count FROM ANIMAL GROUP BY animaltype;", nativeQuery = true) + List getAnimalCount(); + } diff --git a/src/main/java/local/youngw417/java_zoo/services/AnimalService.java b/src/main/java/local/youngw417/java_zoo/services/AnimalService.java index b23d85ca..158719a5 100644 --- a/src/main/java/local/youngw417/java_zoo/services/AnimalService.java +++ b/src/main/java/local/youngw417/java_zoo/services/AnimalService.java @@ -1,6 +1,7 @@ package local.youngw417.java_zoo.services; import local.youngw417.java_zoo.models.Animal; +import local.youngw417.java_zoo.views.AnimalCount; import java.util.List; @@ -34,7 +35,9 @@ public interface AnimalService { * @param name The name (String) of the role you seek * @return The Role object matching the given name */ - Animal findByName(String name); + Animal findByAnimaltype(String type); + + List getAnimalCount(); public void deleteAll(); diff --git a/src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java index 5b940997..5cd74ad7 100644 --- a/src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java +++ b/src/main/java/local/youngw417/java_zoo/services/AnimalServiiceImpl.java @@ -3,7 +3,9 @@ import local.youngw417.java_zoo.models.Animal; import local.youngw417.java_zoo.repository.AnimalRepository; import local.youngw417.java_zoo.repository.ZooRepository; +import local.youngw417.java_zoo.views.AnimalCount; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityExistsException; @@ -12,7 +14,7 @@ import java.util.List; @Transactional -@Override +@Service(value = "animalService") public class AnimalServiiceImpl implements AnimalService { @Autowired @@ -25,7 +27,7 @@ public class AnimalServiiceImpl implements AnimalService { ZooRepository zoorepos; @Autowired - private UserAuditing userAuditing; + private ZooAuditing zooAuditing; @Override public List findAll() @@ -50,19 +52,24 @@ public Animal findAnimalById(long id) } @Override - public Animal findByName(String name) + public Animal findByAnimaltype(String type) { - Animal an = animalrepos.findByNameIgnoreCase(name); + Animal an = animalrepos.findByAnimaltype(type); if (an != null) { return an; } else { - throw new EntityNotFoundException(name); + throw new EntityNotFoundException(type); } } + @Override + public List getAnimalCount() { + return animalrepos.getAnimalCount(); + } + @Transactional @Override public Animal save(Animal animal){ @@ -86,8 +93,8 @@ public void deleteAll() @Transactional @Override public Animal update(long id, Animal animal) { - if (animal.getName() == null){ - throw new EntityNotFoundException("No animal name found to update"); + if (animal.getAnimaltype() == null){ + throw new EntityNotFoundException("No animal type found to update"); } if (animal.getZoos().size() > 0){ @@ -95,7 +102,7 @@ public Animal update(long id, Animal animal) { } Animal newAnimal = findAnimalById(id); - animalrepos.updateAnimalName(userAuditing.getCurrentAuditor().get(), id, animal.getName()); + animalrepos.updateAnimalType(zooAuditing.getCurrentAuditor().get(), id, animal.getAnimaltype()); return newAnimal; } } diff --git a/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java index cda69aa8..3d3cc38c 100644 --- a/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java +++ b/src/main/java/local/youngw417/java_zoo/services/TelephoneServiceImpl.java @@ -4,12 +4,15 @@ import local.youngw417.java_zoo.models.Zoo; import local.youngw417.java_zoo.repository.TelephoneRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityNotFoundException; import java.util.ArrayList; import java.util.List; +@Transactional +@Service(value = "telephoneService") public class TelephoneServiceImpl implements TelephoneService { @Autowired diff --git a/src/main/java/local/youngw417/java_zoo/services/ZooAuditing.java b/src/main/java/local/youngw417/java_zoo/services/ZooAuditing.java new file mode 100644 index 00000000..b65d79b6 --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/services/ZooAuditing.java @@ -0,0 +1,14 @@ +package local.youngw417.java_zoo.services; + +import org.springframework.data.domain.AuditorAware; +import org.springframework.stereotype.Component; + +import java.util.Optional; + +@Component +public class ZooAuditing implements AuditorAware { + @Override + public Optional getCurrentAuditor() { + return Optional.of("SYSTEM"); + } +} diff --git a/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java b/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java index 57916a2f..0f4b66e3 100644 --- a/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java +++ b/src/main/java/local/youngw417/java_zoo/services/ZooServiceImpl.java @@ -39,7 +39,7 @@ public List findAll() { @Override public Zoo findZooById(long zooid) { - EntityNotFoundException +// throw EntityNotFoundException; return zoorepos.findById(zooid) .orElseThrow(() -> new EntityNotFoundException("Zoo id " + zooid + " not found!")); @@ -91,7 +91,7 @@ public Zoo save(Zoo zoo) { { newZoo.getTelephones() .add(new Telephone(te.getPhonetype(),te.getPhonenumber(), - te.getZoo()); + te.getZoo())); } return zoorepos.save(newZoo); @@ -102,21 +102,17 @@ public Zoo save(Zoo zoo) { public Zoo update(Zoo zoo, long id) { Zoo currentZoo = findZooById(id); - if (zoo.getZooname() != null) - { + if (zoo.getZooname() != null) { currentZoo.setZooname(zoo.getZooname() .toLowerCase()); } - if (zoo.getAnimals() - .size() > 0) - { + .size() > 0) { currentZoo.getAnimals() .clear(); - for (Zooanimals z : zoo.getAnimals()) - { + for (Zooanimals z : zoo.getAnimals()) { Animal newAnimal = animalService.findAnimalById(z.getAnimal().getAnimalid()); currentZoo.getAnimals() @@ -124,17 +120,19 @@ public Zoo update(Zoo zoo, long id) { } } - if (Zoo.getTelephones() - .size() > 0) - { + if (zoo.getTelephones() + .size() > 0) { currentZoo.getTelephones() .clear(); - for (Telephone te : zoo.getTelephones()) - { + for (Telephone te : zoo.getTelephones()) { currentZoo.getTelephones() .add(new Telephone(te.getPhonetype(), te.getPhonenumber(), currentZoo)); } + } + + return zoorepos.save(currentZoo); + } @Transactional @@ -143,7 +141,7 @@ public void delete(long id) { zoorepos.findById(id) .orElseThrow(() -> new EntityNotFoundException("Zoo id " + id + " not found!")); zoorepos.deleteById(id); - } + }; - } } + diff --git a/src/main/java/local/youngw417/java_zoo/views/AnimalCount.java b/src/main/java/local/youngw417/java_zoo/views/AnimalCount.java new file mode 100644 index 00000000..c2678cdb --- /dev/null +++ b/src/main/java/local/youngw417/java_zoo/views/AnimalCount.java @@ -0,0 +1,7 @@ +package local.youngw417.java_zoo.views; + +public interface AnimalCount { + + String getType(); + int getCount(); +} diff --git a/data.sql b/src/main/resources/data.sql similarity index 100% rename from data.sql rename to src/main/resources/data.sql From 7efccb8864e7e36403f1e3eb8dc18bf060d2bd70 Mon Sep 17 00:00:00 2001 From: Young Won Date: Wed, 5 Aug 2020 23:10:50 -0700 Subject: [PATCH 8/8] final version --- src/main/resources/data.sql | 16 +++-- .../classes/META-INF/java-zoos.kotlin_module | Bin 0 -> 16 bytes target/classes/data.sql | 61 ++++++++++++++++++ 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 target/classes/META-INF/java-zoos.kotlin_module create mode 100644 target/classes/data.sql diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 8e22ab75..d5a86adc 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -10,21 +10,29 @@ FROM telephone; DELETE FROM zoo; -INSERT INTO zoo (zooid, zooname, createdby, createddate, lastmodifiedby, lastmodifieddate) +INSERT INTO zoo (zooid, zooname, created_by, created_date, last_modified_by, last_modified_date) VALUES (1, 'Gladys Porter Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (2, 'Point Defiance Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (3, 'San Diego Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (4, 'San Antonio Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (5, 'Smithsonian National Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP); +-- INSERT INTO zoo (zooid, zooname) +-- VALUES (1, 'Gladys Porter Zoo'), +-- (2, 'Point Defiance Zoo'), +-- (3, 'San Diego Zoo'), +-- (4, 'San Antonio Zoo'), +-- (5, 'Smithsonian National Zoo'); -INSERT INTO telephone(phoneid, phonetype, phonenumber, zooid, createdby, createddate, lastmodifiedby, lastmodifieddate) + + +INSERT INTO telephone(phoneid, phonetype, phonenumber, zooid, created_by, created_date, last_modified_by, last_modified_date) VALUES (1, 'main', '555-555-5555', 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (2, 'education', '555-555-1234', 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (3, 'membership', '555-555-4321', 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (4, 'main', '123-555-5555', 4, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (5, 'main', '555-123-5555', 3, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP); -INSERT INTO animal (animalid, animaltype, createdby, createddate, lastmodifiedby, lastmodifieddate) +INSERT INTO animal (animalid, animaltype, created_by, created_date, last_modified_by, last_modified_date) VALUES (1, 'lion', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (2, 'bear', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (3, 'monkey', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), @@ -33,7 +41,7 @@ INSERT INTO animal (animalid, animaltype, createdby, createddate, lastmodifiedby (6, 'bear', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (7, 'turtle', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP); -INSERT INTO zooanimals (zooid, animalid, createdby, createddate, lastmodifiedby, lastmodifieddate) +INSERT INTO zooanimals (zooid, animalid, created_by, created_date, last_modified_by, last_modified_date) VALUES (1, 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (2, 2, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), (1, 2, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), diff --git a/target/classes/META-INF/java-zoos.kotlin_module b/target/classes/META-INF/java-zoos.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..a49347afef10a9b5f95305e1058ba36adec7d6dd GIT binary patch literal 16 RcmZQzU|?ooU|@t|0RRA102TlM literal 0 HcmV?d00001 diff --git a/target/classes/data.sql b/target/classes/data.sql new file mode 100644 index 00000000..d5a86adc --- /dev/null +++ b/target/classes/data.sql @@ -0,0 +1,61 @@ +DELETE +FROM zooanimals; + +DELETE +FROM animal; + +DELETE +FROM telephone; + +DELETE +FROM zoo; + +INSERT INTO zoo (zooid, zooname, created_by, created_date, last_modified_by, last_modified_date) + VALUES (1, 'Gladys Porter Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (2, 'Point Defiance Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (3, 'San Diego Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (4, 'San Antonio Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (5, 'Smithsonian National Zoo', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP); +-- INSERT INTO zoo (zooid, zooname) +-- VALUES (1, 'Gladys Porter Zoo'), +-- (2, 'Point Defiance Zoo'), +-- (3, 'San Diego Zoo'), +-- (4, 'San Antonio Zoo'), +-- (5, 'Smithsonian National Zoo'); + + + +INSERT INTO telephone(phoneid, phonetype, phonenumber, zooid, created_by, created_date, last_modified_by, last_modified_date) + VALUES (1, 'main', '555-555-5555', 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (2, 'education', '555-555-1234', 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (3, 'membership', '555-555-4321', 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (4, 'main', '123-555-5555', 4, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (5, 'main', '555-123-5555', 3, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP); + +INSERT INTO animal (animalid, animaltype, created_by, created_date, last_modified_by, last_modified_date) + VALUES (1, 'lion', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (2, 'bear', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (3, 'monkey', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (4, 'penguin', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (5, 'tiger', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (6, 'bear', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (7, 'turtle', 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP); + +INSERT INTO zooanimals (zooid, animalid, created_by, created_date, last_modified_by, last_modified_date) + VALUES (1, 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (2, 2, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (1, 2, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (5, 7, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (5, 6, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (5, 5, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (5, 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (3, 1, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP), + (3, 2, 'SYSTEM', CURRENT_TIMESTAMP, 'SYSTEM', CURRENT_TIMESTAMP); + +/* +We must tell hibernate the ids that have already been used. +The number must be larger than the last used id. +10 > 7 so we are good! + */ + +alter sequence hibernate_sequence restart with 10;