Revert "TAP5-2453: move GenericsUtils (and tests) to plastic"
authorThiago H. de Paula Figueiredo <thiago@arsmachina.com.br>
Wed, 16 Jan 2019 18:06:45 +0000 (16:06 -0200)
committerThiago H. de Paula Figueiredo <thiago@arsmachina.com.br>
Wed, 16 Jan 2019 18:06:45 +0000 (16:06 -0200)
This reverts commit 5c617af6b3bfef81d79c573aec0acf29e1d0eb8c.

commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java [moved from plastic/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java with 100% similarity]
plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java [deleted file]
plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java [deleted file]
tapestry-ioc/src/test/groovy/ioc/specs/GenericUtilsSpec.groovy [moved from plastic/src/test/groovy/ioc/specs/GenericUtilsSpec.groovy with 100% similarity]
tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java [moved from plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java with 100% similarity]
tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java [moved from plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java with 100% similarity]
tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java [moved from plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java with 100% similarity]

diff --git a/plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java b/plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java
deleted file mode 100644 (file)
index 00722f4..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2008 The Apache Software Foundation
-//
-// 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.
-
-package org.apache.tapestry5.ioc.internal.util;
-
-public class Pair<K, V>
-{
-    private K key;
-
-    private V value;
-
-    public K getKey()
-    {
-        return key;
-    }
-
-    public void setKey(K key)
-    {
-        this.key = key;
-    }
-
-    public V getValue()
-    {
-        return value;
-    }
-
-    public void setValue(V value)
-    {
-        this.value = value;
-    }
-}
diff --git a/plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java b/plastic/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java
deleted file mode 100644 (file)
index 0071beb..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2008 The Apache Software Foundation
-//
-// 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.
-
-package org.apache.tapestry5.ioc.internal.util;
-
-public class StringLongPair extends Pair<String, Long>
-{
-}