Loading bundles/es.core.p2/src/info/elexis/server/core/p2/jaxrs/P2Resource.java +16 −16 Original line number Diff line number Diff line package info.elexis.server.core.p2.jaxrs; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.eclipse.equinox.p2.operations.Update; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import info.elexis.server.core.p2.IProvisioner; import info.elexis.server.core.p2.internal.RepoInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; Loading @@ -28,29 +33,24 @@ public class P2Resource { @Path("updates") @ApiOperation(nickname = "checkUpdate", value = "check for available updates") public Response checkUpdates() { // Update[] possibleUpdates = ProvisioningHelper.getPossibleUpdates(); // List<String> resultList = Arrays.asList(possibleUpdates).stream().map(Update::toString) // .collect(Collectors.toList()); return Response.ok(null).build(); Collection<Update> availableUpdates = provisioner.getAvailableUpdates(); List<String> resultList = availableUpdates.stream().map(Update::toString).collect(Collectors.toList()); return Response.ok(resultList).build(); } @POST @Path("updates") @ApiOperation(nickname = "executeUpdate", value = "check for available updates") public Response executeUpdates() { // IStatus updateAllFeatures = ProvisioningHelper.updateAllFeatures(); // if (updateAllFeatures.isOK()) { // return Response.ok().build(); // } // return Response.ok().build(); return null; RepoInfo repositoryInfo = provisioner.getRepositoryInfo(); return Response.ok(repositoryInfo).build(); } @GET @Path("repositories") public Response listRepositories(@QueryParam("filter") String filter) { // return HTTPServiceHelper.doRepositoryList(filter); return null; public Response listRepositories() { RepoInfo repositoryInfo = provisioner.getRepositoryInfo(); return Response.ok(repositoryInfo).build(); } // @GET Loading features/es.openid.feature/p2.inf 0 → 100644 +4 −0 Original line number Diff line number Diff line properties.0.name = git-rev properties.0.value = REPLACE_WITH_GIT_REV properties.1.name = git-repo-url properties.1.value = REPLACE_WITH_GIT_REPO_URL No newline at end of file Loading
bundles/es.core.p2/src/info/elexis/server/core/p2/jaxrs/P2Resource.java +16 −16 Original line number Diff line number Diff line package info.elexis.server.core.p2.jaxrs; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.eclipse.equinox.p2.operations.Update; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import info.elexis.server.core.p2.IProvisioner; import info.elexis.server.core.p2.internal.RepoInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; Loading @@ -28,29 +33,24 @@ public class P2Resource { @Path("updates") @ApiOperation(nickname = "checkUpdate", value = "check for available updates") public Response checkUpdates() { // Update[] possibleUpdates = ProvisioningHelper.getPossibleUpdates(); // List<String> resultList = Arrays.asList(possibleUpdates).stream().map(Update::toString) // .collect(Collectors.toList()); return Response.ok(null).build(); Collection<Update> availableUpdates = provisioner.getAvailableUpdates(); List<String> resultList = availableUpdates.stream().map(Update::toString).collect(Collectors.toList()); return Response.ok(resultList).build(); } @POST @Path("updates") @ApiOperation(nickname = "executeUpdate", value = "check for available updates") public Response executeUpdates() { // IStatus updateAllFeatures = ProvisioningHelper.updateAllFeatures(); // if (updateAllFeatures.isOK()) { // return Response.ok().build(); // } // return Response.ok().build(); return null; RepoInfo repositoryInfo = provisioner.getRepositoryInfo(); return Response.ok(repositoryInfo).build(); } @GET @Path("repositories") public Response listRepositories(@QueryParam("filter") String filter) { // return HTTPServiceHelper.doRepositoryList(filter); return null; public Response listRepositories() { RepoInfo repositoryInfo = provisioner.getRepositoryInfo(); return Response.ok(repositoryInfo).build(); } // @GET Loading
features/es.openid.feature/p2.inf 0 → 100644 +4 −0 Original line number Diff line number Diff line properties.0.name = git-rev properties.0.value = REPLACE_WITH_GIT_REV properties.1.name = git-repo-url properties.1.value = REPLACE_WITH_GIT_REPO_URL No newline at end of file