From dcdd42677f9824b6fb98bd62dd36863ec1221c66 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 27 Jan 2012 17:04:35 +0000 Subject: [PATCH] add a rest method to validate id not already exists git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1236766 13f79535-47bb-0310-9956-ffa450edef68 --- .../ui/services/api/DataValidatorService.java | 50 +++++++++++++ .../api/DefaultDataValidatorService.java | 70 +++++++++++++++++++ .../resources/META-INF/spring-context.xml | 1 + .../main/webapp/js/archiva/repositories.js | 10 ++- 4 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java new file mode 100644 index 000000000..2d28f6723 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java @@ -0,0 +1,50 @@ +package org.apache.archiva.webapp.ui.services.api; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.archiva.rest.api.services.ArchivaRestServiceException; +import org.codehaus.plexus.redback.authorization.RedbackAuthorization; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +/** + * @author Olivier Lamy + * @since 1.4-M3 + */ +@Path( "/dataValidatorService/" ) +public interface DataValidatorService +{ + @Path( "managedRepositoryIdNotExists" ) + @GET + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) + @RedbackAuthorization( noRestriction = true ) + Boolean managedRepositoryIdNotExists( @QueryParam( "id" ) String id ) + throws ArchivaRestServiceException; + + @Path( "remoteRepositoryIdNotExists" ) + @GET + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) + @RedbackAuthorization( noRestriction = true ) + Boolean remoteRepositoryIdNotExists( @QueryParam( "id" ) String id ) + throws ArchivaRestServiceException; +} diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java new file mode 100644 index 000000000..d901770a9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java @@ -0,0 +1,70 @@ +package org.apache.archiva.webapp.ui.services.api; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.archiva.admin.model.RepositoryAdminException; +import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; +import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; +import org.apache.archiva.rest.api.services.ArchivaRestServiceException; +import org.springframework.stereotype.Service; + +import javax.inject.Inject; + +/** + * @author Olivier Lamy + * @since 1.4-M3 + */ +@Service( "dataValidatorService#rest" ) +public class DefaultDataValidatorService + implements DataValidatorService +{ + + @Inject + private ManagedRepositoryAdmin managedRepositoryAdmin; + + @Inject + private RemoteRepositoryAdmin remoteRepositoryAdmin; + + + public Boolean managedRepositoryIdNotExists( String id ) + throws ArchivaRestServiceException + { + try + { + return managedRepositoryAdmin.getManagedRepository( id ) == null; + } + catch ( RepositoryAdminException e ) + { + throw new ArchivaRestServiceException( e.getMessage() ); + } + } + + public Boolean remoteRepositoryIdNotExists( String id ) + throws ArchivaRestServiceException + { + try + { + return remoteRepositoryAdmin.getRemoteRepository( id ) == null; + } + catch ( RepositoryAdminException e ) + { + throw new ArchivaRestServiceException( e.getMessage() ); + } + } +} diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml index 4751faff4..bfd7209c3 100755 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml @@ -64,6 +64,7 @@ + diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js index 04dcee0e2..72d66c71f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js @@ -253,7 +253,14 @@ $(function() { cronExpression: { required: true, remote: { - url: "restServices/archivaServices/commonServices/validateCronExpression", // ?cronExpression="+$("#managed-repository-edit-form #cronExpression").val(), + url: "restServices/archivaServices/commonServices/validateCronExpression", + type: "get" + } + }, + id: { + required: true, + remote: { + url: "restServices/archivaUiServices/dataValidatorService/managedRepositoryIdNotExists", type: "get" } } @@ -263,6 +270,7 @@ $(function() { } }); validator.settings.messages["cronExpression"]=$.i18n.prop("cronExpression.notvalid"); + validator.settings.messages["id"]=$.i18n.prop("id.required.or.alreadyexists"); } ManagedRepositoriesViewModel=function(){ -- 2.39.5