Skip to content

Commit 8bacd7e

Browse files
author
Rick Neeft
committed
Help list and refactoring
1 parent 669458e commit 8bacd7e

27 files changed

+116
-105
lines changed

‎src/main/java/Main.java‎

Lines changed: 35 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import com.google.gson.*;
2-
import dependencyinjection.ServiceProviderBuilder;
1+
import application.IApplication;
2+
import application.dependencyinjection.ServiceProviderBuilder;
33
import modeldifference.*;
44
import modeldifference.calculator.*;
55
import modeldifference.htmloutput.HtmlOutput;
66
import modeldifference.htmloutput.IStateModelDifferenceJsonWidget;
77
import modeldifference.htmloutput.StateModelDifferenceJsonWidget;
8-
import modeldifference.models.AbstractActionId;
9-
import modeldifference.models.Identifier;
108
import modeldifference.orient.*;
119
import modeldifference.orient.query.*;
1210
import org.fruit.alayer.IStateManagementTags;
@@ -15,73 +13,55 @@
1513
import org.fruit.alayer.StateManagementTags;
1614
import org.fruit.alayer.webdriver.enums.WdMapping;
1715
import org.fruit.alayer.windows.UIAMapping;
18-
import settings.*;
16+
import application.settings.*;
1917

20-
import java.lang.reflect.Type;
2118
import java.util.logging.Level;
2219
import java.util.logging.Logger;
2320

2421
public class Main {
2522

26-
class IdentifierJsonSerializer implements JsonSerializer<Identifier>, JsonDeserializer<AbstractActionId>{
27-
28-
public JsonElement serialize(Identifier src, Type typeOfSrc, JsonSerializationContext context) {
29-
return new JsonPrimitive(src.getValue());
30-
}
31-
32-
public AbstractActionId deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
33-
if (json.isJsonPrimitive()){
34-
return new AbstractActionId(json.getAsString());
35-
}
36-
37-
return null;
38-
}
39-
}
40-
41-
public static void ShowHelp(){
42-
System.out.println("this is not very helpful help");
43-
}
44-
4523
public static void main(String[] args) {
4624

47-
Logger.getGlobal().setLevel(Level.SEVERE);
48-
4925
var settingsProvider = new SettingsProviderBuilder()
5026
.add(new ArgumentSettingsParser(args))
5127
.buildSettingsProvider();
5228

5329
var isHelpQuested = settingsProvider.containsSetting("help");
5430

55-
if (isHelpQuested) {
56-
ShowHelp();
57-
} else {
31+
var serviceProviderBuilder = new ServiceProviderBuilder()
32+
.addSingleton(IStateModelDifferenceJsonWidget.class, StateModelDifferenceJsonWidget.class)
33+
.addSingleton(IWdMapping.class, WdMapping.class)
34+
.addSingleton(IUIAMapping.class, UIAMapping.class)
35+
.addSingleton(IStateManagementTags.class, StateManagementTags.class )
36+
.addSingleton(ISettingProvider.class, settingsProvider)
37+
.addSingleton(IOrientDbFactory.class, OrientDbFactory.class)
38+
.addSingleton(IModelApplicationBuilder.class, OrientDbApplicationBuilder.class)
39+
.addSingleton(IDifferenceCalculator.class, DifferenceCalculator.class)
40+
.addSingleton(IOutputDifferences.class, HtmlOutput.class)
41+
.addSingleton(IAbstractStateModelEntityQuery.class, AbstractStateModelEntityQuery.class)
42+
.addSingleton(IAbstractStateEntityQuery.class, AbstractStateEntityQuery.class)
43+
.addSingleton(IConcreteActionEntityQuery.class, ConcreteActionEntityQuery.class)
44+
.addSingleton(IAbstractActionEntityQuery.class, AbstractActionEntityQuery.class)
45+
.addSingleton(IConcreteStateEntityQuery.class, ConcreteStateEntityQuery.class)
46+
.addSingleton(IWidgetTreeQuery.class, WidgetTreeQuery.class)
47+
;
5848

59-
var serviceProvider = new ServiceProviderBuilder()
60-
.addSingleton(IWidgetTreeQuery.class, WidgetTreeQuery.class)
61-
.addSingleton(IStateModelDifferenceJsonWidget.class, StateModelDifferenceJsonWidget.class)
62-
.addSingleton(IWdMapping.class, WdMapping.class)
63-
.addSingleton(IUIAMapping.class, UIAMapping.class)
64-
.addSingleton(IStateManagementTags.class, StateManagementTags.class )
65-
.addSingleton(IApplication.class, ModelDifferenceApplication.class)
66-
.addSingleton(ISettingProvider.class, settingsProvider)
67-
.addSingleton(IOrientDbFactory.class, OrientDbFactory.class)
68-
.addSingleton(IApplicationBuilder.class, OrientDbApplicationBuilder.class)
69-
.addSingleton(IDifferenceCalculator.class, DifferenceCalculator.class)
70-
.addSingleton(IAbstractStateModelEntityQuery.class, AbstractStateModelEntityQuery.class)
71-
.addSingleton(IAbstractStateEntityQuery.class, AbstractStateEntityQuery.class)
72-
.addSingleton(IOutputDifferences.class, HtmlOutput.class)
73-
.addSingleton(IConcreteActionEntityQuery.class, ConcreteActionEntityQuery.class)
74-
.addSingleton(IAbstractActionEntityQuery.class, AbstractActionEntityQuery.class)
75-
.addSingleton(IConcreteStateEntityQuery.class, ConcreteStateEntityQuery.class)
76-
.buildServiceProvider();
49+
if (isHelpQuested){
50+
serviceProviderBuilder.addSingleton(IApplication.class, HelpApplication.class);
51+
}
52+
else
53+
{
54+
serviceProviderBuilder.addSingleton(IApplication.class, ModelDifferenceApplication.class);
55+
}
56+
57+
var serviceProvider = serviceProviderBuilder.buildServiceProvider();
7758

78-
try {
79-
var application = serviceProvider.getService(IApplication.class);
80-
application.Run();
81-
}
82-
catch (Exception ex){
83-
ex.printStackTrace();
84-
}
59+
try {
60+
var application = serviceProvider.getService(IApplication.class);
61+
application.Run();
62+
}
63+
catch (Exception ex){
64+
ex.printStackTrace();
8565
}
8666
}
8767
}

