Skip to content

Commit 4f9ef33

Browse files
hghiannihghianni
committed
Update gestahospital controller
1 parent 5fd4836 commit 4f9ef33

5 files changed

Lines changed: 60 additions & 56 deletions

File tree

‎jdk_8_maven/cs/rest-gui/gestaohospital/src/main/java/br/com/codenation/hospital/resource/HospitalResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@RestController
2525
@RequestMapping(path = Constant.V1)
2626
public class HospitalResource {
27-
private static final Logger LOGGER = LoggerFactory.getLogger(ProductResource.class);
27+
private static final Logger LOGGER = LoggerFactory.getLogger(HospitalResource.class);
2828

2929
@Autowired
3030
private HospitalService service;

‎jdk_8_maven/cs/rest-gui/gestaohospital/src/main/java/br/com/codenation/hospital/resource/PatientResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@RestController
2727
@RequestMapping(path = Constant.V1Path)
2828
public class PatientResource {
29-
private static final Logger LOGGER = LoggerFactory.getLogger(ProductResource.class);
29+
private static final Logger LOGGER = LoggerFactory.getLogger(PatientResource.class);
3030

3131
@Autowired
3232
private PatientService service;

‎jdk_8_maven/em/external/rest/gestaohospital/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
</dependency>
3434
<dependency>
3535
<groupId>org.mongodb</groupId>
36-
<artifactId>mongodb-driver</artifactId>
37-
<version>3.2.2</version>
36+
<artifactId>mongodb-driver-sync</artifactId>
37+
<version>3.8.2</version>
3838
<scope>compile</scope>
3939
</dependency>
4040

‎jdk_8_maven/em/external/rest/gestaohospital/src/main/java/em/external/br/com/codenation/hospital/ExternalEvoMasterController.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package em.external.br.com.codenation.hospital;
22

33

4-
import com.mongodb.MongoClient;
4+
import com.mongodb.client.MongoClient;
5+
import com.mongodb.client.MongoClients;
56
import org.evomaster.client.java.controller.ExternalSutController;
67
import org.evomaster.client.java.controller.InstrumentedSutStarter;
78
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
@@ -23,7 +24,7 @@ public class ExternalEvoMasterController extends ExternalSutController {
2324
private static final int DEFAULT_DB_PORT = 27017;
2425
private static final int MONGODB_PORT = 27017;
2526

26-
private static final String MONGODB_VERSION = "3.2";
27+
private static final String MONGODB_VERSION = "6.0";
2728

2829
private static final String MONGODB_DATABASE_NAME = "HospitalDB";
2930

@@ -42,7 +43,7 @@ public static void main(String[] args) {
4243
jarLocation = args[2];
4344
}
4445
if (!jarLocation.endsWith(".jar")) {
45-
jarLocation += "/gestaohospital-sut.jar";
46+
jarLocation += "/gestaohospital-rest-sut.jar";
4647
}
4748

4849
int timeoutSeconds = 120;
@@ -146,9 +147,7 @@ public void preStart() {
146147
mongodb.start();
147148

148149
try {
149-
mongoClient = new MongoClient(mongodb.getContainerIpAddress(),
150-
mongodb.getMappedPort(DEFAULT_DB_PORT));
151-
150+
mongoClient = MongoClients.create("mongodb://" + mongodb.getContainerIpAddress() + ":" + mongodb.getMappedPort(DEFAULT_DB_PORT));
152151
} catch (Exception e) {
153152
System.out.println("ERROR: " + e.getMessage());
154153
throw new RuntimeException(e);
@@ -206,5 +205,10 @@ public List<DbSpecification> getDbSpecifications() {
206205
return dbSpecification;
207206
}
208207

208+
@Override
209+
public Object getMongoConnection() {
210+
return mongoClient;
211+
}
212+
209213

210214
}

‎scripts/dist.py‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -101,71 +101,71 @@ def build_jdk_8_maven():
101101
callMaven(folder, JAVA_HOME_8)
102102

103103
# Copy JAR files
104-
copy(folder + "/cs/rest/original/features-service/target/features-service-sut.jar", DIST)
105-
copy(folder + "/em/external/rest/features-service/target/features-service-evomaster-runner.jar", DIST)
104+
#copy(folder + "/cs/rest/original/features-service/target/features-service-sut.jar", DIST)
105+
#copy(folder + "/em/external/rest/features-service/target/features-service-evomaster-runner.jar", DIST)
106106

107-
copy(folder + "/cs/rest/original/scout-api/api/target/scout-api-sut.jar", DIST)
108-
copy(folder + "/em/external/rest/scout-api/target/scout-api-evomaster-runner.jar", DIST)
107+
#copy(folder + "/cs/rest/original/scout-api/api/target/scout-api-sut.jar", DIST)
108+
#copy(folder + "/em/external/rest/scout-api/target/scout-api-evomaster-runner.jar", DIST)
109109

110-
copy(folder + "/cs/rest/original/proxyprint/target/proxyprint-sut.jar", DIST)
111-
copy(folder + "/em/external/rest/proxyprint/target/proxyprint-evomaster-runner.jar", DIST)
110+
#copy(folder + "/cs/rest/original/proxyprint/target/proxyprint-sut.jar", DIST)
111+
#copy(folder + "/em/external/rest/proxyprint/target/proxyprint-evomaster-runner.jar", DIST)
112112

113-
copy(folder + "/cs/rest/original/catwatch/catwatch-backend/target/catwatch-sut.jar", DIST)
114-
copy(folder + "/em/external/rest/catwatch/target/catwatch-evomaster-runner.jar", DIST)
113+
#copy(folder + "/cs/rest/original/catwatch/catwatch-backend/target/catwatch-sut.jar", DIST)
114+
#copy(folder + "/em/external/rest/catwatch/target/catwatch-evomaster-runner.jar", DIST)
115115

116-
copy(folder + "/cs/rest/artificial/ncs/target/rest-ncs-sut.jar", DIST)
117-
copy(folder + "/em/external/rest/ncs/target/rest-ncs-evomaster-runner.jar", DIST)
116+
#copy(folder + "/cs/rest/artificial/ncs/target/rest-ncs-sut.jar", DIST)
117+
#copy(folder + "/em/external/rest/ncs/target/rest-ncs-evomaster-runner.jar", DIST)
118118

119-
copy(folder + "/cs/rest/artificial/scs/target/rest-scs-sut.jar", DIST)
120-
copy(folder + "/em/external/rest/scs/target/rest-scs-evomaster-runner.jar", DIST)
119+
#copy(folder + "/cs/rest/artificial/scs/target/rest-scs-sut.jar", DIST)
120+
#copy(folder + "/em/external/rest/scs/target/rest-scs-evomaster-runner.jar", DIST)
121121

122-
copy(folder + "/cs/rest/artificial/news/target/rest-news-sut.jar", DIST)
123-
copy(folder + "/em/external/rest/news/target/rest-news-evomaster-runner.jar", DIST)
122+
#copy(folder + "/cs/rest/artificial/news/target/rest-news-sut.jar", DIST)
123+
#copy(folder + "/em/external/rest/news/target/rest-news-evomaster-runner.jar", DIST)
124124

125-
copy(folder + "/cs/rest-gui/ocvn/web/target/ocvn-rest-sut.jar", DIST)
126-
copy(folder + "/em/external/rest/ocvn/target/ocvn-rest-evomaster-runner.jar", DIST)
125+
#copy(folder + "/cs/rest-gui/ocvn/web/target/ocvn-rest-sut.jar", DIST)
126+
#copy(folder + "/em/external/rest/ocvn/target/ocvn-rest-evomaster-runner.jar", DIST)
127127

128-
copy(folder + "/cs/rest/original/languagetool/languagetool-server/target/languagetool-sut.jar", DIST)
129-
copy(folder + "/em/external/rest/languagetool/target/languagetool-evomaster-runner.jar", DIST)
128+
#copy(folder + "/cs/rest/original/languagetool/languagetool-server/target/languagetool-sut.jar", DIST)
129+
#copy(folder + "/em/external/rest/languagetool/target/languagetool-evomaster-runner.jar", DIST)
130130

131-
copy(folder + "/cs/rest/original/restcountries/target/restcountries-sut.jar", DIST)
132-
copy(folder + "/em/external/rest/restcountries/target/restcountries-evomaster-runner.jar", DIST)
131+
#copy(folder + "/cs/rest/original/restcountries/target/restcountries-sut.jar", DIST)
132+
#copy(folder + "/em/external/rest/restcountries/target/restcountries-evomaster-runner.jar", DIST)
133133

134134
copy(folder + "/cs/rest-gui/gestaohospital/target/gestaohospital-rest-sut.jar", DIST)
135135
copy(folder + "/em/external/rest/gestaohospital/target/gestaohospital-rest-evomaster-runner.jar", DIST)
136136

137-
copy(folder + "/cs/rest-gui/genome-nexus/web/target/genome-nexus-sut.jar", DIST)
138-
copy(folder + "/em/external/rest/genome-nexus/target/genome-nexus-evomaster-runner.jar", DIST)
137+
#copy(folder + "/cs/rest-gui/genome-nexus/web/target/genome-nexus-sut.jar", DIST)
138+
#copy(folder + "/em/external/rest/genome-nexus/target/genome-nexus-evomaster-runner.jar", DIST)
139139

140-
copy(folder + "/cs/graphql/petclinic-graphql/target/petclinic-graphql-sut.jar", DIST)
141-
copy(folder + "/em/external/graphql/petclinic-graphql/target/petclinic-graphql-evomaster-runner.jar", DIST)
140+
#copy(folder + "/cs/graphql/petclinic-graphql/target/petclinic-graphql-sut.jar", DIST)
141+
#copy(folder + "/em/external/graphql/petclinic-graphql/target/petclinic-graphql-evomaster-runner.jar", DIST)
142142

143-
copy(folder + "/cs/graphql/graphql-ncs/target/graphql-ncs-sut.jar", DIST)
144-
copy(folder + "/em/external/graphql/graphql-ncs/target/graphql-ncs-evomaster-runner.jar", DIST)
143+
#copy(folder + "/cs/graphql/graphql-ncs/target/graphql-ncs-sut.jar", DIST)
144+
#copy(folder + "/em/external/graphql/graphql-ncs/target/graphql-ncs-evomaster-runner.jar", DIST)
145145

146-
copy(folder + "/cs/graphql/graphql-scs/target/graphql-scs-sut.jar", DIST)
147-
copy(folder + "/em/external/graphql/graphql-scs/target/graphql-scs-evomaster-runner.jar", DIST)
146+
#copy(folder + "/cs/graphql/graphql-scs/target/graphql-scs-sut.jar", DIST)
147+
#copy(folder + "/em/external/graphql/graphql-scs/target/graphql-scs-evomaster-runner.jar", DIST)
148148

149149
# thrift RPC
150-
copy(folder + "/cs/rpc/thrift/artificial/thrift-ncs/target/rpc-thrift-ncs-sut.jar", DIST)
151-
copy(folder + "/em/external/thrift/ncs/target/rpc-thrift-ncs-evomaster-runner.jar", DIST)
150+
#copy(folder + "/cs/rpc/thrift/artificial/thrift-ncs/target/rpc-thrift-ncs-sut.jar", DIST)
151+
#copy(folder + "/em/external/thrift/ncs/target/rpc-thrift-ncs-evomaster-runner.jar", DIST)
152152

153-
copy(folder + "/cs/rpc/thrift/artificial/thrift-scs/target/rpc-thrift-scs-sut.jar", DIST)
154-
copy(folder + "/em/external/thrift/scs/target/rpc-thrift-scs-evomaster-runner.jar", DIST)
153+
#copy(folder + "/cs/rpc/thrift/artificial/thrift-scs/target/rpc-thrift-scs-sut.jar", DIST)
154+
#copy(folder + "/em/external/thrift/scs/target/rpc-thrift-scs-evomaster-runner.jar", DIST)
155155

156156
# grpc RPC
157-
copy(folder + "/cs/rpc/grpc/artificial/grpc-ncs/target/rpc-grpc-ncs-sut.jar", DIST)
158-
copy(folder + "/em/external/grpc/ncs/target/rpc-grpc-ncs-evomaster-runner.jar", DIST)
157+
#copy(folder + "/cs/rpc/grpc/artificial/grpc-ncs/target/rpc-grpc-ncs-sut.jar", DIST)
158+
#copy(folder + "/em/external/grpc/ncs/target/rpc-grpc-ncs-evomaster-runner.jar", DIST)
159159

160-
copy(folder + "/cs/rpc/grpc/artificial/grpc-scs/target/rpc-grpc-scs-sut.jar", DIST)
161-
copy(folder + "/em/external/grpc/scs/target/rpc-grpc-scs-evomaster-runner.jar", DIST)
160+
#copy(folder + "/cs/rpc/grpc/artificial/grpc-scs/target/rpc-grpc-scs-sut.jar", DIST)
161+
#copy(folder + "/em/external/grpc/scs/target/rpc-grpc-scs-evomaster-runner.jar", DIST)
162162

163-
ind0 = os.environ.get('SUT_LOCATION_IND0', '')
164-
if ind0 == '':
165-
print("\nWARN: SUT_LOCATION_IND0 env variable is not defined")
166-
else:
167-
copy(ind0, os.path.join(DIST, "ind0-sut.jar"))
168-
copy(folder + "/em/external/rest/ind0/target/ind0-evomaster-runner.jar", DIST)
163+
#ind0 = os.environ.get('SUT_LOCATION_IND0', '')
164+
#if ind0 == '':
165+
#print("\nWARN: SUT_LOCATION_IND0 env variable is not defined")
166+
#else:
167+
#copy(ind0, os.path.join(DIST, "ind0-sut.jar"))
168+
#copy(folder + "/em/external/rest/ind0/target/ind0-evomaster-runner.jar", DIST)
169169

170170

171171
####################
@@ -340,10 +340,10 @@ def makeZip():
340340
prepareDistFolder()
341341

342342
build_jdk_8_maven()
343-
build_jdk_11_maven()
344-
build_jdk_17_maven()
345-
build_jdk_11_gradle()
346-
build_jdk_17_gradle()
343+
#build_jdk_11_maven()
344+
#build_jdk_17_maven()
345+
#build_jdk_11_gradle()
346+
#build_jdk_17_gradle()
347347

348348
## Those are disabled for now... might support back in the future
349349
# build_js_npm()

0 commit comments

Comments
 (0)