Merge pull request #150 from eclipse/emily_may

#145 refract the cts structure to bypass the class duplication
microprofile · May 19, 2017 · 783c992 · 783c992
2 parents 3abbaa9 + 17f5b37
commit 783c992
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 37 deletions.
diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/CdiOptionalInjectionTest.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/CdiOptionalInjectionTest.java
@@ -19,12 +19,8 @@
  */
 package org.eclipse.microprofile.config.tck;
 
-import java.util.Optional;
-
-import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
 
-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;
@@ -48,7 +44,7 @@ public class CdiOptionalInjectionTest extends Arquillian {
     public static WebArchive deploy() {
         JavaArchive testJar = ShrinkWrap
                 .create(JavaArchive.class, "cdiOptionalInjectionTest.jar")
-                .addClasses(CdiOptionalInjectionTest.class)
+                .addClasses(CdiOptionalInjectionTest.class, OptionalValuesBean.class)
                 .addAsManifestResource(new StringAsset("my.optional.int.property=1234\nmy.optional.string.property=hello"),
                         "microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
@@ -71,36 +67,4 @@ public void testOptionalInjection() {
         Assert.assertTrue(optionalValuesBean.getStringValue().isPresent());
         Assert.assertEquals(optionalValuesBean.getStringValue().get(), "hello");
     }
-
-
-
-    @Dependent
-    public static class OptionalValuesBean {
-        @Inject
-        @ConfigProperty(name="my.optional.int.property")
-        private Optional<Integer> intProperty;
-
-        @Inject
-        @ConfigProperty(name="my.notexisting.property")
-        private Optional<Integer> notexistingProperty;
-
-        private Optional<String> stringValue;
-
-        @Inject
-        public void setStringValue(@ConfigProperty(name="my.optional.string.property") Optional<String> stringValue) {
-            this.stringValue = stringValue;
-        }
-
-        public Optional<String> getStringValue() {
-            return stringValue;
-        }
-
-        public Optional<Integer> getIntProperty() {
-            return intProperty;
-        }
-
-        public Optional<Integer> getNotexistingProperty() {
-            return notexistingProperty;
-        }
-    }
 }
diff --git a/tck/src/main/java/org/eclipse/microprofile/config/tck/OptionalValuesBean.java b/tck/src/main/java/org/eclipse/microprofile/config/tck/OptionalValuesBean.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016-2017 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;
+/**
+ * Declare a bean for config property injections.
+ * @author <a href="mailto:[email protected]">Mark Struberg</a>
+ * @author <a href="mailto:[email protected]">Emily Jiang</a>
+ */
+import java.util.Optional;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Dependent
+public class OptionalValuesBean {
+    @Inject
+    @ConfigProperty(name="my.optional.int.property")
+    private Optional<Integer> intProperty;
+
+    @Inject
+    @ConfigProperty(name="my.notexisting.property")
+    private Optional<Integer> notexistingProperty;
+
+    private Optional<String> stringValue;
+
+    @Inject
+    public void setStringValue(@ConfigProperty(name="my.optional.string.property") Optional<String> stringValue) {
+        this.stringValue = stringValue;
+    }
+
+    public Optional<String> getStringValue() {
+        return stringValue;
+    }
+
+    public Optional<Integer> getIntProperty() {
+        return intProperty;
+    }
+
+    public Optional<Integer> getNotexistingProperty() {
+        return notexistingProperty;
+    }
+}