apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-29 01:21:52 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #125 from gnodet/env-check

Browse Source 
Display warning in case of environment mismatch #122
This commit is contained in:
Peter Palaga
2020-10-22 16:25:25 +02:00
committed by GitHub
parent e20f19eaff 35467c4b11
commit aff9d8f222
4 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/src/main/java/org/jboss/fuse/mvnd/common/Message.java
View File

@@ -23,7 +23,9 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UTFDataFormatException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public abstract class Message {
@@ -37,11 +39,13 @@ public abstract class Message {
final List<String> args;
final String workingDir;
final String projectDir;
final Map<String, String> env;
public BuildRequest(List<String> args, String workingDir, String projectDir) {
public BuildRequest(List<String> args, String workingDir, String projectDir, Map<String, String> env) {
this.args = args;
this.workingDir = workingDir;
this.projectDir = projectDir;
this.env = env;
}
public List<String> getArgs() {
@@ -56,6 +60,10 @@ public abstract class Message {
return projectDir;
}
public Map<String, String> getEnv() {
return env;
}
@Override
public String toString() {
return "BuildRequest{" +
@@ -221,13 +229,15 @@ public abstract class Message {
List<String> args = readStringList(input);
String workingDir = readUTF(input);
String projectDir = readUTF(input);
return new BuildRequest(args, workingDir, projectDir);
Map<String, String> env = readStringMap(input);
return new BuildRequest(args, workingDir, projectDir, env);
}
private void writeBuildRequest(DataOutputStream output, BuildRequest value) throws IOException {
writeStringList(output, value.args);
writeUTF(output, value.workingDir);
writeUTF(output, value.projectDir);
writeStringMap(output, value.env);
}
private BuildEvent readBuildEvent(DataInputStream input) throws IOException {
@@ -283,6 +293,25 @@ public abstract class Message {
}
}
private Map<String, String> readStringMap(DataInputStream input) throws IOException {
LinkedHashMap<String, String> m = new LinkedHashMap<>();
int nb = input.readInt();
for (int i = 0; i < nb; i++) {
String k = readUTF(input);
String v = readUTF(input);
m.put(k, v);
}
return m;
}
private void writeStringMap(DataOutputStream output, Map<String, String> value) throws IOException {
output.writeInt(value.size());
for (Map.Entry<String, String> e : value.entrySet()) {
writeUTF(output, e.getKey());
writeUTF(output, e.getValue());
}
}
private static final String INVALID_BYTE = "Invalid byte";
private static final int UTF_BUFS_CHAR_CNT = 256;
private static final int UTF_BUFS_BYTE_CNT = UTF_BUFS_CHAR_CNT * 3;