findById(Integer id);
/**
* Save a {@link Pet} to the data store, either inserting or updating it.
+ *
* @param pet the {@link Pet} to save
*/
Pet save(Pet pet);
diff --git a/src/main/java/org/springframework/samples/petclinic/backend/owner/PetType.java b/src/main/java/org/springframework/samples/petclinic/backend/owner/PetType.java
new file mode 100644
index 0000000..5fc2aaf
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/backend/owner/PetType.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-2019 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.
+ */
+package org.springframework.samples.petclinic.backend.owner;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import org.springframework.samples.petclinic.backend.model.NamedEntity;
+
+/**
+ * @author Juergen Hoeller Can be Cat, Dog, Hamster...
+ */
+@Entity
+@Table(name = "types")
+public class PetType extends NamedEntity {
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/samples/petclinic/backend/system/CacheConfiguration.java
similarity index 55%
rename from src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
rename to src/main/java/org/springframework/samples/petclinic/backend/system/CacheConfiguration.java
index 0a96582..02afccb 100755
--- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
+++ b/src/main/java/org/springframework/samples/petclinic/backend/system/CacheConfiguration.java
@@ -1,20 +1,18 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
-package org.springframework.samples.petclinic.system;
+package org.springframework.samples.petclinic.backend.system;
import javax.cache.configuration.MutableConfiguration;
@@ -24,9 +22,8 @@
import org.springframework.context.annotation.Configuration;
/**
- * Cache configuration intended for caches providing the JCache API. This configuration
- * creates the used cache for the application and enables statistics that become
- * accessible via JMX.
+ * Cache configuration intended for caches providing the JCache API. This configuration creates the
+ * used cache for the application and enables statistics that become accessible via JMX.
*/
@Configuration(proxyBeanMethods = false)
@EnableCaching
@@ -40,13 +37,13 @@ public JCacheManagerCustomizer petclinicCacheConfigurationCustomizer() {
}
/**
- * Create a simple configuration that enable statistics via the JCache programmatic
- * configuration API.
+ * Create a simple configuration that enable statistics via the JCache programmatic configuration
+ * API.
*
- * Within the configuration object that is provided by the JCache API standard, there
- * is only a very limited set of configuration options. The really relevant
- * configuration options (like the size limit) must be set via a configuration
- * mechanism that is provided by the selected JCache implementation.
+ * Within the configuration object that is provided by the JCache API standard, there is only a
+ * very limited set of configuration options. The really relevant configuration options (like the
+ * size limit) must be set via a configuration mechanism that is provided by the selected JCache
+ * implementation.
*/
private javax.cache.configuration.Configuration cacheConfiguration() {
return new MutableConfiguration<>().setStatisticsEnabled(true);
diff --git a/src/main/java/org/springframework/samples/petclinic/backend/vet/Specialty.java b/src/main/java/org/springframework/samples/petclinic/backend/vet/Specialty.java
new file mode 100644
index 0000000..04ddca2
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/backend/vet/Specialty.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2012-2019 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.
+ */
+package org.springframework.samples.petclinic.backend.vet;
+
+import java.io.Serializable;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import org.springframework.samples.petclinic.backend.model.NamedEntity;
+
+/**
+ * Models a {@link Vet Vet's} specialty (for example, dentistry).
+ *
+ * @author Juergen Hoeller
+ */
+@Entity
+@Table(name = "specialties")
+public class Specialty extends NamedEntity implements Serializable {
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/backend/vet/Vet.java
similarity index 62%
rename from src/main/java/org/springframework/samples/petclinic/vet/Vet.java
rename to src/main/java/org/springframework/samples/petclinic/backend/vet/Vet.java
index c17c124..29133bc 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
+++ b/src/main/java/org/springframework/samples/petclinic/backend/vet/Vet.java
@@ -1,19 +1,17 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
-package org.springframework.samples.petclinic.vet;
+package org.springframework.samples.petclinic.backend.vet;
import java.util.ArrayList;
import java.util.Collections;
@@ -21,19 +19,18 @@
import java.util.List;
import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlElement;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
+import jakarta.xml.bind.annotation.XmlElement;
import org.springframework.beans.support.MutableSortDefinition;
import org.springframework.beans.support.PropertyComparator;
-import org.springframework.samples.petclinic.model.Person;
+import org.springframework.samples.petclinic.backend.model.Person;
-import dev.hilla.Nonnull;
+import com.vaadin.hilla.Nonnull;
/**
* Simple JavaBean domain object representing a veterinarian.
@@ -50,8 +47,7 @@ public class Vet extends Person {
@ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
inverseJoinColumns = @JoinColumn(name = "specialty_id"))
- @Nonnull
- private Set<@Nonnull Specialty> specialties;
+ private Set specialties;
protected Set getSpecialtiesInternal() {
if (this.specialties == null) {
@@ -65,7 +61,7 @@ protected void setSpecialtiesInternal(Set specialties) {
}
@XmlElement
- public List getSpecialties() {
+ public @Nonnull List<@Nonnull Specialty> getSpecialties() {
List sortedSpecs = new ArrayList<>(getSpecialtiesInternal());
PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true));
return Collections.unmodifiableList(sortedSpecs);
diff --git a/src/main/java/org/springframework/samples/petclinic/backend/vet/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/backend/vet/VetRepository.java
new file mode 100644
index 0000000..ecbc412
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/backend/vet/VetRepository.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2012-2019 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.
+ */
+package org.springframework.samples.petclinic.backend.vet;
+
+import java.util.List;
+
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Repository class for Vet domain objects All method names are compliant with Spring
+ * Data naming 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 Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface VetRepository extends JpaRepository, JpaSpecificationExecutor {
+
+ /**
+ * Retrieve all Vets from the data store.
+ *
+ * @return a Collection of Vets
+ */
+ @Transactional(readOnly = true)
+ @Cacheable("vets")
+ List findAll() throws DataAccessException;
+
+ /**
+ * Retrieve all Vets from data store in Pages
+ *
+ * @param pageable
+ * @return
+ * @throws DataAccessException
+ */
+ @Transactional(readOnly = true)
+ @Cacheable("vets")
+ Page findAll(Pageable pageable) throws DataAccessException;
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java b/src/main/java/org/springframework/samples/petclinic/backend/visit/Visit.java
similarity index 63%
rename from src/main/java/org/springframework/samples/petclinic/visit/Visit.java
rename to src/main/java/org/springframework/samples/petclinic/backend/visit/Visit.java
index df9f25f..7a968e4 100755
--- a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java
+++ b/src/main/java/org/springframework/samples/petclinic/backend/visit/Visit.java
@@ -1,29 +1,26 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
-package org.springframework.samples.petclinic.visit;
+package org.springframework.samples.petclinic.backend.visit;
import java.time.LocalDate;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotEmpty;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotEmpty;
import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.samples.petclinic.model.BaseEntity;
+import org.springframework.samples.petclinic.backend.model.BaseEntity;
/**
* Simple JavaBean domain object representing a visit.
diff --git a/src/main/java/org/springframework/samples/petclinic/backend/visit/VisitRepository.java b/src/main/java/org/springframework/samples/petclinic/backend/visit/VisitRepository.java
new file mode 100644
index 0000000..0d6a80d
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/backend/visit/VisitRepository.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2012-2019 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.
+ */
+package org.springframework.samples.petclinic.backend.visit;
+
+import java.util.List;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.samples.petclinic.backend.model.BaseEntity;
+import org.springframework.samples.petclinic.endpoint.record.VisitRecord;
+
+/**
+ * Repository class for Visit domain objects All method names are compliant with Spring
+ * Data naming 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 Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface VisitRepository extends JpaRepository, JpaSpecificationExecutor {
+
+ /**
+ * Save a Visit to the data store, either inserting or updating it.
+ *
+ * @param visit the Visit to save
+ * @see BaseEntity#isNew
+ */
+ Visit save(Visit visit) throws DataAccessException;
+
+ List findByPetId(Integer petId);
+
+ List findVisitsByPetId(Integer petId);
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/dto/PetDTO.java b/src/main/java/org/springframework/samples/petclinic/dto/PetDTO.java
deleted file mode 100644
index aaebb02..0000000
--- a/src/main/java/org/springframework/samples/petclinic/dto/PetDTO.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.springframework.samples.petclinic.dto;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.PastOrPresent;
-import java.time.LocalDate;
-
-import dev.hilla.Nonnull;
-
-public class PetDTO {
-
- private Integer id;
-
- @Nonnull
- @NotBlank(message = "must not be empty")
- private String name;
-
- @Nonnull
- @NotNull(message = "must not be empty")
- @PastOrPresent
- private LocalDate birthDate;
-
- @Nonnull
- @NotNull(message = "type must be selected")
- private Integer typeId;
-
- private String typeName;
-
- @Nonnull
- private Integer ownerId;
-
- @Nonnull
- private String ownerFirstName;
-
- @Nonnull
- private String ownerLastName;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public LocalDate getBirthDate() {
- return this.birthDate;
- }
-
- public void setBirthDate(LocalDate birthDate) {
- this.birthDate = birthDate;
- }
-
- public Integer getTypeId() {
- return this.typeId;
- }
-
- public void setTypeId(Integer typeId) {
- this.typeId = typeId;
- }
-
- public String getTypeName() {
- return this.typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public Integer getOwnerId() {
- return this.ownerId;
- }
-
- public void setOwnerId(Integer ownerId) {
- this.ownerId = ownerId;
- }
-
- public String getOwnerFirstName() {
- return this.ownerFirstName;
- }
-
- public void setOwnerFirstName(String ownerFirstName) {
- this.ownerFirstName = ownerFirstName;
- }
-
- public String getOwnerLastName() {
- return this.ownerLastName;
- }
-
- public void setOwnerLastName(String ownerLastName) {
- this.ownerLastName = ownerLastName;
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/ErrorService.java b/src/main/java/org/springframework/samples/petclinic/endpoint/ErrorService.java
new file mode 100644
index 0000000..d15f1df
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/ErrorService.java
@@ -0,0 +1,14 @@
+package org.springframework.samples.petclinic.endpoint;
+
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.hilla.BrowserCallable;
+
+@BrowserCallable
+@AnonymousAllowed
+public class ErrorService {
+
+ public void ping() {
+ // Throw a server exception, so as ErrorHandlerView is displayed.
+ throw new RuntimeException("Expected: controller used to showcase what happens when an exception is thrown");
+ }
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/OwnerService.java b/src/main/java/org/springframework/samples/petclinic/endpoint/OwnerService.java
new file mode 100644
index 0000000..730cadd
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/OwnerService.java
@@ -0,0 +1,60 @@
+package org.springframework.samples.petclinic.endpoint;
+
+import java.util.Optional;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.samples.petclinic.backend.owner.Owner;
+import org.springframework.samples.petclinic.backend.owner.OwnerName;
+import org.springframework.samples.petclinic.backend.owner.OwnerRepository;
+import org.springframework.samples.petclinic.backend.owner.Pet;
+import org.springframework.samples.petclinic.backend.visit.VisitRepository;
+
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.hilla.BrowserCallable;
+
+@BrowserCallable
+@AnonymousAllowed
+public class OwnerService {
+
+ private final OwnerRepository ownerRepository;
+ private final VisitRepository visitRepository;
+
+ public OwnerService(OwnerRepository ownerRepository, VisitRepository visitRepository) {
+ this.ownerRepository = ownerRepository;
+ this.visitRepository = visitRepository;
+ }
+
+ private OwnerRepository getRepository() {
+ return ownerRepository;
+ }
+
+ public Page findByLastName(String lastName, Pageable pageable) {
+ return getRepository().findByLastName(lastName, pageable);
+ }
+ public int countByLastName(String lastName) {
+ return getRepository().countByLastName(lastName);
+ }
+
+ public OwnerName findPersonById(Integer id) {
+ Optional personById = getRepository().findPersonById(id);
+ return personById.get();
+ }
+
+ public Owner findOwner(Integer ownerId) {
+ Owner owner = getRepository().findById(ownerId).get();
+ for (Pet pet : owner.getPets()) {
+ visitRepository.findByPetId(pet.getId()).forEach(pet::addVisit);
+ }
+
+ return owner;
+ }
+
+ public Owner save(Owner value) {
+ return getRepository().save(value);
+ }
+
+ public Optional get(Integer petId) {
+ return getRepository().findById(petId);
+ }
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/PetService.java b/src/main/java/org/springframework/samples/petclinic/endpoint/PetService.java
new file mode 100644
index 0000000..cf501e1
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/PetService.java
@@ -0,0 +1,51 @@
+package org.springframework.samples.petclinic.endpoint;
+
+import java.util.List;
+
+import org.springframework.samples.petclinic.backend.owner.Owner;
+import org.springframework.samples.petclinic.backend.owner.OwnerRepository;
+import org.springframework.samples.petclinic.backend.owner.Pet;
+import org.springframework.samples.petclinic.backend.owner.PetRepository;
+import org.springframework.samples.petclinic.backend.owner.PetType;
+
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.hilla.BrowserCallable;
+
+@BrowserCallable
+@AnonymousAllowed
+public class PetService {
+
+ private final PetRepository petRepository;
+ private final OwnerRepository ownerRepository;
+
+ public PetService(OwnerRepository ownerRepository, PetRepository petRepository) {
+ this.petRepository = petRepository;
+ this.ownerRepository = ownerRepository;
+ }
+
+ public Pet savePet(Pet pet,Integer ownerId) {
+ Owner owner = ownerRepository.findById(ownerId).get();
+ owner.addPet(pet);
+ return getRepository().save(pet);
+ }
+
+ public Pet update(Pet model) {
+ //
+ Pet pet = petRepository.findById(model.getId()).get();
+ pet.setName(model.getName());
+ pet.setBirthDate(model.getBirthDate());
+ pet.setType(model.getType());
+ return getRepository().save(pet);
+ }
+ public List findPetTypes(){
+ return getRepository().findPetTypes();
+ }
+
+ public PetRepository getRepository() {
+ return petRepository;
+ }
+
+ public Pet findPetById(Integer petId) {
+ return getRepository().findById(petId).get();
+ }
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/VetService.java b/src/main/java/org/springframework/samples/petclinic/endpoint/VetService.java
new file mode 100644
index 0000000..59f63e5
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/VetService.java
@@ -0,0 +1,32 @@
+package org.springframework.samples.petclinic.endpoint;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import org.springframework.samples.petclinic.backend.vet.Specialty;
+import org.springframework.samples.petclinic.backend.vet.VetRepository;
+import org.springframework.samples.petclinic.endpoint.record.VetRecord;
+
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.hilla.BrowserCallable;
+
+@BrowserCallable
+@AnonymousAllowed
+public class VetService {
+
+ private final VetRepository vetRepository;
+
+ public VetService(VetRepository vetRepository) {
+ this.vetRepository = vetRepository;
+ }
+
+ public Collection findAllVets() {
+ return vetRepository.findAll().stream().map(vet ->
+ new VetRecord(vet.getId(), vet.getFirstName() + " " + vet.getLastName(),
+ vet.getSpecialties().isEmpty()
+ ? "none"
+ : vet.getSpecialties().stream().map(Specialty::getName)
+ .collect(Collectors.joining(", ")))
+ ).toList();
+ }
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/VisitService.java b/src/main/java/org/springframework/samples/petclinic/endpoint/VisitService.java
new file mode 100644
index 0000000..82b8914
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/VisitService.java
@@ -0,0 +1,58 @@
+package org.springframework.samples.petclinic.endpoint;
+
+import java.util.Comparator;
+import java.util.List;
+
+import org.springframework.samples.petclinic.backend.owner.Owner;
+import org.springframework.samples.petclinic.backend.owner.OwnerRepository;
+import org.springframework.samples.petclinic.backend.owner.Pet;
+import org.springframework.samples.petclinic.backend.owner.PetRepository;
+import org.springframework.samples.petclinic.backend.visit.Visit;
+import org.springframework.samples.petclinic.backend.visit.VisitRepository;
+import org.springframework.samples.petclinic.endpoint.record.VisitCreateRecord;
+import org.springframework.samples.petclinic.endpoint.record.VisitRecord;
+
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.hilla.BrowserCallable;
+
+@BrowserCallable
+@AnonymousAllowed
+public class VisitService {
+
+ private final VisitRepository visitRepository;
+ private final OwnerRepository ownerRepository;
+ private final PetRepository petRepository;
+
+ public VisitService(VisitRepository visitRepository, OwnerRepository ownerRepository, PetRepository petRepository) {
+ this.visitRepository = visitRepository;
+ this.ownerRepository = ownerRepository;
+ this.petRepository = petRepository;
+ }
+
+ public VisitCreateRecord get(Integer ownerId, Integer petId) {
+
+ final Owner owner = ownerRepository.findById(ownerId).get();
+
+ final Pet pet = petRepository.findById(petId).get();
+
+ final List previousVisits = visitRepository.findVisitsByPetId(petId);
+ previousVisits.sort(Comparator.comparing(VisitRecord::date).reversed());
+ VisitCreateRecord model = new VisitCreateRecord(ownerId, petId,
+ pet.getName(), pet.getBirthDate(),
+ pet.getType().getName(),
+ owner.getFirstName() + " " + owner.getLastName(),
+ null,
+ "",
+ previousVisits);
+ return model;
+ }
+
+ public void saveVisit(VisitCreateRecord model) {
+ final Visit visit = new Visit();
+ visit.setDate(model.visitDate());
+ visit.setDescription(model.description());
+ visit.setPetId(model.petId());
+ visitRepository.save(visit);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/package-info.java b/src/main/java/org/springframework/samples/petclinic/endpoint/package-info.java
new file mode 100644
index 0000000..624fcb5
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/package-info.java
@@ -0,0 +1,4 @@
+@NonNullApi
+package org.springframework.samples.petclinic.endpoint;
+
+import org.springframework.lang.NonNullApi;
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/record/VetRecord.java b/src/main/java/org/springframework/samples/petclinic/endpoint/record/VetRecord.java
new file mode 100644
index 0000000..4589716
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/record/VetRecord.java
@@ -0,0 +1,4 @@
+package org.springframework.samples.petclinic.endpoint.record;
+
+public record VetRecord(Integer id, String fullName, String specialties) {
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/record/VisitCreateRecord.java b/src/main/java/org/springframework/samples/petclinic/endpoint/record/VisitCreateRecord.java
new file mode 100644
index 0000000..efec6e6
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/record/VisitCreateRecord.java
@@ -0,0 +1,22 @@
+package org.springframework.samples.petclinic.endpoint.record;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public record VisitCreateRecord(
+ Integer ownerId,
+ Integer petId,
+ String petName,
+ LocalDate petBirthDate,
+ String petType,
+ String petOwner,
+ @NotNull(message="The date is required")
+ LocalDate visitDate,
+ @NotEmpty(message="The description is required")
+ String description,
+ @NotNull
+ List previousVisits) {
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/endpoint/record/VisitRecord.java b/src/main/java/org/springframework/samples/petclinic/endpoint/record/VisitRecord.java
new file mode 100644
index 0000000..dd666a5
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/endpoint/record/VisitRecord.java
@@ -0,0 +1,9 @@
+package org.springframework.samples.petclinic.endpoint.record;
+
+import java.time.LocalDate;
+
+public record VisitRecord(
+ LocalDate date,
+ String description,
+ Integer petId) {
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
deleted file mode 100644
index 4cb9ffc..0000000
--- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.model;
-
-import java.io.Serializable;
-
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
-/**
- * Simple JavaBean domain object with an id property. Used as a base class for objects
- * needing this property.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- */
-@MappedSuperclass
-public class BaseEntity implements Serializable {
-
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public boolean isNew() {
- return this.id == null;
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
deleted file mode 100644
index 088e52e..0000000
--- a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.model;
-
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-
-/**
- * Simple JavaBean domain object adds a name property to BaseEntity. Used as
- * a base class for objects needing these properties.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- */
-@MappedSuperclass
-public class NamedEntity extends BaseEntity {
-
- @Column(name = "name")
- private String name;
-
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return this.getName();
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/src/main/java/org/springframework/samples/petclinic/model/package-info.java
deleted file mode 100644
index 37d6295..0000000
--- a/src/main/java/org/springframework/samples/petclinic/model/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-
-/**
- * The classes in this package represent utilities used by the domain.
- */
-package org.springframework.samples.petclinic.model;
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerEndpoint.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerEndpoint.java
deleted file mode 100644
index d3f58d4..0000000
--- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerEndpoint.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.springframework.samples.petclinic.owner;
-
-import java.util.Collection;
-
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
-import dev.hilla.Nonnull;
-
-@Endpoint
-@AnonymousAllowed
-public class OwnerEndpoint {
-
- private OwnerRepository service;
-
- public OwnerEndpoint(OwnerRepository service) {
- this.service = service;
- }
-
- @Nonnull
- public Collection<@Nonnull Owner> findByLastName(String lastName) {
- return service.findByLastName(lastName);
- }
-
- public Owner findById(Integer id) {
- return service.findById(id);
- }
-
- @Nonnull
- public Integer save(Owner owner) {
- return service.save(owner).getId();
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
deleted file mode 100644
index 5c67a42..0000000
--- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.owner;
-
-import java.util.Collection;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Repository class for Owner domain objects All method names are compliant
- * with Spring Data naming 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 Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public interface OwnerRepository extends Repository {
-
- /**
- * Retrieve {@link Owner}s from the data store by last name, returning all owners
- * whose last name starts with the given name.
- * @param lastName Value to search for
- * @return a Collection of matching {@link Owner}s (or an empty Collection if none
- * found)
- */
- @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%")
- @Transactional(readOnly = true)
- Collection findByLastName(@Param("lastName") String lastName);
-
- /**
- * Retrieve an {@link Owner} from the data store by id.
- * @param id the id to search for
- * @return the {@link Owner} if found
- */
- @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id")
- @Transactional(readOnly = true)
- Owner findById(@Param("id") Integer id);
-
- /**
- * Save an {@link Owner} to the data store, either inserting or updating it.
- * @param owner the {@link Owner} to save
- */
- Owner save(Owner owner);
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetEndpoint.java b/src/main/java/org/springframework/samples/petclinic/owner/PetEndpoint.java
deleted file mode 100644
index fcf24a9..0000000
--- a/src/main/java/org/springframework/samples/petclinic/owner/PetEndpoint.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.springframework.samples.petclinic.owner;
-
-import java.util.List;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.samples.petclinic.dto.PetDTO;
-
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
-import dev.hilla.Nonnull;
-
-@Endpoint
-@AnonymousAllowed
-public class PetEndpoint {
-
- private PetRepository service;
-
- private OwnerRepository ownerService;
-
- private ModelMapper modelMapper;
-
- public PetEndpoint(PetRepository service, OwnerRepository ownerService, ModelMapper modelMapper) {
- this.service = service;
- this.ownerService = ownerService;
- this.modelMapper = modelMapper;
- }
-
- @Nonnull
- public List<@Nonnull PetType> findPetTypes() {
- return service.findPetTypes();
- }
-
- public PetDTO findById(Integer id) {
- return convertToDto(service.findById(id));
- }
-
- @Nonnull
- public Integer save(PetDTO pet) {
- return service.save(convertToEntity(pet)).getId();
- }
-
- private PetDTO convertToDto(Pet pet) {
- return modelMapper.map(pet, PetDTO.class);
- }
-
- private Pet convertToEntity(PetDTO petDto) {
- Pet pet = modelMapper.map(petDto, Pet.class);
- Owner owner = ownerService.findById(petDto.getOwnerId());
- pet.setOwner(owner);
-
- if (petDto.getId() != null) {
- Pet oldPet = service.findById(petDto.getId());
- pet.setVisitsInternal(oldPet.getVisitsInternal());
- }
- return pet;
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java b/src/main/java/org/springframework/samples/petclinic/owner/PetType.java
deleted file mode 100644
index 6f0aa58..0000000
--- a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.owner;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import org.springframework.samples.petclinic.model.NamedEntity;
-
-/**
- * @author Juergen Hoeller Can be Cat, Dog, Hamster...
- */
-@Entity
-@Table(name = "types")
-public class PetType extends NamedEntity {
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java b/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java
deleted file mode 100644
index 4940bcb..0000000
--- a/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.owner;
-
-import java.text.ParseException;
-import java.util.Collection;
-import java.util.Locale;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.Formatter;
-import org.springframework.stereotype.Component;
-
-/**
- * Instructs Spring MVC on how to parse and print elements of type 'PetType'. Starting
- * from Spring 3.0, Formatters have come as an improvement in comparison to legacy
- * PropertyEditors. See the following links for more details: - The Spring ref doc:
- * https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/core.html#format
- *
- * @author Mark Fisher
- * @author Juergen Hoeller
- * @author Michael Isvy
- */
-@Component
-public class PetTypeFormatter implements Formatter {
-
- private final PetRepository pets;
-
- @Autowired
- public PetTypeFormatter(PetRepository pets) {
- this.pets = pets;
- }
-
- @Override
- public String print(PetType petType, Locale locale) {
- return petType.getName();
- }
-
- @Override
- public PetType parse(String text, Locale locale) throws ParseException {
- Collection findPetTypes = this.pets.findPetTypes();
- for (PetType type : findPetTypes) {
- if (type.getName().equals(text)) {
- return type;
- }
- }
- throw new ParseException("type not found: " + text, 0);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java b/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java
deleted file mode 100644
index e1370b4..0000000
--- a/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.owner;
-
-import org.springframework.util.StringUtils;
-import org.springframework.validation.Errors;
-import org.springframework.validation.Validator;
-
-/**
- * Validator for Pet forms.
- *
- * We're not using Bean Validation annotations here because it is easier to define such
- * validation rule in Java.
- *
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- */
-public class PetValidator implements Validator {
-
- private static final String REQUIRED = "required";
-
- @Override
- public void validate(Object obj, Errors errors) {
- Pet pet = (Pet) obj;
- String name = pet.getName();
- // name validation
- if (!StringUtils.hasLength(name)) {
- errors.rejectValue("name", REQUIRED, REQUIRED);
- }
-
- // type validation
- if (pet.isNew() && pet.getType() == null) {
- errors.rejectValue("type", REQUIRED, REQUIRED);
- }
-
- // birth date validation
- if (pet.getBirthDate() == null) {
- errors.rejectValue("birthDate", REQUIRED, REQUIRED);
- }
- }
-
- /**
- * This Validator validates *just* Pet instances
- */
- @Override
- public boolean supports(Class clazz) {
- return Pet.class.isAssignableFrom(clazz);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CrashEndpoint.java b/src/main/java/org/springframework/samples/petclinic/system/CrashEndpoint.java
deleted file mode 100644
index 540d71b..0000000
--- a/src/main/java/org/springframework/samples/petclinic/system/CrashEndpoint.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.springframework.samples.petclinic.system;
-
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
-
-@Endpoint
-@AnonymousAllowed
-public class CrashEndpoint {
-
- public String triggerException() {
- throw new RuntimeException("Expected: endpoint used to showcase what happens when an exception is thrown");
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java b/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java
deleted file mode 100644
index ea8ec6d..0000000
--- a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.vet;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import org.springframework.samples.petclinic.model.NamedEntity;
-
-/**
- * Models a {@link Vet Vet's} specialty (for example, dentistry).
- *
- * @author Juergen Hoeller
- */
-@Entity
-@Table(name = "specialties")
-public class Specialty extends NamedEntity implements Serializable {
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetEndpoint.java b/src/main/java/org/springframework/samples/petclinic/vet/VetEndpoint.java
deleted file mode 100644
index 35c0834..0000000
--- a/src/main/java/org/springframework/samples/petclinic/vet/VetEndpoint.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.springframework.samples.petclinic.vet;
-
-import java.util.Collection;
-
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
-import dev.hilla.Nonnull;
-
-@Endpoint
-@AnonymousAllowed
-public class VetEndpoint {
-
- private VetRepository service;
-
- public VetEndpoint(VetRepository service) {
- this.service = service;
- }
-
- @Nonnull
- public Collection<@Nonnull Vet> list() {
- return service.findAll();
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
deleted file mode 100644
index 549b1c2..0000000
--- a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.vet;
-
-import java.util.Collection;
-
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.repository.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Repository class for Vet domain objects All method names are compliant
- * with Spring Data naming 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 Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public interface VetRepository extends Repository {
-
- /**
- * Retrieve all Vets from the data store.
- * @return a Collection of Vets
- */
- @Transactional(readOnly = true)
- @Cacheable("vets")
- Collection findAll() throws DataAccessException;
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vets.java b/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
deleted file mode 100644
index cea6656..0000000
--- a/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.vet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Simple domain object representing a list of veterinarians. Mostly here to be used for
- * the 'vets' {@link org.springframework.web.servlet.view.xml.MarshallingView}.
- *
- * @author Arjen Poutsma
- */
-@XmlRootElement
-public class Vets {
-
- private List vets;
-
- @XmlElement
- public List getVetList() {
- if (vets == null) {
- vets = new ArrayList<>();
- }
- return vets;
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/visit/VisitEndpoint.java b/src/main/java/org/springframework/samples/petclinic/visit/VisitEndpoint.java
deleted file mode 100644
index 0bc7e7d..0000000
--- a/src/main/java/org/springframework/samples/petclinic/visit/VisitEndpoint.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.springframework.samples.petclinic.visit;
-
-import java.util.List;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.BaseEntity;
-
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
-import dev.hilla.Nonnull;
-
-@Endpoint
-@AnonymousAllowed
-public class VisitEndpoint {
-
- private VisitRepository service;
-
- public VisitEndpoint(VisitRepository service) {
- this.service = service;
- }
-
- /**
- * Save a Visit to the data store, either inserting or updating it.
- * @param visit the Visit to save
- * @see BaseEntity#isNew
- */
- @Nonnull
- public Integer save(Visit visit, Integer petId) throws DataAccessException {
- visit.setPetId(petId);
- return service.save(visit).getId();
- }
-
- @Nonnull
- public List<@Nonnull Visit> findByPetId(Integer petId) {
- return service.findByPetId(petId);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java b/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
deleted file mode 100644
index 4020245..0000000
--- a/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-package org.springframework.samples.petclinic.visit;
-
-import java.util.List;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.BaseEntity;
-
-/**
- * Repository class for Visit domain objects All method names are compliant
- * with Spring Data naming 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 Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public interface VisitRepository extends Repository {
-
- /**
- * Save a Visit to the data store, either inserting or updating it.
- * @param visit the Visit to save
- * @see BaseEntity#isNew
- */
- Visit save(Visit visit) throws DataAccessException;
-
- List findByPetId(Integer petId);
-
-}
diff --git a/src/main/resources/static/resources/images/favicon.png b/src/main/resources/META-INF/resources/icons/icon.png
similarity index 100%
rename from src/main/resources/static/resources/images/favicon.png
rename to src/main/resources/META-INF/resources/icons/icon.png
diff --git a/src/main/resources/static/resources/images/pets.png b/src/main/resources/META-INF/resources/images/pets.png
similarity index 100%
rename from src/main/resources/static/resources/images/pets.png
rename to src/main/resources/META-INF/resources/images/pets.png
diff --git a/src/main/resources/static/resources/images/platform-bg.png b/src/main/resources/META-INF/resources/images/platform-bg.png
similarity index 100%
rename from src/main/resources/static/resources/images/platform-bg.png
rename to src/main/resources/META-INF/resources/images/platform-bg.png
diff --git a/src/main/resources/static/resources/images/spring-logo-dataflow-mobile.png b/src/main/resources/META-INF/resources/images/spring-logo-dataflow-mobile.png
similarity index 100%
rename from src/main/resources/static/resources/images/spring-logo-dataflow-mobile.png
rename to src/main/resources/META-INF/resources/images/spring-logo-dataflow-mobile.png
diff --git a/src/main/resources/META-INF/resources/images/spring-logo.svg b/src/main/resources/META-INF/resources/images/spring-logo.svg
new file mode 100644
index 0000000..5b2a27a
--- /dev/null
+++ b/src/main/resources/META-INF/resources/images/spring-logo.svg
@@ -0,0 +1,66 @@
+
diff --git a/src/main/resources/META-INF/resources/images/vaadin.png b/src/main/resources/META-INF/resources/images/vaadin.png
new file mode 100644
index 0000000..79885cf
Binary files /dev/null and b/src/main/resources/META-INF/resources/images/vaadin.png differ
diff --git a/src/main/resources/application-mysql.properties b/src/main/resources/application-mysql.properties
index d388c9e..e23dfa6 100644
--- a/src/main/resources/application-mysql.properties
+++ b/src/main/resources/application-mysql.properties
@@ -4,4 +4,4 @@ spring.datasource.url=${MYSQL_URL:jdbc:mysql://localhost/petclinic}
spring.datasource.username=${MYSQL_USER:petclinic}
spring.datasource.password=${MYSQL_PASS:petclinic}
# SQL is written to be idempotent so this is safe
-spring.datasource.initialization-mode=always
+spring.sql.init.mode=always
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c65e21b..54d1613 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,8 +1,11 @@
# database init, supports mysql too
database=h2
-spring.datasource.schema=classpath*:db/${database}/schema.sql
-spring.datasource.data=classpath*:db/${database}/data.sql
+spring.sql.init.schema-locations=classpath*:db/${database}/schema.sql
+spring.sql.init.data-locations=classpath*:db/${database}/data.sql
+# Web
+spring.thymeleaf.mode=HTML
+server.port=8080
# JPA
spring.jpa.hibernate.ddl-auto=none
spring.jpa.open-in-view=false
@@ -19,5 +22,16 @@ logging.level.org.springframework=INFO
# logging.level.org.springframework.context.annotation=TRACE
# Maximum time static resources should be cached
-spring.resources.cache.cachecontrol.max-age=12h
-vaadin.whitelisted-packages = com/vaadin,dev/hilla,org/vaadin,org/springframework/samples/petclinic
+spring.web.resources.cache.cachecontrol.max-age=12h
+vaadin.allowed-packages=com/vaadin,org/vaadin,org/springframework/samples/petclinic
+
+
+hilla.endpoint.hot-reload.enabled=true
+
+
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.stat=DEBUG
+logging.level.org.hibernate.orm.jdbc.bind=TRACE
+logging.level.org.jdbi.sql=DEBUG
+
+spring.jpa.properties.hibernate.generate_statistics=true
diff --git a/src/main/resources/db/h2/data.sql b/src/main/resources/db/h2/data.sql
index 16dda3e..f232b13 100644
--- a/src/main/resources/db/h2/data.sql
+++ b/src/main/resources/db/h2/data.sql
@@ -1,13 +1,13 @@
-INSERT INTO vets VALUES (1, 'James', 'Carter');
-INSERT INTO vets VALUES (2, 'Helen', 'Leary');
-INSERT INTO vets VALUES (3, 'Linda', 'Douglas');
-INSERT INTO vets VALUES (4, 'Rafael', 'Ortega');
-INSERT INTO vets VALUES (5, 'Henry', 'Stevens');
-INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins');
+INSERT INTO vets VALUES (default, 'James', 'Carter');
+INSERT INTO vets VALUES (default, 'Helen', 'Leary');
+INSERT INTO vets VALUES (default, 'Linda', 'Douglas');
+INSERT INTO vets VALUES (default, 'Rafael', 'Ortega');
+INSERT INTO vets VALUES (default, 'Henry', 'Stevens');
+INSERT INTO vets VALUES (default, 'Sharon', 'Jenkins');
-INSERT INTO specialties VALUES (1, 'radiology');
-INSERT INTO specialties VALUES (2, 'surgery');
-INSERT INTO specialties VALUES (3, 'dentistry');
+INSERT INTO specialties VALUES (default, 'radiology');
+INSERT INTO specialties VALUES (default, 'surgery');
+INSERT INTO specialties VALUES (default, 'dentistry');
INSERT INTO vet_specialties VALUES (2, 1);
INSERT INTO vet_specialties VALUES (3, 2);
@@ -15,39 +15,39 @@ INSERT INTO vet_specialties VALUES (3, 3);
INSERT INTO vet_specialties VALUES (4, 2);
INSERT INTO vet_specialties VALUES (5, 1);
-INSERT INTO types VALUES (1, 'cat');
-INSERT INTO types VALUES (2, 'dog');
-INSERT INTO types VALUES (3, 'lizard');
-INSERT INTO types VALUES (4, 'snake');
-INSERT INTO types VALUES (5, 'bird');
-INSERT INTO types VALUES (6, 'hamster');
+INSERT INTO types VALUES (default, 'cat');
+INSERT INTO types VALUES (default, 'dog');
+INSERT INTO types VALUES (default, 'lizard');
+INSERT INTO types VALUES (default, 'snake');
+INSERT INTO types VALUES (default, 'bird');
+INSERT INTO types VALUES (default, 'hamster');
-INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
-INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');
-INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763');
-INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198');
-INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765');
-INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654');
-INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
-INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
-INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
-INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
+INSERT INTO owners VALUES (default, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
+INSERT INTO owners VALUES (default, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');
+INSERT INTO owners VALUES (default, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763');
+INSERT INTO owners VALUES (default, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198');
+INSERT INTO owners VALUES (default, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765');
+INSERT INTO owners VALUES (default, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654');
+INSERT INTO owners VALUES (default, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
+INSERT INTO owners VALUES (default, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
+INSERT INTO owners VALUES (default, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
+INSERT INTO owners VALUES (default, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
-INSERT INTO pets VALUES (1, 'Leo', '2010-09-07', 1, 1);
-INSERT INTO pets VALUES (2, 'Basil', '2012-08-06', 6, 2);
-INSERT INTO pets VALUES (3, 'Rosy', '2011-04-17', 2, 3);
-INSERT INTO pets VALUES (4, 'Jewel', '2010-03-07', 2, 3);
-INSERT INTO pets VALUES (5, 'Iggy', '2010-11-30', 3, 4);
-INSERT INTO pets VALUES (6, 'George', '2010-01-20', 4, 5);
-INSERT INTO pets VALUES (7, 'Samantha', '2012-09-04', 1, 6);
-INSERT INTO pets VALUES (8, 'Max', '2012-09-04', 1, 6);
-INSERT INTO pets VALUES (9, 'Lucky', '2011-08-06', 5, 7);
-INSERT INTO pets VALUES (10, 'Mulligan', '2007-02-24', 2, 8);
-INSERT INTO pets VALUES (11, 'Freddy', '2010-03-09', 5, 9);
-INSERT INTO pets VALUES (12, 'Lucky', '2010-06-24', 2, 10);
-INSERT INTO pets VALUES (13, 'Sly', '2012-06-08', 1, 10);
+INSERT INTO pets VALUES (default, 'Leo', '2010-09-07', 1, 1);
+INSERT INTO pets VALUES (default, 'Basil', '2012-08-06', 6, 2);
+INSERT INTO pets VALUES (default, 'Rosy', '2011-04-17', 2, 3);
+INSERT INTO pets VALUES (default, 'Jewel', '2010-03-07', 2, 3);
+INSERT INTO pets VALUES (default, 'Iggy', '2010-11-30', 3, 4);
+INSERT INTO pets VALUES (default, 'George', '2010-01-20', 4, 5);
+INSERT INTO pets VALUES (default, 'Samantha', '2012-09-04', 1, 6);
+INSERT INTO pets VALUES (default, 'Max', '2012-09-04', 1, 6);
+INSERT INTO pets VALUES (default, 'Lucky', '2011-08-06', 5, 7);
+INSERT INTO pets VALUES (default, 'Mulligan', '2007-02-24', 2, 8);
+INSERT INTO pets VALUES (default, 'Freddy', '2010-03-09', 5, 9);
+INSERT INTO pets VALUES (default, 'Lucky', '2010-06-24', 2, 10);
+INSERT INTO pets VALUES (default, 'Sly', '2012-06-08', 1, 10);
-INSERT INTO visits VALUES (1, 7, '2013-01-01', 'rabies shot');
-INSERT INTO visits VALUES (2, 8, '2013-01-02', 'rabies shot');
-INSERT INTO visits VALUES (3, 8, '2013-01-03', 'neutered');
-INSERT INTO visits VALUES (4, 7, '2013-01-04', 'spayed');
+INSERT INTO visits VALUES (default, 7, '2013-01-01', 'rabies shot');
+INSERT INTO visits VALUES (default, 8, '2013-01-02', 'rabies shot');
+INSERT INTO visits VALUES (default, 8, '2013-01-03', 'neutered');
+INSERT INTO visits VALUES (default, 7, '2013-01-04', 'spayed');
diff --git a/src/main/resources/db/h2/schema.sql b/src/main/resources/db/h2/schema.sql
index f3c6947..ab2df24 100644
--- a/src/main/resources/db/h2/schema.sql
+++ b/src/main/resources/db/h2/schema.sql
@@ -8,57 +8,57 @@ DROP TABLE owners IF EXISTS;
CREATE TABLE vets (
- id INTEGER IDENTITY PRIMARY KEY,
- first_name VARCHAR(30),
- last_name VARCHAR(30)
+ id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ first_name VARCHAR(30),
+ last_name VARCHAR(30)
);
CREATE INDEX vets_last_name ON vets (last_name);
CREATE TABLE specialties (
- id INTEGER IDENTITY PRIMARY KEY,
- name VARCHAR(80)
+ id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ name VARCHAR(80)
);
CREATE INDEX specialties_name ON specialties (name);
CREATE TABLE vet_specialties (
- vet_id INTEGER NOT NULL,
- specialty_id INTEGER NOT NULL
+ vet_id INTEGER NOT NULL,
+ specialty_id INTEGER NOT NULL
);
ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_vets FOREIGN KEY (vet_id) REFERENCES vets (id);
ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_specialties FOREIGN KEY (specialty_id) REFERENCES specialties (id);
CREATE TABLE types (
- id INTEGER IDENTITY PRIMARY KEY,
- name VARCHAR(80)
+ id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ name VARCHAR(80)
);
CREATE INDEX types_name ON types (name);
CREATE TABLE owners (
- id INTEGER IDENTITY PRIMARY KEY,
- first_name VARCHAR(30),
- last_name VARCHAR_IGNORECASE(30),
- address VARCHAR(255),
- city VARCHAR(80),
- telephone VARCHAR(20)
+ id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ first_name VARCHAR(30),
+ last_name VARCHAR_IGNORECASE(30),
+ address VARCHAR(255),
+ city VARCHAR(80),
+ telephone VARCHAR(20)
);
CREATE INDEX owners_last_name ON owners (last_name);
CREATE TABLE pets (
- id INTEGER IDENTITY PRIMARY KEY,
- name VARCHAR(30),
- birth_date DATE,
- type_id INTEGER NOT NULL,
- owner_id INTEGER NOT NULL
+ id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ name VARCHAR(30),
+ birth_date DATE,
+ type_id INTEGER NOT NULL,
+ owner_id INTEGER
);
ALTER TABLE pets ADD CONSTRAINT fk_pets_owners FOREIGN KEY (owner_id) REFERENCES owners (id);
ALTER TABLE pets ADD CONSTRAINT fk_pets_types FOREIGN KEY (type_id) REFERENCES types (id);
CREATE INDEX pets_name ON pets (name);
CREATE TABLE visits (
- id INTEGER IDENTITY PRIMARY KEY,
- pet_id INTEGER NOT NULL,
- visit_date DATE,
- description VARCHAR(255)
+ id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ pet_id INTEGER,
+ visit_date DATE,
+ description VARCHAR(255)
);
ALTER TABLE visits ADD CONSTRAINT fk_visits_pets FOREIGN KEY (pet_id) REFERENCES pets (id);
CREATE INDEX visits_pet_id ON visits (pet_id);
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
deleted file mode 100644
index 173417a..0000000
--- a/src/main/resources/messages/messages.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-welcome=Welcome
-required=is required
-notFound=has not been found
-duplicate=is already in use
-nonNumeric=must be all numeric
-duplicateFormSubmission=Duplicate form submission is not allowed
-typeMismatch.date=invalid date
-typeMismatch.birthDate=invalid date
diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties
deleted file mode 100644
index 33ee867..0000000
--- a/src/main/resources/messages/messages_es.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-welcome=Bienvenido
-required=Es requerido
-notFound=No ha sido encontrado
-duplicate=Ya se encuentra en uso
-nonNumeric=Sólo debe contener numeros
-duplicateFormSubmission=No se permite el envÃo de formularios duplicados
-typeMismatch.date=Fecha invalida
-typeMismatch.birthDate=Fecha invalida
diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.eot b/src/main/resources/static/resources/fonts/montserrat-webfont.eot
deleted file mode 100644
index 0caea91..0000000
Binary files a/src/main/resources/static/resources/fonts/montserrat-webfont.eot and /dev/null differ
diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.svg b/src/main/resources/static/resources/fonts/montserrat-webfont.svg
deleted file mode 100644
index 7bd96bd..0000000
--- a/src/main/resources/static/resources/fonts/montserrat-webfont.svg
+++ /dev/null
@@ -1,1283 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.ttf b/src/main/resources/static/resources/fonts/montserrat-webfont.ttf
deleted file mode 100644
index 9953fe6..0000000
Binary files a/src/main/resources/static/resources/fonts/montserrat-webfont.ttf and /dev/null differ
diff --git a/src/main/resources/static/resources/fonts/montserrat-webfont.woff b/src/main/resources/static/resources/fonts/montserrat-webfont.woff
deleted file mode 100644
index eb49333..0000000
Binary files a/src/main/resources/static/resources/fonts/montserrat-webfont.woff and /dev/null differ
diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.eot b/src/main/resources/static/resources/fonts/varela_round-webfont.eot
deleted file mode 100644
index dfee0c2..0000000
Binary files a/src/main/resources/static/resources/fonts/varela_round-webfont.eot and /dev/null differ
diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.svg b/src/main/resources/static/resources/fonts/varela_round-webfont.svg
deleted file mode 100644
index 3280e2c..0000000
--- a/src/main/resources/static/resources/fonts/varela_round-webfont.svg
+++ /dev/null
@@ -1,7875 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.ttf b/src/main/resources/static/resources/fonts/varela_round-webfont.ttf
deleted file mode 100644
index 3ca0666..0000000
Binary files a/src/main/resources/static/resources/fonts/varela_round-webfont.ttf and /dev/null differ
diff --git a/src/main/resources/static/resources/fonts/varela_round-webfont.woff b/src/main/resources/static/resources/fonts/varela_round-webfont.woff
deleted file mode 100644
index 77ba166..0000000
Binary files a/src/main/resources/static/resources/fonts/varela_round-webfont.woff and /dev/null differ
diff --git a/src/main/resources/static/resources/images/hilla-dark.png b/src/main/resources/static/resources/images/hilla-dark.png
deleted file mode 100644
index e62c119..0000000
Binary files a/src/main/resources/static/resources/images/hilla-dark.png and /dev/null differ
diff --git a/src/main/resources/static/resources/images/spring-pivotal-logo.png b/src/main/resources/static/resources/images/spring-pivotal-logo.png
deleted file mode 100644
index 1840af2..0000000
Binary files a/src/main/resources/static/resources/images/spring-pivotal-logo.png and /dev/null differ
diff --git a/src/main/resources/vaadin-featureflags.properties b/src/main/resources/vaadin-featureflags.properties
index 5bb4e37..29b19b9 100644
--- a/src/main/resources/vaadin-featureflags.properties
+++ b/src/main/resources/vaadin-featureflags.properties
@@ -1,2 +1,4 @@
-# Use Vite for faster front-end builds
-com.vaadin.experimental.viteForFrontendBuild=true
+# Hilla I18n API
+com.vaadin.experimental.hillaI18n=true
+# Copilot experimental features
+com.vaadin.experimental.copilotExperimentalFeatures=true
diff --git a/src/main/resources/vaadin-i18n/translations.properties b/src/main/resources/vaadin-i18n/translations.properties
new file mode 100644
index 0000000..d5f6bc7
--- /dev/null
+++ b/src/main/resources/vaadin-i18n/translations.properties
@@ -0,0 +1,49 @@
+welcome=Welcome
+required=is required
+notFound=has not been found
+duplicate=is already in use
+nonNumeric=must be all numeric
+duplicateFormSubmission=Duplicate form submission is not allowed
+typeMismatch.date=invalid date
+typeMismatch.birthDate=invalid date
+
+welcomeTitle=PetClinic :: a Spring Framework demonstration
+home=Home
+findOwners=Find owners
+veterinarians=Veterinarians
+error=Error
+firstName=First Name
+lastName=Last Name
+findOwner=Find Owner
+addOwner=Add Owner
+editOwner=Edit Owner
+petsAndVisits=Pets and Visits
+addNewPet=Add New Pet
+name=Name
+address=Address
+city=City
+telephone=Telephone
+pet=Pet
+pets=Pets
+birthDate=Birth Date
+type=Type
+ownerInformation=Owner Information
+visitDate=Visit Date
+description=Description
+editPet=Edit Pet
+addVisit=Add Visit
+updateOwner=Update Owner
+owner=Owner
+newPet=New Pet
+addPet=Add Pet
+updatePet=Update Pet
+newVisit=New Visit
+previousVisits=Previous Visits
+date=Date
+specialties=Specialties
+none=none
+somethingHappened=Something happened...
+navigationError=An unexpected error happened when navigating to ''{0}''
+telephoneError=Telephone must have 1 to 10 digits
+
+name.required=The name is required
diff --git a/src/main/resources/messages/messages_de.properties b/src/main/resources/vaadin-i18n/translations_de.properties
similarity index 74%
rename from src/main/resources/messages/messages_de.properties
rename to src/main/resources/vaadin-i18n/translations_de.properties
index 124bee4..e9048a5 100644
--- a/src/main/resources/messages/messages_de.properties
+++ b/src/main/resources/vaadin-i18n/translations_de.properties
@@ -4,5 +4,5 @@ notFound=wurde nicht gefunden
duplicate=ist bereits vergeben
nonNumeric=darf nur numerisch sein
duplicateFormSubmission=Wiederholtes Absenden des Formulars ist nicht erlaubt
-typeMismatch.date=ungültiges Datum
-typeMismatch.birthDate=ungültiges Datum
+typeMismatch.date=ungultiges Datum
+typeMismatch.birthDate=ungultiges Datum
diff --git a/src/main/resources/messages/messages_en.properties b/src/main/resources/vaadin-i18n/translations_en.properties
similarity index 100%
rename from src/main/resources/messages/messages_en.properties
rename to src/main/resources/vaadin-i18n/translations_en.properties
diff --git a/src/main/resources/vaadin-i18n/translations_es.properties b/src/main/resources/vaadin-i18n/translations_es.properties
new file mode 100644
index 0000000..e69de29
diff --git a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
index 226db01..e559ac4 100644
--- a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
@@ -1,17 +1,15 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
package org.springframework.samples.petclinic;
@@ -19,7 +17,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.samples.petclinic.vet.VetRepository;
+import org.springframework.samples.petclinic.backend.vet.VetRepository;
@SpringBootTest
class PetclinicIntegrationTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
index 8d75490..3b886e3 100644
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
@@ -1,17 +1,15 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
package org.springframework.samples.petclinic.model;
@@ -19,18 +17,18 @@
import java.util.Locale;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
-
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
import org.junit.jupiter.api.Test;
import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.samples.petclinic.backend.model.Person;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
import static org.assertj.core.api.Assertions.assertThat;
/**
- * @author Michael Isvy Simple test to make sure that Bean Validation is working (useful
- * when upgrading to a new version of Hibernate Validator/ Bean Validation)
+ * @author Michael Isvy Simple test to make sure that Bean Validation is working (useful when
+ * upgrading to a new version of Hibernate Validator/ Bean Validation)
*/
class ValidatorTests {
@@ -54,7 +52,7 @@ void shouldNotValidateWhenFirstNameEmpty() {
assertThat(constraintViolations).hasSize(1);
ConstraintViolation violation = constraintViolations.iterator().next();
assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
- assertThat(violation.getMessage()).isEqualTo("must not be empty");
+ assertThat(violation.getMessage()).isEqualTo("The first name is required");
}
}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
deleted file mode 100644
index adb96b6..0000000
--- a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2012-2019 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.
- */
-
-package org.springframework.samples.petclinic.owner;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-
-/**
- * Test class for {@link PetTypeFormatter}
- *
- * @author Colin But
- */
-@ExtendWith(MockitoExtension.class)
-class PetTypeFormatterTests {
-
- @Mock
- private PetRepository pets;
-
- private PetTypeFormatter petTypeFormatter;
-
- @BeforeEach
- void setup() {
- this.petTypeFormatter = new PetTypeFormatter(pets);
- }
-
- @Test
- void testPrint() {
- PetType petType = new PetType();
- petType.setName("Hamster");
- String petTypeName = this.petTypeFormatter.print(petType, Locale.ENGLISH);
- assertThat(petTypeName).isEqualTo("Hamster");
- }
-
- @Test
- void shouldParse() throws ParseException {
- given(this.pets.findPetTypes()).willReturn(makePetTypes());
- PetType petType = petTypeFormatter.parse("Bird", Locale.ENGLISH);
- assertThat(petType.getName()).isEqualTo("Bird");
- }
-
- @Test
- void shouldThrowParseException() throws ParseException {
- given(this.pets.findPetTypes()).willReturn(makePetTypes());
- Assertions.assertThrows(ParseException.class, () -> {
- petTypeFormatter.parse("Fish", Locale.ENGLISH);
- });
- }
-
- /**
- * Helper method to produce some sample pet types just for test purpose
- * @return {@link Collection} of {@link PetType}
- */
- private List makePetTypes() {
- List petTypes = new ArrayList<>();
- petTypes.add(new PetType() {
- {
- setName("Dog");
- }
- });
- petTypes.add(new PetType() {
- {
- setName("Bird");
- }
- });
- return petTypes;
- }
-
-}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
index a7f3d9d..015626b 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
@@ -1,62 +1,61 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
package org.springframework.samples.petclinic.service;
-import static org.assertj.core.api.Assertions.assertThat;
-
import java.time.LocalDate;
import java.util.Collection;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.samples.petclinic.owner.Owner;
-import org.springframework.samples.petclinic.owner.OwnerRepository;
-import org.springframework.samples.petclinic.owner.Pet;
-import org.springframework.samples.petclinic.owner.PetRepository;
-import org.springframework.samples.petclinic.owner.PetType;
-import org.springframework.samples.petclinic.vet.Vet;
-import org.springframework.samples.petclinic.vet.VetRepository;
-import org.springframework.samples.petclinic.visit.Visit;
-import org.springframework.samples.petclinic.visit.VisitRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.samples.petclinic.backend.owner.Owner;
+import org.springframework.samples.petclinic.backend.owner.OwnerRepository;
+import org.springframework.samples.petclinic.backend.owner.Pet;
+import org.springframework.samples.petclinic.backend.owner.PetRepository;
+import org.springframework.samples.petclinic.backend.owner.PetType;
+import org.springframework.samples.petclinic.backend.vet.Vet;
+import org.springframework.samples.petclinic.backend.vet.VetRepository;
+import org.springframework.samples.petclinic.backend.visit.Visit;
+import org.springframework.samples.petclinic.backend.visit.VisitRepository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Integration test of the Service and the Repository layer.
*
- * ClinicServiceSpringDataJpaTests subclasses benefit from the following services provided
- * by the Spring TestContext Framework:
+ * ClinicServiceSpringDataJpaTests subclasses benefit from the following services provided by the
+ * Spring TestContext Framework:
*
*
- * - Spring IoC container caching which spares us unnecessary set up
- * time between test execution.
- * - Dependency Injection of test fixture instances, meaning that we
- * don't need to perform application context lookups. See the use of
- * {@link Autowired @Autowired} on the
{@link
- * ClinicServiceTests#clinicService clinicService} instance variable, which uses
- * autowiring by type.
- * - Transaction management, meaning each test method is executed in
- * its own transaction, which is automatically rolled back by default. Thus, even if tests
- * insert or otherwise change database state, there is no need for a teardown or cleanup
- * script.
- *
- An {@link org.springframework.context.ApplicationContext ApplicationContext} is
- * also inherited and can be used for explicit bean lookup if necessary.
+ * - Spring IoC container caching which spares us unnecessary set up time between
+ * test execution.
+ * - Dependency Injection of test fixture instances, meaning that we don't need
+ * to perform application context lookups. See the use of {@link Autowired @Autowired} on the
+ *
instance variable, which uses autowiring by type.
+ * - Transaction management, meaning each test method is executed in its own
+ * transaction, which is automatically rolled back by default. Thus, even if tests insert or
+ * otherwise change database state, there is no need for a teardown or cleanup script.
+ *
- An {@link org.springframework.context.ApplicationContext ApplicationContext} is also
+ * inherited and can be used for explicit bean lookup if necessary.
*
*
* @author Ken Krebs
@@ -67,6 +66,8 @@
* @author Dave Syer
*/
@DataJpaTest(includeFilters = @ComponentScan.Filter(Service.class))
+// Ensure that if the mysql profile is active we connect to the real database:
+@AutoConfigureTestDatabase(replace = Replace.NONE)
class ClinicServiceTests {
@Autowired
@@ -81,18 +82,20 @@ class ClinicServiceTests {
@Autowired
protected VetRepository vets;
+ Pageable pageable;
+
@Test
void shouldFindOwnersByLastName() {
- Collection owners = this.owners.findByLastName("Davis");
+ Page owners = this.owners.findByLastName("Davis", pageable);
assertThat(owners).hasSize(2);
- owners = this.owners.findByLastName("Daviss");
+ owners = this.owners.findByLastName("Daviss", pageable);
assertThat(owners).isEmpty();
}
@Test
void shouldFindSingleOwnerWithPet() {
- Owner owner = this.owners.findById(1);
+ Owner owner = this.owners.findById(1).get();
assertThat(owner.getLastName()).startsWith("Franklin");
assertThat(owner.getPets()).hasSize(1);
assertThat(owner.getPets().get(0).getType()).isNotNull();
@@ -102,8 +105,8 @@ void shouldFindSingleOwnerWithPet() {
@Test
@Transactional
void shouldInsertOwner() {
- Collection owners = this.owners.findByLastName("Schultz");
- int found = owners.size();
+ Page owners = this.owners.findByLastName("Schultz", pageable);
+ int found = (int) owners.getTotalElements();
Owner owner = new Owner();
owner.setFirstName("Sam");
@@ -114,14 +117,14 @@ void shouldInsertOwner() {
this.owners.save(owner);
assertThat(owner.getId().longValue()).isNotEqualTo(0);
- owners = this.owners.findByLastName("Schultz");
- assertThat(owners.size()).isEqualTo(found + 1);
+ owners = this.owners.findByLastName("Schultz", pageable);
+ assertThat(owners.getTotalElements()).isEqualTo(found + 1);
}
@Test
@Transactional
void shouldUpdateOwner() {
- Owner owner = this.owners.findById(1);
+ Owner owner = this.owners.findById(1).get();
String oldLastName = owner.getLastName();
String newLastName = oldLastName + "X";
@@ -129,13 +132,13 @@ void shouldUpdateOwner() {
this.owners.save(owner);
// retrieving new name from database
- owner = this.owners.findById(1);
+ owner = this.owners.findById(1).get();
assertThat(owner.getLastName()).isEqualTo(newLastName);
}
@Test
void shouldFindPetWithCorrectId() {
- Pet pet7 = this.pets.findById(7);
+ Pet pet7 = this.pets.findById(7).get();
assertThat(pet7.getName()).startsWith("Samantha");
assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean");
@@ -154,7 +157,7 @@ void shouldFindAllPetTypes() {
@Test
@Transactional
void shouldInsertPetIntoDatabaseAndGenerateId() {
- Owner owner6 = this.owners.findById(6);
+ Owner owner6 = this.owners.findById(6).get();
int found = owner6.getPets().size();
Pet pet = new Pet();
@@ -168,7 +171,7 @@ void shouldInsertPetIntoDatabaseAndGenerateId() {
this.pets.save(pet);
this.owners.save(owner6);
- owner6 = this.owners.findById(6);
+ owner6 = this.owners.findById(6).get();
assertThat(owner6.getPets().size()).isEqualTo(found + 1);
// checks that id has been generated
assertThat(pet.getId()).isNotNull();
@@ -177,14 +180,14 @@ void shouldInsertPetIntoDatabaseAndGenerateId() {
@Test
@Transactional
void shouldUpdatePetName() throws Exception {
- Pet pet7 = this.pets.findById(7);
+ Pet pet7 = this.pets.findById(7).get();
String oldName = pet7.getName();
String newName = oldName + "X";
pet7.setName(newName);
this.pets.save(pet7);
- pet7 = this.pets.findById(7);
+ pet7 = this.pets.findById(7).get();
assertThat(pet7.getName()).isEqualTo(newName);
}
@@ -202,7 +205,7 @@ void shouldFindVets() {
@Test
@Transactional
void shouldAddNewVisitForPet() {
- Pet pet7 = this.pets.findById(7);
+ Pet pet7 = this.pets.findById(7).get();
int found = pet7.getVisits().size();
Visit visit = new Visit();
pet7.addVisit(visit);
@@ -210,7 +213,7 @@ void shouldAddNewVisitForPet() {
this.visits.save(visit);
this.pets.save(pet7);
- pet7 = this.pets.findById(7);
+ pet7 = this.pets.findById(7).get();
assertThat(pet7.getVisits().size()).isEqualTo(found + 1);
assertThat(visit.getId()).isNotNull();
}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
index ca8bc41..e61ffc1 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
@@ -1,17 +1,15 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
package org.springframework.samples.petclinic.service;
@@ -19,28 +17,30 @@
import java.util.Collection;
import org.springframework.orm.ObjectRetrievalFailureException;
-import org.springframework.samples.petclinic.model.BaseEntity;
+import org.springframework.samples.petclinic.backend.model.BaseEntity;
/**
- * Utility methods for handling entities. Separate from the BaseEntity class mainly
- * because of dependency on the ORM-associated ObjectRetrievalFailureException.
+ * Utility methods for handling entities. Separate from the BaseEntity class mainly because of
+ * dependency on the ORM-associated ObjectRetrievalFailureException.
*
* @author Juergen Hoeller
* @author Sam Brannen
- * @see org.springframework.samples.petclinic.model.BaseEntity
+ * @see org.springframework.samples.petclinic.backend.model.BaseEntity
* @since 29.10.2003
*/
public abstract class EntityUtils {
/**
* Look up the entity of the given class with the given id in the given collection.
+ *
* @param entities the collection to search
* @param entityClass the entity class to look up
* @param entityId the entity id to look up
* @return the found entity
* @throws ObjectRetrievalFailureException if the entity was not found
*/
- public static T getById(Collection entities, Class entityClass, int entityId)
+ public static T getById(Collection entities, Class entityClass,
+ int entityId)
throws ObjectRetrievalFailureException {
for (T entity : entities) {
if (entity.getId() == entityId && entityClass.isInstance(entity)) {
diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
index d8df78b..1bebec8 100644
--- a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
@@ -1,25 +1,23 @@
/*
* Copyright 2012-2019 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
+ * 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
+ * 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.
+ * 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.
*/
package org.springframework.samples.petclinic.vet;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.Test;
+import org.springframework.samples.petclinic.backend.vet.Vet;
import org.springframework.util.SerializationUtils;
-import static org.assertj.core.api.Assertions.assertThat;
-
/**
* @author Dave Syer
*/
diff --git a/src/test/jmeter/petclinic_test_plan.jmx b/src/test/jmeter/petclinic_test_plan.jmx
deleted file mode 100644
index 0a9a3a5..0000000
--- a/src/test/jmeter/petclinic_test_plan.jmx
+++ /dev/null
@@ -1,411 +0,0 @@
-
-
-
-
-
- false
- false
-
-
-
- PETCLINIC_HOST
- localhost
- =
-
-
- PETCLINIC_PORT
- 8080
- =
-
-
- CONTEXT_WEB
-
- =
-
-
-
-
-
-
-
- continue
-
- false
- 10
-
- 500
- 10
- 1361531541000
- 1361531541000
- false
-
-
- true
- Original : 500 - 10 - 10
-
-
-
- 300
-
-
-
-
-
-
- ${PETCLINIC_HOST}
- ${PETCLINIC_PORT}
-
-
-
-
-
- 4
-
-
-
-
- true
-
-
-
- 1
- 10
- 1
- count
-
- false
-
-
-
- 1
- 13
- 1
- petCount
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/
- GET
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/resources/css/petclinic.css
- GET
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/webjars/jquery/jquery.min.js
- GET
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/vets.html
- GET
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners/find
- GET
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners?lastName=
- GET
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners/${count}
- GET
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners/${count}/edit
- GET
- true
- false
- true
- false
- false
-
-
-
-
- true
-
-
-
- false
- firstName=Test&lastName=${count}&address=1234+Test+St.&city=TestCity&telephone=612345678
- =
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners/${count}/edit
- POST
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners/${count}/pets/${petCount}/visits/new
- GET
- true
- false
- true
- false
- false
-
-
-
-
- true
-
-
-
- false
- date=2013%2F02%2F22&description=visit
- =
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners/${count}/pets/${petCount}/visits/new
- POST
- true
- false
- true
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONTEXT_WEB}/owners/${count}
- GET
- true
- false
- true
- false
- false
-
-
-
-
- false
-
- saveConfig
-
-
- true
- true
- true
-
- true
- true
- true
- true
- false
- true
- true
- false
- false
- false
- false
- false
- false
- false
- false
- 0
- true
- true
-
-
-
-
-
-
- false
-
- saveConfig
-
-
- true
- true
- true
-
- true
- true
- true
- true
- false
- true
- true
- false
- false
- false
- false
- false
- false
- false
- false
- 0
- true
- true
-
-
-
-
-
-
-
-
-
diff --git a/tsconfig.json b/tsconfig.json
index fff58a7..02dd68b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,13 +4,16 @@
// You might want to change the configurations to fit your preferences
// For more information about the configurations, please refer to http://www.typescriptlang.org/docs/handbook/tsconfig-json.html
{
+ "_version": "9.1",
"compilerOptions": {
"sourceMap": true,
+ "jsx": "react-jsx",
"inlineSources": true,
"module": "esNext",
- "target": "es2019",
- "moduleResolution": "node",
+ "target": "es2020",
+ "moduleResolution": "bundler",
"strict": true,
+ "skipLibCheck": true,
"noFallthroughCasesInSwitch": true,
"noImplicitReturns": true,
"noImplicitAny": true,
@@ -18,17 +21,19 @@
"noUnusedLocals": false,
"noUnusedParameters": false,
"experimentalDecorators": true,
- "baseUrl": "frontend",
+ "useDefineForClassFields": false,
+ "baseUrl": "src/main/frontend",
"paths": {
- "Frontend/*": [
- "*"
- ]
+ "@vaadin/flow-frontend": ["generated/jar-resources"],
+ "@vaadin/flow-frontend/*": ["generated/jar-resources/*"],
+ "Frontend/*": ["*"]
}
},
"include": [
- "frontend/**/*.ts",
- "frontend/index.js",
+ "src/main/frontend/**/*",
"types.d.ts"
],
- "exclude": []
+ "exclude": [
+ "src/main/frontend/generated/jar-resources/**"
+ ]
}
diff --git a/types.d.ts b/types.d.ts
index 9f7023e..eff230b 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -3,8 +3,15 @@
// This is needed for TypeScript compiler to declare and export as a TypeScript module.
// It is recommended to commit this file to the VCS.
// You might want to change the configurations to fit your preferences
-declare module '*.css' {
- import { CSSResultGroup } from 'lit';
- const content: CSSResultGroup;
- export default content;
+declare module '*.css?inline' {
+ import type { CSSResultGroup } from 'lit';
+ const content: CSSResultGroup;
+ export default content;
+}
+
+// Allow any CSS Custom Properties
+declare module 'csstype' {
+ interface Properties {
+ [index: `--${string}`]: any;
+ }
}
diff --git a/vite.generated.ts b/vite.generated.ts
index fe0f89e..373f373 100644
--- a/vite.generated.ts
+++ b/vite.generated.ts
@@ -5,23 +5,61 @@
* This file will be overwritten on every run. Any custom changes should be made to vite.config.ts
*/
import path from 'path';
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, Stats } from 'fs';
+import { createHash } from 'crypto';
import * as net from 'net';
-import { processThemeResources } from '@vaadin/application-theme-plugin/theme-handle.js';
+import { processThemeResources } from './target/plugins/application-theme-plugin/theme-handle.js';
+import { rewriteCssUrls } from './target/plugins/theme-loader/theme-loader-utils.js';
+import { addFunctionComponentSourceLocationBabel } from './target/plugins/react-function-location-plugin/react-function-location-plugin.js';
import settings from './target/vaadin-dev-server-settings.json';
-import { UserConfigFn, defineConfig, mergeConfig, PluginOption, ResolvedConfig } from 'vite';
-import { injectManifest } from 'workbox-build';
+import {
+ AssetInfo,
+ ChunkInfo,
+ defineConfig,
+ mergeConfig,
+ OutputOptions,
+ PluginOption,
+ ResolvedConfig,
+ UserConfigFn
+} from 'vite';
+import { getManifest, type ManifestTransform } from 'workbox-build';
import * as rollup from 'rollup';
import brotli from 'rollup-plugin-brotli';
+import replace from '@rollup/plugin-replace';
import checker from 'vite-plugin-checker';
+import postcssLit from './target/plugins/rollup-plugin-postcss-lit-custom/rollup-plugin-postcss-lit.js';
+
+import { createRequire } from 'module';
+
+import { visualizer } from 'rollup-plugin-visualizer';
+import reactPlugin from '@vitejs/plugin-react';
+
+import vitePluginFileSystemRouter from '@vaadin/hilla-file-router/vite-plugin.js';
+
+// Make `require` compatible with ES modules
+const require = createRequire(import.meta.url);
const appShellUrl = '.';
const frontendFolder = path.resolve(__dirname, settings.frontendFolder);
const themeFolder = path.resolve(frontendFolder, settings.themeFolder);
const frontendBundleFolder = path.resolve(__dirname, settings.frontendBundleOutput);
-const addonFrontendFolder = path.resolve(__dirname, settings.addonFrontendFolder);
+const devBundleFolder = path.resolve(__dirname, settings.devBundleOutput);
+const devBundle = !!process.env.devBundle;
+const jarResourcesFolder = path.resolve(__dirname, settings.jarResourcesFolder);
+const themeResourceFolder = path.resolve(__dirname, settings.themeResourceFolder);
+const projectPackageJsonFile = path.resolve(__dirname, 'package.json');
+
+const buildOutputFolder = devBundle ? devBundleFolder : frontendBundleFolder;
+const statsFolder = path.resolve(__dirname, devBundle ? settings.devBundleStatsOutput : settings.statsOutput);
+const statsFile = path.resolve(statsFolder, 'stats.json');
+const bundleSizeFile = path.resolve(statsFolder, 'bundle-size.html');
+const nodeModulesFolder = path.resolve(__dirname, 'node_modules');
+const webComponentTags = '';
+
+const projectIndexHtml = path.resolve(frontendFolder, 'index.html');
const projectStaticAssetsFolders = [
path.resolve(__dirname, 'src', 'main', 'resources', 'META-INF', 'resources'),
@@ -34,225 +72,789 @@ const themeProjectFolders = projectStaticAssetsFolders.map((folder) => path.reso
const themeOptions = {
devMode: false,
- // The following matches folder 'target/flow-frontend/themes/'
+ useDevBundle: devBundle,
+ // The following matches folder 'frontend/generated/themes/'
// (not 'frontend/themes') for theme in JAR that is copied there
- themeResourceFolder: path.resolve(__dirname, settings.themeResourceFolder),
+ themeResourceFolder: path.resolve(themeResourceFolder, settings.themeFolder),
themeProjectFolders: themeProjectFolders,
- projectStaticAssetsOutputFolder: path.resolve(__dirname, settings.staticOutput),
+ projectStaticAssetsOutputFolder: devBundle
+ ? path.resolve(devBundleFolder, '../assets')
+ : path.resolve(__dirname, settings.staticOutput),
frontendGeneratedFolder: path.resolve(frontendFolder, settings.generatedFolder)
};
+const hasExportedWebComponents = existsSync(path.resolve(frontendFolder, 'web-component.html'));
+
// Block debug and trace logs.
console.trace = () => {};
console.debug = () => {};
-function transpileSWPlugin(): PluginOption {
+function injectManifestToSWPlugin(): rollup.Plugin {
+ const rewriteManifestIndexHtmlUrl: ManifestTransform = (manifest) => {
+ const indexEntry = manifest.find((entry) => entry.url === 'index.html');
+ if (indexEntry) {
+ indexEntry.url = appShellUrl;
+ }
+
+ return { manifest, warnings: [] };
+ };
+
+ return {
+ name: 'vaadin:inject-manifest-to-sw',
+ async transform(code, id) {
+ if (/sw\.(ts|js)$/.test(id)) {
+ const { manifestEntries } = await getManifest({
+ globDirectory: buildOutputFolder,
+ globPatterns: ['**/*'],
+ globIgnores: ['**/*.br', 'pwa-icons/**'],
+ manifestTransforms: [rewriteManifestIndexHtmlUrl],
+ maximumFileSizeToCacheInBytes: 100 * 1024 * 1024 // 100mb,
+ });
+
+ return code.replace('self.__WB_MANIFEST', JSON.stringify(manifestEntries));
+ }
+ }
+ };
+}
+
+function buildSWPlugin(opts: { devMode: boolean }): PluginOption {
let config: ResolvedConfig;
+ const devMode = opts.devMode;
+
+ const swObj: { code?: string, map?: rollup.SourceMap | null } = {};
+
+ async function build(action: 'generate' | 'write', additionalPlugins: rollup.Plugin[] = []) {
+ const includedPluginNames = [
+ 'vite:esbuild',
+ 'rollup-plugin-dynamic-import-variables',
+ 'vite:esbuild-transpile',
+ 'vite:terser'
+ ];
+ const plugins: rollup.Plugin[] = config.plugins.filter((p) => {
+ return includedPluginNames.includes(p.name);
+ });
+ const resolver = config.createResolver();
+ const resolvePlugin: rollup.Plugin = {
+ name: 'resolver',
+ resolveId(source, importer, _options) {
+ return resolver(source, importer);
+ }
+ };
+ plugins.unshift(resolvePlugin); // Put resolve first
+ plugins.push(
+ replace({
+ values: {
+ 'process.env.NODE_ENV': JSON.stringify(config.mode),
+ ...config.define
+ },
+ preventAssignment: true
+ })
+ );
+ if (additionalPlugins) {
+ plugins.push(...additionalPlugins);
+ }
+ const bundle = await rollup.rollup({
+ input: path.resolve(settings.clientServiceWorkerSource),
+ plugins
+ });
+
+ try {
+ return await bundle[action]({
+ file: path.resolve(buildOutputFolder, 'sw.js'),
+ format: 'es',
+ exports: 'none',
+ sourcemap: config.command === 'serve' || config.build.sourcemap,
+ inlineDynamicImports: true
+ });
+ } finally {
+ await bundle.close();
+ }
+ }
return {
- name: 'vaadin:transpile-sw',
+ name: 'vaadin:build-sw',
enforce: 'post',
- apply: 'build',
async configResolved(resolvedConfig) {
config = resolvedConfig;
},
async buildStart() {
- const includedPluginNames = [
- 'alias',
- 'vite:resolve',
- 'vite:esbuild',
- 'replace',
- 'vite:define',
- 'rollup-plugin-dynamic-import-variables',
- 'vite:esbuild-transpile',
- 'vite:terser',
- ]
- const plugins = config.plugins.filter((p) => includedPluginNames.includes(p.name))
- const bundle = await rollup.rollup({
- input: path.resolve(settings.clientServiceWorkerSource),
- plugins,
- })
- try {
- await bundle.write({
- format: 'es',
- exports: 'none',
- inlineDynamicImports: true,
- file: path.resolve(frontendBundleFolder, 'sw.js'),
- })
- } finally {
- await bundle.close()
+ if (devMode) {
+ const { output } = await build('generate');
+ swObj.code = output[0].code;
+ swObj.map = output[0].map;
}
},
- }
+ async load(id) {
+ if (id.endsWith('sw.js')) {
+ return '';
+ }
+ },
+ async transform(_code, id) {
+ if (id.endsWith('sw.js')) {
+ return swObj;
+ }
+ },
+ async closeBundle() {
+ if (!devMode) {
+ await build('write', [injectManifestToSWPlugin(), brotli()]);
+ }
+ }
+ };
}
-function injectManifestToSWPlugin(): PluginOption {
- const rewriteManifestIndexHtmlUrl = (manifest) => {
- const indexEntry = manifest.find((entry) => entry.url === 'index.html');
- if (indexEntry) {
- indexEntry.url = appShellUrl;
+function statsExtracterPlugin(): PluginOption {
+ function collectThemeJsonsInFrontend(themeJsonContents: Record, themeName: string) {
+ const themeJson = path.resolve(frontendFolder, settings.themeFolder, themeName, 'theme.json');
+ if (existsSync(themeJson)) {
+ const themeJsonContent = readFileSync(themeJson, { encoding: 'utf-8' }).replace(/\r\n/g, '\n');
+ themeJsonContents[themeName] = themeJsonContent;
+ const themeJsonObject = JSON.parse(themeJsonContent);
+ if (themeJsonObject.parent) {
+ collectThemeJsonsInFrontend(themeJsonContents, themeJsonObject.parent);
+ }
}
-
- return { manifest, warnings: [] };
}
return {
- name: 'vaadin:inject-manifest-to-sw',
+ name: 'vaadin:stats',
enforce: 'post',
- apply: 'build',
- async closeBundle() {
- await injectManifest({
- swSrc: path.resolve(frontendBundleFolder, 'sw.js'),
- swDest: path.resolve(frontendBundleFolder, 'sw.js'),
- globDirectory: frontendBundleFolder,
- globPatterns: ['**/*'],
- globIgnores: ['**/*.br'],
- injectionPoint: 'self.__WB_MANIFEST',
- manifestTransforms: [rewriteManifestIndexHtmlUrl],
- maximumFileSizeToCacheInBytes: 100 * 1024 * 1024 // 100mb,
+ async writeBundle(options: OutputOptions, bundle: { [fileName: string]: AssetInfo | ChunkInfo }) {
+ const modules = Object.values(bundle).flatMap((b) => (b.modules ? Object.keys(b.modules) : []));
+ const nodeModulesFolders = modules
+ .map((id) => id.replace(/\\/g, '/'))
+ .filter((id) => id.startsWith(nodeModulesFolder.replace(/\\/g, '/')))
+ .map((id) => id.substring(nodeModulesFolder.length + 1));
+ const npmModules = nodeModulesFolders
+ .map((id) => id.replace(/\\/g, '/'))
+ .map((id) => {
+ const parts = id.split('/');
+ if (id.startsWith('@')) {
+ return parts[0] + '/' + parts[1];
+ } else {
+ return parts[0];
+ }
+ })
+ .sort()
+ .filter((value, index, self) => self.indexOf(value) === index);
+ const npmModuleAndVersion = Object.fromEntries(npmModules.map((module) => [module, getVersion(module)]));
+ const cvdls = Object.fromEntries(
+ npmModules
+ .filter((module) => getCvdlName(module) != null)
+ .map((module) => [module, { name: getCvdlName(module), version: getVersion(module) }])
+ );
+
+ mkdirSync(path.dirname(statsFile), { recursive: true });
+ const projectPackageJson = JSON.parse(readFileSync(projectPackageJsonFile, { encoding: 'utf-8' }));
+
+ const entryScripts = Object.values(bundle)
+ .filter((bundle) => bundle.isEntry)
+ .map((bundle) => bundle.fileName);
+
+ const generatedIndexHtml = path.resolve(buildOutputFolder, 'index.html');
+ const customIndexData: string = readFileSync(projectIndexHtml, { encoding: 'utf-8' });
+ const generatedIndexData: string = readFileSync(generatedIndexHtml, {
+ encoding: 'utf-8'
+ });
+
+ const customIndexRows = new Set(customIndexData.split(/[\r\n]/).filter((row) => row.trim() !== ''));
+ const generatedIndexRows = generatedIndexData.split(/[\r\n]/).filter((row) => row.trim() !== '');
+
+ const rowsGenerated: string[] = [];
+ generatedIndexRows.forEach((row) => {
+ if (!customIndexRows.has(row)) {
+ rowsGenerated.push(row);
+ }
});
+
+ //After dev-bundle build add used Flow frontend imports JsModule/JavaScript/CssImport
+
+ const parseImports = (filename: string, result: Set): void => {
+ const content: string = readFileSync(filename, { encoding: 'utf-8' });
+ const lines = content.split('\n');
+ const staticImports = lines
+ .filter((line) => line.startsWith('import '))
+ .map((line) => line.substring(line.indexOf("'") + 1, line.lastIndexOf("'")))
+ .map((line) => (line.includes('?') ? line.substring(0, line.lastIndexOf('?')) : line));
+ const dynamicImports = lines
+ .filter((line) => line.includes('import('))
+ .map((line) => line.replace(/.*import\(/, ''))
+ .map((line) => line.split(/'/)[1])
+ .map((line) => (line.includes('?') ? line.substring(0, line.lastIndexOf('?')) : line));
+
+ staticImports.forEach((staticImport) => result.add(staticImport));
+
+ dynamicImports.map((dynamicImport) => {
+ const importedFile = path.resolve(path.dirname(filename), dynamicImport);
+ parseImports(importedFile, result);
+ });
+ };
+
+ const generatedImportsSet = new Set();
+ parseImports(
+ path.resolve(themeOptions.frontendGeneratedFolder, 'flow', 'generated-flow-imports.js'),
+ generatedImportsSet
+ );
+ const generatedImports = Array.from(generatedImportsSet).sort();
+
+ const frontendFiles: Record = {};
+
+ const projectFileExtensions = ['.js', '.js.map', '.ts', '.ts.map', '.tsx', '.tsx.map', '.css', '.css.map', '.'];
+
+ const isThemeComponentsResource = (id: string) =>
+ id.startsWith(themeOptions.frontendGeneratedFolder.replace(/\\/g, '/'))
+ && id.match(/.*\/jar-resources\/themes\/[^\/]+\/components\//);
+
+ const isGeneratedWebComponentResource = (id: string) =>
+ id.startsWith(themeOptions.frontendGeneratedFolder.replace(/\\/g, '/'))
+ && id.match(/.*\/flow\/web-components\//);
+
+ const isFrontendResourceCollected = (id: string) =>
+ !id.startsWith(themeOptions.frontendGeneratedFolder.replace(/\\/g, '/'))
+ || isThemeComponentsResource(id)
+ || isGeneratedWebComponentResource(id);
+
+ // collects project's frontend resources in frontend folder, excluding
+ // 'generated' sub-folder, except for legacy shadow DOM stylesheets
+ // packaged in `theme/components/` folder
+ // and generated web component resources in `flow/web-components` folder.
+ modules
+ .map((id) => id.replace(/\\/g, '/'))
+ .filter((id) => id.startsWith(frontendFolder.replace(/\\/g, '/')))
+ .filter(isFrontendResourceCollected)
+ .map((id) => id.substring(frontendFolder.length + 1))
+ .map((line: string) => (line.includes('?') ? line.substring(0, line.lastIndexOf('?')) : line))
+ .forEach((line: string) => {
+ // \r\n from windows made files may be used so change to \n
+ const filePath = path.resolve(frontendFolder, line);
+ if (projectFileExtensions.includes(path.extname(filePath))) {
+ const fileBuffer = readFileSync(filePath, { encoding: 'utf-8' }).replace(/\r\n/g, '\n');
+ frontendFiles[line] = createHash('sha256').update(fileBuffer, 'utf8').digest('hex');
+ }
+ });
+
+ // collects frontend resources from the JARs
+ generatedImports
+ .filter((line: string) => line.includes('generated/jar-resources'))
+ .forEach((line: string) => {
+ let filename = line.substring(line.indexOf('generated'));
+ // \r\n from windows made files may be used ro remove to be only \n
+ const fileBuffer = readFileSync(path.resolve(frontendFolder, filename), { encoding: 'utf-8' }).replace(
+ /\r\n/g,
+ '\n'
+ );
+ const hash = createHash('sha256').update(fileBuffer, 'utf8').digest('hex');
+
+ const fileKey = line.substring(line.indexOf('jar-resources/') + 14);
+ frontendFiles[fileKey] = hash;
+ });
+ // collects and hash rest of the Frontend resources excluding files in /generated/ and /themes/
+ // and files already in frontendFiles.
+ let frontendFolderAlias = "Frontend";
+ generatedImports
+ .filter((line: string) => line.startsWith(frontendFolderAlias + '/'))
+ .filter((line: string) => !line.startsWith(frontendFolderAlias + '/generated/'))
+ .filter((line: string) => !line.startsWith(frontendFolderAlias + '/themes/'))
+ .map((line) => line.substring(frontendFolderAlias.length + 1))
+ .filter((line: string) => !frontendFiles[line])
+ .forEach((line: string) => {
+ const filePath = path.resolve(frontendFolder, line);
+ if (projectFileExtensions.includes(path.extname(filePath)) && existsSync(filePath)) {
+ const fileBuffer = readFileSync(filePath, { encoding: 'utf-8' }).replace(/\r\n/g, '\n');
+ frontendFiles[line] = createHash('sha256').update(fileBuffer, 'utf8').digest('hex');
+ }
+ });
+ // If a index.ts exists hash it to be able to see if it changes.
+ if (existsSync(path.resolve(frontendFolder, 'index.ts'))) {
+ const fileBuffer = readFileSync(path.resolve(frontendFolder, 'index.ts'), { encoding: 'utf-8' }).replace(
+ /\r\n/g,
+ '\n'
+ );
+ frontendFiles[`index.ts`] = createHash('sha256').update(fileBuffer, 'utf8').digest('hex');
+ }
+
+ const themeJsonContents: Record = {};
+ const themesFolder = path.resolve(jarResourcesFolder, 'themes');
+ if (existsSync(themesFolder)) {
+ readdirSync(themesFolder).forEach((themeFolder) => {
+ const themeJson = path.resolve(themesFolder, themeFolder, 'theme.json');
+ if (existsSync(themeJson)) {
+ themeJsonContents[path.basename(themeFolder)] = readFileSync(themeJson, { encoding: 'utf-8' }).replace(
+ /\r\n/g,
+ '\n'
+ );
+ }
+ });
+ }
+
+ collectThemeJsonsInFrontend(themeJsonContents, settings.themeName);
+
+ let webComponents: string[] = [];
+ if (webComponentTags) {
+ webComponents = webComponentTags.split(';');
+ }
+
+ const stats = {
+ packageJsonDependencies: projectPackageJson.dependencies,
+ npmModules: npmModuleAndVersion,
+ bundleImports: generatedImports,
+ frontendHashes: frontendFiles,
+ themeJsonContents: themeJsonContents,
+ entryScripts,
+ webComponents,
+ cvdlModules: cvdls,
+ packageJsonHash: projectPackageJson?.vaadin?.hash,
+ indexHtmlGenerated: rowsGenerated
+ };
+ writeFileSync(statsFile, JSON.stringify(stats, null, 1));
}
- }
+ };
}
+function vaadinBundlesPlugin(): PluginOption {
+ type ExportInfo =
+ | string
+ | {
+ namespace?: string;
+ source: string;
+ };
-function updateTheme(contextPath: string) {
- const themePath = path.resolve(themeFolder);
- if (contextPath.startsWith(themePath)) {
- const changed = path.relative(themePath, contextPath);
+ type ExposeInfo = {
+ exports: ExportInfo[];
+ };
- console.debug('Theme file changed', changed);
+ type PackageInfo = {
+ version: string;
+ exposes: Record;
+ };
+
+ type BundleJson = {
+ packages: Record;
+ };
+
+ const disabledMessage = 'Vaadin component dependency bundles are disabled.';
+
+ const modulesDirectory = nodeModulesFolder.replace(/\\/g, '/');
+
+ let vaadinBundleJson: BundleJson;
- if (changed.startsWith(settings.themeName)) {
- processThemeResources(themeOptions, console);
+ function parseModuleId(id: string): { packageName: string; modulePath: string } {
+ const [scope, scopedPackageName] = id.split('/', 3);
+ const packageName = scope.startsWith('@') ? `${scope}/${scopedPackageName}` : scope;
+ const modulePath = `.${id.substring(packageName.length)}`;
+ return {
+ packageName,
+ modulePath
+ };
+ }
+
+ function getExports(id: string): string[] | undefined {
+ const { packageName, modulePath } = parseModuleId(id);
+ const packageInfo = vaadinBundleJson.packages[packageName];
+
+ if (!packageInfo) return;
+
+ const exposeInfo: ExposeInfo = packageInfo.exposes[modulePath];
+ if (!exposeInfo) return;
+
+ const exportsSet = new Set();
+ for (const e of exposeInfo.exports) {
+ if (typeof e === 'string') {
+ exportsSet.add(e);
+ } else {
+ const { namespace, source } = e;
+ if (namespace) {
+ exportsSet.add(namespace);
+ } else {
+ const sourceExports = getExports(source);
+ if (sourceExports) {
+ sourceExports.forEach((e) => exportsSet.add(e));
+ }
+ }
+ }
}
+ return Array.from(exportsSet);
+ }
+
+ function getExportBinding(binding: string) {
+ return binding === 'default' ? '_default as default' : binding;
}
+
+ function getImportAssigment(binding: string) {
+ return binding === 'default' ? 'default: _default' : binding;
+ }
+
+ return {
+ name: 'vaadin:bundles',
+ enforce: 'pre',
+ apply(config, { command }) {
+ if (command !== 'serve') return false;
+
+ try {
+ const vaadinBundleJsonPath = require.resolve('@vaadin/bundles/vaadin-bundle.json');
+ vaadinBundleJson = JSON.parse(readFileSync(vaadinBundleJsonPath, { encoding: 'utf8' }));
+ } catch (e: unknown) {
+ if (typeof e === 'object' && (e as { code: string }).code === 'MODULE_NOT_FOUND') {
+ vaadinBundleJson = { packages: {} };
+ console.info(`@vaadin/bundles npm package is not found, ${disabledMessage}`);
+ return false;
+ } else {
+ throw e;
+ }
+ }
+
+ const versionMismatches: Array<{ name: string; bundledVersion: string; installedVersion: string }> = [];
+ for (const [name, packageInfo] of Object.entries(vaadinBundleJson.packages)) {
+ let installedVersion: string | undefined = undefined;
+ try {
+ const { version: bundledVersion } = packageInfo;
+ const installedPackageJsonFile = path.resolve(modulesDirectory, name, 'package.json');
+ const packageJson = JSON.parse(readFileSync(installedPackageJsonFile, { encoding: 'utf8' }));
+ installedVersion = packageJson.version;
+ if (installedVersion && installedVersion !== bundledVersion) {
+ versionMismatches.push({
+ name,
+ bundledVersion,
+ installedVersion
+ });
+ }
+ } catch (_) {
+ // ignore package not found
+ }
+ }
+ if (versionMismatches.length) {
+ console.info(`@vaadin/bundles has version mismatches with installed packages, ${disabledMessage}`);
+ console.info(`Packages with version mismatches: ${JSON.stringify(versionMismatches, undefined, 2)}`);
+ vaadinBundleJson = { packages: {} };
+ return false;
+ }
+
+ return true;
+ },
+ async config(config) {
+ return mergeConfig(
+ {
+ optimizeDeps: {
+ exclude: [
+ // Vaadin bundle
+ '@vaadin/bundles',
+ ...Object.keys(vaadinBundleJson.packages),
+ '@vaadin/vaadin-material-styles'
+ ]
+ }
+ },
+ config
+ );
+ },
+ load(rawId) {
+ const [path, params] = rawId.split('?');
+ if (!path.startsWith(modulesDirectory)) return;
+
+ const id = path.substring(modulesDirectory.length + 1);
+ const bindings = getExports(id);
+ if (bindings === undefined) return;
+
+ const cacheSuffix = params ? `?${params}` : '';
+ const bundlePath = `@vaadin/bundles/vaadin.js${cacheSuffix}`;
+
+ return `import { init as VaadinBundleInit, get as VaadinBundleGet } from '${bundlePath}';
+await VaadinBundleInit('default');
+const { ${bindings.map(getImportAssigment).join(', ')} } = (await VaadinBundleGet('./node_modules/${id}'))();
+export { ${bindings.map(getExportBinding).join(', ')} };`;
+ }
+ };
}
-function runWatchDog(watchDogPort) {
- const client = net.Socket();
+function themePlugin(opts: { devMode: boolean }): PluginOption {
+ const fullThemeOptions = { ...themeOptions, devMode: opts.devMode };
+ return {
+ name: 'vaadin:theme',
+ config() {
+ processThemeResources(fullThemeOptions, console);
+ },
+ configureServer(server) {
+ function handleThemeFileCreateDelete(themeFile: string, stats?: Stats) {
+ if (themeFile.startsWith(themeFolder)) {
+ const changed = path.relative(themeFolder, themeFile);
+ console.debug('Theme file ' + (!!stats ? 'created' : 'deleted'), changed);
+ processThemeResources(fullThemeOptions, console);
+ }
+ }
+ server.watcher.on('add', handleThemeFileCreateDelete);
+ server.watcher.on('unlink', handleThemeFileCreateDelete);
+ },
+ handleHotUpdate(context) {
+ const contextPath = path.resolve(context.file);
+ const themePath = path.resolve(themeFolder);
+ if (contextPath.startsWith(themePath)) {
+ const changed = path.relative(themePath, contextPath);
+
+ console.debug('Theme file changed', changed);
+
+ if (changed.startsWith(settings.themeName)) {
+ processThemeResources(fullThemeOptions, console);
+ }
+ }
+ },
+ async resolveId(id, importer) {
+ // force theme generation if generated theme sources does not yet exist
+ // this may happen for example during Java hot reload when updating
+ // @Theme annotation value
+ if (
+ path.resolve(themeOptions.frontendGeneratedFolder, 'theme.js') === importer &&
+ !existsSync(path.resolve(themeOptions.frontendGeneratedFolder, id))
+ ) {
+ console.debug('Generate theme file ' + id + ' not existing. Processing theme resource');
+ processThemeResources(fullThemeOptions, console);
+ return;
+ }
+ if (!id.startsWith(settings.themeFolder)) {
+ return;
+ }
+ for (const location of [themeResourceFolder, frontendFolder]) {
+ const result = await this.resolve(path.resolve(location, id));
+ if (result) {
+ return result;
+ }
+ }
+ },
+ async transform(raw, id, options) {
+ // rewrite urls for the application theme css files
+ const [bareId, query] = id.split('?');
+ if (
+ (!bareId?.startsWith(themeFolder) && !bareId?.startsWith(themeOptions.themeResourceFolder)) ||
+ !bareId?.endsWith('.css')
+ ) {
+ return;
+ }
+ const resourceThemeFolder = bareId.startsWith(themeFolder) ? themeFolder : themeOptions.themeResourceFolder;
+ const [themeName] = bareId.substring(resourceThemeFolder.length + 1).split('/');
+ return rewriteCssUrls(raw, path.dirname(bareId), path.resolve(resourceThemeFolder, themeName), console, opts);
+ }
+ };
+}
+
+function runWatchDog(watchDogPort: number, watchDogHost: string | undefined) {
+ const client = new net.Socket();
client.setEncoding('utf8');
- client.on('error', function () {
- console.log('Watchdog connection error. Terminating vite process...');
+ client.on('error', function (err) {
+ console.log('Watchdog connection error. Terminating vite process...', err);
client.destroy();
process.exit(0);
});
client.on('close', function () {
client.destroy();
- runWatchDog(watchDogPort);
+ runWatchDog(watchDogPort, watchDogHost);
});
- client.connect(watchDogPort, 'localhost');
+ client.connect(watchDogPort, watchDogHost || 'localhost');
}
-let spaMiddlewareForceRemoved = false;
+const allowedFrontendFolders = [frontendFolder, nodeModulesFolder];
-const allowedFrontendFolders = [
- frontendFolder,
- addonFrontendFolder,
- path.resolve(addonFrontendFolder, '..', 'frontend'), // Contains only generated-flow-imports
- path.resolve(frontendFolder, '../node_modules')
-];
+function showRecompileReason(): PluginOption {
+ return {
+ name: 'vaadin:why-you-compile',
+ handleHotUpdate(context) {
+ console.log('Recompiling because', context.file, 'changed');
+ }
+ };
+}
+
+const DEV_MODE_START_REGEXP = /\/\*[\*!]\s+vaadin-dev-mode:start/;
+const DEV_MODE_CODE_REGEXP = /\/\*[\*!]\s+vaadin-dev-mode:start([\s\S]*)vaadin-dev-mode:end\s+\*\*\//i;
+
+function preserveUsageStats() {
+ return {
+ name: 'vaadin:preserve-usage-stats',
+
+ transform(src: string, id: string) {
+ if (id.includes('vaadin-usage-statistics')) {
+ if (src.includes('vaadin-dev-mode:start')) {
+ const newSrc = src.replace(DEV_MODE_START_REGEXP, '/*! vaadin-dev-mode:start');
+ if (newSrc === src) {
+ console.error('Comment replacement failed to change anything');
+ } else if (!newSrc.match(DEV_MODE_CODE_REGEXP)) {
+ console.error('New comment fails to match original regexp');
+ } else {
+ return { code: newSrc };
+ }
+ }
+ }
+
+ return { code: src };
+ }
+ };
+}
export const vaadinConfig: UserConfigFn = (env) => {
const devMode = env.mode === 'development';
+ const productionMode = !devMode && !devBundle
if (devMode && process.env.watchDogPort) {
// Open a connection with the Java dev-mode handler in order to finish
// vite when it exits or crashes.
- runWatchDog(process.env.watchDogPort);
+ runWatchDog(parseInt(process.env.watchDogPort), process.env.watchDogHost);
}
+
return {
- root: 'frontend',
+ root: frontendFolder,
base: '',
+ publicDir: false,
resolve: {
alias: {
- themes: themeFolder,
+ '@vaadin/flow-frontend': jarResourcesFolder,
Frontend: frontendFolder
- }
+ },
+ preserveSymlinks: true
},
define: {
- OFFLINE_PATH: settings.offlinePath
+ OFFLINE_PATH: settings.offlinePath,
+ VITE_ENABLED: 'true'
},
server: {
+ host: '127.0.0.1',
+ strictPort: true,
fs: {
- allow: allowedFrontendFolders,
+ allow: allowedFrontendFolders
}
},
build: {
- outDir: frontendBundleFolder,
+ minify: productionMode,
+ outDir: buildOutputFolder,
+ emptyOutDir: devBundle,
assetsDir: 'VAADIN/build',
rollupOptions: {
input: {
- indexhtml: path.resolve(frontendFolder, 'index.html')
+ indexhtml: projectIndexHtml,
+
+ ...(hasExportedWebComponents ? { webcomponenthtml: path.resolve(frontendFolder, 'web-component.html') } : {})
+ },
+ onwarn: (warning: rollup.RollupLog, defaultHandler: rollup.LoggingFunction) => {
+ const ignoreEvalWarning = [
+ 'generated/jar-resources/FlowClient.js',
+ 'generated/jar-resources/vaadin-spreadsheet/spreadsheet-export.js',
+ '@vaadin/charts/src/helpers.js'
+ ];
+ if (warning.code === 'EVAL' && warning.id && !!ignoreEvalWarning.find((id) => warning.id?.endsWith(id))) {
+ return;
+ }
+ defaultHandler(warning);
}
}
},
+ optimizeDeps: {
+ entries: [
+ // Pre-scan entrypoints in Vite to avoid reloading on first open
+ 'generated/vaadin.ts'
+ ],
+ exclude: [
+ '@vaadin/router',
+ '@vaadin/vaadin-license-checker',
+ '@vaadin/vaadin-usage-statistics',
+ 'workbox-core',
+ 'workbox-precaching',
+ 'workbox-routing',
+ 'workbox-strategies'
+ ]
+ },
plugins: [
- !devMode && brotli(),
- settings.pwaEnabled && transpileSWPlugin(),
- settings.pwaEnabled && injectManifestToSWPlugin(),
+ productionMode && brotli(),
+ devMode && vaadinBundlesPlugin(),
+ devMode && showRecompileReason(),
+ settings.offlineEnabled && buildSWPlugin({ devMode }),
+ !devMode && statsExtracterPlugin(),
+ !productionMode && preserveUsageStats(),
+ themePlugin({ devMode }),
+ postcssLit({
+ include: ['**/*.css', /.*\/.*\.css\?.*/],
+ exclude: [
+ `${themeFolder}/**/*.css`,
+ new RegExp(`${themeFolder}/.*/.*\\.css\\?.*`),
+ `${themeResourceFolder}/**/*.css`,
+ new RegExp(`${themeResourceFolder}/.*/.*\\.css\\?.*`),
+ new RegExp('.*/.*\\?html-proxy.*')
+ ]
+ }),
+ // The React plugin provides fast refresh and debug source info
+ reactPlugin({
+ include: '**/*.tsx',
+ babel: {
+ // We need to use babel to provide the source information for it to be correct
+ // (otherwise Babel will slightly rewrite the source file and esbuild generate source info for the modified file)
+ presets: [['@babel/preset-react', { runtime: 'automatic', development: !productionMode }]],
+ // React writes the source location for where components are used, this writes for where they are defined
+ plugins: [
+ !productionMode && addFunctionComponentSourceLocationBabel(),
+ [
+ 'module:@preact/signals-react-transform',
+ {
+ mode: 'all' // Needed to include translations which do not use something.value
+ }
+ ]
+ ].filter(Boolean)
+ }
+ }),
{
- name: 'vaadin:custom-theme',
- config() {
- processThemeResources(themeOptions, console);
+ name: 'vaadin:force-remove-html-middleware',
+ configureServer(server) {
+ return () => {
+ server.middlewares.stack = server.middlewares.stack.filter((mw) => {
+ const handleName = `${mw.handle}`;
+ return !handleName.includes('viteHtmlFallbackMiddleware');
+ });
+ };
},
- handleHotUpdate(context) {
- updateTheme(path.resolve(context.file));
- }
},
- {
- name: 'vaadin:force-remove-spa-middleware',
+ hasExportedWebComponents && {
+ name: 'vaadin:inject-entrypoints-to-web-component-html',
transformIndexHtml: {
- enforce: 'pre',
- transform(_html, { server }) {
- if (server && !spaMiddlewareForceRemoved) {
- server.middlewares.stack = server.middlewares.stack.filter((mw) => {
- const handleName = '' + mw.handle;
- return !handleName.includes('viteSpaFallbackMiddleware');
- });
- spaMiddlewareForceRemoved = true;
+ order: 'pre',
+ handler(_html, { path, server }) {
+ if (path !== '/web-component.html') {
+ return;
}
+
+ return [
+ {
+ tag: 'script',
+ attrs: { type: 'module', src: `/generated/vaadin-web-component.ts` },
+ injectTo: 'head'
+ }
+ ];
}
}
},
{
- name: 'vaadin:inject-entrypoint-script',
+ name: 'vaadin:inject-entrypoints-to-index-html',
transformIndexHtml: {
- enforce: 'pre',
- transform(_html, { path, server }) {
+ order: 'pre',
+ handler(_html, { path, server }) {
if (path !== '/index.html') {
return;
}
- if (devMode) {
- const basePath = server?.config.base ?? '';
- return [
- {
- tag: 'script',
- attrs: { type: 'module', src: `${basePath}generated/vite-devmode.ts` },
- injectTo: 'head',
- },
- {
- tag: 'script',
- attrs: { type: 'module', src: `${basePath}generated/vaadin.ts` },
- injectTo: 'head',
- }
- ]
- }
+ const scripts = [];
- return [
- {
+ if (devMode) {
+ scripts.push({
tag: 'script',
- attrs: { type: 'module', src: './generated/vaadin.ts' },
- injectTo: 'head',
- }
- ]
- },
- },
+ attrs: { type: 'module', src: `/generated/vite-devmode.ts`, onerror: "document.location.reload()" },
+ injectTo: 'head'
+ });
+ }
+ scripts.push({
+ tag: 'script',
+ attrs: { type: 'module', src: '/generated/vaadin.ts' },
+ injectTo: 'head'
+ });
+ return scripts;
+ }
+ }
},
checker({
typescript: true
- })
+ }),
+ productionMode && visualizer({ brotliSize: true, filename: bundleSizeFile })
+ , vitePluginFileSystemRouter({isDevMode: devMode})
]
};
};
@@ -260,3 +862,11 @@ export const vaadinConfig: UserConfigFn = (env) => {
export const overrideVaadinConfig = (customConfig: UserConfigFn) => {
return defineConfig((env) => mergeConfig(vaadinConfig(env), customConfig(env)));
};
+function getVersion(module: string): string {
+ const packageJson = path.resolve(nodeModulesFolder, module, 'package.json');
+ return JSON.parse(readFileSync(packageJson, { encoding: 'utf-8' })).version;
+}
+function getCvdlName(module: string): string {
+ const packageJson = path.resolve(nodeModulesFolder, module, 'package.json');
+ return JSON.parse(readFileSync(packageJson, { encoding: 'utf-8' })).cvdlName;
+}
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 24715ca..0000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * This file contains project specific customizations for the webpack build.
- * It is autogenerated if it didn't exist or if it was made for an older
- * incompatible version.
- *
- * Defaults are provided in an autogenerated webpack.generated.js file and used by this file.
- * The webpack.generated.js file is overwritten on each build and no customization can be done there.
- */
-const merge = require('webpack-merge');
-const flowDefaults = require('./webpack.generated.js');
-
-/**
- * To change the webpack config, add a new configuration object in
- * the merge arguments below:
- */
-module.exports = merge(flowDefaults,
- // Override default configuration
- // {
- // mode: 'development',
- // devtool: 'inline-source-map',
- // },
-
- // Add a custom plugin
- // (install the plugin with `npm install --save-dev webpack-bundle-analyzer`)
- // {
- // plugins: [
- // new require('webpack-bundle-analyzer').BundleAnalyzerPlugin({
- // analyzerMode: 'static'
- // })
- // ]
- // },
-);
-