Skip to content

Commit 1c9821c

Browse files
author
Fernando de Oliveira Pereira
committed
refactory and update dependencies
1 parent 4125eca commit 1c9821c

15 files changed

Lines changed: 33 additions & 27 deletions

File tree

‎devframework/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@
136136
<version>1.5.10</version>
137137
</dependency>
138138
<dependency>
139-
<groupId>com.github.esfingeframework</groupId>
139+
<groupId>io.github.esfinge-framework</groupId>
140140
<artifactId>querybuilder-jpa1</artifactId>
141-
<version>2.0.0-SNAPSHOT</version>
141+
<version>2.0.0</version>
142142
</dependency>
143143
<dependency>
144-
<groupId>com.github.esfingeframework</groupId>
144+
<groupId>io.github.esfinge-framework</groupId>
145145
<artifactId>querybuilder-mongodb</artifactId>
146-
<version>2.0.0-SNAPSHOT</version>
146+
<version>2.0.0</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>net.sf.esfinge</groupId>

‎devframework/src/main/java/org/esfinge/virtuallab/metadata/validator/ValidServiceDAOValidador.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.esfinge.virtuallab.metadata.validator;
22

3-
import esfinge.querybuilder.core.Repository;
3+
import ef.qb.core.Repository;
44
import java.lang.annotation.Annotation;
55
import java.lang.reflect.AnnotatedElement;
66
import javax.persistence.Entity;
@@ -26,7 +26,7 @@ public void validate(Annotation toValidate, AnnotatedElement annotated) throws A
2626
// verifica se eh uma interface e estende Repository (do QueryBuilder)
2727
if (!clazz.isInterface() || !Repository.class.isAssignableFrom(clazz)) {
2828
throw new AnnotationValidationException(String.format(
29-
"A classe '%s' deve ser uma interface que estende 'esfinge.querybuilder.core.Repository' do Esfinge QueryBuilder!", clazz.getCanonicalName()));
29+
"A classe '%s' deve ser uma interface que estende 'ef.qb.core.Repository' do Esfinge QueryBuilder!", clazz.getCanonicalName()));
3030
}
3131

3232
// verifica se a entidade implementa a anotacao JPA @Entity

‎devframework/src/main/java/org/esfinge/virtuallab/polyglot/QueryBuilderMongoDBDatastoreProvider.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
package org.esfinge.virtuallab.polyglot;
22

33
import com.mongodb.MongoClientSettings;
4+
import com.mongodb.MongoCredential;
45
import com.mongodb.ServerAddress;
56
import com.mongodb.client.MongoClient;
67
import com.mongodb.client.MongoClients;
78
import dev.morphia.Datastore;
89
import dev.morphia.Morphia;
9-
import static esfinge.querybuilder.core.utils.PersistenceTypeConstants.MONGODB;
10-
import esfinge.querybuilder.mongodb.DatastoreProvider;
10+
import static ef.qb.core.utils.PersistenceTypeConstants.MONGODB;
11+
import ef.qb.mongodb.DatastoreProvider;
1112
import java.util.Collections;
1213
import java.util.HashMap;
1314
import java.util.Map;
1415
import java.util.regex.Matcher;
1516
import java.util.regex.Pattern;
1617

17-
public class QueryBuilderMongoDBDatastoreProvider implements DatastoreProvider {
18+
public final class QueryBuilderMongoDBDatastoreProvider implements DatastoreProvider {
1819

1920
protected MongoClient mongo;
2021
private final String host;
2122
private final int port;
2223
private final String database;
24+
private final String user;
25+
private final String password;
2326
private Datastore datastore;
2427

2528
public QueryBuilderMongoDBDatastoreProvider() {
@@ -32,6 +35,8 @@ public QueryBuilderMongoDBDatastoreProvider() {
3235
host = (String) getInfo("host", secInfo);
3336
port = Integer.parseInt(getInfo("port", secInfo));
3437
database = (String) getInfo("database", secInfo);
38+
user = secInfo.getUser();
39+
password = secInfo.getPassword();
3540
}
3641

3742
public MongoClient getMongo() {
@@ -40,6 +45,7 @@ public MongoClient getMongo() {
4045
MongoClientSettings.builder()
4146
.applyToClusterSettings(builder
4247
-> builder.hosts(Collections.singletonList(new ServerAddress(host, port))))
48+
.credential(MongoCredential.createCredential(user, database, password.toCharArray()))
4349
.build()
4450
);
4551
} catch (Exception e) {

‎devframework/src/main/java/org/esfinge/virtuallab/services/ClassLoaderService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.esfinge.virtuallab.services;
22

3-
import esfinge.querybuilder.core.annotation.PersistenceType;
3+
import ef.qb.core.annotation.PersistenceType;
44
import java.io.File;
55
import java.io.FileInputStream;
66
import java.io.IOException;

‎devframework/src/main/java/org/esfinge/virtuallab/services/InvokerService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.esfinge.virtuallab.services;
22

3-
import esfinge.querybuilder.core.QueryBuilder;
3+
import ef.qb.core.QueryBuilder;
44
import java.lang.reflect.Method;
55
import java.lang.reflect.Proxy;
66
import org.apache.commons.lang3.ClassUtils;

‎devframework/src/main/java/org/esfinge/virtuallab/spring/QueryBuilderEntityManagerProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.esfinge.virtuallab.spring;
22

3-
import esfinge.querybuilder.jpa1.EntityManagerProvider;
3+
import ef.qb.jpa1.EntityManagerProvider;
44
import java.util.HashMap;
55
import java.util.Map;
66
import javax.persistence.EntityManager;

devframework/src/main/resources/META-INF/services/esfinge.querybuilder.jpa1.EntityManagerProvider renamed to devframework/src/main/resources/META-INF/services/ef.qb.jpa1.EntityManagerProvider

File renamed without changes.

devframework/src/main/resources/META-INF/services/esfinge.querybuilder.mongodb.DatastoreProvider renamed to devframework/src/main/resources/META-INF/services/ef.qb.mongodb.DatastoreProvider

File renamed without changes.

‎devframework/src/test/java/org/esfinge/virtuallab/demo/chart/lines/DaoXrayLow.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.esfinge.virtuallab.demo.chart.lines;
22

3-
import esfinge.querybuilder.core.Repository;
4-
import esfinge.querybuilder.core.annotation.GreaterOrEquals;
3+
import ef.qb.core.Repository;
4+
import ef.qb.core.annotation.GreaterOrEquals;
55
import java.util.List;
66
import org.esfinge.virtuallab.api.annotations.ServiceDAO;
77
import org.esfinge.virtuallab.api.annotations.ServiceMethod;

‎devframework/src/test/java/org/esfinge/virtuallab/demo/dao/DaoDemo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.esfinge.virtuallab.demo.dao;
22

3-
import esfinge.querybuilder.core.Repository;
4-
import esfinge.querybuilder.core.annotation.GreaterOrEquals;
5-
import esfinge.querybuilder.core.annotation.LesserOrEquals;
3+
import ef.qb.core.Repository;
4+
import ef.qb.core.annotation.GreaterOrEquals;
5+
import ef.qb.core.annotation.LesserOrEquals;
66
import java.util.List;
77
import org.esfinge.virtuallab.api.annotations.ServiceDAO;
88
import org.esfinge.virtuallab.api.annotations.ServiceMethod;

0 commit comments

Comments
 (0)