merge: #4148 again?

Author: Cervator

engine-tests/src/test/java/org/terasology/persistence/typeHandling/reflection/ModuleEnvironmentSandboxTest.java

@@ -89,11 +89,6 @@ private boolean doesSubclassMatch(Class<?> subclass, String subTypeIdentifier) {
         return Objects.equals(givenModuleName, providingModule) && subTypeName.toString().equals(subclass.getSimpleName());
     }
 
-    @Override
-    public <T> String getSubTypeIdentifier(Class<? extends T> subType, Class<T> baseType) {
-        return subType.getName();
-    }
-
     @Override
     public <T> boolean isValidTypeHandlerDeclaration(TypeInfo<T> type, TypeHandler<T> typeHandler) {
         Name moduleDeclaringHandler = getModuleProviding(typeHandler.getClass());

engine/src/main/java/org/terasology/persistence/typeHandling/reflection/ModuleEnvironmentSandbox.java

@@ -1,18 +1,5 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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.
- */
+// Copyright 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.persistence.typeHandling.reflection;
 
 import org.reflections.Reflections;
@@ -43,11 +30,6 @@ public <T> Optional<Class<? extends T>> findSubTypeOf(String subTypeIdentifier,
         return Optional.empty();
     }
 
-    @Override
-    public <T> String getSubTypeIdentifier(Class<? extends T> subType, Class<T> baseType) {
-        return subType.getName();
-    }
-
     @Override
     public <T> boolean isValidTypeHandlerDeclaration(TypeInfo<T> type, TypeHandler<T> typeHandler) {
         return true;

engine/src/main/java/org/terasology/persistence/typeHandling/reflection/ReflectionsSandbox.java

@@ -1,18 +1,5 @@
-/*
- * Copyright 2019 MovingBlocks
- *
- * 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.
- */
+// Copyright 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 package org.terasology.persistence.typeHandling.reflection;
 
 import org.terasology.persistence.typeHandling.TypeHandler;
@@ -46,7 +33,9 @@ public interface SerializationSandbox {
      * @param <T>      The base type whose subtype needs to be identified.
      * @return The unique identifier for {@code subType}.
      */
-    <T> String getSubTypeIdentifier(Class<? extends T> subType, Class<T> baseType);
+    default <T> String getSubTypeIdentifier(Class<? extends T> subType, Class<T> baseType) {
+        return subType.getName();
+    }
 
     /**
      * Checks whether the given {@link TypeHandler} should be allowed to handle instances of