Skip to content

The Unified and Autonomous Development Platform

fix: Push nuget package issue (#1772)

Robin Shen52eb201f4b50
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/rest/resource/BuildLogResource.java
rename to server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java
index 31da1804e7..6848c1f9ff 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java
@@ -17,7 +17,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import java.io.IOException;
import java.io.OutputStream;
@@ -26,14 +25,14 @@ import java.nio.ByteBuffer;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
-@Api(order=4200, description="In most cases, build log resource is operated with build id, which is different from build number. "
+@Api(order=4200, description="Build log stream resource is operated with build id, which is different from build number. "
+ "To get build id of a particular build number, use the <a href='/~help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
+ "instance <code>&quot;Number&quot; is &quot;projectName#100&quot;</code>")
-@Path("/build-logs")
+@Path("/streaming/build-logs")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
@Singleton
-public class BuildLogResource {
+public class BuildLogStreamResource {
private static final int MAX_LOG_ENTRIES = 1000;
@@ -46,16 +45,16 @@ public class BuildLogResource {
private final SessionManager sessionManager;
@Inject
- public BuildLogResource(BuildManager buildManager, LogManager logManager,
- ObjectMapper objectMapper, SessionManager sessionManager) {
+ public BuildLogStreamResource(BuildManager buildManager, LogManager logManager,
+ ObjectMapper objectMapper, SessionManager sessionManager) {
this.buildManager = buildManager;
this.logManager = logManager;
this.objectMapper = objectMapper;
this.sessionManager = sessionManager;
}
- @Api(order=200, description = "Streaming build log of specified build")
- @Path("/{buildId}/streaming")
+ @Api(order=200, description = "Streaming log of specified build")
+ @Path("/{buildId}")
@GET
@Produces(APPLICATION_OCTET_STREAM)
public StreamingOutput downloadLog(@PathParam("buildId") Long buildId) {
diff --git a/server-core/src/main/java/io/onedev/server/util/SemanticVersion.java b/server-core/src/main/java/io/onedev/server/util/SemanticVersion.java
index 1d2f244c75..0e07f9a21c 100644
--- a/server-core/src/main/java/io/onedev/server/util/SemanticVersion.java
+++ b/server-core/src/main/java/io/onedev/server/util/SemanticVersion.java
@@ -403,7 +403,7 @@ public final class SemanticVersion implements Comparable<SemanticVersion> {
errPos = index;
return false;
}
- if (input[0] == '0' && pos - index > 1) { // Leading zero
+ if (input[index] == '0' && pos - index > 1) { // Leading zero
errPos = index;
return false;
}
@@ -437,7 +437,7 @@ public final class SemanticVersion implements Comparable<SemanticVersion> {
errPos = index;
return false;
}
- if (input[0] == '0' && pos - index > 1) { // Leading zero
+ if (input[index] == '0' && pos - index > 1) { // Leading zero
errPos = index;
return false;
}
@@ -471,7 +471,7 @@ public final class SemanticVersion implements Comparable<SemanticVersion> {
errPos = index;
return false;
}
- if (input[0] == '0' && pos - index > 1) { // Leading zero
+ if (input[index] == '0' && pos - index > 1) { // Leading zero
errPos = index;
return false;
}
diff --git a/server-core/src/test/java/io/onedev/server/util/SemanticVersionTest.java b/server-core/src/test/java/io/onedev/server/util/SemanticVersionTest.java
new file mode 100644
index 0000000000..645d507a0b
--- /dev/null
+++ b/server-core/src/test/java/io/onedev/server/util/SemanticVersionTest.java
@@ -0,0 +1,42 @@
+package io.onedev.server.util;
+
+import org.junit.Test;
+
+import java.text.ParseException;
+
+import static org.junit.Assert.*;
+
+public class SemanticVersionTest {
+
+ @Test
+ public void parseVersion() {
+ try {
+ new SemanticVersion("1.0.0");
+ new SemanticVersion("1.0.0.0");
+ new SemanticVersion("0.5.10");
+ new SemanticVersion("100.1000.10000.100000");
+ new SemanticVersion("0.5.10.2-alpha3+build4");
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+
+ try {
+ new SemanticVersion("00");
+ assertFalse(true);
+ } catch (ParseException e) {
+ }
+
+ try {
+ new SemanticVersion("1.02");
+ assertFalse(true);
+ } catch (ParseException e) {
+ }
+
+ try {
+ new SemanticVersion("1.0.4 build4");
+ assertFalse(true);
+ } catch (ParseException e) {
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java
index 877ffe29b2..9072fa493f 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackService.java
@@ -294,7 +294,7 @@ public class NugetPackService implements PackService {
}
}));
} catch (ParseException e) {
- logger.warn("Package version is not a SemVer v2 compatible");
+ logger.warn("Package version is not a SemVer v2 compatible version");
throw new ClientException(SC_BAD_REQUEST);
} finally {
FileUtils.deleteFile(tempFile);