Skip to content
This repository was archived by the owner on May 25, 2020. It is now read-only.

Commit 67e5019

Browse files
amitjindalamitjindal
committed
Fixing tests and removing dead code
1 parent b1a9b6f commit 67e5019

File tree

1 file changed

+9
-50
lines changed

1 file changed

+9
-50
lines changed

‎generators/app/index.js‎

Lines changed: 9 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ var convertIDtoUUIDwithCol = function(file, importNeedle, columnName) {
2828
jhipsterFunc.replaceContent(file, '@SequenceGenerator(name = "sequenceGenerator")', '@GenericGenerator(name = "UUIDGenerator", strategy = "uuid2")');
2929
jhipsterFunc.replaceContent(file, '@Id', '@Id\n @Column(name = "'+columnName+'", columnDefinition = "uuid")\n @org.hibernate.annotations.Type(type="pg-uuid")');
3030
longToUUID(file);
31-
//jhipsterFunc.replaceContent(file, 'public Long getId()', 'public UUID getId()');
32-
//jhipsterFunc.replaceContent(file, 'public void setId(Long id)', 'public void setId(UUID id)');
3331
};
3432

3533
var convertIDtoUUID = function(file, importNeedle) {
@@ -53,8 +51,8 @@ module.exports = yeoman.Base.extend({
5351
displayLogo: function () {
5452
// Have Yeoman greet the user.
5553
this.log('Welcome to the ' + chalk.red('JHipster Aquevix Postgres to UUID Converter') + ' generator! ' + chalk.yellow('v' + packagejs.version + '\n'));
56-
// this.log('Variables:');
57-
// this.log(JSON.stringify(jhipsterVar));
54+
this.log('Variables:');
55+
this.log(JSON.stringify(jhipsterVar));
5856
},
5957
checkDBType: function () {
6058
if (jhipsterVar.databaseType != 'sql' && jhipsterVar.prodDatabaseType != 'postgresql') {
@@ -90,27 +88,6 @@ module.exports = yeoman.Base.extend({
9088
}
9189
},
9290

93-
/*
94-
prompting: function () {
95-
var done = this.async();
96-
97-
//var prompts = [
98-
// {
99-
// type: 'confirm',
100-
// name: 'convertUUID',
101-
// message: 'Do you want to convert to UUID?',
102-
// default: true
103-
// }
104-
//];
105-
106-
this.prompt(prompts, function (props) {
107-
this.props = props;
108-
// To access props later use this.props.someOption;
109-
110-
done();
111-
}.bind(this));
112-
},
113-
*/
11491
writing: {
11592
writeTemplates : function () {
11693
},
@@ -150,16 +127,12 @@ module.exports = yeoman.Base.extend({
150127
// And the Repository
151128
jhipsterFunc.replaceContent(this.javaDir + 'repository/UserRepository.java', 'import java.util.List;', 'import java.util.List;\nimport java.util.UUID;');
152129
longToUUID(this.javaDir + 'repository/UserRepository.java');
153-
// jhipsterFunc.replaceContent(this.javaDir + 'repository/UserRepository.java', 'JpaRepository<User, Long>', 'JpaRepository<User, UUID>');
154-
// jhipsterFunc.replaceContent(this.javaDir + 'repository/UserRepository.java', 'findOneById(Long userId)', 'findOneById(UUID userId)');
155130

156131
jhipsterFunc.replaceContent(this.javaDir + 'repository/PersistenceAuditEventRepository.java', 'import java.util.List;', 'import java.util.List;\nimport java.util.UUID;');
157132
longToUUID(this.javaDir + 'repository/PersistenceAuditEventRepository.java');
158-
//jhipsterFunc.replaceContent(this.javaDir + 'repository/PersistenceAuditEventRepository.java', 'JpaRepository<PersistentAuditEvent, Long>', 'JpaRepository<PersistentAuditEvent, UUID>');
159133

160134
jhipsterFunc.replaceContent(this.javaDir + 'service/AuditEventService.java', 'import java.util.Optional;', 'import java.util.Optional;\nimport java.util.UUID;');
161135
longToUUID(this.javaDir + 'service/AuditEventService.java');
162-
// jhipsterFunc.replaceContent(this.javaDir + 'service/AuditEventService.java', 'find(Long id)', 'find(UUID id)');
163136

164137
jhipsterFunc.replaceContent(this.javaDir + 'service/UserService.java', 'getUserWithAuthorities(Long id)', 'getUserWithAuthorities(UUID id)');
165138

@@ -181,8 +154,6 @@ module.exports = yeoman.Base.extend({
181154
longToUUID(this.javaDir + 'service/UserService.java');
182155

183156
var file = glob.sync("src/main/resources/config/liquibase/changelog/*initial_schema.xml")[0];
184-
//jhipsterFunc.replaceContent(file, 'type="bigint" autoIncrement="${autoIncrement}"', 'type="uuid"');
185-
//jhipsterFunc.replaceContent(file, 'type="bigint" autoIncrement="${autoIncrement}"', 'type="uuid"');
186157
jhipsterFunc.replaceContent(file, 'type="bigint"', 'type="uuid"',true);
187158
jhipsterFunc.replaceContent(file, 'autoIncrement="\\$\\{autoIncrement\\}"', '', true);
188159

@@ -194,7 +165,6 @@ module.exports = yeoman.Base.extend({
194165
jhipsterFunc.replaceContent('src/main/resources/config/liquibase/users_authorities.csv', '1;', '8d9b707a-ddf4-11e5-b86d-9a79f06e9478;', true);
195166
jhipsterFunc.replaceContent('src/main/resources/config/liquibase/users_authorities.csv', '3;', '8d9b77f0-ddf4-11e5-b86d-9a79f06e9478;', true);
196167
jhipsterFunc.replaceContent('src/main/resources/config/liquibase/users_authorities.csv', '4;', '8d9b79c6-ddf4-11e5-b86d-9a79f06e9478;', true);
197-
198168
}
199169
},
200170

@@ -225,8 +195,6 @@ module.exports = yeoman.Base.extend({
225195
if(fs.existsSync(this.javaDir + 'service/dto/' + entityName + 'DTO.java')) {
226196
jhipsterFunc.replaceContent(this.javaDir + 'service/dto/' + entityName + 'DTO.java', 'import java.util.Objects;', 'import java.util.Objects;\nimport java.util.UUID;');
227197
longToUUID(this.javaDir + 'service/dto/' + entityName + 'DTO.java');
228-
//jhipsterFunc.replaceContent(this.javaDir + 'web/rest/dto/' + entityName + 'DTO.java', 'public Long getId()', 'public UUID getId()');
229-
//jhipsterFunc.replaceContent(this.javaDir + 'web/rest/dto/' + entityName + 'DTO.java', 'public void setId(Long id)', 'public void setId(UUID id)');
230198
}
231199

232200
// Mapper
@@ -238,37 +206,28 @@ module.exports = yeoman.Base.extend({
238206
// And the Repository
239207
jhipsterFunc.replaceContent(this.javaDir + 'repository/' + entityName + 'Repository.java', 'import org.springframework.data.jpa.repository.*;', 'import java.util.UUID;\nimport org.springframework.data.jpa.repository.*;');
240208
longToUUID(this.javaDir + 'repository/' + entityName + 'Repository.java');
241-
//jhipsterFunc.replaceContent(this.javaDir + 'repository/' + entityName + 'Repository.java', 'JpaRepository<' + entityName + ',Long>', 'JpaRepository<' + entityName + ',UUID>');
242-
//jhipsterFunc.replaceContent(this.javaDir + 'repository/' + entityName + 'Repository.java', '@Param("id") Long id', '@Param("id") UUID id');
243209

244210
// The Search Repository
245211
if(fs.existsSync(this.javaDir + 'repository/search/' + entityName + 'SearchRepository.java')) {
246212
jhipsterFunc.replaceContent(this.javaDir + 'repository/search/' + entityName + 'SearchRepository.java', 'import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;', 'import java.util.UUID;\nimport org.springframework.data.elasticsearch.repository.ElasticsearchRepository;');
247213
longToUUID(this.javaDir + 'repository/search/' + entityName + 'SearchRepository.java');
248-
//jhipsterFunc.replaceContent(this.javaDir + 'repository/search/' + entityName + 'SearchRepository.java', 'ElasticsearchRepository<' + entityName + ', Long>', 'ElasticsearchRepository<' + entityName + ',UUID>');
249214
}
250215

251216
// Service
252217
if(fs.existsSync(this.javaDir + 'service/' + entityName + 'Service.java')) {
253218
jhipsterFunc.replaceContent(this.javaDir + 'service/' + entityName + 'Service.java', 'import org.springframework.data.domain.Page;', 'import java.util.UUID;\nimport org.springframework.data.domain.Page;');
254219
longToUUID(this.javaDir + 'service/' + entityName + 'Service.java');
255-
//jhipsterFunc.replaceContent(this.javaDir + 'service/' + entityName + 'Service.java', 'findOne(Long id)', 'findOne(UUID id)');
256-
//jhipsterFunc.replaceContent(this.javaDir + 'service/' + entityName + 'Service.java', 'delete(Long id)', 'delete(UUID id)');
257220
}
258221

259222
// ServiceImp
260223
if(fs.existsSync(this.javaDir + 'service/impl/' + entityName + 'ServiceImpl.java')) {
261224
jhipsterFunc.replaceContent(this.javaDir + 'service/impl/' + entityName + 'ServiceImpl.java', 'import org.springframework.data.domain.Page;', 'import java.util.UUID;\nimport org.springframework.data.domain.Page;');
262225
longToUUID(this.javaDir + 'service/impl/' + entityName + 'ServiceImpl.java');
263-
//jhipsterFunc.replaceContent(this.javaDir + 'service/impl/' + entityName + 'ServiceImpl.java', 'findOne(Long id)', 'findOne(UUID id)');
264-
//jhipsterFunc.replaceContent(this.javaDir + 'service/impl/' + entityName + 'ServiceImpl.java', 'delete(Long id)', 'delete(UUID id)');
265226
}
266227

267228
// Resource
268229
jhipsterFunc.replaceContent(this.javaDir + 'web/rest/' + entityName + 'Resource.java', 'import java.util.List;', 'import java.util.UUID;\nimport java.util.List;');
269230
longToUUID(this.javaDir + 'web/rest/' + entityName + 'Resource.java');
270-
//jhipsterFunc.replaceContent(this.javaDir + 'web/rest/' + entityName + 'Resource.java', '@PathVariable Long id', '@PathVariable UUID id', true);
271-
//jhipsterFunc.replaceContent(this.javaDir + 'web/rest/' + entityName + 'Resource.java', '@PathVariable Long id', '@PathVariable UUID id');
272231

273232
// JavaScript
274233
var entityNameSpinalCased = _s.dasherize(_s.decapitalize(entityName));
@@ -277,17 +236,17 @@ module.exports = yeoman.Base.extend({
277236

278237
// Liquidbase
279238
var file = glob.sync("src/main/resources/config/liquibase/changelog/*entity_" + entityName + ".xml")[0];
280-
//jhipsterFunc.replaceContent(file, 'column name="id" type="bigint" autoIncrement="\$\{autoIncrement\}"', 'column name="id" type="uuid"');
281239
jhipsterFunc.replaceContent(file, 'type="bigint"', 'type="uuid"',true);
282240
jhipsterFunc.replaceContent(file, 'autoIncrement="\\$\\{autoIncrement\\}"', '', true);
283241

284242
// Test
285243
// TODO: Fix this
286244
jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'import java.util.List;', 'import java.util.List;\nimport java.util.UUID;');
287245
jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'getId\\(\\)\\.intValue\\(\\)', 'getId().toString()', true);
288-
jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'Long.MAX_VALUE', 'UUID.randomUUID()', true);
289-
//jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'getId()\.intValue()', 'getId()');
290-
//jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'getId()\.intValue()', 'getId()');
246+
jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'Long (.*) = 1L', 'UUID $1 = UUID.fromString("00000000-0000-0000-0000-000000000001")', true);
247+
jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'Long (.*) = 2L', 'UUID $1 = UUID.fromString("00000000-0000-0000-0000-000000000002")', true);
248+
jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'setId\\(1L\\);', 'setId(UUID.fromString("00000000-0000-0000-0000-000000000001"));', true);
249+
jhipsterFunc.replaceContent('src/test/java/'+this.packageFolder+'/web/rest/' + entityName + 'ResourceIntTest.java', 'DEFAULT_ITEM_ID\\.intValue\\(\\)', 'DEFAULT_ITEM_ID.toString()', true);
291250
}
292251
}
293252
}, this);
@@ -304,9 +263,9 @@ module.exports = yeoman.Base.extend({
304263
}
305264
},
306265

307-
install: function () {
308-
this.installDependencies();
309-
},
266+
// install: function () {
267+
// this.installDependencies();
268+
// },
310269

311270
end: function () {
312271
this.log(chalk.bold.green('Finished running of Postgres Long Primary Keys to UUID converter. Enjoy !!!'));

0 commit comments

Comments
 (0)