JBEAP-26402: handle badly formatted artifact cache #540
Conversation
There was a problem hiding this comment.
Thanks @michpetrov. A couple of comments, plus could you port it to 1.1.x branch as well please?
| @@ -205,6 +205,9 @@ private void init() throws IOException { | |||
| final List<String> lines = Files.readAllLines(artifactLog); | |||
| for (String line : lines) { | |||
| final String[] splitLine = line.split(ArtifactCache.CACHE_LINE_SEPARATOR); | |||
| if (splitLine.length < 3) { | |||
| throw new MavenUniverseException("Bad record format"); | |||
There was a problem hiding this comment.
Can you add this to the translations in ProsperoLogger with a bit more context please. Maybe something like "Bad artifact record format in the cache descriptor: %s"
Also I think just a base IOException would be better, it has nothing to do with MavenUniverse
There was a problem hiding this comment.
If I add this to the logger what about the IOE in the catch block? I'd assume we want the top message to be the same, i.e. "can't read cache".
There was a problem hiding this comment.
ah good point, I remember why it was using MavenUniverseException. It's the top level catch that should have a more descriptive error message
There was a problem hiding this comment.
@spyrkob well what messages do you want me to change then?
There was a problem hiding this comment.
@michpetrov the one in throw new IOException("Unable to read cached items.", e); if you don't mind adding this to this PR
| Path newFolder = temp.newFolder().toPath(); | ||
| Files.createDirectories(newFolder.resolve(ArtifactCache.CACHE_FOLDER)); | ||
| Files.writeString(newFolder.resolve(ArtifactCache.CACHE_FOLDER).resolve(ArtifactCache.CACHE_FILENAME),"badformat"); | ||
| try { |
There was a problem hiding this comment.
you can use following instead
assertThatThrownBy(() -> { ArtifactCache.getInstance(newFolder)})
.isInstanceOf(IOException.class)
.hasMessageContaining("Bad record format");
michpetrov
force-pushed
the
jbeap-24602
branch
from
10e5755
to
71a6628
Compare
|
@spyrkob does this work? I'll port it to 1.1.x if there're no further requests. |
michpetrov
force-pushed
the
jbeap-24602
branch
from
71a6628
to
f602605
Compare
michpetrov
changed the title
Issue: JBEAP-26402