src/main/java/modeldifference/IApplication.java renamed to src/main/java/application/IApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package modeldifference;
1+
package application;
22

33
public interface IApplication {
44
void Run( ) throws Exception;

src/main/java/dependencyinjection/ServiceDescriptor.java renamed to src/main/java/application/dependencyinjection/ServiceDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dependencyinjection;
1+
package application.dependencyinjection;
22
import java.util.Optional;
33

44
public class ServiceDescriptor{

src/main/java/dependencyinjection/ServiceLifetime.java renamed to src/main/java/application/dependencyinjection/ServiceLifetime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dependencyinjection;
1+
package application.dependencyinjection;
22

33
public enum ServiceLifetime {
44
SINGLETON,

src/main/java/dependencyinjection/ServiceProvider.java renamed to src/main/java/application/dependencyinjection/ServiceProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
package dependencyinjection;
2-
3-
import settings.ISettingProvider;
4-
import settings.ISettingsFor;
5-
import settings.ISettingsForInternal;
1+
package application.dependencyinjection;
62

73
import java.lang.reflect.Constructor;
84
import java.lang.reflect.InvocationTargetException;

src/main/java/dependencyinjection/ServiceProviderBuilder.java renamed to src/main/java/application/dependencyinjection/ServiceProviderBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dependencyinjection;
1+
package application.dependencyinjection;
22

33
import java.util.ArrayList;
44

src/main/java/settings/ArgumentSettingsParser.java renamed to src/main/java/application/settings/ArgumentSettingsParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package settings;
1+
package application.settings;
22

33
import java.util.HashMap;
44

src/main/java/settings/ISettingProvider.java renamed to src/main/java/application/settings/ISettingProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package settings;
1+
package application.settings;
22

33
import java.util.Optional;
44

src/main/java/settings/ISettingsFor.java renamed to src/main/java/application/settings/ISettingsFor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package settings;
1+
package application.settings;
22

33
public interface ISettingsFor<T> extends ISettingsForInternal {
44
T getValue();

src/main/java/settings/ISettingsForInternal.java renamed to src/main/java/application/settings/ISettingsForInternal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package settings;
1+
package application.settings;
22

33
public interface ISettingsForInternal {
44
}

0 commit comments

Comments
 (0)