Changeset 5227


Ignore:
Timestamp:
05/19/14 11:34:10 (10 years ago)
Author:
Twan Goosen
Message:

Replaced @Autowired with @Inject from JSR-330

Location:
vlo/trunk/vlo-web-app/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

    r5160 r5227  
    1010import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
    1111import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
     12import javax.inject.Inject;
    1213import org.apache.wicket.Application;
    1314import org.apache.wicket.markup.html.WebPage;
    … …  
    1920import org.slf4j.LoggerFactory;
    2021import org.springframework.beans.BeansException;
    21 import org.springframework.beans.factory.annotation.Autowired;
    2222import org.springframework.context.ApplicationContext;
    2323import org.springframework.context.ApplicationContextAware;
    … …  
    3333    private final static Logger logger = LoggerFactory.getLogger(VloWicketApplication.class);
    3434
    35     @Autowired
     35    @Inject
    3636    private SolrDocumentService documentService;
    37     @Autowired
     37    @Inject
    3838    private XmlTransformationService cmdiTransformationService;
    39     @Autowired
     39    @Inject
    4040    private VloConfig vloConfig;
    4141

  • vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java

    r4932 r5227  
    1010import java.util.Arrays;
    1111import java.util.List;
     12import javax.inject.Inject;
    1213import org.apache.solr.client.solrj.response.FacetField;
    1314import org.apache.solr.common.SolrDocument;
    … …  
    1920import org.junit.Test;
    2021import org.junit.runner.RunWith;
    21 import org.springframework.beans.factory.annotation.Autowired;
    2222import org.springframework.context.annotation.Bean;
    2323import org.springframework.context.annotation.Configuration;
    … …  
    6161
    6262    private WicketTester tester;
    63     @Autowired(required = true)
     63    @Inject
    6464    private VloWicketApplication application;
    65     @Autowired(required = true)
     65    @Inject
    6666    private Mockery mockery;
    6767
    68     @Autowired(required = true)
     68    @Inject
    6969    private FacetFieldsService facetFieldsService;
    7070
    71     @Autowired(required = true)
     71    @Inject
    7272    private SolrDocumentService documentService;
    7373

  • vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java

    r4966 r5227  
    88import eu.clarin.cmdi.vlo.config.VloSpringConfig;
    99import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
     10import javax.inject.Inject;
    1011import org.apache.solr.common.SolrDocument;
    1112import org.apache.wicket.request.mapper.parameter.PageParameters;
    … …  
    1819import org.junit.Test;
    1920import org.junit.runner.RunWith;
    20 import org.springframework.beans.factory.annotation.Autowired;
    2121import org.springframework.context.annotation.Bean;
    2222import org.springframework.context.annotation.Configuration;
    … …  
    5858
    5959    private WicketTester tester;
    60     @Autowired(required = true)
     60    @Inject
    6161    private VloWicketApplication application;
    62     @Autowired(required = true)
     62    @Inject
    6363    private Mockery mockery;
    64     @Autowired(required = true)
     64    @Inject
    6565    private SolrDocumentService documentService;
    6666

  • vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/panels/ContentSearchFormPanelTest.java

    r5101 r5227  
    2424import java.io.IOException;
    2525import java.util.regex.Pattern;
     26import javax.inject.Inject;
    2627import org.apache.solr.common.SolrDocument;
    2728import org.apache.wicket.model.Model;
    … …  
    3031import org.junit.Test;
    3132import org.junit.runner.RunWith;
    32 import org.springframework.beans.factory.annotation.Autowired;
    3333import org.springframework.context.annotation.Configuration;
    3434import org.springframework.test.context.ContextConfiguration;
    … …  
    6666    }
    6767
    68     @Autowired(required = true)
     68    @Inject
    6969    private VloWicketApplication application;
    7070    private WicketTester tester;
Note: See TracChangeset for help on using the changeset viewer.