Release 3.2.51

.gitignore

-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# IDE files
-.settings
-.project
-.classpath
-.checkstyle
-*.iml
-.idea
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+
+.metadata
+bin/
+tmp/
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
+
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+/.classpath
+/.settings
+/.project
+/.classpath
+/internal.iml
+/maven-central-deployment-pom.xml

pom.xml

@@ -3,13 +3,12 @@
 	<parent>
 		<groupId>de.fraunhofer.iese.ind2uce</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.1.33</version>
-	</parent>
+		<version>3.2.51</version>
+	</parent> 
 
 	<artifactId>core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.1.33</version>
-
+	<version>3.2.51</version>
 	<name>IND2UCE :: Core</name>
 	<description>IND2UCE :: Core</description>
 	<url>https://git.iese.fraunhofer.de/ind2uce/core</url>
@@ -64,7 +63,11 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 		</dependency>
-
+<dependency>
+    <groupId>xerces</groupId>
+    <artifactId>xercesImpl</artifactId>
+    <version>2.11.0</version>
+</dependency>
 	</dependencies>
 
 
@@ -74,9 +77,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
 				<configuration>
-					<tagBase>
-						https://ind2uce.iese.de/svn/ind2uce/dev2/core/tags/
-					</tagBase>
 					<useReleaseProfile>false</useReleaseProfile>
 				</configuration>
 			</plugin>
@@ -130,42 +130,36 @@
 					</execution>
 				</executions>
 			</plugin>
-		<!--	<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>-->
+		
 		</plugins>
 	</build>
 
 
+
 	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
 		<repository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<id>deployment</id>
+			<name>Internal Releases</name>
+
+			<url>http://ind2uce-nexus.iese.de/nexus/content/repositories/releases/</url>
 		</repository>
+		<snapshotRepository>
+			<id>deployment</id>
+			<name>Internal Snapshots</name>
+
+			<url>http://ind2uce-nexus.iese.de/nexus/content/repositories/snapshots/</url>
+		</snapshotRepository>
 	</distributionManagement>
 
+
 	<scm>
-		<url>scm:svn:https://ind2uce.iese.de/svn/ind2uce/dev2/core/tags/3.1.33-RELEASE</url>
-		<connection>scm:svn:https://ind2uce.iese.de/svn/ind2uce/dev2/core/tags/3.1.33-RELEASE</connection>
-		<developerConnection>scm:svn:https://ind2uce.iese.de/svn/ind2uce/dev2/core/tags/3.1.33-RELEASE
-        </developerConnection>
+
+		<connection>scm:git:http://ind2uce-git.iese.de/ind2uce/dev/core.git</connection>
+		<developerConnection>scm:git:http://ind2uce-git.iese.de/ind2uce/dev/core.git</developerConnection>
+		<tag>3.2.51-RELEASE</tag>
 	</scm>
 
+
 	<licenses>
 		<license>
 			<name>The Apache License, Version 2.0</name>

src/main/java/de/fraunhofer/iese/ind2uce/api/common/Hide.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/common/Ind2uceEntity.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.
@@ -173,7 +173,7 @@ public abstract class Ind2uceEntity implements Serializable {
             return null;
         }
       } catch (final Exception e) {
-        LOG.debug("Using default GSON" , e);
+        LOG.debug("Using default GSON", e);
         return GSON_PLAIN.fromJson(json, TypeDescription.class);
       }
     }

src/main/java/de/fraunhofer/iese/ind2uce/api/common/RuntimeTypeAdapterFactory.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.
@@ -17,6 +17,7 @@
  * limitations under the License.
  * =================================LICENSE_END=================================
  */
+
 package de.fraunhofer.iese.ind2uce.api.common;
 
 import com.google.gson.Gson;

src/main/java/de/fraunhofer/iese/ind2uce/api/common/package-info.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/Component.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/ComponentBase.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/ComponentType.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.
@@ -17,6 +17,7 @@
  * limitations under the License.
  * =================================LICENSE_END=================================
  */
