common EGIZ code-style refactoring

4 files changed, 205 insertions, 194 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EAAFRequestedAttributeImpl.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EAAFRequestedAttributeImpl.java
deleted file mode 100644
index ed169d8c..00000000
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EAAFRequestedAttributeImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright 2017 Graz University of Technology
- * EAAF-Core Components has been developed in a cooperation between EGIZ,  
- * A-SIT Plus, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *  
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eaaf.modules.pvp2.impl.reqattr;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.opensaml.common.impl.AbstractSAMLObject;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.schema.XSBooleanValue;
-import org.opensaml.xml.util.AttributeMap;
-import org.opensaml.xml.util.XMLObjectChildrenList;
-
-import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
-
-public class EAAFRequestedAttributeImpl extends AbstractSAMLObject implements EAAFRequestedAttribute {
-
-    private final XMLObjectChildrenList<XMLObject> attributeValues;
-    private String friendlyName;
-    private String isRequired;
-    private String name;
-    private String nameFormat;
-    private AttributeMap unknownAttributes;
-	
-	public EAAFRequestedAttributeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
-		super(namespaceURI, elementLocalName, namespacePrefix);
-		unknownAttributes = new AttributeMap(this);
-		attributeValues = new XMLObjectChildrenList<XMLObject>(this);
-
-	}
-
-    public final List<XMLObject> getAttributeValues() {
-	return attributeValues;
-    }
-
-    public final String getFriendlyName() {
-	return friendlyName;
-    }
-
-    public final String getIsRequiredXSBoolean() {
-	return isRequired;
-    }
-
-    public final String getName() {
-	return name;
-    }
-
-    public final String getNameFormat() {
-	return nameFormat;
-    }
-
-    public final List<XMLObject> getOrderedChildren() {
-	final List<XMLObject> children = new ArrayList<XMLObject>();
-	children.addAll(attributeValues);
-	return Collections.unmodifiableList(children);
-    }
-
-
-    public final AttributeMap getUnknownAttributes() {
-	return unknownAttributes;
-    }
-
-
-    public final void setFriendlyName(final String newFriendlyName) {
-	this.friendlyName = prepareForAssignment(this.friendlyName,
-		newFriendlyName);
-    }
-
-
-    public final void setIsRequired(final String newIsRequired) {
-	isRequired = prepareForAssignment(this.isRequired, newIsRequired);
-
-    }
-
-
-    public final void setName(final String newName) {
-	this.name = prepareForAssignment(this.name, newName);
-    }
-
-
-    public final void setNameFormat(final String newNameFormat) {
-	this.nameFormat = prepareForAssignment(this.nameFormat, newNameFormat);
-    }
-
-
-    public final void setUnknownAttributes(final AttributeMap newUnknownAttr) {
-	this.unknownAttributes = newUnknownAttr;
-    }
-
-    @Override
-    public XSBooleanValue isRequiredXSBoolean() {
-        return XSBooleanValue.valueOf(isRequired);
-    }
-
-    @Override
-    public void setIsRequired(Boolean aBoolean) {
-        this.isRequired = String.valueOf(aBoolean);
-    }
-
-    @Override
-    public void setIsRequired(XSBooleanValue xsBooleanValue) {
-        this.isRequired = String.valueOf(xsBooleanValue);
-    }
-
-    @Override
-    public Boolean isRequired() {
-        return Boolean.parseBoolean(isRequired);
-    }
-
-}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EAAFRequestedAttributesImpl.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EAAFRequestedAttributesImpl.java
deleted file mode 100644
index b85d4791..00000000
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EAAFRequestedAttributesImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright 2017 Graz University of Technology
- * EAAF-Core Components has been developed in a cooperation between EGIZ,  
- * A-SIT Plus, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *  
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eaaf.modules.pvp2.impl.reqattr;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.opensaml.common.impl.AbstractSAMLObject;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.util.IndexedXMLObjectChildrenList;
-
-import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
-import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttributes;
-
-public class EAAFRequestedAttributesImpl extends AbstractSAMLObject implements EAAFRequestedAttributes {
-
-	 private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;
-	
-	public EAAFRequestedAttributesImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
-		super(namespaceURI, elementLocalName, namespacePrefix);
-		indexedChildren = new IndexedXMLObjectChildrenList<XMLObject>(this);
-	}
-
-	@Override
-	public List<XMLObject> getOrderedChildren() {
-		final List<XMLObject> children = new ArrayList<XMLObject>();
-		children.addAll(indexedChildren);
-		return Collections.unmodifiableList(children);
-		
-	}
-
-	@Override
-	public List<EAAFRequestedAttribute> getAttributes() {
-		return (List<EAAFRequestedAttribute>) indexedChildren
-				.subList(EAAFRequestedAttribute.DEFAULT_ELEMENT_NAME);
-	}
-
-}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EaafRequestedAttributeImpl.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EaafRequestedAttributeImpl.java
new file mode 100644
index 00000000..1ceb5adc
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EaafRequestedAttributeImpl.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
+ * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.gv.egiz.eaaf.modules.pvp2.impl.reqattr;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttribute;
+import org.opensaml.common.impl.AbstractSAMLObject;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.schema.XSBooleanValue;
+import org.opensaml.xml.util.AttributeMap;
+import org.opensaml.xml.util.XMLObjectChildrenList;
+
+public class EaafRequestedAttributeImpl extends AbstractSAMLObject
+    implements EaafRequestedAttribute {
+
+  private final XMLObjectChildrenList<XMLObject> attributeValues;
+  private String friendlyName;
+  private String isRequired;
+  private String name;
+  private String nameFormat;
+  private AttributeMap unknownAttributes;
+
+  /**
+   * Build an EAAF specific requested attribute.
+   *
+   * @param namespaceUri Attribute namespace
+   * @param elementLocalName Attribute name
+   * @param namespacePrefix Attribute namespace prefix
+   */
+  public EaafRequestedAttributeImpl(final String namespaceUri, final String elementLocalName,
+      final String namespacePrefix) {
+    super(namespaceUri, elementLocalName, namespacePrefix);
+    unknownAttributes = new AttributeMap(this);
+    attributeValues = new XMLObjectChildrenList<>(this);
+
+  }
+
+  @Override
+  public final List<XMLObject> getAttributeValues() {
+    return attributeValues;
+  }
+
+  @Override
+  public final String getFriendlyName() {
+    return friendlyName;
+  }
+
+  @Override
+  public final String getIsRequiredXsBoolean() {
+    return isRequired;
+  }
+
+  @Override
+  public final String getName() {
+    return name;
+  }
+
+  @Override
+  public final String getNameFormat() {
+    return nameFormat;
+  }
+
+  @Override
+  public final List<XMLObject> getOrderedChildren() {
+    final List<XMLObject> children = new ArrayList<>();
+    children.addAll(attributeValues);
+    return Collections.unmodifiableList(children);
+  }
+
+
+  @Override
+  public final AttributeMap getUnknownAttributes() {
+    return unknownAttributes;
+  }
+
+
+  @Override
+  public final void setFriendlyName(final String newFriendlyName) {
+    this.friendlyName = prepareForAssignment(this.friendlyName, newFriendlyName);
+  }
+
+
+  @Override
+  public void setIsRequired(final Boolean aboolean) {
+    this.isRequired = String.valueOf(aboolean);
+  }
+
+  @Override
+  public void setIsRequired(final XSBooleanValue xsBooleanValue) {
+    this.isRequired = String.valueOf(xsBooleanValue);
+  }
+
+  @Override
+  public final void setIsRequired(final String newIsRequired) {
+    isRequired = prepareForAssignment(this.isRequired, newIsRequired);
+
+  }
+
+
+  @Override
+  public final void setName(final String newName) {
+    this.name = prepareForAssignment(this.name, newName);
+  }
+
+
+  @Override
+  public final void setNameFormat(final String newNameFormat) {
+    this.nameFormat = prepareForAssignment(this.nameFormat, newNameFormat);
+  }
+
+
+  public final void setUnknownAttributes(final AttributeMap newUnknownAttr) {
+    this.unknownAttributes = newUnknownAttr;
+  }
+
+  @Override
+  public XSBooleanValue isRequiredXSBoolean() {
+    return XSBooleanValue.valueOf(isRequired);
+  }
+
+
+
+
+
+  @Override
+  public Boolean isRequired() {
+    return Boolean.parseBoolean(isRequired);
+  }
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EaafRequestedAttributesImpl.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EaafRequestedAttributesImpl.java
new file mode 100644
index 00000000..3b447538
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/reqattr/EaafRequestedAttributesImpl.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
+ * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.gv.egiz.eaaf.modules.pvp2.impl.reqattr;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttribute;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttributes;
+import org.opensaml.common.impl.AbstractSAMLObject;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.util.IndexedXMLObjectChildrenList;
+
+public class EaafRequestedAttributesImpl extends AbstractSAMLObject
+    implements EaafRequestedAttributes {
+
+  private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;
+
+  public EaafRequestedAttributesImpl(final String namespaceUri, final String elementLocalName,
+      final String namespacePrefix) {
+    super(namespaceUri, elementLocalName, namespacePrefix);
+    indexedChildren = new IndexedXMLObjectChildrenList<>(this);
+  }
+
+  @Override
+  public List<XMLObject> getOrderedChildren() {
+    final List<XMLObject> children = new ArrayList<>();
+    children.addAll(indexedChildren);
+    return Collections.unmodifiableList(children);
+
+  }
+
+  @Override
+  public List<EaafRequestedAttribute> getAttributes() {
+    return (List<EaafRequestedAttribute>) indexedChildren
+        .subList(EaafRequestedAttribute.DEFAULT_ELEMENT_NAME);
+  }
+
+}