Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientCompositeException.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientCompositeException.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientCompositeException.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientCompositeException.java Tue Aug 5 11:20:00 2014 @@ -1,96 +1,96 @@ -/* - * 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. - */ -package org.apache.syncope.common; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import org.apache.syncope.common.types.ClientExceptionType; - -public class SyncopeClientCompositeException extends SyncopeClientException { - - private static final long serialVersionUID = 7882118041134372129L; - - private final Set<SyncopeClientException> exceptions = new HashSet<SyncopeClientException>(); - - protected SyncopeClientCompositeException() { - super(ClientExceptionType.Composite); - } - - public boolean hasExceptions() { - return !exceptions.isEmpty(); - } - - public boolean hasException(final ClientExceptionType exceptionType) { - return getException(exceptionType) != null; - } - - public SyncopeClientException getException(final ClientExceptionType exceptionType) { - boolean found = false; - SyncopeClientException syncopeClientException = null; - for (Iterator<SyncopeClientException> itor = exceptions.iterator(); itor.hasNext() && !found;) { - syncopeClientException = itor.next(); - if (syncopeClientException.getType().equals(exceptionType)) { - found = true; - } - } - - return found - ? syncopeClientException - : null; - } - - public Set<SyncopeClientException> getExceptions() { - return exceptions; - } - - public boolean addException(final SyncopeClientException exception) { - if (exception.getType() == null) { - throw new IllegalArgumentException(exception + " does not have the right " - + ClientExceptionType.class.getName() + " set"); - } - - return exceptions.add(exception); - } - - @Override - public String getMessage() { - StringBuilder message = new StringBuilder(); - - message.append("{"); - Iterator<SyncopeClientException> iter = getExceptions().iterator(); - while (iter.hasNext()) { - SyncopeClientException e = iter.next(); - message.append("["); - message.append(e.getMessage()); - message.append("]"); - if (iter.hasNext()) { - message.append(", "); - } - } - message.append("}"); - - return message.toString(); - } - - @Override - public String getLocalizedMessage() { - return getMessage(); - } -} +/* + * 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. + */ +package org.apache.syncope.common; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import org.apache.syncope.common.types.ClientExceptionType; + +public class SyncopeClientCompositeException extends SyncopeClientException { + + private static final long serialVersionUID = 7882118041134372129L; + + private final Set<SyncopeClientException> exceptions = new HashSet<SyncopeClientException>(); + + protected SyncopeClientCompositeException() { + super(ClientExceptionType.Composite); + } + + public boolean hasExceptions() { + return !exceptions.isEmpty(); + } + + public boolean hasException(final ClientExceptionType exceptionType) { + return getException(exceptionType) != null; + } + + public SyncopeClientException getException(final ClientExceptionType exceptionType) { + boolean found = false; + SyncopeClientException syncopeClientException = null; + for (Iterator<SyncopeClientException> itor = exceptions.iterator(); itor.hasNext() && !found;) { + syncopeClientException = itor.next(); + if (syncopeClientException.getType().equals(exceptionType)) { + found = true; + } + } + + return found + ? syncopeClientException + : null; + } + + public Set<SyncopeClientException> getExceptions() { + return exceptions; + } + + public boolean addException(final SyncopeClientException exception) { + if (exception.getType() == null) { + throw new IllegalArgumentException(exception + " does not have the right " + + ClientExceptionType.class.getName() + " set"); + } + + return exceptions.add(exception); + } + + @Override + public String getMessage() { + StringBuilder message = new StringBuilder(); + + message.append("{"); + Iterator<SyncopeClientException> iter = getExceptions().iterator(); + while (iter.hasNext()) { + SyncopeClientException e = iter.next(); + message.append("["); + message.append(e.getMessage()); + message.append("]"); + if (iter.hasNext()) { + message.append(", "); + } + } + message.append("}"); + + return message.toString(); + } + + @Override + public String getLocalizedMessage() { + return getMessage(); + } +}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientException.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientException.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientException.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeClientException.java Tue Aug 5 11:20:00 2014 @@ -1,97 +1,97 @@ -/* - * 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. - */ -package org.apache.syncope.common; - -import java.util.ArrayList; -import java.util.List; -import org.apache.syncope.common.types.ClientExceptionType; - -public class SyncopeClientException extends RuntimeException { - - private static final long serialVersionUID = 3380920886511913475L; - - private ClientExceptionType type; - - private final List<String> elements = new ArrayList<String>(); - - public static SyncopeClientException build(final ClientExceptionType type) { - if (type == ClientExceptionType.Composite) { - throw new IllegalArgumentException("Composite exceptions must be obtained via buildComposite()"); - } - return new SyncopeClientException(type); - } - - public static SyncopeClientCompositeException buildComposite() { - return new SyncopeClientCompositeException(); - } - - protected SyncopeClientException(final ClientExceptionType type) { - super(); - setType(type); - } - - public boolean isComposite() { - return getType() == ClientExceptionType.Composite; - } - - public SyncopeClientCompositeException asComposite() { - if (!isComposite()) { - throw new IllegalArgumentException("This is not a composite exception"); - } - - return (SyncopeClientCompositeException) this; - } - - public ClientExceptionType getType() { - return type; - } - - public final void setType(final ClientExceptionType type) { - this.type = type; - } - - public List<String> getElements() { - return elements; - } - - public boolean isEmpty() { - return elements.isEmpty(); - } - - public int size() { - return elements.size(); - } - - @Override - public String getMessage() { - StringBuilder message = new StringBuilder(); - - message.append(getType()); - message.append(" "); - message.append(getElements()); - - return message.toString(); - } - - @Override - public String getLocalizedMessage() { - return getMessage(); - } - -} +/* + * 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. + */ +package org.apache.syncope.common; + +import java.util.ArrayList; +import java.util.List; +import org.apache.syncope.common.types.ClientExceptionType; + +public class SyncopeClientException extends RuntimeException { + + private static final long serialVersionUID = 3380920886511913475L; + + private ClientExceptionType type; + + private final List<String> elements = new ArrayList<String>(); + + public static SyncopeClientException build(final ClientExceptionType type) { + if (type == ClientExceptionType.Composite) { + throw new IllegalArgumentException("Composite exceptions must be obtained via buildComposite()"); + } + return new SyncopeClientException(type); + } + + public static SyncopeClientCompositeException buildComposite() { + return new SyncopeClientCompositeException(); + } + + protected SyncopeClientException(final ClientExceptionType type) { + super(); + setType(type); + } + + public boolean isComposite() { + return getType() == ClientExceptionType.Composite; + } + + public SyncopeClientCompositeException asComposite() { + if (!isComposite()) { + throw new IllegalArgumentException("This is not a composite exception"); + } + + return (SyncopeClientCompositeException) this; + } + + public ClientExceptionType getType() { + return type; + } + + public final void setType(final ClientExceptionType type) { + this.type = type; + } + + public List<String> getElements() { + return elements; + } + + public boolean isEmpty() { + return elements.isEmpty(); + } + + public int size() { + return elements.size(); + } + + @Override + public String getMessage() { + StringBuilder message = new StringBuilder(); + + message.append(getType()); + message.append(" "); + message.append(getElements()); + + return message.toString(); + } + + @Override + public String getLocalizedMessage() { + return getMessage(); + } + +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java Tue Aug 5 11:20:00 2014 @@ -1,52 +1,52 @@ -/* - * 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. - */ -package org.apache.syncope.common; - -import java.util.regex.Pattern; - -public class SyncopeConstants { - - public static final String NAMESPACE = "http://syncope.apache.org/1.2";; - - public static final String UNAUTHENTICATED = "unauthenticated"; - - public static final String ANONYMOUS_ENTITLEMENT = "anonymous"; - - public static final String ENUM_VALUES_SEPARATOR = ";"; - - public static final String[] DATE_PATTERNS = { - "yyyy-MM-dd'T'HH:mm:ssZ", - "EEE, dd MMM yyyy HH:mm:ss z", - "yyyy-MM-dd'T'HH:mm:ssz", - "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-dd HH:mm:ss.S", // explicitly added to import date into MySql repository - "yyyy-MM-dd" }; - - public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZ"; - - public static final String DEFAULT_ENCODING = "UTF-8"; - - public static final String ROOT_LOGGER = "ROOT"; - - public static final Pattern EMAIL_PATTERN = Pattern.compile( - "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*" - + "@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - Pattern.CASE_INSENSITIVE); - -} +/* + * 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. + */ +package org.apache.syncope.common; + +import java.util.regex.Pattern; + +public class SyncopeConstants { + + public static final String NAMESPACE = "http://syncope.apache.org/1.2";; + + public static final String UNAUTHENTICATED = "unauthenticated"; + + public static final String ANONYMOUS_ENTITLEMENT = "anonymous"; + + public static final String ENUM_VALUES_SEPARATOR = ";"; + + public static final String[] DATE_PATTERNS = { + "yyyy-MM-dd'T'HH:mm:ssZ", + "EEE, dd MMM yyyy HH:mm:ss z", + "yyyy-MM-dd'T'HH:mm:ssz", + "yyyy-MM-dd HH:mm:ss", + "yyyy-MM-dd HH:mm:ss.S", // explicitly added to import date into MySql repository + "yyyy-MM-dd" }; + + public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ssZ"; + + public static final String DEFAULT_ENCODING = "UTF-8"; + + public static final String ROOT_LOGGER = "ROOT"; + + public static final Pattern EMAIL_PATTERN = Pattern.compile( + "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*" + + "@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", + Pattern.CASE_INSENSITIVE); + +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/ClassList.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/ClassList.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/ClassList.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/ClassList.java Tue Aug 5 11:20:00 2014 @@ -1,26 +1,26 @@ -/* - * 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. - */ -package org.apache.syncope.common.annotation; - -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@Retention(RUNTIME) -public @interface ClassList { -} +/* + * 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. + */ +package org.apache.syncope.common.annotation; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Retention(RUNTIME) +public @interface ClassList { +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/FormAttributeField.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/FormAttributeField.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/FormAttributeField.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/FormAttributeField.java Tue Aug 5 11:20:00 2014 @@ -1,37 +1,37 @@ -/* - * 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. - */ -package org.apache.syncope.common.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.apache.syncope.common.types.IntMappingType; - -@Target({ ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -public @interface FormAttributeField { - - boolean userSearch() default false; - - boolean roleSearch() default false; - - IntMappingType schema() default IntMappingType.UserSchema; -} +/* + * 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. + */ +package org.apache.syncope.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.apache.syncope.common.types.IntMappingType; + +@Target({ ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface FormAttributeField { + + boolean userSearch() default false; + + boolean roleSearch() default false; + + IntMappingType schema() default IntMappingType.UserSchema; +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/SchemaList.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/SchemaList.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/SchemaList.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/annotation/SchemaList.java Tue Aug 5 11:20:00 2014 @@ -1,28 +1,28 @@ -/* - * 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. - */ -package org.apache.syncope.common.annotation; - -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@Retention(RUNTIME) -public @interface SchemaList { - - boolean extended() default false; -} +/* + * 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. + */ +package org.apache.syncope.common.annotation; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Retention(RUNTIME) +public @interface SchemaList { + + boolean extended() default false; +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AbstractAttributableMod.java Tue Aug 5 11:20:00 2014 @@ -1,113 +1,113 @@ -/* - * 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. - */ -package org.apache.syncope.common.mod; - -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.HashSet; -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; - -import org.apache.syncope.common.AbstractBaseBean; - -/** - * Abstract base class for objects that can have attributes removed, added or updated. - * - * Attributes can be regular attributes, derived attributes, virtual attributes and resources. - */ -@XmlType -public abstract class AbstractAttributableMod extends AbstractBaseBean { - - private static final long serialVersionUID = 3241118574016303198L; - - protected long id; - - protected final Set<AttributeMod> attrsToUpdate = new HashSet<AttributeMod>(); - - protected final Set<String> attrsToRemove = new HashSet<String>(); - - protected final Set<String> derAttrsToAdd = new HashSet<String>(); - - protected final Set<String> derAttrsToRemove = new HashSet<String>(); - - protected final Set<AttributeMod> virAttrsToUpdate = new HashSet<AttributeMod>(); - - protected final Set<String> virAttrsToRemove = new HashSet<String>(); - - public long getId() { - return id; - } - - public void setId(final long id) { - this.id = id; - } - - @XmlElementWrapper(name = "attributesToRemove") - @XmlElement(name = "attribute") - @JsonProperty("attributesToRemove") - public Set<String> getAttrsToRemove() { - return attrsToRemove; - } - - @XmlElementWrapper(name = "attributesToUpdate") - @XmlElement(name = "attributeMod") - @JsonProperty("attributesToUpdate") - public Set<AttributeMod> getAttrsToUpdate() { - return attrsToUpdate; - } - - @XmlElementWrapper(name = "derAttrsToAdd") - @XmlElement(name = "attribute") - @JsonProperty("derAttrsToAdd") - public Set<String> getDerAttrsToAdd() { - return derAttrsToAdd; - } - - @XmlElementWrapper(name = "derAttrsToRemove") - @XmlElement(name = "attribute") - @JsonProperty("derAttrsToRemove") - public Set<String> getDerAttrsToRemove() { - return derAttrsToRemove; - } - - @XmlElementWrapper(name = "virAttrsToRemove") - @XmlElement(name = "attribute") - @JsonProperty("virAttrsToRemove") - public Set<String> getVirAttrsToRemove() { - return virAttrsToRemove; - } - - @XmlElementWrapper(name = "virAttrsToUpdate") - @XmlElement(name = "attribute") - @JsonProperty("virAttrsToUpdate") - public Set<AttributeMod> getVirAttrsToUpdate() { - return virAttrsToUpdate; - } - - /** - * @return true is all backing Sets are empty. - */ - public boolean isEmpty() { - return attrsToUpdate.isEmpty() && attrsToRemove.isEmpty() - && derAttrsToAdd.isEmpty() && derAttrsToRemove.isEmpty() - && virAttrsToUpdate.isEmpty() && virAttrsToRemove.isEmpty(); - } -} +/* + * 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. + */ +package org.apache.syncope.common.mod; + +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.HashSet; +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlType; + +import org.apache.syncope.common.AbstractBaseBean; + +/** + * Abstract base class for objects that can have attributes removed, added or updated. + * + * Attributes can be regular attributes, derived attributes, virtual attributes and resources. + */ +@XmlType +public abstract class AbstractAttributableMod extends AbstractBaseBean { + + private static final long serialVersionUID = 3241118574016303198L; + + protected long id; + + protected final Set<AttributeMod> attrsToUpdate = new HashSet<AttributeMod>(); + + protected final Set<String> attrsToRemove = new HashSet<String>(); + + protected final Set<String> derAttrsToAdd = new HashSet<String>(); + + protected final Set<String> derAttrsToRemove = new HashSet<String>(); + + protected final Set<AttributeMod> virAttrsToUpdate = new HashSet<AttributeMod>(); + + protected final Set<String> virAttrsToRemove = new HashSet<String>(); + + public long getId() { + return id; + } + + public void setId(final long id) { + this.id = id; + } + + @XmlElementWrapper(name = "attributesToRemove") + @XmlElement(name = "attribute") + @JsonProperty("attributesToRemove") + public Set<String> getAttrsToRemove() { + return attrsToRemove; + } + + @XmlElementWrapper(name = "attributesToUpdate") + @XmlElement(name = "attributeMod") + @JsonProperty("attributesToUpdate") + public Set<AttributeMod> getAttrsToUpdate() { + return attrsToUpdate; + } + + @XmlElementWrapper(name = "derAttrsToAdd") + @XmlElement(name = "attribute") + @JsonProperty("derAttrsToAdd") + public Set<String> getDerAttrsToAdd() { + return derAttrsToAdd; + } + + @XmlElementWrapper(name = "derAttrsToRemove") + @XmlElement(name = "attribute") + @JsonProperty("derAttrsToRemove") + public Set<String> getDerAttrsToRemove() { + return derAttrsToRemove; + } + + @XmlElementWrapper(name = "virAttrsToRemove") + @XmlElement(name = "attribute") + @JsonProperty("virAttrsToRemove") + public Set<String> getVirAttrsToRemove() { + return virAttrsToRemove; + } + + @XmlElementWrapper(name = "virAttrsToUpdate") + @XmlElement(name = "attribute") + @JsonProperty("virAttrsToUpdate") + public Set<AttributeMod> getVirAttrsToUpdate() { + return virAttrsToUpdate; + } + + /** + * @return true is all backing Sets are empty. + */ + public boolean isEmpty() { + return attrsToUpdate.isEmpty() && attrsToRemove.isEmpty() + && derAttrsToAdd.isEmpty() && derAttrsToRemove.isEmpty() + && virAttrsToUpdate.isEmpty() && virAttrsToRemove.isEmpty(); + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AttributeMod.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AttributeMod.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AttributeMod.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/AttributeMod.java Tue Aug 5 11:20:00 2014 @@ -1,78 +1,78 @@ -/* - * 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. - */ -package org.apache.syncope.common.mod; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -import org.apache.syncope.common.AbstractBaseBean; - -@XmlRootElement -@XmlType -public class AttributeMod extends AbstractBaseBean { - - private static final long serialVersionUID = -913573979137431406L; - - private String schema; - - private List<String> valuesToBeAdded; - - private List<String> valuesToBeRemoved; - - public AttributeMod() { - super(); - - valuesToBeAdded = new ArrayList<String>(); - valuesToBeRemoved = new ArrayList<String>(); - } - - public String getSchema() { - return schema; - } - - public void setSchema(String schema) { - this.schema = schema; - } - - @XmlElementWrapper(name = "valuesToBeAdded") - @XmlElement(name = "value") - @JsonProperty("valuesToBeAdded") - public List<String> getValuesToBeAdded() { - return valuesToBeAdded; - } - - @XmlElementWrapper(name = "valuesToBeRemoved") - @XmlElement(name = "value") - @JsonProperty("valuesToBeRemoved") - public List<String> getValuesToBeRemoved() { - return valuesToBeRemoved; - } - - @JsonIgnore - public boolean isEmpty() { - return valuesToBeAdded.isEmpty() && valuesToBeRemoved.isEmpty(); - } -} +/* + * 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. + */ +package org.apache.syncope.common.mod; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +import org.apache.syncope.common.AbstractBaseBean; + +@XmlRootElement +@XmlType +public class AttributeMod extends AbstractBaseBean { + + private static final long serialVersionUID = -913573979137431406L; + + private String schema; + + private List<String> valuesToBeAdded; + + private List<String> valuesToBeRemoved; + + public AttributeMod() { + super(); + + valuesToBeAdded = new ArrayList<String>(); + valuesToBeRemoved = new ArrayList<String>(); + } + + public String getSchema() { + return schema; + } + + public void setSchema(String schema) { + this.schema = schema; + } + + @XmlElementWrapper(name = "valuesToBeAdded") + @XmlElement(name = "value") + @JsonProperty("valuesToBeAdded") + public List<String> getValuesToBeAdded() { + return valuesToBeAdded; + } + + @XmlElementWrapper(name = "valuesToBeRemoved") + @XmlElement(name = "value") + @JsonProperty("valuesToBeRemoved") + public List<String> getValuesToBeRemoved() { + return valuesToBeRemoved; + } + + @JsonIgnore + public boolean isEmpty() { + return valuesToBeAdded.isEmpty() && valuesToBeRemoved.isEmpty(); + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/MembershipMod.java Tue Aug 5 11:20:00 2014 @@ -1,46 +1,46 @@ -/* - * 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. - */ -package org.apache.syncope.common.mod; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement -@XmlType -public class MembershipMod extends AbstractAttributableMod { - - private static final long serialVersionUID = 2511869129977331525L; - - private long role; - - public long getRole() { - return role; - } - - public void setRole(long role) { - this.role = role; - } - - @JsonIgnore - @Override - public boolean isEmpty() { - return super.isEmpty() && role == 0; - } -} +/* + * 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. + */ +package org.apache.syncope.common.mod; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement +@XmlType +public class MembershipMod extends AbstractAttributableMod { + + private static final long serialVersionUID = 2511869129977331525L; + + private long role; + + public long getRole() { + return role; + } + + public void setRole(long role) { + this.role = role; + } + + @JsonIgnore + @Override + public boolean isEmpty() { + return super.isEmpty() && role == 0; + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ReferenceMod.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ReferenceMod.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ReferenceMod.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ReferenceMod.java Tue Aug 5 11:20:00 2014 @@ -1,54 +1,54 @@ -/* - * 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. - */ -package org.apache.syncope.common.mod; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -import org.apache.syncope.common.AbstractBaseBean; - -/** - * This class is used to specify the willing to modify an external reference id. Use 'null' ReferenceMod to keep the - * current reference id; use a ReferenceMod with a null id to try to reset the reference id; use a ReferenceMod with a - * not null id to specify a new reference id. - */ -@XmlRootElement(name = "referenceMod") -@XmlType -public class ReferenceMod extends AbstractBaseBean { - - private static final long serialVersionUID = -4188817853738067677L; - - private Long id; - - public ReferenceMod() { - this.id = null; - } - - public ReferenceMod(final Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setId(final Long id) { - this.id = id; - } -} +/* + * 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. + */ +package org.apache.syncope.common.mod; + +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +import org.apache.syncope.common.AbstractBaseBean; + +/** + * This class is used to specify the willing to modify an external reference id. Use 'null' ReferenceMod to keep the + * current reference id; use a ReferenceMod with a null id to try to reset the reference id; use a ReferenceMod with a + * not null id to specify a new reference id. + */ +@XmlRootElement(name = "referenceMod") +@XmlType +public class ReferenceMod extends AbstractBaseBean { + + private static final long serialVersionUID = -4188817853738067677L; + + private Long id; + + public ReferenceMod() { + this.id = null; + } + + public ReferenceMod(final Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setId(final Long id) { + this.id = id; + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ResourceAssociationMod.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ResourceAssociationMod.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ResourceAssociationMod.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/ResourceAssociationMod.java Tue Aug 5 11:20:00 2014 @@ -1,81 +1,81 @@ -/* - * 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. - */ -package org.apache.syncope.common.mod; - -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -import org.apache.syncope.common.AbstractBaseBean; -import org.apache.syncope.common.wrap.ResourceName; - -/** - * This class is used to specify the willing to create associations between user and external references. - * Password can be provided if required by an assign or provisioning operation. - * - * @see org.apache.syncope.common.types.ResourceAssociationActionType - */ -@XmlRootElement(name = "resourceAssociationMod") -@XmlType -public class ResourceAssociationMod extends AbstractBaseBean { - - private static final long serialVersionUID = -4188817853738067678L; - - /** - * Target external resources. - */ - private final List<ResourceName> targetResources = new ArrayList<ResourceName>(); - - /** - * Indicate the willing to change password on target external resources. - */ - private boolean changePwd; - - /** - * Indicate the new password to be provisioned on target external resources. - */ - private String password; - - @XmlElementWrapper(name = "resources") - @XmlElement(name = "resource") - @JsonProperty("resources") - public List<ResourceName> getTargetResources() { - return targetResources; - } - - public boolean isChangePwd() { - return changePwd; - } - - public void setChangePwd(boolean changePwd) { - this.changePwd = changePwd; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } -} +/* + * 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. + */ +package org.apache.syncope.common.mod; + +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +import org.apache.syncope.common.AbstractBaseBean; +import org.apache.syncope.common.wrap.ResourceName; + +/** + * This class is used to specify the willing to create associations between user and external references. + * Password can be provided if required by an assign or provisioning operation. + * + * @see org.apache.syncope.common.types.ResourceAssociationActionType + */ +@XmlRootElement(name = "resourceAssociationMod") +@XmlType +public class ResourceAssociationMod extends AbstractBaseBean { + + private static final long serialVersionUID = -4188817853738067678L; + + /** + * Target external resources. + */ + private final List<ResourceName> targetResources = new ArrayList<ResourceName>(); + + /** + * Indicate the willing to change password on target external resources. + */ + private boolean changePwd; + + /** + * Indicate the new password to be provisioned on target external resources. + */ + private String password; + + @XmlElementWrapper(name = "resources") + @XmlElement(name = "resource") + @JsonProperty("resources") + public List<ResourceName> getTargetResources() { + return targetResources; + } + + public boolean isChangePwd() { + return changePwd; + } + + public void setChangePwd(boolean changePwd) { + this.changePwd = changePwd; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/RoleMod.java Tue Aug 5 11:20:00 2014 @@ -1,301 +1,301 @@ -/* - * 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. - */ -package org.apache.syncope.common.mod; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "roleMod") -@XmlType -public class RoleMod extends AbstractSubjectMod { - - private static final long serialVersionUID = 7455805264680210747L; - - private String name; - - private ReferenceMod userOwner; - - private ReferenceMod roleOwner; - - private Boolean inheritOwner; - - private Boolean inheritTemplates; - - private Boolean inheritAttrs; - - private Boolean inheritDerAttrs; - - private Boolean inheritVirAttrs; - - private Boolean inheritAccountPolicy; - - private Boolean inheritPasswordPolicy; - - private boolean modEntitlements; - - private List<String> entitlements = new ArrayList<String>(); - - private boolean modRAttrTemplates; - - private List<String> rAttrTemplates = new ArrayList<String>(); - - private boolean modRDerAttrTemplates; - - private List<String> rDerAttrTemplates = new ArrayList<String>(); - - private boolean modRVirAttrTemplates; - - private List<String> rVirAttrTemplates = new ArrayList<String>(); - - private boolean modMAttrTemplates; - - private List<String> mAttrTemplates = new ArrayList<String>(); - - private boolean modMDerAttrTemplates; - - private List<String> mDerAttrTemplates = new ArrayList<String>(); - - private boolean modMVirAttrTemplates; - - private List<String> mVirAttrTemplates = new ArrayList<String>(); - - private ReferenceMod passwordPolicy; - - private ReferenceMod accountPolicy; - - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - public ReferenceMod getUserOwner() { - return userOwner; - } - - public void setUserOwner(ReferenceMod userOwner) { - this.userOwner = userOwner; - } - - public ReferenceMod getRoleOwner() { - return roleOwner; - } - - public void setRoleOwner(ReferenceMod roleOwner) { - this.roleOwner = roleOwner; - } - - public Boolean getInheritOwner() { - return inheritOwner; - } - - public void setInheritOwner(Boolean inheritOwner) { - this.inheritOwner = inheritOwner; - } - - public Boolean getInheritTemplates() { - return inheritTemplates; - } - - public void setInheritTemplates(final Boolean inheritTemplates) { - this.inheritTemplates = inheritTemplates; - } - - public Boolean getInheritAttrs() { - return inheritAttrs; - } - - public void setInheritAttributes(final Boolean inheritAttrs) { - this.inheritAttrs = inheritAttrs; - } - - public Boolean getInheritDerAttrs() { - return inheritDerAttrs; - } - - public void setInheritDerAttrs(final Boolean inheritDerAttrs) { - this.inheritDerAttrs = inheritDerAttrs; - } - - public Boolean getInheritVirAttrs() { - return inheritVirAttrs; - } - - public void setInheritVirAttrs(final Boolean inheritVirAttrs) { - this.inheritVirAttrs = inheritVirAttrs; - } - - public boolean isModEntitlements() { - return modEntitlements; - } - - public void setModEntitlements(final boolean modEntitlements) { - this.modEntitlements = modEntitlements; - } - - @XmlElementWrapper(name = "entitlements") - @XmlElement(name = "entitlement") - @JsonProperty("entitlements") - public List<String> getEntitlements() { - return entitlements; - } - - public boolean isModRAttrTemplates() { - return modRAttrTemplates; - } - - public void setModRAttrTemplates(final boolean modRAttrTemplates) { - this.modRAttrTemplates = modRAttrTemplates; - } - - @XmlElementWrapper(name = "rAttrTemplates") - @XmlElement(name = "rAttrTemplate") - @JsonProperty("rAttrTemplates") - public List<String> getRAttrTemplates() { - return rAttrTemplates; - } - - public boolean isModRDerAttrTemplates() { - return modRDerAttrTemplates; - } - - public void setModRDerAttrTemplates(final boolean modRDerAttrTemplates) { - this.modRDerAttrTemplates = modRDerAttrTemplates; - } - - @XmlElementWrapper(name = "rDerAttrTemplates") - @XmlElement(name = "rDerAttrTemplate") - @JsonProperty("rDerAttrTemplates") - public List<String> getRDerAttrTemplates() { - return rDerAttrTemplates; - } - - public boolean isModRVirAttrTemplates() { - return modRVirAttrTemplates; - } - - public void setModRVirAttrTemplates(final boolean modRVirAttrTemplates) { - this.modRVirAttrTemplates = modRVirAttrTemplates; - } - - @XmlElementWrapper(name = "rVirAttrTemplates") - @XmlElement(name = "rVirAttrTemplate") - @JsonProperty("rVirAttrTemplates") - public List<String> getRVirAttrTemplates() { - return rVirAttrTemplates; - } - - public boolean isModMAttrTemplates() { - return modMAttrTemplates; - } - - public void setModMAttrTemplates(final boolean modMAttrTemplates) { - this.modMAttrTemplates = modMAttrTemplates; - } - - @XmlElementWrapper(name = "mAttrTemplates") - @XmlElement(name = "mAttrTemplate") - @JsonProperty("mAttrTemplates") - public List<String> getMAttrTemplates() { - return mAttrTemplates; - } - - public boolean isModMDerAttrTemplates() { - return modMDerAttrTemplates; - } - - public void setModMDerAttrTemplates(final boolean modMDerAttrTemplates) { - this.modMDerAttrTemplates = modMDerAttrTemplates; - } - - @XmlElementWrapper(name = "mDerAttrTemplates") - @XmlElement(name = "mDerAttrTemplate") - @JsonProperty("mDerAttrTemplates") - public List<String> getMDerAttrTemplates() { - return mDerAttrTemplates; - } - - public boolean isModMVirAttrTemplates() { - return modMVirAttrTemplates; - } - - public void setModMVirAttrTemplates(final boolean modMVirAttrTemplates) { - this.modMVirAttrTemplates = modMVirAttrTemplates; - } - - @XmlElementWrapper(name = "mVirAttrTemplates") - @XmlElement(name = "mVirAttrTemplate") - @JsonProperty("mVirAttrTemplates") - public List<String> getMVirAttrTemplates() { - return mVirAttrTemplates; - } - - public ReferenceMod getPasswordPolicy() { - return passwordPolicy; - } - - public void setPasswordPolicy(final ReferenceMod passwordPolicy) { - this.passwordPolicy = passwordPolicy; - } - - public Boolean getInheritPasswordPolicy() { - return inheritPasswordPolicy; - } - - public void setInheritPasswordPolicy(final Boolean inheritPasswordPolicy) { - this.inheritPasswordPolicy = inheritPasswordPolicy; - } - - public ReferenceMod getAccountPolicy() { - return accountPolicy; - } - - public void setAccountPolicy(final ReferenceMod accountPolicy) { - this.accountPolicy = accountPolicy; - } - - public Boolean getInheritAccountPolicy() { - return inheritAccountPolicy; - } - - public void setInheritAccountPolicy(final Boolean inheritAccountPolicy) { - this.inheritAccountPolicy = inheritAccountPolicy; - } - - @JsonIgnore - @Override - public boolean isEmpty() { - return super.isEmpty() && name == null && userOwner == null && roleOwner == null - && inheritTemplates == null && inheritOwner == null - && inheritAccountPolicy == null && inheritPasswordPolicy == null - && inheritAttrs == null && inheritDerAttrs == null && inheritVirAttrs == null - && accountPolicy == null && passwordPolicy == null && entitlements.isEmpty() - && rAttrTemplates.isEmpty() && rDerAttrTemplates.isEmpty() && rVirAttrTemplates.isEmpty() - && mAttrTemplates.isEmpty() && mDerAttrTemplates.isEmpty() && mVirAttrTemplates.isEmpty(); - } -} +/* + * 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. + */ +package org.apache.syncope.common.mod; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "roleMod") +@XmlType +public class RoleMod extends AbstractSubjectMod { + + private static final long serialVersionUID = 7455805264680210747L; + + private String name; + + private ReferenceMod userOwner; + + private ReferenceMod roleOwner; + + private Boolean inheritOwner; + + private Boolean inheritTemplates; + + private Boolean inheritAttrs; + + private Boolean inheritDerAttrs; + + private Boolean inheritVirAttrs; + + private Boolean inheritAccountPolicy; + + private Boolean inheritPasswordPolicy; + + private boolean modEntitlements; + + private List<String> entitlements = new ArrayList<String>(); + + private boolean modRAttrTemplates; + + private List<String> rAttrTemplates = new ArrayList<String>(); + + private boolean modRDerAttrTemplates; + + private List<String> rDerAttrTemplates = new ArrayList<String>(); + + private boolean modRVirAttrTemplates; + + private List<String> rVirAttrTemplates = new ArrayList<String>(); + + private boolean modMAttrTemplates; + + private List<String> mAttrTemplates = new ArrayList<String>(); + + private boolean modMDerAttrTemplates; + + private List<String> mDerAttrTemplates = new ArrayList<String>(); + + private boolean modMVirAttrTemplates; + + private List<String> mVirAttrTemplates = new ArrayList<String>(); + + private ReferenceMod passwordPolicy; + + private ReferenceMod accountPolicy; + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + + public ReferenceMod getUserOwner() { + return userOwner; + } + + public void setUserOwner(ReferenceMod userOwner) { + this.userOwner = userOwner; + } + + public ReferenceMod getRoleOwner() { + return roleOwner; + } + + public void setRoleOwner(ReferenceMod roleOwner) { + this.roleOwner = roleOwner; + } + + public Boolean getInheritOwner() { + return inheritOwner; + } + + public void setInheritOwner(Boolean inheritOwner) { + this.inheritOwner = inheritOwner; + } + + public Boolean getInheritTemplates() { + return inheritTemplates; + } + + public void setInheritTemplates(final Boolean inheritTemplates) { + this.inheritTemplates = inheritTemplates; + } + + public Boolean getInheritAttrs() { + return inheritAttrs; + } + + public void setInheritAttributes(final Boolean inheritAttrs) { + this.inheritAttrs = inheritAttrs; + } + + public Boolean getInheritDerAttrs() { + return inheritDerAttrs; + } + + public void setInheritDerAttrs(final Boolean inheritDerAttrs) { + this.inheritDerAttrs = inheritDerAttrs; + } + + public Boolean getInheritVirAttrs() { + return inheritVirAttrs; + } + + public void setInheritVirAttrs(final Boolean inheritVirAttrs) { + this.inheritVirAttrs = inheritVirAttrs; + } + + public boolean isModEntitlements() { + return modEntitlements; + } + + public void setModEntitlements(final boolean modEntitlements) { + this.modEntitlements = modEntitlements; + } + + @XmlElementWrapper(name = "entitlements") + @XmlElement(name = "entitlement") + @JsonProperty("entitlements") + public List<String> getEntitlements() { + return entitlements; + } + + public boolean isModRAttrTemplates() { + return modRAttrTemplates; + } + + public void setModRAttrTemplates(final boolean modRAttrTemplates) { + this.modRAttrTemplates = modRAttrTemplates; + } + + @XmlElementWrapper(name = "rAttrTemplates") + @XmlElement(name = "rAttrTemplate") + @JsonProperty("rAttrTemplates") + public List<String> getRAttrTemplates() { + return rAttrTemplates; + } + + public boolean isModRDerAttrTemplates() { + return modRDerAttrTemplates; + } + + public void setModRDerAttrTemplates(final boolean modRDerAttrTemplates) { + this.modRDerAttrTemplates = modRDerAttrTemplates; + } + + @XmlElementWrapper(name = "rDerAttrTemplates") + @XmlElement(name = "rDerAttrTemplate") + @JsonProperty("rDerAttrTemplates") + public List<String> getRDerAttrTemplates() { + return rDerAttrTemplates; + } + + public boolean isModRVirAttrTemplates() { + return modRVirAttrTemplates; + } + + public void setModRVirAttrTemplates(final boolean modRVirAttrTemplates) { + this.modRVirAttrTemplates = modRVirAttrTemplates; + } + + @XmlElementWrapper(name = "rVirAttrTemplates") + @XmlElement(name = "rVirAttrTemplate") + @JsonProperty("rVirAttrTemplates") + public List<String> getRVirAttrTemplates() { + return rVirAttrTemplates; + } + + public boolean isModMAttrTemplates() { + return modMAttrTemplates; + } + + public void setModMAttrTemplates(final boolean modMAttrTemplates) { + this.modMAttrTemplates = modMAttrTemplates; + } + + @XmlElementWrapper(name = "mAttrTemplates") + @XmlElement(name = "mAttrTemplate") + @JsonProperty("mAttrTemplates") + public List<String> getMAttrTemplates() { + return mAttrTemplates; + } + + public boolean isModMDerAttrTemplates() { + return modMDerAttrTemplates; + } + + public void setModMDerAttrTemplates(final boolean modMDerAttrTemplates) { + this.modMDerAttrTemplates = modMDerAttrTemplates; + } + + @XmlElementWrapper(name = "mDerAttrTemplates") + @XmlElement(name = "mDerAttrTemplate") + @JsonProperty("mDerAttrTemplates") + public List<String> getMDerAttrTemplates() { + return mDerAttrTemplates; + } + + public boolean isModMVirAttrTemplates() { + return modMVirAttrTemplates; + } + + public void setModMVirAttrTemplates(final boolean modMVirAttrTemplates) { + this.modMVirAttrTemplates = modMVirAttrTemplates; + } + + @XmlElementWrapper(name = "mVirAttrTemplates") + @XmlElement(name = "mVirAttrTemplate") + @JsonProperty("mVirAttrTemplates") + public List<String> getMVirAttrTemplates() { + return mVirAttrTemplates; + } + + public ReferenceMod getPasswordPolicy() { + return passwordPolicy; + } + + public void setPasswordPolicy(final ReferenceMod passwordPolicy) { + this.passwordPolicy = passwordPolicy; + } + + public Boolean getInheritPasswordPolicy() { + return inheritPasswordPolicy; + } + + public void setInheritPasswordPolicy(final Boolean inheritPasswordPolicy) { + this.inheritPasswordPolicy = inheritPasswordPolicy; + } + + public ReferenceMod getAccountPolicy() { + return accountPolicy; + } + + public void setAccountPolicy(final ReferenceMod accountPolicy) { + this.accountPolicy = accountPolicy; + } + + public Boolean getInheritAccountPolicy() { + return inheritAccountPolicy; + } + + public void setInheritAccountPolicy(final Boolean inheritAccountPolicy) { + this.inheritAccountPolicy = inheritAccountPolicy; + } + + @JsonIgnore + @Override + public boolean isEmpty() { + return super.isEmpty() && name == null && userOwner == null && roleOwner == null + && inheritTemplates == null && inheritOwner == null + && inheritAccountPolicy == null && inheritPasswordPolicy == null + && inheritAttrs == null && inheritDerAttrs == null && inheritVirAttrs == null + && accountPolicy == null && passwordPolicy == null && entitlements.isEmpty() + && rAttrTemplates.isEmpty() && rDerAttrTemplates.isEmpty() && rVirAttrTemplates.isEmpty() + && mAttrTemplates.isEmpty() && mDerAttrTemplates.isEmpty() && mVirAttrTemplates.isEmpty(); + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java Tue Aug 5 11:20:00 2014 @@ -1,101 +1,101 @@ -/* - * 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. - */ -package org.apache.syncope.common.mod; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.HashSet; -import java.util.Set; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "userMod") -@XmlType -public class UserMod extends AbstractSubjectMod { - - private static final long serialVersionUID = 3081848906558106204L; - - private String password; - - private String username; - - private final Set<MembershipMod> membershipsToAdd; - - private final Set<Long> membershipsToRemove; - - private StatusMod pwdPropRequest; - - public UserMod() { - super(); - - membershipsToAdd = new HashSet<MembershipMod>(); - membershipsToRemove = new HashSet<Long>(); - } - - public String getUsername() { - return username; - } - - public void setUsername(final String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(final String password) { - this.password = password; - } - - @XmlElementWrapper(name = "membershipsToAdd") - @XmlElement(name = "membership") - @JsonProperty("membershipsToAdd") - public Set<MembershipMod> getMembershipsToAdd() { - return membershipsToAdd; - } - - @XmlElementWrapper(name = "membershipsToRemove") - @XmlElement(name = "membership") - @JsonProperty("membershipsToRemove") - public Set<Long> getMembershipsToRemove() { - return membershipsToRemove; - } - - public StatusMod getPwdPropRequest() { - return pwdPropRequest; - } - - public void setPwdPropRequest(final StatusMod pwdPropRequest) { - this.pwdPropRequest = pwdPropRequest; - } - - @JsonIgnore - @Override - public boolean isEmpty() { - return super.isEmpty() - && password == null - && username == null - && membershipsToAdd.isEmpty() - && membershipsToRemove.isEmpty() - && pwdPropRequest == null; - } -} +/* + * 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. + */ +package org.apache.syncope.common.mod; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.HashSet; +import java.util.Set; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "userMod") +@XmlType +public class UserMod extends AbstractSubjectMod { + + private static final long serialVersionUID = 3081848906558106204L; + + private String password; + + private String username; + + private final Set<MembershipMod> membershipsToAdd; + + private final Set<Long> membershipsToRemove; + + private StatusMod pwdPropRequest; + + public UserMod() { + super(); + + membershipsToAdd = new HashSet<MembershipMod>(); + membershipsToRemove = new HashSet<Long>(); + } + + public String getUsername() { + return username; + } + + public void setUsername(final String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(final String password) { + this.password = password; + } + + @XmlElementWrapper(name = "membershipsToAdd") + @XmlElement(name = "membership") + @JsonProperty("membershipsToAdd") + public Set<MembershipMod> getMembershipsToAdd() { + return membershipsToAdd; + } + + @XmlElementWrapper(name = "membershipsToRemove") + @XmlElement(name = "membership") + @JsonProperty("membershipsToRemove") + public Set<Long> getMembershipsToRemove() { + return membershipsToRemove; + } + + public StatusMod getPwdPropRequest() { + return pwdPropRequest; + } + + public void setPwdPropRequest(final StatusMod pwdPropRequest) { + this.pwdPropRequest = pwdPropRequest; + } + + @JsonIgnore + @Override + public boolean isEmpty() { + return super.isEmpty() + && password == null + && username == null + && membershipsToAdd.isEmpty() + && membershipsToRemove.isEmpty() + && pwdPropRequest == null; + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/report/AbstractReportletConf.java Tue Aug 5 11:20:00 2014 @@ -1,51 +1,51 @@ -/* - * 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. - */ -package org.apache.syncope.common.report; - -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - -import org.apache.syncope.common.AbstractBaseBean; - -@XmlType -@XmlSeeAlso({ StaticReportletConf.class, UserReportletConf.class, RoleReportletConf.class }) -public abstract class AbstractReportletConf extends AbstractBaseBean implements ReportletConf { - - private static final long serialVersionUID = -6130008602014516608L; - - private String name; - - public AbstractReportletConf() { - this(""); - setName(getClass().getName()); - } - - public AbstractReportletConf(final String name) { - this.name = name; - } - - @Override - public final String getName() { - return name; - } - - public final void setName(final String name) { - this.name = name; - } -} +/* + * 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. + */ +package org.apache.syncope.common.report; + +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + +import org.apache.syncope.common.AbstractBaseBean; + +@XmlType +@XmlSeeAlso({ StaticReportletConf.class, UserReportletConf.class, RoleReportletConf.class }) +public abstract class AbstractReportletConf extends AbstractBaseBean implements ReportletConf { + + private static final long serialVersionUID = -6130008602014516608L; + + private String name; + + public AbstractReportletConf() { + this(""); + setName(getClass().getName()); + } + + public AbstractReportletConf(final String name) { + this.name = name; + } + + @Override + public final String getName() { + return name; + } + + public final void setName(final String name) { + this.name = name; + } +} Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/report/ReportletConf.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/report/ReportletConf.java?rev=1615910&r1=1615909&r2=1615910&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/report/ReportletConf.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/report/ReportletConf.java Tue Aug 5 11:20:00 2014 @@ -1,32 +1,32 @@ -/* - * 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. - */ -package org.apache.syncope.common.report; - -import com.fasterxml.jackson.annotation.JsonTypeInfo; - -@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") -public interface ReportletConf { - - /** - * Give name of related reportlet instance. - * - * @return name of this reportlet instance - */ - String getName(); -} +/* + * 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. + */ +package org.apache.syncope.common.report; + +import com.fasterxml.jackson.annotation.JsonTypeInfo; + +@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class") +public interface ReportletConf { + + /** + * Give name of related reportlet instance. + * + * @return name of this reportlet instance + */ + String getName(); +}
