You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/11/22 15:37:20 UTC
svn commit: r1544553 - in /syncope/branches/1_1_X:
common/src/main/java/org/apache/syncope/common/to/
common/src/main/java/org/apache/syncope/common/util/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/...
Author: ilgrosso
Date: Fri Nov 22 14:37:20 2013
New Revision: 1544553
URL: http://svn.apache.org/r1544553
Log:
[SYNCOPE-431] Removing unnecessary debug statements from controllers' methods and enhancing ControllerHandler's debug statements
Added:
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ControllerHandler.java
- copied, changed from r1544534, syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/ControllerHandler.java
Removed:
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/ControllerHandler.java
Modified:
syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/EventCategoryTO.java
syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/util/LoggerEventUtils.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SelectedEventsPanel.java
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_pt_BR.properties
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractTransactionalController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnauthorizedRoleException.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnresolvedReferenceException.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java
syncope/branches/1_1_X/core/src/main/resources/restContext.xml
syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
Modified: syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/EventCategoryTO.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/EventCategoryTO.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/EventCategoryTO.java (original)
+++ syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/EventCategoryTO.java Fri Nov 22 14:37:20 2013
@@ -1,17 +1,20 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*/
package org.apache.syncope.common.to;
@@ -22,7 +25,7 @@ import javax.xml.bind.annotation.XmlType
import org.apache.syncope.common.AbstractBaseBean;
import org.apache.syncope.common.types.AuditElements;
-@XmlRootElement(name = "user")
+@XmlRootElement(name = "eventCategory")
@XmlType
public class EventCategoryTO extends AbstractBaseBean {
Modified: syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/util/LoggerEventUtils.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/util/LoggerEventUtils.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/util/LoggerEventUtils.java (original)
+++ syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/util/LoggerEventUtils.java Fri Nov 22 14:37:20 2013
@@ -1,17 +1,20 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*/
package org.apache.syncope.common.util;
Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java (original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java Fri Nov 22 14:37:20 2013
@@ -71,8 +71,8 @@ public class ReportletConfModalPage exte
private static final long serialVersionUID = 3910027601200382958L;
- private static final String[] EXCLUDE_PROPERTIES = new String[]{"serialVersionUID", "class", "name",
- "reportletClassName"};
+ private static final String[] EXCLUDE_PROPERTIES = new String[] { "serialVersionUID", "class", "name",
+ "reportletClassName" };
private AbstractReportletConf reportletConf;
@@ -104,30 +104,31 @@ public class ReportletConfModalPage exte
final AjaxDropDownChoicePanel<String> reportletClass = new AjaxDropDownChoicePanel<String>("reportletClass",
"reportletClass", new IModel<String>() {
- private static final long serialVersionUID = -2316468110411802130L;
+ private static final long serialVersionUID = -2316468110411802130L;
- @Override
- public String getObject() {
- return ReportletConfModalPage.this.reportletConf == null
+ @Override
+ public String getObject() {
+ return ReportletConfModalPage.this.reportletConf == null
? null
: ReportletConfModalPage.this.reportletConf.getClass().getName();
- }
+ }
- @Override
- public void setObject(final String object) {
- try {
- Class<?> reportletClass = Class.forName(object);
- ReportletConfModalPage.this.reportletConf = (AbstractReportletConf) reportletClass.newInstance();
- propertiesContainer.replace(buildPropView());
- } catch (Exception e) {
- LOG.error("Cannot find or initialize {}", object, e);
- }
- }
+ @Override
+ public void setObject(final String object) {
+ try {
+ Class<?> reportletClass = Class.forName(object);
+ ReportletConfModalPage.this.reportletConf = (AbstractReportletConf) reportletClass.
+ newInstance();
+ propertiesContainer.replace(buildPropView());
+ } catch (Exception e) {
+ LOG.error("Cannot find or initialize {}", object, e);
+ }
+ }
- @Override
- public void detach() {
- }
- });
+ @Override
+ public void detach() {
+ }
+ });
reportletClass.setStyleSheet("long_dynamicsize");
reportletClass.setChoices(reportRestClient.getReportletConfClasses());
((DropDownChoice) reportletClass.getField()).setNullValid(true);
@@ -254,15 +255,15 @@ public class ReportletConfModalPage exte
try {
field = ReportletConfModalPage.this.reportletConf.getClass().getDeclaredField(fieldName);
} catch (Exception e) {
- LOG.error("Could not find field {} in class {}", new Object[]{fieldName,
- ReportletConfModalPage.this.reportletConf.getClass(), e});
+ LOG.error("Could not find field {} in class {}",
+ fieldName, ReportletConfModalPage.this.reportletConf.getClass(), e);
}
if (field == null) {
return;
}
- BeanWrapper wrapper = PropertyAccessorFactory
- .forBeanPropertyAccess(ReportletConfModalPage.this.reportletConf);
+ BeanWrapper wrapper = PropertyAccessorFactory.
+ forBeanPropertyAccess(ReportletConfModalPage.this.reportletConf);
Panel panel;
@@ -333,7 +334,7 @@ public class ReportletConfModalPage exte
} else if (listItemType.isEnum()) {
panel = new CheckBoxMultipleChoiceFieldPanel("value", new PropertyModel(
ReportletConfModalPage.this.reportletConf, fieldName), new ListModel(Arrays
- .asList(listItemType.getEnumConstants())));
+ .asList(listItemType.getEnumConstants())));
} else {
if (((List) wrapper.getPropertyValue(fieldName)).isEmpty()) {
((List) wrapper.getPropertyValue(fieldName)).add(null);
@@ -341,7 +342,7 @@ public class ReportletConfModalPage exte
panel = new MultiValueSelectorPanel("value", new PropertyModel<List>(
ReportletConfModalPage.this.reportletConf, fieldName), buildSinglePanel(
- field.getType(), fieldName, "panel"));
+ field.getType(), fieldName, "panel"));
}
} else {
panel = buildSinglePanel(field.getType(), fieldName, "value");
Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java (original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java Fri Nov 22 14:37:20 2013
@@ -178,15 +178,13 @@ public class PoliciesPanel extends Panel
@Override
public void onClick(final AjaxRequestTarget target) {
try {
-
policyRestClient.delete(accountPolicyTO.getId(), accountPolicyTO.getClass());
info(getString(Constants.OPERATION_SUCCEEDED));
-
} catch (SyncopeClientCompositeErrorException e) {
error(getString(Constants.OPERATION_ERROR));
- LOG.error("While deleting resource {}({})", new Object[]{accountPolicyTO.getId(),
- accountPolicyTO.getDescription()}, e);
+ LOG.error("While deleting resource {}({})",
+ accountPolicyTO.getId(), accountPolicyTO.getDescription(), e);
}
target.add(container);
Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SelectedEventsPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SelectedEventsPanel.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SelectedEventsPanel.java (original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SelectedEventsPanel.java Fri Nov 22 14:37:20 2013
@@ -1,17 +1,20 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*/
package org.apache.syncope.console.pages.panels;
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_pt_BR.properties?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_pt_BR.properties (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/markup/html/CrontabContainer_pt_BR.properties Fri Nov 22 14:37:20 2013
@@ -1,17 +1,19 @@
-# Copyright 2013 The Apache Software Foundation.
+# 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
#
-# Licensed 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
#
-# 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.
-
+# 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.
selOpt1=N\u00E3o Agendado
selOpt2=A cada 5 minutos
selOpt3=Acionar \u00E0s 12\:00 todos os dias
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractController.java Fri Nov 22 14:37:20 2013
@@ -36,6 +36,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.TypeMismatchException;
import org.springframework.transaction.annotation.Transactional;
+/**
+ * Superclass for all controllers.
+ *
+ * @param <T> transfer object used for input / output
+ */
public abstract class AbstractController<T extends AbstractBaseBean> {
/**
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractTransactionalController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractTransactionalController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractTransactionalController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractTransactionalController.java Fri Nov 22 14:37:20 2013
@@ -21,6 +21,12 @@ package org.apache.syncope.core.rest.con
import org.apache.syncope.common.AbstractBaseBean;
import org.springframework.transaction.annotation.Transactional;
-@Transactional(rollbackFor = {Throwable.class})
-public abstract class AbstractTransactionalController<T extends AbstractBaseBean> extends AbstractController<T> {
+/**
+ * Adds Spring's transactional support to <tt>AbstractController</tt>.
+ *
+ * @param <T> transfer object used for input / output
+ * @see AbstractController
+ */
+@Transactional(rollbackFor = { Throwable.class })
+abstract class AbstractTransactionalController<T extends AbstractBaseBean> extends AbstractController<T> {
}
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java Fri Nov 22 14:37:20 2013
@@ -78,7 +78,6 @@ public class ConfigurationController ext
@RequestMapping(method = RequestMethod.POST, value = "/create")
public ConfigurationTO create(final HttpServletResponse response,
@RequestBody final ConfigurationTO configurationTO) {
- LOG.debug("Configuration create called with parameters {}", configurationTO);
SyncopeConf conf = binder.create(configurationTO);
conf = confDAO.save(conf);
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java Fri Nov 22 14:37:20 2013
@@ -82,8 +82,6 @@ public class ConnInstanceController exte
@PreAuthorize("hasRole('CONNECTOR_CREATE')")
@RequestMapping(method = RequestMethod.POST, value = "/create")
public ConnInstanceTO create(final HttpServletResponse response, @RequestBody final ConnInstanceTO connInstanceTO) {
- LOG.debug("ConnInstance create called with configuration {}", connInstanceTO);
-
ConnInstance connInstance = binder.getConnInstance(connInstanceTO);
try {
connInstance = connInstanceDAO.save(connInstance);
@@ -106,8 +104,6 @@ public class ConnInstanceController exte
@PreAuthorize("hasRole('CONNECTOR_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/update")
public ConnInstanceTO update(@RequestBody final ConnInstanceTO connInstanceTO) {
- LOG.debug("Connector update called with configuration {}", connInstanceTO);
-
ConnInstance connInstance = binder.updateConnInstance(connInstanceTO.getId(), connInstanceTO);
try {
connInstance = connInstanceDAO.save(connInstance);
@@ -348,8 +344,6 @@ public class ConnInstanceController exte
@PreAuthorize("hasRole('CONNECTOR_DELETE') and #bulkAction.operation == #bulkAction.operation.DELETE")
@RequestMapping(method = RequestMethod.POST, value = "/bulk")
public BulkActionRes bulkAction(@RequestBody final BulkAction bulkAction) {
- LOG.debug("Bulk action '{}' called on '{}'", bulkAction.getOperation(), bulkAction.getTargets());
-
BulkActionRes res = new BulkActionRes();
switch (bulkAction.getOperation()) {
Copied: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ControllerHandler.java (from r1544534, syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/ControllerHandler.java)
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ControllerHandler.java?p2=syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ControllerHandler.java&p1=syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/ControllerHandler.java&r1=1544534&r2=1544553&rev=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/ControllerHandler.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ControllerHandler.java Fri Nov 22 14:37:20 2013
@@ -1,26 +1,28 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*/
-package org.apache.syncope.core.services;
+package org.apache.syncope.core.rest.controller;
import java.lang.reflect.Method;
+import java.util.Arrays;
import org.apache.syncope.common.types.AuditElements;
import org.apache.syncope.core.audit.AuditManager;
import org.apache.syncope.core.notification.NotificationManager;
-import org.apache.syncope.core.rest.controller.AbstractController;
-import org.apache.syncope.core.rest.controller.UnresolvedReferenceException;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -61,8 +63,8 @@ public class ControllerHandler {
Object before = null;
try {
- LOG.debug("Before {}.{}({})",
- new Object[] {clazz.getSimpleName(), event, input == null || input.length == 0 ? "" : "..."});
+ LOG.debug("Before {}.{}({})", clazz.getSimpleName(), event,
+ input == null || input.length == 0 ? "" : Arrays.asList(input));
try {
before = ((AbstractController) joinPoint.getTarget()).resolveBeanReference(method, input);
@@ -73,7 +75,7 @@ public class ControllerHandler {
output = joinPoint.proceed();
result = AuditElements.Result.SUCCESS;
- LOG.debug("After returning {}.{}", clazz.getSimpleName(), event);
+ LOG.debug("After returning {}.{}: {}", clazz.getSimpleName(), event, output);
return output;
} catch (Throwable t) {
output = t;
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java Fri Nov 22 14:37:20 2013
@@ -81,15 +81,12 @@ public class NotificationController exte
@PreAuthorize("hasRole('NOTIFICATION_CREATE')")
public NotificationTO createInternal(final NotificationTO notificationTO) {
- LOG.debug("Notification create called with parameter {}", notificationTO);
return binder.getNotificationTO(notificationDAO.save(binder.createNotification(notificationTO)));
}
@PreAuthorize("hasRole('NOTIFICATION_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/update")
public NotificationTO update(@RequestBody final NotificationTO notificationTO) {
- LOG.debug("ConnNotificationtor update called with parameter {}", notificationTO);
-
Notification notification = notificationDAO.find(notificationTO.getId());
if (notification == null) {
LOG.error("Could not find notification '" + notificationTO.getId() + "'");
@@ -124,6 +121,7 @@ public class NotificationController exte
@Override
protected NotificationTO resolveReference(final Method method, final Object... args)
throws UnresolvedReferenceException {
+
Long id = null;
if (ArrayUtils.isNotEmpty(args)) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java Fri Nov 22 14:37:20 2013
@@ -76,12 +76,10 @@ public class PolicyController extends Ab
@PreAuthorize("hasRole('POLICY_CREATE')")
public <T extends PolicyTO> T createInternal(final T policyTO) {
- LOG.debug("Creating policy " + policyTO);
return binder.getPolicyTO(policyDAO.save(binder.getPolicy(null, policyTO)));
}
private <T extends PolicyTO, K extends Policy> T update(final T policyTO, final K policy) {
- LOG.debug("Updating policy " + policyTO);
binder.getPolicy(policy, policyTO);
K savedPolicy = policyDAO.save(policy);
return binder.getPolicyTO(savedPolicy);
@@ -123,7 +121,6 @@ public class PolicyController extends Ab
@PreAuthorize("hasRole('POLICY_LIST')")
@RequestMapping(method = RequestMethod.GET, value = "/{kind}/list")
public List<PolicyTO> list(@PathVariable("kind") final String kind) {
- LOG.debug("Listing policies");
List<? extends Policy> policies = policyDAO.find(PolicyType.valueOf(kind.toUpperCase(Locale.ENGLISH)));
final List<PolicyTO> policyTOs = new ArrayList<PolicyTO>();
@@ -137,8 +134,6 @@ public class PolicyController extends Ab
@PreAuthorize("hasRole('POLICY_READ')")
@RequestMapping(method = RequestMethod.GET, value = "/password/global/read")
public PasswordPolicyTO getGlobalPasswordPolicy() {
- LOG.debug("Reading global password policy");
-
PasswordPolicy policy = policyDAO.getGlobalPasswordPolicy();
if (policy == null) {
throw new NotFoundException("No password policy found");
@@ -150,8 +145,6 @@ public class PolicyController extends Ab
@PreAuthorize("hasRole('POLICY_READ')")
@RequestMapping(method = RequestMethod.GET, value = "/account/global/read")
public AccountPolicyTO getGlobalAccountPolicy() {
- LOG.debug("Reading global account policy");
-
AccountPolicy policy = policyDAO.getGlobalAccountPolicy();
if (policy == null) {
throw new NotFoundException("No account policy found");
@@ -163,8 +156,6 @@ public class PolicyController extends Ab
@PreAuthorize("hasRole('POLICY_READ')")
@RequestMapping(method = RequestMethod.GET, value = "/sync/global/read")
public SyncPolicyTO getGlobalSyncPolicy() {
- LOG.debug("Reading global sync policy");
-
SyncPolicy policy = policyDAO.getGlobalSyncPolicy();
if (policy == null) {
throw new NotFoundException("No sync policy found");
@@ -176,8 +167,6 @@ public class PolicyController extends Ab
@PreAuthorize("hasRole('POLICY_READ')")
@RequestMapping(method = RequestMethod.GET, value = "/read/{id}")
public <T extends PolicyTO> T read(@PathVariable("id") final Long id) {
- LOG.debug("Reading policy with id {}", id);
-
Policy policy = policyDAO.find(id);
if (policy == null) {
throw new NotFoundException("Policy " + id + " not found");
@@ -211,8 +200,9 @@ public class PolicyController extends Ab
* {@inheritDoc}
*/
@Override
- protected PolicyTO resolveReference(final Method method, final Object... args) throws
- UnresolvedReferenceException {
+ protected PolicyTO resolveReference(final Method method, final Object... args)
+ throws UnresolvedReferenceException {
+
Long id = null;
if (ArrayUtils.isNotEmpty(args)) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java Fri Nov 22 14:37:20 2013
@@ -103,8 +103,6 @@ public class ReportController extends Ab
@PreAuthorize("hasRole('REPORT_CREATE')")
public ReportTO createInternal(final ReportTO reportTO) {
- LOG.debug("Creating report " + reportTO);
-
Report report = new Report();
binder.getReport(report, reportTO);
report = reportDAO.save(report);
@@ -128,8 +126,6 @@ public class ReportController extends Ab
@PreAuthorize("hasRole('REPORT_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/update")
public ReportTO update(@RequestBody final ReportTO reportTO) {
- LOG.debug("Report update called with parameter {}", reportTO);
-
Report report = reportDAO.find(reportTO.getId());
if (report == null) {
throw new NotFoundException("Report " + reportTO.getId());
@@ -250,8 +246,6 @@ public class ReportController extends Ab
public void exportExecutionResultInternal(final OutputStream os, final ReportExec reportExec,
final ReportExecExportFormat format) {
- LOG.debug("Exporting result of {} as {}", reportExec, format);
-
// streaming SAX handler from a compressed byte array stream
ByteArrayInputStream bais = new ByteArrayInputStream(reportExec.getExecResult());
ZipInputStream zis = new ZipInputStream(bais);
@@ -261,7 +255,7 @@ public class ReportController extends Ab
Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
pipeline.addComponent(new XMLGenerator(zis));
-
+
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("status", reportExec.getStatus());
parameters.put("message", reportExec.getMessage());
@@ -341,10 +335,6 @@ public class ReportController extends Ab
throw new NotFoundException("Report " + reportId);
}
- ReportExecTO result;
-
- LOG.debug("Triggering new execution of report {}", report);
-
try {
jobInstanceLoader.registerJob(report);
@@ -361,7 +351,7 @@ public class ReportController extends Ab
throw scce;
}
- result = new ReportExecTO();
+ ReportExecTO result = new ReportExecTO();
result.setReport(reportId);
result.setStartDate(new Date());
result.setStatus(ReportExecStatus.STARTED.name());
@@ -401,8 +391,9 @@ public class ReportController extends Ab
* {@inheritDoc}
*/
@Override
- protected ReportTO resolveReference(final Method method, final Object... args) throws
- UnresolvedReferenceException {
+ protected ReportTO resolveReference(final Method method, final Object... args)
+ throws UnresolvedReferenceException {
+
Long id = null;
if (ArrayUtils.isNotEmpty(args) && ("create".equals(method.getName())
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java Fri Nov 22 14:37:20 2013
@@ -102,8 +102,6 @@ public class ResourceController extends
@PreAuthorize("hasRole('RESOURCE_CREATE')")
@RequestMapping(method = RequestMethod.POST, value = "/create")
public ResourceTO create(final HttpServletResponse response, @RequestBody final ResourceTO resourceTO) {
- LOG.debug("Resource creation: {}", resourceTO);
-
if (StringUtils.isBlank(resourceTO.getName())) {
SyncopeClientCompositeErrorException sccee =
new SyncopeClientCompositeErrorException(HttpStatus.BAD_REQUEST);
@@ -126,8 +124,6 @@ public class ResourceController extends
@PreAuthorize("hasRole('RESOURCE_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/update")
public ResourceTO update(@RequestBody final ResourceTO resourceTO) {
- LOG.debug("Role update request: {}", resourceTO);
-
ExternalResource resource = resourceDAO.find(resourceTO.getName());
if (resource == null) {
throw new NotFoundException("Resource '" + resourceTO.getName() + "'");
@@ -275,8 +271,6 @@ public class ResourceController extends
@PreAuthorize("hasRole('RESOURCE_DELETE') and #bulkAction.operation == #bulkAction.operation.DELETE")
@RequestMapping(method = RequestMethod.POST, value = "/bulk")
public BulkActionRes bulkAction(@RequestBody final BulkAction bulkAction) {
- LOG.debug("Bulk action '{}' called on '{}'", bulkAction.getOperation(), bulkAction.getTargets());
-
BulkActionRes res = new BulkActionRes();
switch (bulkAction.getOperation()) {
@@ -300,8 +294,9 @@ public class ResourceController extends
* {@inheritDoc}
*/
@Override
- protected ResourceTO resolveReference(final Method method, final Object... args) throws
- UnresolvedReferenceException {
+ protected ResourceTO resolveReference(final Method method, final Object... args)
+ throws UnresolvedReferenceException {
+
String name = null;
if (ArrayUtils.isNotEmpty(args)) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java Fri Nov 22 14:37:20 2013
@@ -59,6 +59,12 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
+/**
+ * Note that this controller does not extend AbstractTransactionalController, hence does not provide any
+ * Spring's Transactional logic at class level.
+ *
+ * @see AbstractTransactionalController
+ */
@Controller
@RequestMapping("/role")
public class RoleController extends AbstractController<RoleTO> {
@@ -167,7 +173,7 @@ public class RoleController extends Abst
@PreAuthorize("hasRole('ROLE_READ')")
@RequestMapping(method = RequestMethod.POST, value = "/search")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public List<RoleTO> search(@RequestBody final NodeCond searchCondition)
throws InvalidSearchConditionException {
@@ -176,13 +182,11 @@ public class RoleController extends Abst
@PreAuthorize("hasRole('ROLE_READ')")
@RequestMapping(method = RequestMethod.POST, value = "/search/{page}/{size}")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public List<RoleTO> search(@RequestBody final NodeCond searchCondition, @PathVariable("page") final int page,
@PathVariable("size") final int size)
throws InvalidSearchConditionException {
- LOG.debug("Role search called with condition {}", searchCondition);
-
if (!searchCondition.isValid()) {
LOG.error("Invalid search condition: {}", searchCondition);
throw new InvalidSearchConditionException();
@@ -202,7 +206,7 @@ public class RoleController extends Abst
@PreAuthorize("hasRole('ROLE_READ')")
@RequestMapping(method = RequestMethod.POST, value = "/search/count")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public ModelAndView searchCount(@RequestBody final NodeCond searchCondition)
throws InvalidSearchConditionException {
@@ -232,8 +236,6 @@ public class RoleController extends Abst
@PreAuthorize("hasRole('ROLE_CREATE')")
@RequestMapping(method = RequestMethod.POST, value = "/create")
public RoleTO create(final HttpServletResponse response, @RequestBody final RoleTO roleTO) {
- LOG.debug("Role create called with parameters {}", roleTO);
-
// Check that this operation is allowed to be performed by caller
Set<Long> allowedRoleIds = EntitlementUtil.getRoleIds(EntitlementUtil.getOwnedEntitlementNames());
if (roleTO.getParent() != 0 && !allowedRoleIds.contains(roleTO.getParent())) {
@@ -247,7 +249,6 @@ public class RoleController extends Abst
/*
* Actual operations: workflow, propagation
*/
-
WorkflowResult<Long> created = rwfAdapter.create(actual);
EntitlementUtil.extendAuthContext(created.getResult());
@@ -262,22 +263,18 @@ public class RoleController extends Abst
propagationReporter.onPrimaryResourceFailure(tasks);
}
+ response.setStatus(HttpServletResponse.SC_CREATED);
+
final RoleTO savedTO = binder.getRoleTO(created.getResult());
savedTO.setPropagationStatusTOs(propagationReporter.getStatuses());
-
- LOG.debug("About to return created role\n{}", savedTO);
-
- response.setStatus(HttpServletResponse.SC_CREATED);
return savedTO;
}
@PreAuthorize("hasRole('ROLE_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/update")
public RoleTO update(@RequestBody final RoleMod roleMod) {
- LOG.debug("Role update called with {}", roleMod);
-
// Check that this operation is allowed to be performed by caller
- SyncopeRole role = binder.getRoleFromId(roleMod.getId());
+ binder.getRoleFromId(roleMod.getId());
// Attribute value transformation (if configured)
RoleMod actual = attrTransformer.transform(roleMod);
@@ -286,7 +283,6 @@ public class RoleController extends Abst
/*
* Actual operations: workflow, propagation
*/
-
WorkflowResult<Long> updated = rwfAdapter.update(actual);
List<PropagationTask> tasks = propagationManager.getRoleUpdateTaskIds(updated,
@@ -301,17 +297,12 @@ public class RoleController extends Abst
}
final RoleTO updatedTO = binder.getRoleTO(updated.getResult());
updatedTO.setPropagationStatusTOs(propagationReporter.getStatuses());
-
- LOG.debug("About to return updated role\n{}", updatedTO);
-
return updatedTO;
}
@PreAuthorize("hasRole('ROLE_DELETE')")
@RequestMapping(method = RequestMethod.GET, value = "/delete/{roleId}")
public RoleTO delete(@PathVariable("roleId") final Long roleId) {
- LOG.debug("Role delete called for {}", roleId);
-
// Generate propagation tasks for deleting users from role resources, if they are on those resources only
// because of the reason being deleted (see SYNCOPE-357)
List<PropagationTask> tasks = new ArrayList<PropagationTask>();
@@ -337,8 +328,6 @@ public class RoleController extends Abst
rwfAdapter.delete(roleId);
- LOG.debug("Role successfully deleted: {}", roleId);
-
return roleTO;
}
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java Fri Nov 22 14:37:20 2013
@@ -144,8 +144,9 @@ public class SchemaController extends Ab
* {@inheritDoc}
*/
@Override
- protected SchemaTO resolveReference(final Method method, final Object... args) throws
- UnresolvedReferenceException {
+ protected SchemaTO resolveReference(final Method method, final Object... args)
+ throws UnresolvedReferenceException {
+
String kind = null;
String name = null;
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java Fri Nov 22 14:37:20 2013
@@ -107,8 +107,6 @@ public class TaskController extends Abst
@PreAuthorize("hasRole('TASK_CREATE')")
public TaskTO createSchedTaskInternal(final SchedTaskTO taskTO) {
- LOG.debug("Creating task " + taskTO);
-
TaskUtil taskUtil = getTaskUtil(taskTO);
SchedTask task = binder.createSchedTask(taskTO, taskUtil);
@@ -139,8 +137,6 @@ public class TaskController extends Abst
@PreAuthorize("hasRole('TASK_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/update/sched")
public TaskTO updateSched(@RequestBody final SchedTaskTO taskTO) {
- LOG.debug("Task update called with parameter {}", taskTO);
-
SchedTask task = taskDAO.find(taskTO.getId());
if (task == null) {
throw new NotFoundException("Task " + taskTO.getId());
@@ -253,7 +249,6 @@ public class TaskController extends Abst
TaskUtil taskUtil = getTaskUtil(task);
TaskExecTO result = null;
- LOG.debug("Execution started for {}", task);
switch (taskUtil) {
case PROPAGATION:
final TaskExec propExec = taskExecutor.execute((PropagationTask) task);
@@ -297,7 +292,7 @@ public class TaskController extends Abst
default:
}
- LOG.debug("Execution finished for {}, {}", task, result);
+
return result;
}
@@ -389,8 +384,6 @@ public class TaskController extends Abst
+ "#bulkAction.operation == #bulkAction.operation.DRYRUN))")
@RequestMapping(method = RequestMethod.POST, value = "/bulk")
public BulkActionRes bulkAction(@RequestBody final BulkAction bulkAction) {
- LOG.debug("Bulk action '{}' called on '{}'", bulkAction.getOperation(), bulkAction.getTargets());
-
BulkActionRes res = new BulkActionRes();
switch (bulkAction.getOperation()) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnauthorizedRoleException.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnauthorizedRoleException.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnauthorizedRoleException.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnauthorizedRoleException.java Fri Nov 22 14:37:20 2013
@@ -23,9 +23,9 @@ import java.util.Set;
public class UnauthorizedRoleException extends RuntimeException {
- private static final long serialVersionUID = 7540587364235915081L;
-
- private final Set<Long> roleIds;
+ private static final long serialVersionUID = 7540587364235915081L;
+
+ private final Set<Long> roleIds;
public UnauthorizedRoleException(final Set<Long> roleIds) {
super("Missing entitlement for role(s) " + roleIds);
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnresolvedReferenceException.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnresolvedReferenceException.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnresolvedReferenceException.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UnresolvedReferenceException.java Fri Nov 22 14:37:20 2013
@@ -1,17 +1,20 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.
*/
package org.apache.syncope.core.rest.controller;
@@ -23,6 +26,7 @@ public class UnresolvedReferenceExceptio
private static final long serialVersionUID = -675489116009955632L;
public UnresolvedReferenceException() {
+ super();
}
public UnresolvedReferenceException(Throwable cause) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Fri Nov 22 14:37:20 2013
@@ -74,10 +74,10 @@ import org.springframework.web.bind.anno
import org.springframework.web.servlet.ModelAndView;
/**
- * Note that this controller does not extend AbstractController, hence does not provide any Spring's Transactional logic
- * at class level.
+ * Note that this controller does not extend AbstractTransactionalController, hence does not provide any
+ * Spring's Transactional logic at class level.
*
- * @see AbstractController
+ * @see AbstractTransactionalController
*/
@Controller
@RequestMapping("/user")
@@ -126,7 +126,7 @@ public class UserController extends Abst
}
@PreAuthorize("hasRole('USER_LIST')")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public int countInternal() {
return userDAO.count(EntitlementUtil.getRoleIds(EntitlementUtil.getOwnedEntitlementNames()));
}
@@ -139,7 +139,7 @@ public class UserController extends Abst
}
@PreAuthorize("hasRole('USER_READ')")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public int searchCountInternal(final NodeCond searchCondition) throws InvalidSearchConditionException {
if (!searchCondition.isValid()) {
LOG.error("Invalid search condition: {}", searchCondition);
@@ -152,7 +152,7 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_LIST')")
@RequestMapping(method = RequestMethod.GET, value = "/list")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public List<UserTO> list() {
List<SyncopeUser> users =
userDAO.findAll(EntitlementUtil.getRoleIds(EntitlementUtil.getOwnedEntitlementNames()));
@@ -167,7 +167,7 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_LIST')")
@RequestMapping(method = RequestMethod.GET, value = "/list/{page}/{size}")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public List<UserTO> list(@PathVariable("page") final int page, @PathVariable("size") final int size) {
Set<Long> adminRoleIds = EntitlementUtil.getRoleIds(EntitlementUtil.getOwnedEntitlementNames());
@@ -182,14 +182,14 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_READ')")
@RequestMapping(method = RequestMethod.GET, value = "/read/{userId}")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public UserTO read(@PathVariable("userId") final Long userId) {
return binder.getUserTO(userId);
}
@PreAuthorize("#username == authentication.name or hasRole('USER_READ')")
@RequestMapping(method = RequestMethod.GET, value = "/readByUsername/{username}")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public UserTO read(@PathVariable final String username) {
return binder.getUserTO(username);
}
@@ -203,7 +203,7 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_READ')")
@RequestMapping(method = RequestMethod.POST, value = "/search")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public List<UserTO> search(@RequestBody final NodeCond searchCondition)
throws InvalidSearchConditionException {
@@ -212,13 +212,11 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_READ')")
@RequestMapping(method = RequestMethod.POST, value = "/search/{page}/{size}")
- @Transactional(readOnly = true, rollbackFor = {Throwable.class})
+ @Transactional(readOnly = true, rollbackFor = { Throwable.class })
public List<UserTO> search(@RequestBody final NodeCond searchCondition, @PathVariable("page") final int page,
@PathVariable("size") final int size)
throws InvalidSearchConditionException {
- LOG.debug("User search called with condition {}", searchCondition);
-
if (!searchCondition.isValid()) {
LOG.error("Invalid search condition: {}", searchCondition);
throw new InvalidSearchConditionException();
@@ -245,8 +243,6 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_CREATE')")
public UserTO createInternal(final UserTO userTO) {
- LOG.debug("User create called with {}", userTO);
-
// Check that this operation is allowed to be performed by caller
Set<Long> requestRoleIds = new HashSet<Long>(userTO.getMemberships().size());
for (MembershipTO membership : userTO.getMemberships()) {
@@ -265,7 +261,6 @@ public class UserController extends Abst
/*
* Actual operations: workflow, propagation, notification
*/
-
WorkflowResult<Map.Entry<Long, Boolean>> created = uwfAdapter.create(actual);
List<PropagationTask> tasks = propagationManager.getUserCreateTaskIds(
@@ -281,17 +276,12 @@ public class UserController extends Abst
final UserTO savedTO = binder.getUserTO(created.getResult().getKey());
savedTO.setPropagationStatusTOs(propagationReporter.getStatuses());
-
- LOG.debug("About to return created user\n{}", savedTO);
-
return savedTO;
}
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/update")
public UserTO update(@RequestBody final UserMod userMod) {
- LOG.debug("User update called with {}", userMod);
-
// AttributableMod transformation (if configured)
UserMod actual = attrTransformer.transform(userMod);
LOG.debug("Transformed: {}", actual);
@@ -365,15 +355,12 @@ public class UserController extends Abst
// 4. prepare result, including propagation status on external resources
final UserTO updatedTO = binder.getUserTO(updated.getResult().getKey());
updatedTO.setPropagationStatusTOs(propagationReporter.getStatuses());
-
- LOG.debug("About to return updated user\n{}", updatedTO);
-
return updatedTO;
}
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.GET, value = "/activate/{userId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO activate(@PathVariable("userId") final Long userId,
@RequestParam(required = true) final String token) {
@@ -382,21 +369,17 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/activate/{userId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO activate(@PathVariable("userId") final Long userId,
@RequestParam(required = true) final String token,
@RequestBody final PropagationRequestTO propagationRequestTO) {
- LOG.debug("About to activate " + userId);
-
- SyncopeUser user = binder.getUserFromId(userId);
-
- return setStatus(user, token, propagationRequestTO, true, "activate");
+ return setStatus(binder.getUserFromId(userId), token, propagationRequestTO, true, "activate");
}
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.GET, value = "/activateByUsername/{username}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO activate(@PathVariable("username") final String username,
@RequestParam(required = true) final String token) {
@@ -405,21 +388,17 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/activateByUsername/{username}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO activate(@PathVariable("username") final String username,
@RequestParam(required = true) final String token,
@RequestBody final PropagationRequestTO propagationRequestTO) {
- LOG.debug("About to activate " + username);
-
- SyncopeUser user = binder.getUserFromUsername(username);
-
- return setStatus(user, token, propagationRequestTO, true, "activate");
+ return setStatus(binder.getUserFromUsername(username), token, propagationRequestTO, true, "activate");
}
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.GET, value = "/suspend/{userId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO suspend(@PathVariable("userId") final Long userId) {
return suspend(userId, null);
@@ -427,20 +406,16 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/suspend/{userId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO suspend(@PathVariable("userId") final Long userId,
@RequestBody final PropagationRequestTO propagationRequestTO) {
- LOG.debug("About to suspend " + userId);
-
- SyncopeUser user = binder.getUserFromId(userId);
-
- return setStatus(user, null, propagationRequestTO, false, "suspend");
+ return setStatus(binder.getUserFromId(userId), null, propagationRequestTO, false, "suspend");
}
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.GET, value = "/suspendByUsername/{username}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO suspend(@PathVariable("username") final String username) {
return suspend(username, null);
@@ -448,20 +423,16 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/suspendByUsername/{username}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO suspend(@PathVariable("username") final String username,
@RequestBody final PropagationRequestTO propagationRequestTO) {
- LOG.debug("About to suspend " + username);
-
- SyncopeUser user = binder.getUserFromUsername(username);
-
- return setStatus(user, null, propagationRequestTO, false, "suspend");
+ return setStatus(binder.getUserFromUsername(username), null, propagationRequestTO, false, "suspend");
}
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.GET, value = "/reactivate/{userId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO reactivate(@PathVariable("userId") final Long userId) {
return reactivate(userId, null);
@@ -469,49 +440,37 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/reactivate/{userId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO reactivate(@PathVariable("userId") final Long userId,
@RequestBody final PropagationRequestTO propagationRequestTO) {
- LOG.debug("About to reactivate " + userId);
-
- SyncopeUser user = binder.getUserFromId(userId);
-
- return setStatus(user, null, propagationRequestTO, true, "reactivate");
+ return setStatus(binder.getUserFromId(userId), null, propagationRequestTO, true, "reactivate");
}
@RequestMapping(method = RequestMethod.GET, value = "/reactivateByUsername/{username}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO reactivate(@PathVariable("username") final String username) {
return reactivate(username, null);
}
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/reactivateByUsername/{username}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO reactivate(@PathVariable("username") final String username,
@RequestBody final PropagationRequestTO propagationRequestTO) {
- LOG.debug("About to reactivate " + username);
-
- SyncopeUser user = binder.getUserFromUsername(username);
-
- return setStatus(user, null, propagationRequestTO, true, "reactivate");
+ return setStatus(binder.getUserFromUsername(username), null, propagationRequestTO, true, "reactivate");
}
@PreAuthorize("hasRole('USER_DELETE')")
@RequestMapping(method = RequestMethod.GET, value = "/delete/{userId}")
public UserTO delete(@PathVariable("userId") final Long userId) {
- LOG.debug("User delete called with {}", userId);
-
return doDelete(userId);
}
@PreAuthorize("hasRole('USER_DELETE')")
@RequestMapping(method = RequestMethod.GET, value = "/deleteByUsername/{username}")
public UserTO delete(@PathVariable final String username) {
- LOG.debug("User delete called with {}", username);
-
UserTO result = binder.getUserTO(username);
long userId = result.getId();
@@ -521,33 +480,27 @@ public class UserController extends Abst
@PreAuthorize("hasRole('USER_UPDATE')")
@RequestMapping(method = RequestMethod.POST, value = "/execute/workflow/{taskId}")
public UserTO executeWorkflow(@RequestBody final UserTO userTO, @PathVariable("taskId") final String taskId) {
- LOG.debug("About to execute {} on {}", taskId, userTO.getId());
-
WorkflowResult<Long> updated = uwfAdapter.execute(userTO, taskId);
List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
new WorkflowResult<Map.Entry<Long, Boolean>>(new SimpleEntry<Long, Boolean>(updated.getResult(), null),
- updated.getPropByRes(), updated.getPerformedTasks()));
+ updated.getPropByRes(), updated.getPerformedTasks()));
taskExecutor.execute(tasks);
- final UserTO savedTO = binder.getUserTO(updated.getResult());
-
- LOG.debug("About to return updated user\n{}", savedTO);
-
- return savedTO;
+ return binder.getUserTO(updated.getResult());
}
@PreAuthorize("hasRole('WORKFLOW_FORM_LIST')")
@RequestMapping(method = RequestMethod.GET, value = "/workflow/form/list")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public List<WorkflowFormTO> getForms() {
return uwfAdapter.getForms();
}
@PreAuthorize("hasRole('WORKFLOW_FORM_READ') and hasRole('USER_READ')")
@RequestMapping(method = RequestMethod.GET, value = "/workflow/form/{userId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public WorkflowFormTO getFormForUser(@PathVariable("userId") final Long userId) {
SyncopeUser user = binder.getUserFromId(userId);
return uwfAdapter.getForm(user.getWorkflowId());
@@ -555,17 +508,15 @@ public class UserController extends Abst
@PreAuthorize("hasRole('WORKFLOW_FORM_CLAIM')")
@RequestMapping(method = RequestMethod.GET, value = "/workflow/form/claim/{taskId}")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public WorkflowFormTO claimForm(@PathVariable("taskId") final String taskId) {
return uwfAdapter.claimForm(taskId, SecurityContextHolder.getContext().getAuthentication().getName());
}
@PreAuthorize("hasRole('WORKFLOW_FORM_SUBMIT')")
@RequestMapping(method = RequestMethod.POST, value = "/workflow/form/submit")
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public UserTO submitForm(@RequestBody final WorkflowFormTO form) {
- LOG.debug("About to process form {}", form);
-
WorkflowResult<Map.Entry<Long, String>> updated = uwfAdapter.submitForm(form,
SecurityContextHolder.getContext().getAuthentication().getName());
@@ -574,9 +525,9 @@ public class UserController extends Abst
if (updated.getPropByRes() != null && !updated.getPropByRes().isEmpty()) {
List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
new WorkflowResult<Map.Entry<Long, Boolean>>(
- new SimpleEntry<Long, Boolean>(updated.getResult().getKey(), Boolean.TRUE),
- updated.getPropByRes(),
- updated.getPerformedTasks()),
+ new SimpleEntry<Long, Boolean>(updated.getResult().getKey(), Boolean.TRUE),
+ updated.getPropByRes(),
+ updated.getPerformedTasks()),
updated.getResult().getValue(),
null,
null,
@@ -584,18 +535,12 @@ public class UserController extends Abst
taskExecutor.execute(tasks);
}
- final UserTO savedTO = binder.getUserTO(updated.getResult().getKey());
-
- LOG.debug("About to return user after form processing\n{}", savedTO);
-
- return savedTO;
+ return binder.getUserTO(updated.getResult().getKey());
}
protected UserTO setStatus(final SyncopeUser user, final String token,
final PropagationRequestTO propagationRequestTO, final boolean status, final String task) {
- LOG.debug("About to set status of {}" + user);
-
WorkflowResult<Long> updated;
if (propagationRequestTO == null || propagationRequestTO.isOnSyncope()) {
updated = setStatusOnWfAdapter(user, token, task);
@@ -621,9 +566,6 @@ public class UserController extends Abst
final UserTO savedTO = binder.getUserTO(updated.getResult());
savedTO.setPropagationStatusTOs(propReporter.getStatuses());
-
- LOG.debug("About to return updated user\n{}", savedTO);
-
return savedTO;
}
@@ -662,7 +604,6 @@ public class UserController extends Abst
// information could only be available after uwfAdapter.delete(), which
// will also effectively remove user from db, thus making virtually
// impossible by NotificationManager to fetch required user information
-
List<PropagationTask> tasks = propagationManager.getUserDeleteTaskIds(userId);
final UserTO userTO = new UserTO();
@@ -681,8 +622,6 @@ public class UserController extends Abst
uwfAdapter.delete(userId);
- LOG.debug("User successfully deleted: {}", userId);
-
return userTO;
}
@@ -692,8 +631,6 @@ public class UserController extends Abst
+ "#bulkAction.operation == #bulkAction.operation.SUSPEND))")
@RequestMapping(method = RequestMethod.POST, value = "/bulk")
public BulkActionRes bulkAction(@RequestBody final BulkAction bulkAction) {
- LOG.debug("Bulk action '{}' called on '{}'", bulkAction.getOperation(), bulkAction.getTargets());
-
BulkActionRes res = new BulkActionRes();
switch (bulkAction.getOperation()) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java Fri Nov 22 14:37:20 2013
@@ -75,8 +75,6 @@ public class UserRequestController exten
throw new UnauthorizedRoleException(-1L);
}
- LOG.debug("Request user create called with {}", userTO);
-
try {
binder.testCreate(userTO);
} catch (RollbackException e) {
@@ -91,8 +89,6 @@ public class UserRequestController exten
@PreAuthorize("isAuthenticated()")
@RequestMapping(method = RequestMethod.POST, value = "/update")
public UserRequestTO update(@RequestBody final UserMod userMod) {
- LOG.debug("Request user update called with {}", userMod);
-
try {
binder.testUpdate(userMod);
} catch (RollbackException e) {
@@ -129,8 +125,6 @@ public class UserRequestController exten
@PreAuthorize("isAuthenticated()")
@RequestMapping(method = RequestMethod.GET, value = "/delete/{userId}")
public UserRequestTO delete(@PathVariable("userId") final Long userId) {
- LOG.debug("Request user delete called with {}", userId);
-
try {
binder.testDelete(userId);
} catch (RollbackException e) {
@@ -164,7 +158,8 @@ public class UserRequestController exten
if (ArrayUtils.isNotEmpty(obj) && obj[0] instanceof Long
&& ("deleteRequest".equals(method.getName()) || "read".equals(method.getName()))) {
- final UserRequest request = userRequestDAO.find((Long) obj[0]);
+
+ UserRequest request = userRequestDAO.find((Long) obj[0]);
result = request == null ? null : binder.getUserRequestTO(request);
} else {
result = null;
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java Fri Nov 22 14:37:20 2013
@@ -139,8 +139,9 @@ public class VirtualSchemaController ext
* {@inheritDoc}
*/
@Override
- protected VirtualSchemaTO resolveReference(final Method method, final Object... args) throws
- UnresolvedReferenceException {
+ protected VirtualSchemaTO resolveReference(final Method method, final Object... args)
+ throws UnresolvedReferenceException {
+
String kind = null;
String name = null;
Modified: syncope/branches/1_1_X/core/src/main/resources/restContext.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/resources/restContext.xml?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/resources/restContext.xml (original)
+++ syncope/branches/1_1_X/core/src/main/resources/restContext.xml Fri Nov 22 14:37:20 2013
@@ -38,11 +38,10 @@ under the License.
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<context:component-scan base-package="org.apache.syncope.core.rest.controller"/>
+ <bean class="org.apache.syncope.core.rest.controller.ControllerHandler"/>
<!-- CXF Configuration - BEGIN -->
- <context:component-scan base-package="org.apache.syncope.core.services"/>
-
- <bean id="controllerHandler" name="controllerHandler" class="org.apache.syncope.core.services.ControllerHandler" />
+ <context:component-scan base-package="org.apache.syncope.core.services"/>
<bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
<property name="depthProperties">
Modified: syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java?rev=1544553&r1=1544552&r2=1544553&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java (original)
+++ syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java Fri Nov 22 14:37:20 2013
@@ -73,12 +73,10 @@ public class VirtualSchemaTestITCase ext
@Test
public void delete() {
- VirtualSchemaTO schema = schemaService.read(AttributableType.ROLE, SchemaType.VIRTUAL,
- "rvirtualdata");
+ VirtualSchemaTO schema = schemaService.read(AttributableType.ROLE, SchemaType.VIRTUAL, "rvirtualdata");
assertNotNull(schema);
- schemaService.delete(AttributableType.ROLE, SchemaType.VIRTUAL,
- schema.getName());
+ schemaService.delete(AttributableType.ROLE, SchemaType.VIRTUAL, schema.getName());
Throwable t = null;
try {