+
 package de.fraunhofer.iese.ind2uce.api.component;
 
 import de.fraunhofer.iese.ind2uce.api.component.interfaces.IComponent;

src/main/java/de/fraunhofer/iese/ind2uce/api/component/EnforcementScope.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/PepComponent.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/description/ClassTypeDescription.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/description/InputParameterDescription.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.
@@ -346,7 +346,10 @@ public class InputParameterDescription extends Ind2uceEntity {
    * @param type the new parameter type
    */
   public void setType(Class<?> type) {
-    this.type = type.getCanonicalName();
+    Class<?> wrappedType = Primitives.replaceByWrapper(type);
+    if(wrappedType != null && Number.class.isAssignableFrom(wrappedType))
+      wrappedType = Number.class;
+    this.type = wrappedType.getCanonicalName();
   }
 
   /**

src/main/java/de/fraunhofer/iese/ind2uce/api/component/description/JsonType.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/description/MethodInterfaceDescription.java

@@ -280,6 +280,11 @@ public class MethodInterfaceDescription extends Ind2uceEntity {
    */
   public void setReturnType(Class<?> returnType) {
     if (returnType != null) {
+      Class<?> wrappedType = Primitives.replaceByWrapper(returnType);
+      if (wrappedType != null && Number.class.isAssignableFrom(wrappedType)) {
+        wrappedType = Number.class;
+        this.returnType = wrappedType.getCanonicalName();
+      }
       this.returnType = returnType.getCanonicalName();
     }
   }

src/main/java/de/fraunhofer/iese/ind2uce/api/component/description/PepInterfaceDescription.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.

src/main/java/de/fraunhofer/iese/ind2uce/api/component/description/Primitives.java

+/*-
+ * =================================LICENSE_START=================================
+ * IND2UCE
+ * %%
+ * Copyright (C) 2016 Fraunhofer IESE (www.iese.fraunhofer.de)
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * 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.
+ * =================================LICENSE_END=================================
+ */
+
+package de.fraunhofer.iese.ind2uce.api.component.description;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Wrapper class for primitive data types.
+ */
+public class Primitives {
+  /**
+   * Map for fetching wrapper-classes by their primitives.
+   */
+  private static final Map<Class<?>, Class<?>> wrappersByPrimitives = new HashMap<>();
+
+  static {
+    wrappersByPrimitives.put(Byte.TYPE, Byte.class);
+    wrappersByPrimitives.put(Boolean.TYPE, Boolean.class);
+    wrappersByPrimitives.put(Character.TYPE, Character.class);
+    wrappersByPrimitives.put(Short.TYPE, Short.class);
+    wrappersByPrimitives.put(Integer.TYPE, Integer.class);
+    wrappersByPrimitives.put(Long.TYPE, Long.class);
+    wrappersByPrimitives.put(Float.TYPE, Float.class);
+    wrappersByPrimitives.put(Double.TYPE, Double.class);
+  }
+
+
+  /**
+   * The constructor not to create instance.
+   */
+  private Primitives() {
+  }
+
+  /**
+   * Replaces class by it's wrapper, when it's primitive. Otherwise the class
+   * itself is returned.
+   *
+   * @param c class
+   * @return Class
+   */
+  public static Class<?> replaceByWrapper(Class<?> c) {
+    if (!c.isPrimitive()) {
+      return c;
+    }
+    return wrappersByPrimitives.get(c);
+  }
+
+
+}

src/main/java/de/fraunhofer/iese/ind2uce/api/component/description/TypeByName.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * 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.
@@ -42,7 +42,6 @@ public class TypeByName {
   /** The logger. */
   private static final Logger LOG = LoggerFactory.getLogger(Ind2uceEntity.class);
 
-  
   /**
    * Primitives can not be instantiated by Class.forName.
    */