Skip to content

Commit

Permalink
Revert "refactor: Remove Bloop4j as it seems not to be used at all"
Browse files Browse the repository at this point in the history
This reverts commit 2a4ee42.
  • Loading branch information
tgodzik committed Mar 27, 2024
1 parent 7653717 commit aecb40a
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 3 deletions.
109 changes: 109 additions & 0 deletions bloop-rifle/src/bloop/rifle/bloop4j/BloopExtraBuildParams.java
@@ -0,0 +1,109 @@
// from https://github.com/scalacenter/bloop/blob/f599f9bb4cbd63bac64eddf071e5283b27357db4/bloop4j/src/main/java/bloop/bloop4j/BloopExtraBuildParams.java

package bloop.rifle.bloop4j;

import java.util.List;
import org.eclipse.xtext.xbase.lib.Pure;
import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;

@SuppressWarnings("all")
public class BloopExtraBuildParams {
private Boolean ownsBuildFiles;

private String clientClassesRootDir;

private String semanticdbVersion;

private List<String> supportedScalaVersions;

@Pure
public Boolean getOwnsBuildFiles() {
return this.ownsBuildFiles;
}

public void setOwnsBuildFiles(final Boolean ownsBuildFiles) {
this.ownsBuildFiles = ownsBuildFiles;
}

@Pure
public String getClientClassesRootDir() {
return this.clientClassesRootDir;
}

public void setClientClassesRootDir(final String clientClassesRootDir) {
this.clientClassesRootDir = clientClassesRootDir;
}

@Pure
public String getSemanticdbVersion() {
return this.semanticdbVersion;
}

public void setSemanticdbVersion(final String semanticdbVersion) {
this.semanticdbVersion = semanticdbVersion;
}

@Pure
public List<String> getSupportedScalaVersions() {
return this.supportedScalaVersions;
}

public void setSupportedScalaVersions(final List<String> supportedScalaVersions) {
this.supportedScalaVersions = supportedScalaVersions;
}

@Override
@Pure
public String toString() {
ToStringBuilder b = new ToStringBuilder(this);
b.add("ownsBuildFiles", this.ownsBuildFiles);
b.add("clientClassesRootDir", this.clientClassesRootDir);
b.add("semanticdbVersion", this.semanticdbVersion);
b.add("supportedScalaVersions", this.supportedScalaVersions);
return b.toString();
}

@Override
@Pure
public boolean equals(final Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
BloopExtraBuildParams other = (BloopExtraBuildParams) obj;
if (this.ownsBuildFiles == null) {
if (other.ownsBuildFiles != null)
return false;
} else if (!this.ownsBuildFiles.equals(other.ownsBuildFiles))
return false;
if (this.clientClassesRootDir == null) {
if (other.clientClassesRootDir != null)
return false;
} else if (!this.clientClassesRootDir.equals(other.clientClassesRootDir))
return false;
if (this.semanticdbVersion == null) {
if (other.semanticdbVersion != null)
return false;
} else if (!this.semanticdbVersion.equals(other.semanticdbVersion))
return false;
if (this.supportedScalaVersions == null) {
if (other.supportedScalaVersions != null)
return false;
} else if (!this.supportedScalaVersions.equals(other.supportedScalaVersions))
return false;
return true;
}

@Override
@Pure
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((this.ownsBuildFiles== null) ? 0 : this.ownsBuildFiles.hashCode());
result = prime * result + ((this.clientClassesRootDir== null) ? 0 : this.clientClassesRootDir.hashCode());
result = prime * result + ((this.semanticdbVersion== null) ? 0 : this.semanticdbVersion.hashCode());
return prime * result + ((this.supportedScalaVersions== null) ? 0 : this.supportedScalaVersions.hashCode());
}
}
4 changes: 3 additions & 1 deletion bloop-rifle/src/bloop/rifle/internal/Operations.scala
Expand Up @@ -144,7 +144,9 @@ object Operations {
case s: BloopRifleConfig.Address.DomainSocket =>
val writeOutputToOpt0 =
if (bloopServerSupportsFileTruncating) Some(s.outputPath)
else None(Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0)
else None

(Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0)
}

val extraJavaOpts =
Expand Down
4 changes: 2 additions & 2 deletions bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala
Expand Up @@ -39,10 +39,10 @@ class SnailgunClient(openSocket: () => Socket) extends snailgun.Client {
catch {
case t: SocketException =>
logger.debug("Tracing an ignored socket exception...")
logger.trace(t)()
logger.trace(t)
case t: SocketExceptionLike =>
logger.debug("Tracing an ignored socket exception-like...")
logger.trace(t)()
logger.trace(t)
}
}
}
Expand Down

0 comments on commit aecb40a

Please sign in to comment.