Skip to content

Commit 747223b

Browse files
jsmethiejsmethie
committed
feat: Updated to Java 11
1 parent b56924c commit 747223b

File tree

115 files changed

+641
-580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+641
-580
lines changed

‎.project

100755100644
File mode changed.

‎pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898

9999
<properties>
100100
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
101-
<maven.compiler.source>1.8</maven.compiler.source>
102-
<maven.compiler.target>1.8</maven.compiler.target>
103-
<aspectj.version>1.8.6</aspectj.version>
104-
<aspectj.plugin.version>1.7</aspectj.plugin.version>
101+
<maven.compiler.source>11</maven.compiler.source>
102+
<maven.compiler.target>11</maven.compiler.target>
103+
<aspectj.version>1.9.4</aspectj.version>
104+
<aspectj.plugin.version>1.14.0</aspectj.plugin.version>
105105
<junit.version>4.13.1</junit.version>
106106
<runway.url>http://www.terraframe.com</runway.url>
107107
</properties>

‎runwaysdk-client/src/main/java/com/runwaysdk/controller/URLConfigurationManager.java

+2
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ public void readMappings(InputStream stream) throws ParserConfigurationException
198198
if (stream != null)
199199
{
200200
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
201+
dbFactory.setValidating(false);
202+
201203
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
202204
Document doc = dBuilder.parse(stream);
203205

‎runwaysdk-common/.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
</buildSpec>
2929
<natures>
3030
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
31-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
31+
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3232
<nature>org.eclipse.jdt.core.javanature</nature>
33+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3334
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
34-
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3535
</natures>
3636
</projectDescription>

‎runwaysdk-gis/runwaysdk-gis-server/src/main/java/com/runwaysdk/dataaccess/io/dataDefinition/GISImportPlugin.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public GeoNodeEntityHandler(ImportManager manager)
116116
}
117117

118118
@Override
119-
public void onStartElement(String localName, Attributes attributes, TagContext context)
119+
public void onStartElement(String qName, Attributes attributes, TagContext context)
120120
{
121121
String type = attributes.getValue(TYPE);
122122
String attribute = attributes.getValue(ATTRIBUTE);
@@ -197,7 +197,7 @@ public GeoNodeGeometryHandler(ImportManager manager)
197197
}
198198

199199
@Override
200-
public void onStartElement(String localName, Attributes attributes, TagContext context)
200+
public void onStartElement(String qName, Attributes attributes, TagContext context)
201201
{
202202
String type = attributes.getValue(TYPE);
203203
String attribute = attributes.getValue(ATTRIBUTE);
@@ -331,7 +331,7 @@ public MdGeoVertexHandler(ImportManager manager)
331331
super(manager);
332332
}
333333

334-
protected final MdGeoVertexDAO createMdVertex(String localName, String name)
334+
protected final MdGeoVertexDAO createMdVertex(String qName, String name)
335335
{
336336
return (MdGeoVertexDAO) this.getManager().getEntityDAO(MdGeoVertexInfo.CLASS, name).getEntityDAO();
337337
}

‎runwaysdk-server/.project

+2-14
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,11 @@
2727
</buildCommand>
2828
</buildSpec>
2929
<natures>
30-
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
3130
<nature>org.eclipse.ajdt.ui.ajnature</nature>
31+
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
32+
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3233
<nature>org.eclipse.jdt.core.javanature</nature>
3334
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3435
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
35-
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3636
</natures>
37-
<linkedResources>
38-
<link>
39-
<name>base</name>
40-
<type>2</type>
41-
<location>/Users/nathan/git/Runway-SDK/runwaysdk-test/src/main/java-gen/server/base</location>
42-
</link>
43-
<link>
44-
<name>stub</name>
45-
<type>2</type>
46-
<location>/Users/nathan/git/Runway-SDK/runwaysdk-test/src/main/java-gen/server/stub</location>
47-
</link>
48-
</linkedResources>
4937
</projectDescription>

