Skip to content

Commit 9d17321

Browse files
committed
Removed the broken FileSeeder and Job implementations
1 parent bd6592d commit 9d17321

File tree

11 files changed

+0
-499
lines changed

11 files changed

+0
-499
lines changed

src/main/java/org/javawebstack/framework/WebApplication.java

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
import org.javawebstack.framework.bind.ModelBindTransformer;
88
import org.javawebstack.framework.command.*;
99
import org.javawebstack.framework.config.Config;
10-
import org.javawebstack.framework.job.*;
1110
import org.javawebstack.framework.module.Module;
1211
import org.javawebstack.framework.seed.AllSeeder;
13-
import org.javawebstack.framework.seed.FileSeeder;
1412
import org.javawebstack.framework.seed.MergedSeeder;
1513
import org.javawebstack.framework.seed.Seeder;
1614
import org.javawebstack.framework.util.*;
@@ -19,8 +17,6 @@
1917
import org.javawebstack.httpserver.transformer.response.JsonResponseTransformer;
2018
import org.javawebstack.injector.Injector;
2119
import org.javawebstack.injector.SimpleInjector;
22-
import org.javawebstack.orm.ORM;
23-
import org.javawebstack.orm.ORMConfig;
2420
import org.javawebstack.orm.exception.ORMConfigurationException;
2521
import org.javawebstack.orm.wrapper.MySQL;
2622
import org.javawebstack.orm.wrapper.SQL;
@@ -118,7 +114,6 @@ public WebApplication(){
118114
setupCommands(commandSystem);
119115
modules.forEach(m -> m.setupCommands(this, commandSystem));
120116
commandSystem.addCommand("start", new StartCommand());
121-
commandSystem.addCommand("worker", new WorkerCommand());
122117
commandSystem.addCommand("sh", new ShellCommand());
123118
commandSystem.addCommand("db", new MultiCommand()
124119
.add("migrate", new DBMigrateCommand())
@@ -131,7 +126,6 @@ public WebApplication(){
131126
);
132127
commandSystem.addCommand("generate", new MultiCommand()
133128
.add("key", new GenerateKeyCommand())
134-
.add("seed", new GenerateSeedCommand())
135129
);
136130
}
137131

@@ -155,28 +149,6 @@ public void addTranslation(Locale locale, String resource){
155149
addTranslation(locale, ClassLoader.getSystemClassLoader(), resource);
156150
}
157151

158-
public void addDatabaseJobQueue(String name, boolean defaultQueue){
159-
addQueue(name, new DatabaseJobQueue(name), defaultQueue);
160-
}
161-
162-
public void enableDatabaseJobs(ORMConfig config) throws ORMConfigurationException {
163-
ORM.register(DatabaseQueuedJob.class, sql, config);
164-
}
165-
166-
public void addSyncJobQueue(String name, int capacity, boolean defaultQueue){
167-
addQueue(name, new SyncThreadedJobQueue(capacity).start(), defaultQueue);
168-
}
169-
170-
public void addImmediateJobQueue(String name, boolean defaultQueue){
171-
addQueue(name, new ImmidiateJobQueue(), defaultQueue);
172-
}
173-
174-
public void addQueue(String name, JobQueue queue, boolean defaultQueue){
175-
injector.setInstance(JobQueue.class, name, queue);
176-
if(defaultQueue)
177-
injector.setInstance(JobQueue.class, "", queue);
178-
}
179-
180152
public WebApplication addModule(Module module){
181153
modules.add(module);
182154
return this;
@@ -205,8 +177,6 @@ public void addSeeder(String name, Seeder... seeder){
205177
}
206178

207179
public Seeder getSeeder(String name){
208-
if(!seeders.containsKey(name))
209-
seeders.put(name, new FileSeeder(this, getClass().getClassLoader(), "seeds/"+name+".json"));
210180
return seeders.get(name);
211181
}
212182

@@ -265,25 +235,4 @@ public void start(){
265235
server.join();
266236
}
267237

268-
public void startWorker(String... queues){
269-
List<WorkerJobQueue> workerQueues = new ArrayList<>();
270-
for(String name : queues){
271-
JobQueue queue = injector.getInstance(JobQueue.class, name);
272-
if(queue == null)
273-
continue;
274-
if(queue instanceof WorkerJobQueue)
275-
workerQueues.add((WorkerJobQueue) queue);
276-
}
277-
if(workerQueues.size() == 0){
278-
logger.severe("No queue to process!");
279-
return;
280-
}
281-
UUID processUUID = UUID.randomUUID();
282-
logger.info("Running worker ("+processUUID.toString()+")");
283-
while (true){
284-
for(WorkerJobQueue queue : workerQueues)
285-
queue.process(processUUID);
286-
}
287-
}
288-
289238
}

src/main/java/org/javawebstack/framework/command/GenerateSeedCommand.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/java/org/javawebstack/framework/command/WorkerCommand.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/main/java/org/javawebstack/framework/job/DatabaseJobQueue.java

Lines changed: 0 additions & 100 deletions
This file was deleted.

src/main/java/org/javawebstack/framework/job/DatabaseQueuedJob.java

Lines changed: 0 additions & 93 deletions
This file was deleted.

src/main/java/org/javawebstack/framework/job/ImmidiateJobQueue.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/org/javawebstack/framework/job/Job.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/java/org/javawebstack/framework/job/JobQueue.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)