Skip to content

Commit

Permalink
Merge pull request #395 from alexarchambault/more-resolution-params
Browse files Browse the repository at this point in the history 
Expose more ResolutionParams fields in Java API
  • Loading branch information
@alexarchambault
alexarchambault authored Nov 11, 2024
2 parents e2b93f7 + 307e12d commit 3d091ae
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 114 deletions.
190 changes: 77 additions & 113 deletions interface/src/main/java/coursierapi/ResolutionParams.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public class ResolutionParams implements Serializable {
private boolean useSystemOsInfo;
private boolean useSystemJdkVersion;
private String scalaVersion;
private Boolean keepProvidedDependencies;
private Boolean forceDepMgmtVersions;
private Boolean enableDependencyOverrides;

private ResolutionParams() {
maxIterations = null;
Expand All @@ -23,129 +26,60 @@ private ResolutionParams() {
useSystemOsInfo = true;
useSystemJdkVersion = true;
scalaVersion = null;
keepProvidedDependencies = null;
forceDepMgmtVersions = null;
enableDependencyOverrides = null;
}

@Override
public boolean equals(Object obj) {
if (obj instanceof ResolutionParams) {
ResolutionParams other = (ResolutionParams) obj;
return Objects.equals(this.maxIterations, other.maxIterations) &&
this.forcedProperties.equals(other.forcedProperties) &&
this.profiles.equals(other.profiles) && this.exclusions.equals(other.exclusions) &&
Objects.equals(this.useSystemOsInfo, other.useSystemOsInfo) &&
Objects.equals(this.useSystemJdkVersion, other.useSystemJdkVersion) &&
Objects.equals(this.scalaVersion, other.scalaVersion);
}
return false;
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof ResolutionParams)) return false;
ResolutionParams that = (ResolutionParams) o;
return useSystemOsInfo == that.useSystemOsInfo &&
useSystemJdkVersion == that.useSystemJdkVersion &&
Objects.equals(maxIterations, that.maxIterations) &&
Objects.equals(forceVersions, that.forceVersions) &&
Objects.equals(forcedProperties, that.forcedProperties) &&
Objects.equals(profiles, that.profiles) &&
Objects.equals(exclusions, that.exclusions) &&
Objects.equals(scalaVersion, that.scalaVersion) &&
Objects.equals(keepProvidedDependencies, that.keepProvidedDependencies) &&
Objects.equals(forceDepMgmtVersions, that.forceDepMgmtVersions) &&
Objects.equals(enableDependencyOverrides, that.enableDependencyOverrides);
}

@Override
public int hashCode() {
return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + Objects.hashCode(maxIterations)) + forceVersions.hashCode()) + forcedProperties.hashCode()) + profiles.hashCode()) + exclusions.hashCode()) + Boolean.hashCode(useSystemOsInfo)) + Boolean.hashCode(useSystemJdkVersion)) + Objects.hashCode(scalaVersion);
return Objects.hash(
maxIterations,
forceVersions,
forcedProperties,
profiles,
exclusions,
useSystemOsInfo,
useSystemJdkVersion,
scalaVersion,
keepProvidedDependencies,
forceDepMgmtVersions,
enableDependencyOverrides);
}

@Override
public String toString() {
StringBuilder b = new StringBuilder("ResolutionParams(");
boolean needSep = false;
if (maxIterations != null) {
b.append("maxIterations=");
b.append(maxIterations.toString());
needSep = true;
}
if (!forceVersions.isEmpty()) {
if (needSep)
b.append(", ");
else
needSep = true;

b.append("forceVersions=[");
boolean first = true;
for (Map.Entry<Module, String> e : forceVersions.entrySet()) {
if (first)
first = false;
else
b.append(", ");
b.append(e.getKey().toString());
b.append(":");
b.append(e.getValue());
}
b.append("]");
}
if (!forcedProperties.isEmpty()) {
if (needSep)
b.append(", ");
else
needSep = true;

b.append("forcedProperties=[");
boolean first = true;
for (Map.Entry<String, String> e : forcedProperties.entrySet()) {
if (first)
first = false;
else
b.append(", ");
b.append(e.getKey());
b.append("=");
b.append(e.getValue());
}
b.append("]");
}
if (!profiles.isEmpty()) {
if (needSep)
b.append(", ");
else
needSep = true;

b.append("profiles=[");
boolean first = true;
for (String profile : profiles) {
if (first)
first = false;
else
b.append(", ");
b.append(profile);
}
b.append("]");
}
if (!exclusions.isEmpty()) {
if (needSep)
b.append(", ");
else
needSep = true;

b.append("exclusions=[");
boolean first = true;
for (Map.Entry<String, String> exclusion : exclusions) {
if (first)
first = false;
else
b.append(", ");
b.append(exclusion.getKey());
b.append(":");
b.append(exclusion.getValue());
}
b.append("]");
}

if (needSep)
b.append(", ");
else
needSep = true;

b.append("useSystemOsInfo=");
b.append(useSystemOsInfo);

b.append("useSystemJdkVersion=");
b.append(useSystemJdkVersion);

if (scalaVersion != null) {
b.append(", scalaVersion=");
b.append(scalaVersion);
}

b.append(")");
return b.toString();
return "ResolutionParams{" +
"maxIterations=" + maxIterations +
", forceVersions=" + forceVersions +
", forcedProperties=" + forcedProperties +
", profiles=" + profiles +
", exclusions=" + exclusions +
", useSystemOsInfo=" + useSystemOsInfo +
", useSystemJdkVersion=" + useSystemJdkVersion +
", scalaVersion='" + scalaVersion + '\'' +
", keepProvidedDependencies=" + keepProvidedDependencies +
", forceDepMgmtVersions=" + forceDepMgmtVersions +
", enableDependencyOverrides=" + enableDependencyOverrides +
'}';
}