‎runwaysdk-server/pom.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,11 @@
109109
<artifactId>commons-math</artifactId>
110110
<version>1.2</version>
111111
</dependency>
112+
<!-- https://mvnrepository.com/artifact/org.eclipse.jdt/ecj -->
112113
<dependency>
113-
<groupId>org.eclipse.jdt.core.compiler</groupId>
114+
<groupId>org.eclipse.jdt</groupId>
114115
<artifactId>ecj</artifactId>
115-
<version>4.4.2</version>
116+
<version>3.19.0</version>
116117
</dependency>
117118
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
118119
<dependency>
@@ -142,11 +143,13 @@
142143
<version>2.23.1</version>
143144
</dependency>
144145
<!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
146+
<!--
145147
<dependency>
146148
<groupId>xerces</groupId>
147149
<artifactId>xercesImpl</artifactId>
148150
<version>2.12.2</version>
149151
</dependency>
152+
!-->
150153
<dependency>
151154
<groupId>org.ehcache</groupId>
152155
<artifactId>ehcache</artifactId>

‎runwaysdk-server/src/main/java/com/runwaysdk/business/generation/DelegateCompiler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void execute()
151151
* javac must be executed first because its common generated class files
152152
* must be on the classpath of the ajc compiler.
153153
*/
154-
javac.execute();
154+
// javac.execute();
155155
ajc.execute();
156156
}
157157

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/ImportManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ public static void setLocalizedValue(EntityDAO entityDAO, String attributeName,
724724
}
725725
}
726726

