Skip to content
This repository has been archived by the owner on Jul 6, 2023. It is now read-only.

Commit

Permalink
Update OrientAutoConfiguration.java
Browse files Browse the repository at this point in the history
Removed document references from auto configuration (Issue #23).
  • Loading branch information
Andreas Cordsen committed Mar 18, 2015
1 parent 955c281 commit 013f85a
Showing 1 changed file with 1 addition and 23 deletions.
@@ -1,6 +1,5 @@
package org.springframework.boot.autoconfigure.orient;

import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.object.db.OObjectDatabaseTx;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand All @@ -13,9 +12,6 @@
import org.springframework.data.orient.commons.core.OrientDatabaseFactory;
import org.springframework.data.orient.commons.core.OrientOperations;
import org.springframework.data.orient.commons.core.OrientTransactionManager;
import org.springframework.data.orient.document.OrientDocumentDatabaseFactory;
import org.springframework.data.orient.document.OrientDocumentOperations;
import org.springframework.data.orient.document.OrientDocumentTemplate;
import org.springframework.data.orient.object.OrientObjectDatabaseFactory;
import org.springframework.data.orient.object.OrientObjectOperations;
import org.springframework.data.orient.object.OrientObjectTemplate;
Expand Down Expand Up @@ -46,32 +42,14 @@ public OrientObjectDatabaseFactory objectDatabaseFactory() {

return factory;
}

@Bean
@ConditionalOnMissingClass(OObjectDatabaseTx.class)
@ConditionalOnMissingBean(OrientDocumentDatabaseFactory.class)
public OrientDocumentDatabaseFactory documentDatabaseFactory() {
OrientDocumentDatabaseFactory factory = new OrientDocumentDatabaseFactory();

configure(factory);

return factory;
}


@Bean
@ConditionalOnClass(OObjectDatabaseTx.class)
@ConditionalOnMissingBean(OrientObjectOperations.class)
public OrientObjectTemplate objectTemplate(OrientObjectDatabaseFactory factory) {
return new OrientObjectTemplate(factory);
}

@Bean
@ConditionalOnClass(ODatabaseDocumentTx.class)
@ConditionalOnMissingBean(OrientDocumentOperations.class)
public OrientDocumentTemplate documentTemplate(OrientDocumentDatabaseFactory factory) {
return new OrientDocumentTemplate(factory);
}

@Bean
@ConditionalOnWebApplication
@ConditionalOnClass(OObjectDatabaseTx.class)
Expand Down

0 comments on commit 013f85a

Please sign in to comment.