Skip to content

Commit 7323575

Browse files
jlcanovasjlcanovas
committed
renaming backend classes to be aligned with website
1 parent 7aedcd5 commit 7323575

File tree

34 files changed

+919
-254
lines changed

34 files changed

+919
-254
lines changed

‎jsondiscoverer.examples/exampleData/multidiscoverer/source1/json1.json renamed to ‎jsondiscoverer.examples/exampleData/advancedDiscoverer/source1/json1.json

File renamed without changes.

‎jsondiscoverer.examples/exampleData/multidiscoverer/source2/json1.json renamed to ‎jsondiscoverer.examples/exampleData/advancedDiscoverer/source2/json1.json

File renamed without changes.

‎jsondiscoverer.examples/exampleData/multidiscoverer/source3/json1.json renamed to ‎jsondiscoverer.examples/exampleData/advancedDiscoverer/source3/json1.json

File renamed without changes.

‎jsondiscoverer.examples/exampleData/discoverer/json1A.json renamed to ‎jsondiscoverer.examples/exampleData/simpleDiscoverer/json1A.json

File renamed without changes.

‎jsondiscoverer.examples/exampleData/discoverer/json1B.json renamed to ‎jsondiscoverer.examples/exampleData/simpleDiscoverer/json1B.json

File renamed without changes.

‎jsondiscoverer.examples/src/jsondiscoverer/ExampleJsonMultiDiscoverer.java renamed to ‎jsondiscoverer.examples/src/jsondiscoverer/ExampleJsonAdvancedDiscoverer.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,36 @@
2121
import jsondiscoverer.util.ModelHelper;
2222

