Move static nested CDI beans out into their own classes

Signed-off-by: Tom Evans <tevans@uk.ibm.com>

tck/src/main/java/org/eclipse/microprofile/config/tck/ClassConverterBean.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.eclipse.microprofile.config.tck;
+
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Dependent
+public class ClassConverterBean {
+    @Inject
+    @ConfigProperty(name = "tck.config.test.javaconfig.converter.class")
+    private Class testClass;
+
+    @Inject
+    @ConfigProperty(name = "tck.config.test.javaconfig.converter.class.array")
+    private Class[] testClasses;
+
+    @Inject
+    @ConfigProperty(name = "tck.config.test.javaconfig.converter.class.array")
+    private Set<Class> testClassSet;
+
+    @Inject
+    @ConfigProperty(name = "tck.config.test.javaconfig.converter.class.array")
+    private List<Class> testClassList;
+
+    public Class getTestClass(){
+        return testClass;
+    }
+
+    public Class[] getTestClasses(){
+        return testClasses;
+    }
+
+    public Set<Class> getTestClassSet(){
+        return testClassSet;
+    }
+
+    public List<Class> getTestClassList(){
+        return testClassList;
+    }
+}

tck/src/main/java/org/eclipse/microprofile/config/tck/ClassConverterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -24,14 +24,10 @@
 
 import java.util.Arrays;
 import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
 
-import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -81,31 +77,12 @@ public void testClassConverterWithLookup() {
 
     @Test
     public void testConverterForClassLoadedInBean() {
-        assertEquals(classConverterBean.testClass, ClassConverterTest.class);
-        assertEquals(classConverterBean.testClasses.length, 2);
-        assertEquals(classConverterBean.testClasses, new Class[]{ClassConverterTest.class, String.class});
-        assertEquals(classConverterBean.testClassSet.size(), 2);
-        assertEquals(classConverterBean.testClassSet, new LinkedHashSet<>(Arrays.asList(ClassConverterTest.class, String.class)));
-        assertEquals(classConverterBean.testClassList.size(), 2);
-        assertEquals(classConverterBean.testClassList, Arrays.asList(ClassConverterTest.class, String.class));
-    }
-
-    @Dependent
-    public static class ClassConverterBean {
-        @Inject
-        @ConfigProperty(name = "tck.config.test.javaconfig.converter.class")
-        private Class testClass;
-
-        @Inject
-        @ConfigProperty(name = "tck.config.test.javaconfig.converter.class.array")
-        private Class[] testClasses;
-
-        @Inject
-        @ConfigProperty(name = "tck.config.test.javaconfig.converter.class.array")
-        private Set<Class> testClassSet;
-
-        @Inject
-        @ConfigProperty(name = "tck.config.test.javaconfig.converter.class.array")
-        private List<Class> testClassList;
+        assertEquals(classConverterBean.getTestClass(), ClassConverterTest.class);
+        assertEquals(classConverterBean.getTestClasses().length, 2);
+        assertEquals(classConverterBean.getTestClasses(), new Class[]{ClassConverterTest.class, String.class});
+        assertEquals(classConverterBean.getTestClassSet().size(), 2);
+        assertEquals(classConverterBean.getTestClassSet(), new LinkedHashSet<>(Arrays.asList(ClassConverterTest.class, String.class)));
+        assertEquals(classConverterBean.getTestClassList().size(), 2);
+        assertEquals(classConverterBean.getTestClassList(), Arrays.asList(ClassConverterTest.class, String.class));
     }
 }

tck/src/main/java/org/eclipse/microprofile/config/tck/ImplicitConverterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
+ * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -23,11 +23,9 @@
 
 import java.time.YearMonth;
 
-import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.config.tck.converters.implicit.ConvTestTypeWCharSequenceParse;
 import org.eclipse.microprofile.config.tck.converters.implicit.ConvTestTypeWStringCt;
 import org.eclipse.microprofile.config.tck.converters.implicit.ConvTestTypeWStringValueOf;
@@ -106,8 +104,8 @@ public void testImplicitConverterCharSequenceParseJavaTime() {
 
     @Test
     public void testImplicitConverterCharSequenceParseJavaTimeInjection() {
-        Assert.assertNotNull(parserConverterInjection.yearMonth);
-        Assert.assertEquals(parserConverterInjection.yearMonth, YearMonth.parse("2017-12"));
+        Assert.assertNotNull(parserConverterInjection.getYearMonth());
+        Assert.assertEquals(parserConverterInjection.getYearMonth(), YearMonth.parse("2017-12"));
     }
 
     @Test
@@ -118,11 +116,4 @@ public void testImplicitConverterEnumValueOf() {
         Assert.assertEquals(value, SomeEnumToConvert.BAZ);
         Assert.assertEquals(value.name(), "BAZ");
     }
-
-    @Dependent
-    public static class ParseConverterInjection {
-        private @Inject @ConfigProperty(name = "tck.config.test.javaconfig.converter.implicit.charSequenceParse.yearmonth") YearMonth yearMonth;
-
-    }
-
 }

tck/src/main/java/org/eclipse/microprofile/config/tck/ParseConverterInjection.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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.eclipse.microprofile.config.tck;
+
+import java.time.YearMonth;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Dependent
+public class ParseConverterInjection {
+    private @Inject @ConfigProperty(name = "tck.config.test.javaconfig.converter.implicit.charSequenceParse.yearmonth") YearMonth yearMonth;
+
+    public YearMonth getYearMonth(){
+        return yearMonth;
+    }
+}
+
+