727-
public HandlerFactoryIF getFactory(TagContext context, String localName)
727+
public HandlerFactoryIF getFactory(TagContext context, String qName)
728728
{
729729
TagHandlerIF handler = context.getHandler();
730730
String key = handler.getKey();
@@ -735,7 +735,7 @@ public HandlerFactoryIF getFactory(TagContext context, String localName)
735735

736736
for (HandlerFactoryIF factory : factories)
737737
{
738-
if (factory.supports(context, localName))
738+
if (factory.supports(context, qName))
739739
{
740740
return factory;
741741
}

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/XMLExporter.java

+2
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ public XMLExporter(String schemaFile)
175175
try
176176
{
177177
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
178+
factory.setValidating(false);
179+
178180
DocumentBuilder builder = factory.newDocumentBuilder();
179181
document = builder.newDocument();
180182

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/XMLHandler.java

+22-13
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
*/
1919
package com.runwaysdk.dataaccess.io;
2020

21+
import javax.xml.parsers.ParserConfigurationException;
22+
import javax.xml.parsers.SAXParser;
23+
import javax.xml.parsers.SAXParserFactory;
24+
2125
import org.xml.sax.InputSource;
2226
import org.xml.sax.Locator;
2327
import org.xml.sax.SAXException;
2428
import org.xml.sax.SAXParseException;
2529
import org.xml.sax.XMLFilter;
2630
import org.xml.sax.XMLReader;
2731
import org.xml.sax.helpers.DefaultHandler;
28-
import org.xml.sax.helpers.XMLReaderFactory;
2932

3033
/**
3134
* Parent Handler Class all othere Handlers extend from. Keeps data that is universal to all Handlers.
@@ -83,15 +86,16 @@ public class XMLHandler extends DefaultHandler
8386
* fully qualified path of the schema file
8487
*
8588
* @throws SAXException
89+
* @throws ParserConfigurationException
8690
*/
87-
public XMLHandler(StreamSource source, String schemaLocation) throws SAXException
91+
public XMLHandler(StreamSource source, String schemaLocation) throws SAXException, ParserConfigurationException
8892
{
8993
this(new ImportManager(source, schemaLocation));
9094

9195
streamSource = source;
9296
}
9397

94-
public XMLHandler(StreamSource source, String schemaLocation, XMLFilter filter) throws SAXException
98+
public XMLHandler(StreamSource source, String schemaLocation, XMLFilter filter) throws SAXException, ParserConfigurationException
9599
{
96100
this(new ImportManager(source, schemaLocation), filter);
97101

@@ -104,28 +108,29 @@ public XMLHandler(StreamSource source, String schemaLocation, XMLFilter filter)
104108
* @param manager
105109
* The manager of the import. Contains the filename, schema location, and the status of the import
106110
* @throws SAXException
111+
* @throws ParserConfigurationException
107112
*/
108-
public XMLHandler(ImportManager manager) throws SAXException
113+
public XMLHandler(ImportManager manager) throws SAXException, ParserConfigurationException
109114
{
110115
reader = createReader();
111116

112-
reader.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true);
113-
reader.setFeature(VALIDATION_FEATURE_ID, true);
114-
reader.setEntityResolver(new RunwayClasspathEntityResolver());
117+
// reader.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true);
118+
// reader.setFeature(VALIDATION_FEATURE_ID, true);
119+
// reader.setEntityResolver(new RunwayClasspathEntityResolver());
115120

116121
// Root Handler
117122
this.previousHandler = null;
118123
this.manager = manager;
119124
}
120125

121-
public XMLHandler(ImportManager manager, XMLFilter filter) throws SAXException
126+
public XMLHandler(ImportManager manager, XMLFilter filter) throws SAXException, ParserConfigurationException
122127
{
123128
filter.setParent(this.createReader());
124129
reader = filter;
125130

126-
reader.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true);
127-
reader.setFeature(VALIDATION_FEATURE_ID, true);
128-
reader.setEntityResolver(new RunwayClasspathEntityResolver());
131+
// reader.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true);
132+
// reader.setFeature(VALIDATION_FEATURE_ID, true);
133+
// reader.setEntityResolver(new RunwayClasspathEntityResolver());
129134

130135
// Root Handler
131136
this.previousHandler = null;
@@ -137,9 +142,13 @@ protected XMLHandler()
137142

138143
}
139144

140-
protected XMLReader createReader() throws SAXException
145+
protected XMLReader createReader() throws SAXException, ParserConfigurationException
141146
{
142-
return XMLReaderFactory.createXMLReader(READER);
147+
SAXParserFactory parserFactory = SAXParserFactory.newInstance();
148+
parserFactory.setValidating(false);
149+
150+
SAXParser parser = parserFactory.newSAXParser();
151+
return parser.getXMLReader();
143152
}
144153

145154
/**

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/dataDefinition/AttributeEnumerationHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public EnumeratedItemHandler(ImportManager manager)
5757
* @see com.runwaysdk.dataaccess.io.dataDefinition.TagHandlerIF#onStartElement(java.lang.String, org.xml.sax.Attributes, com.runwaysdk.dataaccess.io.dataDefinition.TagContext)
5858
*/
5959
@Override
60-
public void onStartElement(String localName, Attributes attributes, TagContext context)
60+
public void onStartElement(String qName, Attributes attributes, TagContext context)
6161
{
6262
String attributeName = (String) context.getObject(XMLTags.ENTITY_ATTRIBUTE_NAME_ATTRIBUTE);
6363
String structAttributeName = (String) context.getObject(StructAttributeHandler.STRUCT_ATTRIBUTE_NAME);
@@ -110,7 +110,7 @@ public AttributeEnumerationHandler(ImportManager manager)
110110
* @see com.runwaysdk.dataaccess.io.dataDefinition.TagHandlerIF#onStartElement(java.lang.String, org.xml.sax.Attributes, com.runwaysdk.dataaccess.io.dataDefinition.TagContext)
111111
*/
112112
@Override
113-
public void onStartElement(String localName, Attributes attributes, TagContext context)
113+
public void onStartElement(String qName, Attributes attributes, TagContext context)
114114
{
115115
String attributeName = attributes.getValue(XMLTags.ENTITY_ATTRIBUTE_NAME_ATTRIBUTE);
116116

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/dataDefinition/AttributeHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public AttributeHandler(ImportManager manager)
5050
* com.runwaysdk.dataaccess.io.dataDefinition.TagContext)
5151
*/
5252
@Override
53-
public void onStartElement(String localName, Attributes attributes, TagContext context)
53+
public void onStartElement(String qName, Attributes attributes, TagContext context)
5454
{
5555
Object obj = context.getObject(EntityInfo.CLASS);
5656

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/dataDefinition/AttributeReferenceHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public AttributeReferenceHandler(ImportManager manager)
5353
* com.runwaysdk.dataaccess.io.dataDefinition.TagContext)
5454
*/
5555
@Override
56-
public void onStartElement(String localName, Attributes attributes, TagContext context)
56+
public void onStartElement(String qName, Attributes attributes, TagContext context)
5757
{
5858
Object obj = context.getObject(EntityInfo.CLASS);
5959

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/dataDefinition/CreateDecorator.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public CreateDecorator(TagHandlerIF handler)
3333
* @see com.runwaysdk.dataaccess.io.dataDefinition.TagHandlerDecorator#onStartElement(java.lang.String, org.xml.sax.Attributes, com.runwaysdk.dataaccess.io.dataDefinition.TagContext)
3434
*/
3535
@Override
36-
public void onStartElement(String localName, Attributes attributes, TagContext context)
36+
public void onStartElement(String qName, Attributes attributes, TagContext context)
3737
{
38-
if (localName.equals(XMLTags.CREATE_TAG))
38+
if (qName.equals(XMLTags.CREATE_TAG))
3939
{
4040
this.getManager().enterCreateState();
4141
}
4242
else
4343
{
44-
super.onStartElement(localName, attributes, context);
44+
super.onStartElement(qName, attributes, context);
4545
}
4646
}
4747

@@ -52,15 +52,15 @@ public void onStartElement(String localName, Attributes attributes, TagContext c
5252
* com.runwaysdk.dataaccess.io.ImportManager)
5353
*/
5454
@Override
55-
public void onEndElement(String uri, String localName, String name, TagContext context)
55+
public void onEndElement(String uri, String qName, String name, TagContext context)
5656
{
57-
if (localName.equals(XMLTags.CREATE_TAG))
57+
if (qName.equals(XMLTags.CREATE_TAG))
5858
{
5959
this.getManager().leavingCurrentState();
6060
}
6161
else
6262
{
63-
super.onEndElement(uri, localName, name, context);
63+
super.onEndElement(uri, qName, name, context);
6464
}
6565
}
6666

@@ -70,15 +70,15 @@ public void onEndElement(String uri, String localName, String name, TagContext c
7070
* @see com.runwaysdk.dataaccess.io.dataDefinition.TagHandler#modifiesState(java.lang.String)
7171
*/
7272
@Override
73-
public boolean modifiesState(String localName)
73+
public boolean modifiesState(String qName)
7474
{
75-
if (localName.equals(XMLTags.CREATE_TAG))
75+
if (qName.equals(XMLTags.CREATE_TAG))
7676
{
7777
return true;
7878
}
7979
else
8080
{
81-
return super.modifiesState(localName);
81+
return super.modifiesState(qName);
8282
}
8383
}
8484

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/dataDefinition/CreateOrUpdateHandler.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public CreateOrUpdateHandler(ImportManager manager)
3939
* com.runwaysdk.dataaccess.io.ImportManager)
4040
*/
4141
@Override
42-
public void onStartElement(String localName, Attributes attributes, TagContext context)
42+
public void onStartElement(String qName, Attributes attributes, TagContext context)
4343
{
4444
this.getManager().enterCreateOrUpdateState();
4545
}
@@ -50,7 +50,7 @@ public void onStartElement(String localName, Attributes attributes, TagContext c
5050
* @see com.runwaysdk.dataaccess.io.dataDefinition.TagHandlerIF#onEndElement(java.lang.String, java.lang.String, java.lang.String, com.runwaysdk.dataaccess.io.ImportManager)
5151
*/
5252
@Override
53-
public void onEndElement(String uri, String localName, String name, TagContext context)
53+
public void onEndElement(String uri, String qName, String name, TagContext context)
5454
{
5555
this.getManager().leavingCurrentState();
5656
}
@@ -61,8 +61,8 @@ public void onEndElement(String uri, String localName, String name, TagContext c
6161
* @see com.runwaysdk.dataaccess.io.dataDefinition.TagHandler#modifiesState(java.lang.String)
6262
*/
6363
@Override
64-
public boolean modifiesState(String localName)
64+
public boolean modifiesState(String qName)
6565
{
66-
return localName.equals(XMLTags.CREATE_OR_UPDATE_TAG);
66+
return qName.equals(XMLTags.CREATE_OR_UPDATE_TAG);
6767
}
6868
}

‎runwaysdk-server/src/main/java/com/runwaysdk/dataaccess/io/dataDefinition/DeleteEntityHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public DeleteEntityHandler(ImportManager manager, String tag)
5757
* com.runwaysdk.dataaccess.io.ImportManager)
5858
*/
5959
@Override
60-
public void onStartElement(String localName, Attributes attributes, TagContext context)
60+
public void onStartElement(String qName, Attributes attributes, TagContext context)
6161
{
6262
String type = attributes.getValue(XMLTags.TYPE_ATTRIBUTE);
6363
String key = attributes.getValue(XMLTags.KEY_ATTRIBUTE);

0 commit comments

Comments
 (0)