starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-29 19:57:26 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Leverage basic Java 17 features (#451)

Browse Source 
- Refactor code to use the following basic Java 17 features:
  - pattern matching for instanceof
  - @Serial annotation
  - switch expressions
  - enhanced switch statements
  - StringBuilder.isEmpty()
- Replace two switch statements with simpler if statements.
- Rename a few local variables.
This commit is contained in:
translatenix
2024-04-25 12:52:28 -07:00
committed by GitHub
parent 3ab9e4184e
commit a7c7e51180
142 changed files with 1333 additions and 1798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkl-config-java/src/test/java/org/pkl/config/java/mapper/PObjectToDataObjectJavaxInjectTest.java
View File

@@ -91,9 +91,7 @@ public class PObjectToDataObjectJavaxInjectTest {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof Person)) return false;
var other = (Person) obj;
if (!(obj instanceof Person other)) return false;
return name.equals(other.name)
&& age == other.age
&& hobbies.equals(other.hobbies)
@@ -118,9 +116,7 @@ public class PObjectToDataObjectJavaxInjectTest {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof Address)) return false;
var other = (Address) obj;
if (!(obj instanceof Address other)) return false;
return street.equals(other.street) && zip == other.zip;
}
@@ -148,9 +144,7 @@ public class PObjectToDataObjectJavaxInjectTest {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof Pair)) return false;
var other = (Pair<?, ?>) obj;
if (!(obj instanceof Pair<?, ?> other)) return false;
return first.equals(other.first) && second.equals(other.second);
}

16
pkl-config-java/src/test/java/org/pkl/config/java/mapper/PObjectToDataObjectTest.java
View File

@@ -136,9 +136,7 @@ public class PObjectToDataObjectTest {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof Person)) return false;
var other = (Person) obj;
if (!(obj instanceof Person other)) return false;
return name.equals(other.name)
&& age == other.age
&& hobbies.equals(other.hobbies)
@@ -168,9 +166,7 @@ public class PObjectToDataObjectTest {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof PersonConstructoProperties)) return false;
var other = (PersonConstructoProperties) obj;
if (!(obj instanceof PersonConstructoProperties other)) return false;
return name.equals(other.name)
&& age == other.age
&& hobbies.equals(other.hobbies)
@@ -195,9 +191,7 @@ public class PObjectToDataObjectTest {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof Address)) return false;
var other = (Address) obj;
if (!(obj instanceof Address other)) return false;
return street.equals(other.street) && zip == other.zip;
}
@@ -225,9 +219,7 @@ public class PObjectToDataObjectTest {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof Pair)) return false;
var other = (Pair<?, ?>) obj;
if (!(obj instanceof Pair<?, ?> other)) return false;
return first.equals(other.first) && second.equals(other.second);
}

4
pkl-config-java/src/test/java/org/pkl/config/java/mapper/Person.java
View File

@@ -29,9 +29,7 @@ public class Person {
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) return true;
if (!(obj instanceof Person)) return false;
var other = (Person) obj;
if (!(obj instanceof Person other)) return false;
return name.equals(other.name) && age == other.age;
}