diff --git a/changed_codeobjects.csv b/changed_codeobjects.csv new file mode 100644 index 000000000..a2c5b7ca2 --- /dev/null +++ b/changed_codeobjects.csv @@ -0,0 +1,2 @@ +Class Name,Method Name +DomainValidationService,validateDomainLogic diff --git a/opentelemetry-javaagent.jar b/opentelemetry-javaagent.jar deleted file mode 100644 index ce19e62c3..000000000 Binary files a/opentelemetry-javaagent.jar and /dev/null differ diff --git a/src/main/java/org/springframework/samples/petclinic/domain/DomainValidationService.java b/src/main/java/org/springframework/samples/petclinic/domain/DomainValidationService.java index bce1a8101..b2a8798aa 100644 --- a/src/main/java/org/springframework/samples/petclinic/domain/DomainValidationService.java +++ b/src/main/java/org/springframework/samples/petclinic/domain/DomainValidationService.java @@ -4,12 +4,17 @@ import io.opentelemetry.instrumentation.annotations.WithSpan; public class DomainValidationService { + + public void testFunc(){ + + } // Main method for domain validation logic @WithSpan public boolean validateDomainLogic(String usr) { String domain = normalizeDomainFormat("example.com"); if (isValidDomain(domain)) { + if (!containsRestrictedWords(domain) && isValidDomainSuffix(domain)) { if (isDomainAvailable(domain)) { saveValidationResults(domain, true, true); @@ -98,6 +103,7 @@ public class DomainValidationService { System.out.println("Notifying admin: " + notification); } + // Fake method to check if the domain is reserved private boolean isReservedDomain(String domain) { String[] reservedDomains = { "example.com", "localhost" }; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java index 66d1caeb9..6606bbf72 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java @@ -16,6 +16,8 @@ package org.springframework.samples.petclinic.owner; import io.opentelemetry.instrumentation.annotations.WithSpan; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import jakarta.validation.Valid; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -23,6 +25,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.samples.petclinic.domain.OwnerValidation; import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.springframework.web.ErrorResponse; @@ -51,6 +54,9 @@ class OwnerController { private OwnerValidation validator; + @PersistenceContext + private EntityManager entityManager; + public OwnerController(OwnerRepository clinicService) { this.owners = clinicService; @@ -94,6 +100,49 @@ class OwnerController { return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; } + @GetMapping("/owners/selects") + public String deathBySelects() throws NoSuchMethodException { + + // if (model!=null){ + // throw new RuntimeException(); + // + // } + var owner = this.owners.findById(3); + for (var pet : owner.getPets()){ + System.out.println(pet.getName()); + + } + return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; + + } + @GetMapping("/owners/inserts") + @Transactional + public String deathByInserts() throws NoSuchMethodException { + + var txn = entityManager.getTransaction(); + txn.begin(); + // if (model!=null){ + // throw new RuntimeException(); + // + // } + var owner = this.owners.findById(3); + for (int i=0;i<3000;i++){ + Pet pet = new Pet(); + PetType type = new PetType(); + type.setName("dog"); + type.setId(1); + pet.setType(type); + pet.setName("A"+i); + owner.addPet(pet); + } + + this.owners.save(owner); + txn.commit(); + //model.put("owner", owner); + + return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; + } + @PostMapping("/owners/new") public String processCreationForm(@Valid Owner owner, BindingResult result) { if (result.hasErrors()) { @@ -106,7 +155,7 @@ class OwnerController { this.owners.save(owner); validator.ValidateUserAccess("admin", "pwd", "fullaccess"); return "redirect:/owners/" + owner.getId(); - } + } @GetMapping("/owners/find") public String initFindForm() { diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java index 68b2cfe61..6fdfed349 100755 --- a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java @@ -87,7 +87,7 @@ public class Pet extends NamedEntity { return this.pet_vaccines; } - public void addVisit(Visit visit) { + public void addVisit(Visit visit) { getVisits().add(visit); }