public static ResolutionParams create() {
Expand All @@ -161,7 +95,10 @@ public static ResolutionParams of(ResolutionParams params) {
.withExclusions(params.exclusions)
.withUseSystemOsInfo(params.useSystemOsInfo)
.withUseSystemJdkVersion(params.useSystemJdkVersion)
.withScalaVersion(params.scalaVersion);
.withScalaVersion(params.scalaVersion)
.withKeepProvidedDependencies(params.keepProvidedDependencies)
.withForceDepMgmtVersions(params.forceDepMgmtVersions)
.withEnableDependencyOverrides(params.enableDependencyOverrides);
}

public ResolutionParams withMaxIterations(Integer maxIterations) {
Expand Down Expand Up @@ -245,6 +182,21 @@ public ResolutionParams withScalaVersion(String scalaVersion) {
return this;
}

public ResolutionParams withKeepProvidedDependencies(Boolean keepProvidedDependencies) {
this.keepProvidedDependencies = keepProvidedDependencies;
return this;
}

public ResolutionParams withForceDepMgmtVersions(Boolean forceDepMgmtVersions) {
this.forceDepMgmtVersions = forceDepMgmtVersions;
return this;
}

public ResolutionParams withEnableDependencyOverrides(Boolean enableDependencyOverrides) {
this.enableDependencyOverrides = enableDependencyOverrides;
return this;
}

public Integer getMaxIterations() {
return maxIterations;
}
Expand Down Expand Up @@ -276,4 +228,16 @@ public boolean getUseSystemJdkVersion() {
public String getScalaVersion() {
return scalaVersion;
}

public Boolean getKeepProvidedDependencies() {
return keepProvidedDependencies;
}

public Boolean getForceDepMgmtVersions() {
return forceDepMgmtVersions;
}

public Boolean getEnableDependencyOverrides() {
return enableDependencyOverrides;
}
}
8 changes: 7 additions & 1 deletion interface/src/main/scala/coursier/internal/api/ApiHelper.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package coursier.internal.api

import java.io.{File, OutputStreamWriter}
import java.lang.{Long => JLong}
import java.lang.{Boolean => JBoolean, Long => JLong}
import java.time.LocalDateTime
import java.{util => ju}
import java.util.concurrent.ExecutorService
Expand Down Expand Up @@ -257,6 +257,9 @@ object ApiHelper {
.withUseSystemOsInfo(params.useSystemOsInfo)
.withUseSystemJdkVersion(params.useSystemJdkVersion)
.withScalaVersion(params.scalaVersionOpt.orNull)
.withKeepProvidedDependencies(params.keepProvidedDependencies.map(b => b: JBoolean).orNull)
.withForceDepMgmtVersions(params.forceDepMgmtVersions.map(b => b: JBoolean).orNull)
.withEnableDependencyOverrides(params.enableDependencyOverrides.map(b => b: JBoolean).orNull)
}

def resolutionParams(params: coursierapi.ResolutionParams): ResolutionParams = {
Expand All @@ -271,6 +274,9 @@ object ApiHelper {
.withUseSystemOsInfo(params.getUseSystemOsInfo)
.withUseSystemJdkVersion(params.getUseSystemJdkVersion)
.withScalaVersionOpt(Option(params.getScalaVersion))
.withKeepProvidedDependencies(Option(params.getKeepProvidedDependencies).map(b => b: Boolean))
.withForceDepMgmtVersions(Option(params.getForceDepMgmtVersions).map(b => b: Boolean))
.withEnableDependencyOverrides(Option(params.getEnableDependencyOverrides).map(b => b: Boolean))
}

def cache(cache: coursierapi.Cache): FileCache[Task] = {
Expand Down
14 changes: 14 additions & 0 deletions interface/src/test/scala/coursierapi/ResolutionParamsTests.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ object ResolutionParamsTests extends TestSuite {
assert(params != ResolutionParams.create())
assert(params == params0)
}

test {
val params = ResolutionParams.create()
.withMaxIterations(31)
.forceVersion(Module.of("org", "foo"), "1.2")
.forceVersion(Module.of("org", "bzz"), "1.3")
.withKeepProvidedDependencies(false)
.withForceDepMgmtVersions(true)
.withEnableDependencyOverrides(true)
val params0 = ApiHelper.resolutionParams(ApiHelper.resolutionParams(params))

assert(params != ResolutionParams.create())
assert(params == params0)
}
}

}
Expand Down

0 comments on commit 3d091ae

Please sign in to comment.