Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • s51119/broken-petclinic
  • s72462/broken-petclinic
  • s61200/broken-petclinic
  • s76620/broken-petclinic
  • s76545/broken-petclinic
  • s76915/broken-petclinic
  • s70130/broken-petclinic
  • s72523/broken-petclinic
  • s77047/broken-petclinic
  • s70178/broken-petclinic
  • s76522/broken-petclinic
  • s76426/broken-petclinic
  • s76863/broken-petclinic
  • s76856/broken-petclinic
  • s76728/broken-petclinic
  • williamreetz/broken-petclinic
  • s77034/broken-petclinic
  • s76400/broken-petclinic
  • s72288/broken-petclinic
  • s76608/broken-petclinic
20 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 148 additions and 125 deletions
src/main/java/org/springframework/samples/petclinic/web/VetController.java → src/main/java/org/springframework/samples/petclinic/vet/VetController.java
View file @ 92257938
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
...@@ -13,17 +13,14 @@ ...@@ -13,17 +13,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.samples.petclinic.web; package org.springframework.samples.petclinic.vet;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.samples.petclinic.model.Vets;
import org.springframework.samples.petclinic.service.ClinicService;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
/** /**
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Mark Fisher * @author Mark Fisher
...@@ -31,36 +28,31 @@ import org.springframework.web.bind.annotation.ResponseBody; ...@@ -31,36 +28,31 @@ import org.springframework.web.bind.annotation.ResponseBody;
* @author Arjen Poutsma * @author Arjen Poutsma
*/ */
@Controller @Controller
public class VetController { class VetController {
private final ClinicService clinicService;
private final VetRepository vets;
@Autowired public VetController(VetRepository clinicService) {
public VetController(ClinicService clinicService) { this.vets = clinicService;
this.clinicService = clinicService;
} }
@RequestMapping(value = {"/vets.xml", "/vets.html"}) @GetMapping("/vets.html")
public String showVetList(Map<String, Object> model) { public String showVetList(Map<String, Object> model) {
// Here we are returning an object of type 'Vets' rather than a collection of Vet objects // Here we are returning an object of type 'Vets' rather than a collection of Vet
// so it is simpler for Object-Xml mapping // objects so it is simpler for Object-Xml mapping
Vets vets = new Vets(); Vets vets = new Vets();
vets.getVetList().addAll(this.clinicService.findVets()); vets.getVetList().addAll(this.vets.findAll());
model.put("vets", vets); model.put("vets", vets);
return "vets/vetList"; return "vets/vetList";
} }
@RequestMapping("/vets.json") @GetMapping({ "/vets" })
public public @ResponseBody Vets showResourcesVetList() {
@ResponseBody // Here we are returning an object of type 'Vets' rather than a collection of Vet
Vets showResourcesVetList() { // objects so it is simpler for JSon/Object mapping
// Here we are returning an object of type 'Vets' rather than a collection of Vet objects
// so it is simpler for JSon/Object mapping
Vets vets = new Vets(); Vets vets = new Vets();
vets.getVetList().addAll(this.clinicService.findVets()); vets.getVetList().addAll(this.vets.findAll());
return vets; return vets;
} }
} }
src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java → src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
View file @ 92257938
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
...@@ -13,17 +13,19 @@ ...@@ -13,17 +13,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.samples.petclinic.repository; package org.springframework.samples.petclinic.vet;
import java.util.Collection; import java.util.Collection;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.data.repository.Repository; import org.springframework.data.repository.Repository;
import org.springframework.samples.petclinic.model.Vet; import org.springframework.transaction.annotation.Transactional;
/** /**
* Repository class for <code>Vet</code> domain objects All method names are compliant with Spring Data naming * Repository class for <code>Vet</code> domain objects All method names are compliant with Spring Data naming
* conventions so this interface can easily be extended for Spring Data See here: http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation * conventions so this interface can easily be extended for Spring Data.
* See: https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
* *
* @author Ken Krebs * @author Ken Krebs
* @author Juergen Hoeller * @author Juergen Hoeller
...@@ -37,6 +39,8 @@ public interface VetRepository extends Repository<Vet, Integer> { ...@@ -37,6 +39,8 @@ public interface VetRepository extends Repository<Vet, Integer> {
* *
* @return a <code>Collection</code> of <code>Vet</code>s * @return a <code>Collection</code> of <code>Vet</code>s
*/ */
@Transactional(readOnly = true)
@Cacheable("vets")
Collection<Vet> findAll() throws DataAccessException; Collection<Vet> findAll() throws DataAccessException;
......
src/main/java/org/springframework/samples/petclinic/model/Vets.java → src/main/java/org/springframework/samples/petclinic/vet/Vets.java
View file @ 92257938
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.samples.petclinic.model; package org.springframework.samples.petclinic.vet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
src/main/java/org/springframework/samples/petclinic/model/Visit.java → src/main/java/org/springframework/samples/petclinic/visit/Visit.java 100644 → 100755
View file @ 92257938
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
...@@ -13,111 +13,68 @@ ...@@ -13,111 +13,68 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.samples.petclinic.model; package org.springframework.samples.petclinic.visit;
import java.time.LocalDate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table; import javax.persistence.Table;
import javax.validation.constraints.NotEmpty;
import org.hibernate.annotations.Type;
import org.hibernate.validator.constraints.NotEmpty;
import org.joda.time.LocalDate;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.samples.petclinic.model.BaseEntity;
/** /**
* Simple JavaBean domain object representing a visit. * Simple JavaBean domain object representing a visit.
* *
* @author Ken Krebs * @author Ken Krebs
* @author Dave Syer
*/ */
@Entity @Entity
@Table(name = "visits") @Table(name = "visits")
public class Visit extends BaseEntity { public class Visit extends BaseEntity {
/**
* Holds value of property date.
*/
@Column(name = "visit_date") @Column(name = "visit_date")
@Type(type = "org.jadira.usertype.dateandtime.joda.PersistentLocalDate") @DateTimeFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy/MM/dd")
private LocalDate date; private LocalDate date;
/**
* Holds value of property description.
*/
@NotEmpty @NotEmpty
@Column(name = "description") @Column(name = "description")
private String description; private String description;
/** @Column(name = "pet_id")
* Holds value of property pet. private Integer petId;
*/
@ManyToOne
@JoinColumn(name = "pet_id")
private Pet pet;
/** /**
* Creates a new instance of Visit for the current date * Creates a new instance of Visit for the current date
*/ */
public Visit() { public Visit() {
this.date = new LocalDate(); this.date = LocalDate.now();
} }
/**
* Getter for property date.
*
* @return Value of property date.
*/
public LocalDate getDate() { public LocalDate getDate() {
return this.date; return this.date;
} }
/**
* Setter for property date.
*
* @param date New value of property date.
*/
public void setDate(LocalDate date) { public void setDate(LocalDate date) {
this.date = date; this.date = date;
} }
/**
* Getter for property description.
*
* @return Value of property description.
*/
public String getDescription() { public String getDescription() {
return this.description; return this.description;
} }
/**
* Setter for property description.
*
* @param description New value of property description.
*/
public void setDescription(String description) { public void setDescription(String description) {
this.description = description; this.description = description;
} }
/** public Integer getPetId() {
* Getter for property pet. return this.petId;
*
* @return Value of property pet.
*/
public Pet getPet() {
return this.pet;
} }
/** public void setPetId(Integer petId) {
* Setter for property pet. this.petId = petId;
*
* @param pet New value of property pet.
*/
public void setPet(Pet pet) {
this.pet = pet;
} }
} }
src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java → src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
View file @ 92257938
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.samples.petclinic.repository; package org.springframework.samples.petclinic.visit;
import java.util.List; import java.util.List;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.data.repository.Repository; import org.springframework.data.repository.Repository;
import org.springframework.samples.petclinic.model.BaseEntity; import org.springframework.samples.petclinic.model.BaseEntity;
import org.springframework.samples.petclinic.model.Visit;
/** /**
* Repository class for <code>Visit</code> domain objects All method names are compliant with Spring Data naming * Repository class for <code>Visit</code> domain objects All method names are compliant with Spring Data naming
* conventions so this interface can easily be extended for Spring Data See here: http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation * conventions so this interface can easily be extended for Spring Data.
* See: https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
* *
* @author Ken Krebs * @author Ken Krebs
* @author Juergen Hoeller * @author Juergen Hoeller
......
src/main/java/org/springframework/samples/petclinic/web/WelcomeController.java deleted 100644 → 0
View file @ a6e81a51
package org.springframework.samples.petclinic.web;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class WelcomeController {
@RequestMapping("/")
public String welcome() {
return "welcome";
}
}
src/main/java/org/springframework/samples/petclinic/web/package-info.java deleted 100644 → 0
View file @ a6e81a51
/**
* The classes in this package represent PetClinic's web presentation layer.
*/
package org.springframework.samples.petclinic.web;
src/main/webapp/resources/less/petclinic.less → src/main/less/petclinic.less
View file @ 92257938
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
@import "../../vendors/bootstrap/less/bootstrap.less"; @icon-font-path: "../../webjars/bootstrap/fonts/";
@spring-green: #6db33f; @spring-green: #6db33f;
@spring-dark-green: #5fa134; @spring-dark-green: #5fa134;
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
@btn-default-bg: @spring-brown; @btn-default-bg: @spring-brown;
@btn-default-border: @spring-green; @btn-default-border: @spring-green;
@icon-font-path: "../../vendors/bootstrap/dist/fonts/";
@nav-tabs-active-link-hover-color: @spring-light-grey; @nav-tabs-active-link-hover-color: @spring-light-grey;
@nav-tabs-active-link-hover-bg: @spring-brown; @nav-tabs-active-link-hover-bg: @spring-brown;
@nav-tabs-active-link-hover-border-color: @spring-brown; @nav-tabs-active-link-hover-border-color: @spring-brown;
...@@ -51,9 +49,6 @@ ...@@ -51,9 +49,6 @@
@pagination-active-border: @spring-green; @pagination-active-border: @spring-green;
@table-border-color: @spring-brown; @table-border-color: @spring-brown;
@import "typography.less";
@import "header.less";
.table > thead > tr > th { .table > thead > tr > th {
background-color: lighten(@spring-brown, 3%); background-color: lighten(@spring-brown, 3%);
color: @spring-light-grey; color: @spring-light-grey;
...@@ -235,18 +230,10 @@ table td.action-column { ...@@ -235,18 +230,10 @@ table td.action-column {
-webkit-animation-timing-function: linear; -webkit-animation-timing-function: linear;
} }
@keyframes "spinner" {
from { transform: rotate( 0deg ); }
to { transform: rotate( 360deg ); }
}
@-webkit-keyframes "spinner" {
from { -webkit-transform: rotate( 0deg ); }
to { -webkit-transform: rotate( 360deg ); }
}
hr { hr {
border-top: 1px dotted @spring-brown; border-top: 1px dotted @spring-brown;
} }
@import "typography.less";
@import "header.less";
@import "responsive.less"; @import "responsive.less";
src/main/resources/application-mysql.properties 0 → 100644
View file @ 92257938
# database init, supports mysql too
database=mysql
spring.datasource.url=jdbc:mysql://localhost/petclinic
spring.datasource.username=root
spring.datasource.password=petclinic
# Uncomment this the first time the app runs
# spring.datasource.initialization-mode=always
src/main/resources/application.properties
View file @ 92257938
# Web # database init, supports mysql too
spring.mvc.view.prefix: /WEB-INF/jsp/ database=hsqldb
spring.mvc.view.suffix: .jsp spring.datasource.schema=classpath*:db/${database}/schema.sql
spring.datasource.data=classpath*:db/${database}/data.sql
# Web
spring.thymeleaf.mode=HTML
# JPA # JPA
spring.jpa.hibernate.ddl-auto: none spring.jpa.hibernate.ddl-auto=none
#spring.jpa.database: HSQL
#spring.jpa.show-sql: true
#spring.datasource.driverClassName=org.hsqldb.jdbcDriver
spring.datasource.schema: classpath*:db/hsqldb/initDB.sql
spring.datasource.data: classpath*:db/hsqldb/populateDB.sql
#spring.datasource.username: sa
#spring.datasource.password:
# Internationalization # Internationalization
spring.messages.basename: messages/messages spring.messages.basename=messages/messages
# Actuator / Management # Actuator / Management
management.contextPath: /manage management.endpoints.web.base-path=/manage
management.endpoints.web.exposure.include=*
# Logging # Logging
logging.level.org.springframework=INFO logging.level.org.springframework=INFO
# logging.level.org.springframework.web=DEBUG
# logging.level.org.springframework.context.annotation=TRACE
# Maximum time static resources should be cached
spring.resources.cache.cachecontrol.max-age=12h
src/main/resources/dandelion/datatables/datatables.properties deleted 100644 → 0
View file @ a6e81a51
# ==================================
# Dandelion-Datatables configuration
# ==================================
# Disable the asset management of Dandelion-Core for all non-DataTable-related assets
main.standalone=true
\ No newline at end of file
src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
View file @ 92257938
...@@ -4,21 +4,14 @@ ...@@ -4,21 +4,14 @@
@author Sam Brannen @author Sam Brannen
@author Costin Leau @author Costin Leau
@author Dave Syer
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
1) Download and install the MySQL database (e.g., MySQL Community Server 5.1.x), 1) Download and install the MySQL database (e.g., MySQL Community Server 5.1.x),
which can be found here: http://dev.mysql.com/downloads/ which can be found here: https://dev.mysql.com/downloads/. Or run the
"docker-compose.yml" from the root of the project (if you have docker installed
locally).
2) Download Connector/J, the MySQL JDBC driver (e.g., Connector/J 5.1.x), which 2) Create the PetClinic database and user by executing the "db/mysql/{schema,data}.sql"
can be found here: http://dev.mysql.com/downloads/connector/j/ scripts (or set "spring.datasource.initialize=true" the first time you run the app).
Copy the Connector/J JAR file (e.g., mysql-connector-java-5.1.5-bin.jar) into
the db/mysql directory. Alternatively, uncomment the mysql-connector from the
Petclinic pom.
3) Create the PetClinic database and user by executing the "db/mysql/initDB.sql"
script.
4) Open "src/main/resources/spring/data-access.properties"; comment out all properties in the
"HSQL Settings" section; uncomment all properties in the "MySQL Settings"
section.
src/main/resources/ehcache.xml deleted 100644 → 0
View file @ a6e81a51
<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="ehcache.xsd"
updateCheck="false">
<diskStore path="java.io.tmpdir"/>
<!-- objects are evicted from the cache every 60 seconds -->
<cache name="vets"
timeToLiveSeconds="60"
maxElementsInMemory="100"
eternal="false"
overflowToDisk="false"
maxElementsOnDisk="10000000"
diskPersistent="false"
diskExpiryThreadIntervalSeconds="1"
memoryStoreEvictionPolicy="LRU"/>
</ehcache>