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.

Sign up for GitHub

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

Convert org.pkl.core POJOs to record classes #808

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Convert org.pkl.core POJOs to record classes #808

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad61ac9
Convert `org.pkl.core` POJOs to `record` classes
KushalP Nov 13, 2024
19f3e15
Update pkl-core/src/main/java/org/pkl/core/Platform.java
bioball Nov 13, 2024
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
18 changes: 9 additions & 9 deletions pkl-core/src/main/java/org/pkl/core/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,21 @@ public String getSimpleName() {
return simpleName;
}

public static class SourceLocation implements Serializable {
public record SourceLocation(int startLine, int endLine) implements Serializable {
@Serial private static final long serialVersionUID = 0L;

private final int startLine;
private final int endLine;

public SourceLocation(int startLine, int endLine) {
this.startLine = startLine;
this.endLine = endLine;
}

/**
* @deprecated As of 0.28.0, replaced by {@link #startLine()}.
*/
@Deprecated(forRemoval = true)
public int getStartLine() {
return startLine;
}

/**
* @deprecated As of 0.28.0, replaced by {@link #endLine()}.
*/
@Deprecated(forRemoval = true)
public int getEndLine() {
return endLine;
}
Expand Down
20 changes: 6 additions & 14 deletions pkl-core/src/main/java/org/pkl/core/PklInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,12 @@ public PackageIndex getPackageIndex() {
return packageIndex;
}

/** A Pkl package index. */
public static final class PackageIndex {
private final String homepage;

/** Constructs a {@link PackageIndex}. */
public PackageIndex(String homepage) {
this.homepage = homepage;
}

/** The homepage of this package index. */
public String homepage() {
return homepage;
}

/**
* A Pkl package index.
*
* @param homepage The homepage of this package index.
*/
public record PackageIndex(String homepage) {
/** Returns the homepage of the given package. */
public String getPackagePage(String packageName, String packageVersion) {
return homepage + packageName + "/" + packageVersion + "/";
Expand Down
261 changes: 43 additions & 218 deletions pkl-core/src/main/java/org/pkl/core/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@

import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.TruffleOptions;
import java.util.Objects;
import org.graalvm.home.Version;

/**
* Information about the Pkl release that the current program runs on. This class is the Java
* equivalent of standard library module {@code pkl.platform}.
*/
public final class Platform {
public record Platform(
org.pkl.core.Platform.Language language,
org.pkl.core.Platform.Runtime runtime,
org.pkl.core.Platform.VirtualMachine virtualMachine,
org.pkl.core.Platform.OperatingSystem operatingSystem,
org.pkl.core.Platform.Processor processor) {
bioball marked this conversation as resolved.
Show resolved Hide resolved
private static final Platform CURRENT;

static {
Expand All @@ -49,225 +53,46 @@ public final class Platform {
new Processor(architecture));
}

private final Language language;
private final Runtime runtime;
private final VirtualMachine virtualMachine;
private final OperatingSystem operatingSystem;
private final Processor processor;

/** Constructs a platform. */
public Platform(
Language language,
Runtime runtime,
VirtualMachine virtualMachine,
OperatingSystem operatingSystem,
Processor processor) {
this.language = language;
this.runtime = runtime;
this.virtualMachine = virtualMachine;
this.operatingSystem = operatingSystem;
this.processor = processor;
}

/** The Pkl release that the current program runs on. */
public static Platform current() {
return CURRENT;
}

/** The language implementation of this platform. */
public Language language() {
return language;
}

/** The language runtime of this platform. */
public Runtime runtime() {
return runtime;
}

/** The virtual machine of this platform. */
public VirtualMachine virtualMachine() {
return virtualMachine;
}

/** The operating system of this platform. */
public OperatingSystem operatingSystem() {
return operatingSystem;
}

/** The processor of this platform. */
public Processor processor() {
return processor;
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof Platform other)) return false;
return language.equals(other.language)
&& runtime.equals(other.runtime)
&& virtualMachine.equals(other.virtualMachine)
&& operatingSystem.equals(other.operatingSystem)
&& processor.equals(other.processor);
}

@Override
public int hashCode() {
return Objects.hash(language, runtime, virtualMachine, operatingSystem, processor);
}

/** The language implementation of a platform. */
public static final class Language {
private final String version;

/** Constructs a {@link Language}. */
public Language(String version) {
this.version = version;
}

/** The version of this language implementation. */
public String version() {
return version;
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof Language other)) return false;
return version.equals(other.version);
}

@Override
public int hashCode() {
return version.hashCode();
}
}

/** The language runtime of a platform. */
public static final class Runtime {
private final String name;
private final String version;

/** Constructs a {@link Runtime}. */
public Runtime(String name, String version) {
this.name = name;
this.version = version;
}

/** The name of this language runtime. */
public String name() {
return name;
}

/** The version of this language runtime. */
public String version() {
return version;
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof Runtime other)) return false;
return name.equals(other.name) && version.equals(other.version);
}

@Override
public int hashCode() {
return Objects.hash(name, version);
}
}

/** The virtual machine of a platform. */
public static final class VirtualMachine {
private final String name;
private final String version;

/** Constructs a {@link VirtualMachine}. */
public VirtualMachine(String name, String version) {
this.name = name;
this.version = version;
}

/** The name of this virtual machine. */
public String name() {
return name;
}

/** The version of this virtual machine. */
public String version() {
return version;
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof VirtualMachine other)) return false;
return name.equals(other.name) && version.equals(other.version);
}

@Override
public int hashCode() {
return Objects.hash(name, version);
}
}

/** The operating system of a platform. */
public static final class OperatingSystem {
private final String name;
private final String version;

/** Constructs an {@link OperatingSystem}. */
public OperatingSystem(String name, String version) {
this.name = name;
this.version = version;
}

/** The name of this operating system. */
public String name() {
return name;
}

/** The version of this operating system. */
public String version() {
return version;
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof OperatingSystem other)) return false;
return name.equals(other.name) && version.equals(other.version);
}

@Override
public int hashCode() {
return Objects.hash(name, version);
}
}

/** The processor of a platform. */
public static final class Processor {
private final String architecture;

/** Constructs a {@link Processor}. */
public Processor(String architecture) {
this.architecture = architecture;
}

/** The instruction set architecture of this processor. */
public String architecture() {
return architecture;
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof Processor other)) return false;
return architecture.equals(other.architecture);
}

@Override
public int hashCode() {
return architecture.hashCode();
}
}
/**
* The language implementation of a platform.
*
* @param version the version of this language implementation
*/
public record Language(String version) {}

/**
* The language runtime of a platform.
*
* @param name the name of this language runtime.
* @param version the version of this language runtime.
*/
public record Runtime(String name, String version) {}

/**
* The virtual machine of a platform.
*
* @param name the name of this virtual machine.
* @param version the version of this virtual machine.
*/
public record VirtualMachine(String name, String version) {}

/**
* The operating system of a platform.
*
* @param name the name of this operating system.
* @param version the version of this operating system.
*/
public record OperatingSystem(String name, String version) {}

/**
* The processor of a platform.
*
* @param architecture the instruction set architecture of this processor.
*/
public record Processor(String architecture) {}
}
Loading