Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#89 Removal of the spring-petclinic-monitoring module #96

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<module>spring-petclinic-config-server</module>
<module>spring-petclinic-discovery-server</module>
<module>spring-petclinic-api-gateway</module>
<module>spring-petclinic-monitoring</module>
<module>spring-petclinic-tracing-server</module>
</modules>

Expand Down Expand Up @@ -56,11 +55,6 @@
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.springframework.samples.petclinic.monitoring</groupId>
<artifactId>spring-petclinic-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions spring-petclinic-customers-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
</properties>

<dependencies>
<!-- Petclinic -->
<dependency>
<groupId>org.springframework.samples.petclinic.monitoring</groupId>
<artifactId>spring-petclinic-monitoring</artifactId>
</dependency>

<!-- Spring Boot -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Import;
import org.springframework.samples.petclinic.monitoring.MonitoringConfig;

/**
* @author Maciej Szarlinski
*/
@EnableDiscoveryClient
@SpringBootApplication
@Import(MonitoringConfig.class)
public class CustomersServiceApplication {

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.samples.petclinic.customers.model.Owner;
import org.springframework.samples.petclinic.customers.model.OwnerRepository;
import org.springframework.samples.petclinic.monitoring.Monitored;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
Expand All @@ -48,7 +46,6 @@ class OwnerResource {
*/
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
@Monitored
public void createOwner(@Valid @RequestBody Owner owner) {
ownerRepository.save(owner);
}
Expand All @@ -73,7 +70,6 @@ public List<Owner> findAll() {
* Update Owner
*/
@PutMapping(value = "/{ownerId}")
@Monitored
public Owner updateOwner(@PathVariable("ownerId") int ownerId, @Valid @RequestBody Owner ownerRequest) {
final Optional<Owner> owner = ownerRepository.findById(ownerId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.samples.petclinic.customers.model.*;
import org.springframework.samples.petclinic.monitoring.Monitored;
import org.springframework.web.bind.annotation.*;

import java.util.List;
Expand Down Expand Up @@ -48,7 +46,6 @@ public List<PetType> getPetTypes() {

@PostMapping("/owners/{ownerId}/pets")
@ResponseStatus(HttpStatus.NO_CONTENT)
@Monitored
public void processCreationForm(
@RequestBody PetRequest petRequest,
@PathVariable("ownerId") int ownerId) {
Expand All @@ -63,7 +60,6 @@ public void processCreationForm(

@PutMapping("/owners/*/pets/{petId}")
@ResponseStatus(HttpStatus.NO_CONTENT)
@Monitored
public void processUpdateForm(@RequestBody PetRequest petRequest) {
int petId = petRequest.getId();
Pet pet = findPetById(petId);
Expand Down
31 changes: 0 additions & 31 deletions spring-petclinic-monitoring/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.