use dependence injection for the core classes

catalog-core/src/main/java/uk/gov/justice/schema/catalog/CatalogLoader.java

@@ -4,6 +4,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.everit.json.schema.Schema;
 
 public class CatalogLoader {
@@ -13,6 +15,7 @@ public class CatalogLoader {
     private final JsonSchemaLoader jsonSchemaLoader;
     private final SchemaClientFactory schemaClientFactory;
 
+    @Inject
     public CatalogLoader(
             final SchemaResolverAndLoader schemaResolverAndLoader,
             final CatalogToSchemaResolver catalogToSchemaResolver,

catalog-core/src/main/java/uk/gov/justice/schema/catalog/CatalogToSchemaResolver.java

@@ -13,11 +13,14 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 
+import javax.inject.Inject;
+
 public class CatalogToSchemaResolver {
 
     private final ClasspathCatalogLoader classpathCatalogLoader;
     private final SchemaResolver schemaResolver;
 
+    @Inject
     public CatalogToSchemaResolver(final ClasspathCatalogLoader classpathCatalogLoader, final SchemaResolver schemaResolver) {
         this.classpathCatalogLoader = classpathCatalogLoader;
         this.schemaResolver = schemaResolver;

catalog-core/src/main/java/uk/gov/justice/schema/catalog/ClasspathCatalogLoader.java

@@ -14,6 +14,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class ClasspathCatalogLoader {
@@ -24,6 +26,7 @@ public class ClasspathCatalogLoader {
     private final ClasspathResourceLoader classpathResourceLoader;
     private final UrlConverter urlConverter;
 
+    @Inject
     public ClasspathCatalogLoader(final ObjectMapper objectMapper,
                                   final ClasspathResourceLoader classpathResourceLoader,
                                   final UrlConverter urlConverter) {

catalog-core/src/main/java/uk/gov/justice/schema/catalog/JsonSchemaLoader.java

@@ -5,10 +5,13 @@
 import java.net.URL;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 public class JsonSchemaLoader {
 
     private final FileContentsAsStringLoader fileContentsAsStringLoader;
 
+    @Inject
     public JsonSchemaLoader(final FileContentsAsStringLoader fileContentsAsStringLoader) {
         this.fileContentsAsStringLoader = fileContentsAsStringLoader;
     }

catalog-core/src/main/java/uk/gov/justice/schema/catalog/SchemaResolver.java

@@ -6,12 +6,15 @@
 import java.net.URL;
 import java.util.Optional;
 
+import javax.inject.Inject;
+
 public class SchemaResolver {
 
     private static final String AN_EMPTY_STRING = "";
 
     private final UrlConverter urlConverter;
 
+    @Inject
     public SchemaResolver(final UrlConverter urlConverter) {
         this.urlConverter = urlConverter;
     }

catalog-core/src/main/java/uk/gov/justice/schema/catalog/SchemaResolverAndLoader.java

@@ -4,13 +4,16 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.loader.SchemaClient;
 
 public class SchemaResolverAndLoader {
 
     private final JsonStringToSchemaConverter jsonStringToSchemaConverter;
 
+    @Inject
     public SchemaResolverAndLoader(final JsonStringToSchemaConverter jsonStringToSchemaConverter) {
         this.jsonStringToSchemaConverter = jsonStringToSchemaConverter;
     }

catalog-core/src/main/resources/META-INF/beans.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       version="1.1" bean-discovery-mode="all">
+</beans>

schema-service/src/test/java/uk/gov/justice/schema/service/SchemaServiceIT.java

@@ -3,6 +3,17 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import uk.gov.justice.schema.catalog.CatalogLoader;
+import uk.gov.justice.schema.catalog.CatalogToSchemaResolver;
+import uk.gov.justice.schema.catalog.ClasspathCatalogLoader;
+import uk.gov.justice.schema.catalog.FileContentsAsStringLoader;
+import uk.gov.justice.schema.catalog.JsonSchemaLoader;
+import uk.gov.justice.schema.catalog.JsonStringToSchemaConverter;
+import uk.gov.justice.schema.catalog.SchemaResolver;
+import uk.gov.justice.schema.catalog.SchemaResolverAndLoader;
+import uk.gov.justice.schema.catalog.util.ClasspathResourceLoader;
+import uk.gov.justice.schema.catalog.util.UrlConverter;
+import uk.gov.justice.schema.client.SchemaClientFactory;
 import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer;
 
 import java.util.Optional;
@@ -26,9 +37,19 @@ public class SchemaServiceIT {
 
     @Module
     @Classes(cdi = true, value = {
+            CatalogLoader.class,
+            CatalogToSchemaResolver.class,
+            ClasspathCatalogLoader.class,
+            ClasspathResourceLoader.class,
+            FileContentsAsStringLoader.class,
+            JsonSchemaLoader.class,
+            JsonStringToSchemaConverter.class,
             ObjectMapperProducer.class,
-            CatalogLoaderProducer.class,
-            SchemaCatalogService.class
+            SchemaCatalogService.class,
+            SchemaClientFactory.class,
+            SchemaResolver.class,
+            SchemaResolverAndLoader.class,
+            UrlConverter.class
     })
     public WebApp war() {
         return new WebApp()