Updated Branches: refs/heads/master c26a4ef7d -> 7be552917
DELTASPIKE-399 Switched to using a marker interface style for storage types. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7be55291 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7be55291 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7be55291 Branch: refs/heads/master Commit: 7be5529171b5bf577fcf32d823b90b96c8183ba7 Parents: c26a4ef Author: John D. Ament <[email protected]> Authored: Thu Dec 26 22:29:23 2013 -0500 Committer: John D. Ament <[email protected]> Committed: Thu Dec 26 22:29:23 2013 -0500 ---------------------------------------------------------------------- .../api/literal/ExternalResourceLiteral.java | 7 ++-- .../api/resoureloader/ClasspathStorage.java | 26 +++++++++++++++ .../api/resoureloader/ExternalResource.java | 2 +- .../resoureloader/ExternalResourceStorage.java | 26 +++++++++++++++ .../api/resoureloader/FileSystemStorage.java | 26 +++++++++++++++ .../core/api/resoureloader/XMLProperties.java | 35 -------------------- .../core/spi/literal/StorageTypeLiteral.java | 7 ++-- .../core/spi/resourceloader/StorageType.java | 7 ++-- .../resourceloader/BaseResourceProvider.java | 10 ++---- .../ClasspathResourceProvider.java | 3 +- .../ExternalResourceProducer.java | 14 +++++--- .../resourceloader/FileResourceProvider.java | 3 +- .../resourceloader/ClasspathResourceTest.java | 12 ++++--- .../impl/resourceloader/FileResourceTest.java | 16 ++++----- 14 files changed, 121 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ExternalResourceLiteral.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ExternalResourceLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ExternalResourceLiteral.java index d8f20c7..7b1388e 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ExternalResourceLiteral.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ExternalResourceLiteral.java @@ -19,6 +19,7 @@ package org.apache.deltaspike.core.api.literal; import org.apache.deltaspike.core.api.resoureloader.ExternalResource; +import org.apache.deltaspike.core.api.resoureloader.ExternalResourceStorage; import javax.enterprise.util.AnnotationLiteral; @@ -27,9 +28,9 @@ import javax.enterprise.util.AnnotationLiteral; */ public class ExternalResourceLiteral extends AnnotationLiteral<ExternalResource> implements ExternalResource { - private String storage; + private Class<? extends ExternalResourceStorage> storage; private String location; - public ExternalResourceLiteral(final String storage, final String location) + public ExternalResourceLiteral(final Class<? extends ExternalResourceStorage> storage, final String location) { this.storage = storage; this.location = location; @@ -41,7 +42,7 @@ public class ExternalResourceLiteral extends AnnotationLiteral<ExternalResource> } @Override - public String storage() + public Class<? extends ExternalResourceStorage> storage() { return this.storage; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ClasspathStorage.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ClasspathStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ClasspathStorage.java new file mode 100644 index 0000000..ef5fa2f --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ClasspathStorage.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.deltaspike.core.api.resoureloader; + +/** + * Represents storage found on the classpath + */ +public interface ClasspathStorage extends ExternalResourceStorage +{ +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResource.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResource.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResource.java index 38e9408..ed8b525 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResource.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResource.java @@ -37,7 +37,7 @@ import static java.lang.annotation.ElementType.METHOD; public @interface ExternalResource { @Nonbinding - String storage(); + Class<? extends ExternalResourceStorage> storage(); @Nonbinding String location() default ""; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResourceStorage.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResourceStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResourceStorage.java new file mode 100644 index 0000000..aa896f1 --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/ExternalResourceStorage.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.deltaspike.core.api.resoureloader; + +/** + * A marker interface for types of external resource storage. + */ +public interface ExternalResourceStorage +{ +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/FileSystemStorage.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/FileSystemStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/FileSystemStorage.java new file mode 100644 index 0000000..dac1ad2 --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/FileSystemStorage.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.deltaspike.core.api.resoureloader; + +/** + * A File System marker for external resources. + */ +public interface FileSystemStorage extends ExternalResourceStorage +{ +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/XMLProperties.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/XMLProperties.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/XMLProperties.java deleted file mode 100644 index 9a1a4a4..0000000 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resoureloader/XMLProperties.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.deltaspike.core.api.resoureloader; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.METHOD; - -@Target( { METHOD, PARAMETER, FIELD }) -@Retention(value = RetentionPolicy.RUNTIME) -@Documented -public @interface XMLProperties -{ -} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/literal/StorageTypeLiteral.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/literal/StorageTypeLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/literal/StorageTypeLiteral.java index de71d41..4504ac3 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/literal/StorageTypeLiteral.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/literal/StorageTypeLiteral.java @@ -18,19 +18,20 @@ */ package org.apache.deltaspike.core.spi.literal; +import org.apache.deltaspike.core.api.resoureloader.ExternalResourceStorage; import org.apache.deltaspike.core.spi.resourceloader.StorageType; import javax.enterprise.util.AnnotationLiteral; public class StorageTypeLiteral extends AnnotationLiteral<StorageType> implements StorageType { - private String value; - public StorageTypeLiteral(String value) + private Class<? extends ExternalResourceStorage> value; + public StorageTypeLiteral(Class<? extends ExternalResourceStorage> value) { this.value = value; } @Override - public String value() + public Class<? extends ExternalResourceStorage> value() { return this.value; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/resourceloader/StorageType.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/resourceloader/StorageType.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/resourceloader/StorageType.java index 6cb664d..9403c60 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/resourceloader/StorageType.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/resourceloader/StorageType.java @@ -18,6 +18,8 @@ */ package org.apache.deltaspike.core.spi.resourceloader; +import org.apache.deltaspike.core.api.resoureloader.ExternalResourceStorage; + import javax.inject.Qualifier; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -39,8 +41,5 @@ import static java.lang.annotation.ElementType.FIELD; @Qualifier public @interface StorageType { - String FILE = "file"; - String CLASSPATH = "classpath"; - - String value(); + Class<? extends ExternalResourceStorage> value(); } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/BaseResourceProvider.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/BaseResourceProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/BaseResourceProvider.java index fd16e77..aa751a3 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/BaseResourceProvider.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/BaseResourceProvider.java @@ -19,9 +19,7 @@ package org.apache.deltaspike.core.impl.resourceloader; import org.apache.deltaspike.core.api.resoureloader.ExternalResource; -import org.apache.deltaspike.core.api.resoureloader.XMLProperties; import org.apache.deltaspike.core.spi.resourceloader.ExternalResourceProvider; -import org.apache.deltaspike.core.util.BeanUtils; import javax.enterprise.inject.Any; import javax.enterprise.inject.Instance; @@ -46,11 +44,9 @@ public abstract class BaseResourceProvider implements ExternalResourceProvider @Any private Instance<InjectionPoint> injectionPoint; - protected boolean isXml() + protected boolean isXml(String fileName) { - final boolean isXml = BeanUtils.extractAnnotation(getInjectionPoint().getAnnotated(), XMLProperties.class) - != null; - return isXml; + return fileName.endsWith(".xml"); } protected InjectionPoint getInjectionPoint() @@ -65,7 +61,7 @@ public abstract class BaseResourceProvider implements ExternalResourceProvider protected void loadInputStreamToProperties(InputStream inputStream, Properties properties, String name) { - boolean isXml = this.isXml(); + boolean isXml = this.isXml(name); try { if (isXml) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java index b552c00..ecc2b86 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.core.impl.resourceloader; +import org.apache.deltaspike.core.api.resoureloader.ClasspathStorage; import org.apache.deltaspike.core.api.resoureloader.ExternalResource; import org.apache.deltaspike.core.spi.resourceloader.StorageType; import org.apache.deltaspike.core.util.ClassUtils; @@ -34,7 +35,7 @@ import java.util.logging.Logger; * A classpath based resource provider */ @ApplicationScoped -@StorageType(StorageType.CLASSPATH) +@StorageType(ClasspathStorage.class) public class ClasspathResourceProvider extends BaseResourceProvider { private static final Logger logger = Logger.getLogger(ClasspathResourceProvider.class.getName()); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ExternalResourceProducer.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ExternalResourceProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ExternalResourceProducer.java index 7ef976a..95d3c9a 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ExternalResourceProducer.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ExternalResourceProducer.java @@ -19,6 +19,7 @@ package org.apache.deltaspike.core.impl.resourceloader; import org.apache.deltaspike.core.api.resoureloader.ExternalResource; +import org.apache.deltaspike.core.api.resoureloader.ExternalResourceStorage; import org.apache.deltaspike.core.spi.literal.StorageTypeLiteral; import org.apache.deltaspike.core.spi.resourceloader.ExternalResourceProvider; import org.apache.deltaspike.core.spi.resourceloader.StorageType; @@ -49,15 +50,15 @@ public class ExternalResourceProducer @Any private Instance<ExternalResourceProvider> resourceProviders; - private ExternalResourceProvider getProvider(String storageTypeName) + private ExternalResourceProvider getProvider(Class<? extends ExternalResourceStorage> storageTypeClass) { - StorageType storageType = new StorageTypeLiteral(storageTypeName); + StorageType storageType = new StorageTypeLiteral(storageTypeClass); ExternalResourceProvider provider = resourceProviders.select(storageType).get(); return provider; } @Produces - @ExternalResource(storage = "",location = "") + @ExternalResource(storage = ExternalResourceStorage.class,location = "") public InputStream getInputStream(final InjectionPoint injectionPoint) { ExternalResource externalResource = getAnnotation(injectionPoint); @@ -67,7 +68,7 @@ public class ExternalResourceProducer } @Produces - @ExternalResource(storage = "",location = "") + @ExternalResource(storage = ExternalResourceStorage.class,location = "") public Properties getProperties(final InjectionPoint injectionPoint) throws IOException { ExternalResource externalResource = getAnnotation(injectionPoint); @@ -76,7 +77,8 @@ public class ExternalResourceProducer return properties; } - public void closeInputStream(@Disposes @ExternalResource(storage = "",location = "") InputStream inputStream) + public void closeInputStream(@Disposes @ExternalResource(storage = ExternalResourceStorage.class,location = "") + InputStream inputStream) { if (inputStream != null) { @@ -93,6 +95,8 @@ public class ExternalResourceProducer private ExternalResource getAnnotation(final InjectionPoint injectionPoint) { + System.out.println("processing injection point " + injectionPoint + + " with qualifiers " + injectionPoint.getQualifiers()); for (Annotation annotation : injectionPoint.getQualifiers()) { if (annotation instanceof ExternalResource) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/FileResourceProvider.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/FileResourceProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/FileResourceProvider.java index 0fcbf2d..67dbcc8 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/FileResourceProvider.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/FileResourceProvider.java @@ -19,6 +19,7 @@ package org.apache.deltaspike.core.impl.resourceloader; import org.apache.deltaspike.core.api.resoureloader.ExternalResource; +import org.apache.deltaspike.core.api.resoureloader.FileSystemStorage; import org.apache.deltaspike.core.spi.resourceloader.StorageType; import javax.enterprise.context.ApplicationScoped; @@ -33,7 +34,7 @@ import java.util.logging.Logger; * A file based resource provider, looking for a file based on the name. */ @ApplicationScoped -@StorageType(StorageType.FILE) +@StorageType(FileSystemStorage.class) public class FileResourceProvider extends BaseResourceProvider { private static final Logger logger = Logger.getLogger(FileResourceProvider.class.getName()); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java index d57bee1..780a8e7 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java @@ -19,8 +19,8 @@ package org.apache.deltaspike.test.core.impl.resourceloader; +import org.apache.deltaspike.core.api.resoureloader.ClasspathStorage; import org.apache.deltaspike.core.api.resoureloader.ExternalResource; -import org.apache.deltaspike.core.spi.resourceloader.StorageType; import org.apache.deltaspike.test.util.ArchiveUtils; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -51,15 +51,16 @@ public class ClasspathResourceTest { } @Inject - @ExternalResource(storage = StorageType.CLASSPATH,location="myconfig.properties") + @ExternalResource(storage = ClasspathStorage.class,location="myconfig.properties") private InputStream inputStream; @Inject - @ExternalResource(storage = StorageType.CLASSPATH,location="myconfig.properties") + @ExternalResource(storage = ClasspathStorage.class,location="myconfig.properties") private Properties props; @Test - public void testInputStream() throws IOException { + public void testInputStream() throws IOException + { Assert.assertNotNull(inputStream); Properties p = new Properties(); p.load(inputStream); @@ -67,7 +68,8 @@ public class ClasspathResourceTest { } @Test - public void testProperties() { + public void testProperties() + { Assert.assertEquals("somevalue", props.getProperty("some.propertykey", "wrong answer")); } } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7be55291/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java index 932b6c1..6c2fbd8 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java @@ -20,17 +20,14 @@ package org.apache.deltaspike.test.core.impl.resourceloader; import org.apache.deltaspike.core.api.literal.ExternalResourceLiteral; -import org.apache.deltaspike.core.api.resoureloader.ExternalResource; -import org.apache.deltaspike.core.spi.resourceloader.StorageType; +import org.apache.deltaspike.core.api.resoureloader.FileSystemStorage; import org.apache.deltaspike.test.util.ArchiveUtils; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -88,9 +85,10 @@ public class FileResourceTest private Instance<Properties> propsInst; @Test - public void testInputStream() throws IOException { + public void testInputStream() throws IOException + { InputStream inputStream = inputStreamInst - .select(new ExternalResourceLiteral(StorageType.FILE, tempFileName)).get(); + .select(new ExternalResourceLiteral(FileSystemStorage.class, tempFileName)).get(); Assert.assertNotNull(inputStream); Properties p = new Properties(); p.load(inputStream); @@ -98,8 +96,10 @@ public class FileResourceTest } @Test - public void testProperties() { - Properties props = this.propsInst.select(new ExternalResourceLiteral(StorageType.FILE,tempFileName)).get(); + public void testProperties() + { + Properties props = this.propsInst.select(new ExternalResourceLiteral(FileSystemStorage.class,tempFileName)) + .get(); Assert.assertEquals("somevalue", props.getProperty("some.propertykey", "wrong answer")); } }
