[SYNCOPE-709] Fixing build with Java 1.7
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/15f6d19d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/15f6d19d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/15f6d19d Branch: refs/heads/SYNCOPE-156 Commit: 15f6d19dc49006be90bdce1b3859510a4a471066 Parents: 55fdc58 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Oct 22 15:19:00 2015 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Oct 22 15:19:00 2015 +0200 ---------------------------------------------------------------------- .../api/entity/LinkingMappingItem.java | 140 +++++++++++++++++++ .../persistence/jpa/entity/JPAVirSchema.java | 111 +-------------- 2 files changed, 142 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/15f6d19d/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/LinkingMappingItem.java ---------------------------------------------------------------------- diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/LinkingMappingItem.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/LinkingMappingItem.java new file mode 100644 index 0000000..46fcedc --- /dev/null +++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/LinkingMappingItem.java @@ -0,0 +1,140 @@ +/* + * 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.core.persistence.api.entity; + +import java.util.Collections; +import java.util.List; +import org.apache.syncope.common.lib.types.IntMappingType; +import org.apache.syncope.common.lib.types.MappingPurpose; +import org.apache.syncope.core.persistence.api.entity.resource.Mapping; +import org.apache.syncope.core.persistence.api.entity.resource.MappingItem; + +/** + * {@link MappingItem} implementation for usage within {@link VirSchema#asLinkingMappingItem()} implementations. + */ +public class LinkingMappingItem implements MappingItem { + + private static final long serialVersionUID = 327455459536715529L; + + private final VirSchema virSchema; + + public LinkingMappingItem(final VirSchema virSchema) { + this.virSchema = virSchema; + } + + @Override + public Long getKey() { + return -1L; + } + + @Override + public Mapping getMapping() { + return virSchema.getProvision().getMapping(); + } + + @Override + public void setMapping(final Mapping mapping) { + // RO instance, nothing to do + } + + @Override + public String getExtAttrName() { + return virSchema.getExtAttrName(); + } + + @Override + public void setExtAttrName(final String extAttrName) { + // RO instance, nothing to do + } + + @Override + public String getIntAttrName() { + return virSchema.getKey(); + } + + @Override + public void setIntAttrName(final String intAttrName) { + // RO instance, nothing to do + } + + @Override + public IntMappingType getIntMappingType() { + switch (virSchema.getProvision().getAnyType().getKind()) { + case ANY_OBJECT: + return IntMappingType.AnyObjectVirtualSchema; + + case GROUP: + return IntMappingType.GroupVirtualSchema; + + case USER: + default: + return IntMappingType.UserVirtualSchema; + } + } + + @Override + public void setIntMappingType(final IntMappingType intMappingType) { + // RO instance, nothing to do + } + + @Override + public String getMandatoryCondition() { + return virSchema.getMandatoryCondition(); + } + + @Override + public void setMandatoryCondition(final String condition) { + // RO instance, nothing to do + } + + @Override + public MappingPurpose getPurpose() { + return virSchema.isReadonly() ? MappingPurpose.SYNCHRONIZATION : MappingPurpose.BOTH; + } + + @Override + public void setPurpose(final MappingPurpose purpose) { + // RO instance, nothing to do + } + + @Override + public boolean isConnObjectKey() { + return false; + } + + @Override + public void setConnObjectKey(final boolean connObjectKey) { + // RO instance, nothing to do + } + + @Override + public boolean isPassword() { + return false; + } + + @Override + public void setPassword(final boolean password) { + // RO instance, nothing to do + } + + @Override + public List<String> getMappingItemTransformerClassNames() { + return Collections.emptyList(); + } +} http://git-wip-us.apache.org/repos/asf/syncope/blob/15f6d19d/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAVirSchema.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAVirSchema.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAVirSchema.java index 419e93a..0ee1606 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAVirSchema.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAVirSchema.java @@ -18,8 +18,6 @@ */ package org.apache.syncope.core.persistence.jpa.entity; -import java.util.Collections; -import java.util.List; import javax.persistence.Basic; import javax.persistence.Cacheable; import javax.persistence.Entity; @@ -32,11 +30,9 @@ import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import org.apache.syncope.common.lib.types.AttrSchemaType; -import org.apache.syncope.common.lib.types.IntMappingType; -import org.apache.syncope.common.lib.types.MappingPurpose; import org.apache.syncope.core.persistence.api.entity.AnyTypeClass; +import org.apache.syncope.core.persistence.api.entity.LinkingMappingItem; import org.apache.syncope.core.persistence.api.entity.VirSchema; -import org.apache.syncope.core.persistence.api.entity.resource.Mapping; import org.apache.syncope.core.persistence.api.entity.resource.MappingItem; import org.apache.syncope.core.persistence.api.entity.resource.Provision; import org.apache.syncope.core.persistence.jpa.entity.resource.JPAProvision; @@ -150,110 +146,7 @@ public class JPAVirSchema extends AbstractEntity<String> implements VirSchema { @Override public MappingItem asLinkingMappingItem() { - return new MappingItem() { - - private static final long serialVersionUID = 327455459536715529L; - - @Override - public Long getKey() { - return -1L; - } - - @Override - public Mapping getMapping() { - return getProvision().getMapping(); - } - - @Override - public void setMapping(final Mapping mapping) { - // RO instance, nothing to do - } - - @Override - public String getExtAttrName() { - return JPAVirSchema.this.getExtAttrName(); - } - - @Override - public void setExtAttrName(final String extAttrName) { - // RO instance, nothing to do - } - - @Override - public String getIntAttrName() { - return JPAVirSchema.this.getKey(); - } - - @Override - public void setIntAttrName(final String intAttrName) { - // RO instance, nothing to do - } - - @Override - public IntMappingType getIntMappingType() { - switch (getProvision().getAnyType().getKind()) { - case ANY_OBJECT: - return IntMappingType.AnyObjectVirtualSchema; - - case GROUP: - return IntMappingType.GroupVirtualSchema; - - case USER: - default: - return IntMappingType.UserVirtualSchema; - } - } - - @Override - public void setIntMappingType(final IntMappingType intMappingType) { - // RO instance, nothing to do - } - - @Override - public String getMandatoryCondition() { - return JPAVirSchema.this.getMandatoryCondition(); - } - - @Override - public void setMandatoryCondition(final String condition) { - // RO instance, nothing to do - } - - @Override - public MappingPurpose getPurpose() { - return JPAVirSchema.this.isReadonly() ? MappingPurpose.SYNCHRONIZATION : MappingPurpose.BOTH; - } - - @Override - public void setPurpose(final MappingPurpose purpose) { - // RO instance, nothing to do - } - - @Override - public boolean isConnObjectKey() { - return false; - } - - @Override - public void setConnObjectKey(final boolean connObjectKey) { - // RO instance, nothing to do - } - - @Override - public boolean isPassword() { - return false; - } - - @Override - public void setPassword(final boolean password) { - // RO instance, nothing to do - } - - @Override - public List<String> getMappingItemTransformerClassNames() { - return Collections.emptyList(); - } - }; + return new LinkingMappingItem(this); } }