Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-12-27 19:07:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: fix PMD code smells

Browse source 
Fix ControlStatementBraces, GuardLogStatement, DoubleBraceInitialization and UseUtilityClass patterns.

Signed-off-by: AleGTorres <ale.gtorres0710@gmail.com>
This commit is contained in:
AleGTorres 2025-11-25 23:59:06 -04:00
parent 8f08b38f2c
commit caf93b6a40
6 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
View file

@ -29,6 +29,10 @@ import org.springframework.context.annotation.ImportRuntimeHints;
@ImportRuntimeHints(PetClinicRuntimeHints.class)
public class PetClinicApplication {
private PetClinicApplication() {
// prevent instantiation
}
public static void main(String[] args) {
SpringApplication.run(PetClinicApplication.class, args);
}

3
src/main/java/org/springframework/samples/petclinic/owner/PetController.java
View file

@ -107,8 +107,9 @@ class PetController {
public String processCreationForm(Owner owner, @Valid Pet pet, BindingResult result,
RedirectAttributes redirectAttributes) {
if (StringUtils.hasText(pet.getName()) && pet.isNew() && owner.getPet(pet.getName(), true) != null)
if (StringUtils.hasText(pet.getName()) && pet.isNew() && owner.getPet(pet.getName(), true) != null) {
result.rejectValue("name", "duplicate", "already exists");
}
LocalDate currentDate = LocalDate.now();
if (pet.getBirthDate() != null && pet.getBirthDate().isAfter(currentDate)) {

8
src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java
View file

@ -32,11 +32,15 @@ import org.testcontainers.utility.DockerImageName;
@Configuration
public class MysqlTestApplication {
private MysqlTestApplication() {
// prevent instantiation
}
@ServiceConnection
@Profile("mysql")
@Bean
static MySQLContainer container() {
return new MySQLContainer(DockerImageName.parse("mysql:9.5"));
static MySQLContainer<?> container() {
return new MySQLContainer<>(DockerImageName.parse("mysql:9.5"));
}
public static void main(String[] args) {

18
src/test/java/org/springframework/samples/petclinic/PostgresIntegrationTests.java
View file

@ -110,7 +110,10 @@ public class PostgresIntegrationTests {
public void printProperties() {
for (EnumerablePropertySource<?> source : findPropertiesPropertySources()) {
log.info("PropertySource: " + source.getName());
if (log.isInfoEnabled()) {
log.info("PropertySource: " + source.getName());
}
String[] names = source.getPropertyNames();
Arrays.sort(names);
for (String name : names) {
@ -125,11 +128,14 @@ public class PostgresIntegrationTests {
assertNotNull(sourceProperty.toString(), "source property toString() returned null.");
String value = sourceProperty.toString();
if (resolved.equals(value)) {
log.info(name + "=" + resolved);
}
else {
log.info(name + "=" + value + " OVERRIDDEN to " + resolved);
if (log.isInfoEnabled()) {
if (resolved.equals(value)) {
log.info(name + "=" + resolved);
}
else {
log.info(name + "=" + value + " OVERRIDDEN to " + resolved);
}
}
}
}

19
src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
View file

@ -81,16 +81,15 @@ class PetTypeFormatterTests {
*/
private List<PetType> makePetTypes() {
List<PetType> petTypes = new ArrayList<>();
petTypes.add(new PetType() {
{
setName("Dog");
}
});
petTypes.add(new PetType() {
{
setName("Bird");
}
});
PetType dog = new PetType();
dog.setName("Dog");
petTypes.add(dog);
PetType bird = new PetType();
bird.setName("Bird");
petTypes.add(bird);
return petTypes;
}

6
src/test/java/org/springframework/samples/petclinic/system/I18nPropertiesSyncTest.java
View file

@ -56,8 +56,9 @@ public class I18nPropertiesSyncTest {
String line = lines.get(i).trim();
if (line.startsWith("//") || line.startsWith("@") || line.contains("log.")
|| line.contains("System.out"))
|| line.contains("System.out")) {
continue;
}
if (file.toString().endsWith(".html")) {
boolean hasLiteralText = HTML_TEXT_LITERAL.matcher(line).find();
@ -115,8 +116,9 @@ public class I18nPropertiesSyncTest {
String fileName = entry.getKey();
// We use fallback logic to include english strings, hence messages_en is not
// populated.
if (fileName.equals(baseFile) || fileName.equals("messages_en.properties"))
if (fileName.equals(baseFile) || fileName.equals("messages_en.properties")) {
continue;
}
Properties props = entry.getValue();
Set<String> missingKeys = new TreeSet<>(baseKeys);