2323
/**
24-
* Class with some example code to illustrate how to call the {@link JsonMultiDiscoverer}.
24+
* Class with some example code to illustrate how to call the {@link JsonAdvancedDiscoverer}.
2525
*
2626
* @author Javier Canovas ([email protected])
2727
*
2828
*/
29-
public class ExampleJsonMultiDiscoverer {
29+
public class ExampleJsonAdvancedDiscoverer {
3030

3131
public static void main(String[] args) throws FileNotFoundException {
32-
ExampleJsonMultiDiscoverer.exampleDiscover();
32+
ExampleJsonAdvancedDiscoverer.exampleDiscover();
3333
}
3434

3535
public static void exampleDiscover() throws FileNotFoundException {
3636
JsonSource source1 = new JsonSource("stopPosition");
37-
source1.addJsonData(null, new FileReader(new File("./exampleData/multidiscoverer/source1/json1.json")));
37+
source1.addJsonData(null, new FileReader(new File("./exampleData/advancedDiscoverer/source1/json1.json")));
3838

3939
JsonSource source2 = new JsonSource("waitingTimeStop");
40-
source2.addJsonData(null, new FileReader(new File("./exampleData/multidiscoverer/source2/json1.json")));
40+
source2.addJsonData(null, new FileReader(new File("./exampleData/advancedDiscoverer/source2/json1.json")));
4141

4242
JsonSource source3 = new JsonSource("horariesStopLineDirection");
43-
source3.addJsonData(null, new FileReader(new File("./exampleData/multidiscoverer/source3/json1.json")));
43+
source3.addJsonData(null, new FileReader(new File("./exampleData/advancedDiscoverer/source3/json1.json")));
4444

4545
JsonSourceSet sourceSet = new JsonSourceSet("composed");
4646
sourceSet.addJsonSource(source1);
4747
sourceSet.addJsonSource(source2);
4848
sourceSet.addJsonSource(source3);
4949

50-
JsonMultiDiscoverer composer = new JsonMultiDiscoverer(sourceSet);
50+
JsonAdvancedDiscoverer composer = new JsonAdvancedDiscoverer(sourceSet);
5151
EPackage ePackage = composer.discover();
5252

53-
ModelHelper.saveEPackage(ePackage, new File("./exampleData/multidiscoverer/exampleMultidiscoverer.ecore"));
53+
ModelHelper.saveEPackage(ePackage, new File("./exampleData/advancedDiscoverer/exampleAdvancedDiscoverer.ecore"));
5454

5555

5656
}

‎jsondiscoverer.examples/src/jsondiscoverer/ExampleJsonComposer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static void exampleCompose() throws FileNotFoundException, IOException {
5151
new StringReader(api1Source1Properties.getProperty("input")),
5252
new FileReader(new File("./exampleData/composer/api1/source1/json1.json")));
5353

54-
JsonDiscoverer api1Discoverer = new JsonDiscoverer();
54+
JsonSimpleDiscoverer api1Discoverer = new JsonSimpleDiscoverer();
5555
EPackage ePackageApi1 = api1Discoverer.discover(api1Source1);
5656
ModelHelper.saveEPackage(ePackageApi1, new File("./exampleData/composer/exampleComposer-api1.ecore"));
5757

@@ -70,7 +70,7 @@ public static void exampleCompose() throws FileNotFoundException, IOException {
7070
new StringReader(api2Source1Properties.getProperty("input")),
7171
new FileReader(new File("./exampleData/composer/api2/source1/json1.json")));
7272

73-
JsonDiscoverer api2Discoverer = new JsonDiscoverer();
73+
JsonSimpleDiscoverer api2Discoverer = new JsonSimpleDiscoverer();
7474
EPackage ePackageApi2 = api2Discoverer.discover(api2Source1);
7575
ModelHelper.saveEPackage(ePackageApi2, new File("./exampleData/composer/exampleComposer-api2.ecore"));
7676

‎jsondiscoverer.examples/src/jsondiscoverer/ExampleJsonDiscoverer.java renamed to ‎jsondiscoverer.examples/src/jsondiscoverer/ExampleJsonSimpleDiscoverer.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,42 @@
2121
import jsondiscoverer.util.ModelHelper;
2222

2323
/**
24-
* Class with some example code to illustrate how to call the {@link JsonDiscoverer}.
24+
* Class with some example code to illustrate how to call the {@link JsonSimpleDiscoverer}.
2525
*
2626
* @author Javier Canovas ([email protected])
2727
*
2828
*/
29-
public class ExampleJsonDiscoverer {
29+
public class ExampleJsonSimpleDiscoverer {
3030

3131
public static void main(String[] args) throws FileNotFoundException {
32-
ExampleJsonDiscoverer.exampleDiscover();
33-
ExampleJsonDiscoverer.exampleRefine();
32+
ExampleJsonSimpleDiscoverer.exampleDiscover();
33+
ExampleJsonSimpleDiscoverer.exampleRefine();
3434
}
3535

3636
public static void exampleDiscover() throws FileNotFoundException {
3737
JsonSource source = new JsonSource("example");
38-
source.addJsonData(null, new FileReader(new File("./exampleData/discoverer/json1A.json")));
38+
source.addJsonData(null, new FileReader(new File("./exampleData/simpleDiscoverer/json1A.json")));
3939

40-
JsonDiscoverer discoverer = new JsonDiscoverer();
40+
JsonSimpleDiscoverer discoverer = new JsonSimpleDiscoverer();
4141
EPackage ePackage = discoverer.discover(source);
4242

43-
ModelHelper.saveEPackage(ePackage, new File("./exampleData/discoverer/exampleDiscover.ecore"));
43+
ModelHelper.saveEPackage(ePackage, new File("./exampleData/simpleDiscoverer/exampleSimpleDiscover.ecore"));
4444
}
4545

4646
public static void exampleRefine() throws FileNotFoundException {
4747
JsonSource source = new JsonSource("example");
48-
source.addJsonData(null, new FileReader(new File("./exampleData/discoverer/json1A.json")));
48+
source.addJsonData(null, new FileReader(new File("./exampleData/simpleDiscoverer/json1A.json")));
4949

50-
JsonDiscoverer discoverer = new JsonDiscoverer();
50+
JsonSimpleDiscoverer discoverer = new JsonSimpleDiscoverer();
5151
EPackage ePackage0 = discoverer.discover(source);
5252

5353
JsonSource source2 = new JsonSource("example");
54-
source2.addJsonData(null, new FileReader(new File("./exampleData/discoverer/json1B.json")));
54+
source2.addJsonData(null, new FileReader(new File("./exampleData/simpleDiscoverer/json1B.json")));
5555

56-
discoverer = new JsonDiscoverer();
56+
discoverer = new JsonSimpleDiscoverer();
5757
EPackage ePackage = discoverer.refine(ePackage0, source2);
5858

59-
ModelHelper.saveEPackage(ePackage, new File("./exampleData/discoverer/exampleRefine.ecore"));
59+
ModelHelper.saveEPackage(ePackage, new File("./exampleData/simpleDiscoverer/exampleSimpleRefine.ecore"));
6060
}
6161

6262
}

‎jsondiscoverer.tests/src/jsondiscoverer/test/AllTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.runners.Suite.SuiteClasses;
1919

2020
@RunWith(Suite.class)
21-
@SuiteClasses({ TestJsonDiscoverer.class, TestJsonInjector.class, TestMultiDiscoverer.class, TestJsonComposer.class})
21+
@SuiteClasses({ TestJsonSimpleDiscoverer.class, TestJsonInjector.class, TestAdvancedDiscoverer.class, TestJsonComposer.class})
2222
public class AllTests {
2323

2424
}

‎jsondiscoverer.tests/src/jsondiscoverer/test/TestMultiDiscoverer.java renamed to ‎jsondiscoverer.tests/src/jsondiscoverer/test/TestAdvancedDiscoverer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@
2626
import org.eclipse.emf.ecore.EPackage;
2727
import org.junit.Test;
2828

29-
import jsondiscoverer.JsonMultiDiscoverer;
29+
import jsondiscoverer.JsonAdvancedDiscoverer;
3030
import jsondiscoverer.JsonSource;
3131
import jsondiscoverer.JsonSourceSet;
3232

33-
public class TestMultiDiscoverer {
33+
public class TestAdvancedDiscoverer {
3434

3535
@Test
3636
public void testDiscover() throws FileNotFoundException {
3737
JsonSource source1 = new JsonSource("stopPosition");
38-
source1.addJsonData(null, new FileReader(new File("./testData/multidiscoverer/source1/json1.json")));
38+
source1.addJsonData(null, new FileReader(new File("./testData/advancedDiscoverer/source1/json1.json")));
3939

4040
JsonSource source2 = new JsonSource("waitingTimeStop");
41-
source2.addJsonData(null, new FileReader(new File("./testData/multidiscoverer/source2/json1.json")));
41+
source2.addJsonData(null, new FileReader(new File("./testData/advancedDiscoverer/source2/json1.json")));
4242

4343
JsonSource source3 = new JsonSource("horariesStopLineDirection");
44-
source3.addJsonData(null, new FileReader(new File("./testData/multidiscoverer/source3/json1.json")));
44+
source3.addJsonData(null, new FileReader(new File("./testData/advancedDiscoverer/source3/json1.json")));
4545

4646
JsonSourceSet sourceSet = new JsonSourceSet("composed");
4747
sourceSet.addJsonSource(source1);
4848
sourceSet.addJsonSource(source2);
4949
sourceSet.addJsonSource(source3);
5050

51-
JsonMultiDiscoverer composer = new JsonMultiDiscoverer(sourceSet);
51+
JsonAdvancedDiscoverer composer = new JsonAdvancedDiscoverer(sourceSet);
5252
EPackage ePackage = composer.discover();
5353
assertNotNull(ePackage);
5454

0 commit comments

Comments
 (0)