From 1f43b2533f0bde16d27c483f6381c43cc65bd5df Mon Sep 17 00:00:00 2001
From: Martijn van Exel <m@rtijn.org>
Date: Fri, 4 Jan 2019 17:29:29 -0700
Subject: [PATCH 1/3] adding port parameter

---
 .gitignore                                    |  1 +
 .../apidb/common/DataSourceFactory.java       |  4 +--
 .../osmosis/apidb/common/DatabaseContext.java |  9 ++++--
 .../apidb/v0_6/impl/DatabaseUtilities.java    |  1 +
 .../AuthenticationPropertiesLoader.java       |  5 ++++
 .../core/database/DatabaseConstants.java      | 10 +++++++
 .../database/DatabaseLoginCredentials.java    | 29 +++++++++++++++++--
 .../database/DatabaseTaskManagerFactory.java  |  3 ++
 .../extract/apidb/common/Configuration.java   | 12 +++++++-
 .../apidb/v0_6/OsmosisExtractApiDb.java       |  1 +
 .../apidb/v0_6/osmosis-extract-apidb.conf     |  2 ++
 .../extract/apidb/v0_6/DatabaseUtilities.java |  2 +-
 .../pgsimple/common/DatabaseContext.java      |  2 +-
 .../pgsnapshot/common/DataSourceManager.java  |  4 +--
 package/bin/osmosis                           |  6 ++--
 15 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index b41d5494f..ae0e15f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 out
+/bin/
diff --git a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
index fe0f28db2..96de5caaf 100644
--- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
+++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
@@ -34,12 +34,12 @@ public static BasicDataSource createDataSource(DatabaseLoginCredentials credenti
         switch (credentials.getDbType()) {
         case POSTGRESQL:
         	dataSource.setDriverClassName("org.postgresql.Driver");
-        	dataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + "/" + credentials.getDatabase()
+        	dataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + ":" + credentials.getPort() + "/" + credentials.getDatabase()
         			/*+ "?loglevel=2"*/);
         	break;
         case MYSQL:
         	dataSource.setDriverClassName("com.mysql.jdbc.Driver");
-        	dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + "/" + credentials.getDatabase());
+        	dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + ":" + credentials.getPort() + "/" + credentials.getDatabase());
             break;
         default:
             throw new OsmosisRuntimeException("Unknown database type " + credentials.getDbType() + ".");
diff --git a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java
index 94990e922..23453083d 100644
--- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java
+++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java
@@ -104,7 +104,8 @@ private Connection getPostgresConnection() {
             LOG.finer("Creating a new database connection.");
 
             newConnection = DriverManager.getConnection(
-            		"jdbc:postgresql://" + loginCredentials.getHost() + "/"
+            		"jdbc:postgresql://" + loginCredentials.getHost() + ":"
+            		+ loginCredentials.getPort() + "/"
                     + loginCredentials.getDatabase(), // + "?logLevel=2"
                     loginCredentials.getUser(),
                     loginCredentials.getPassword()
@@ -126,8 +127,10 @@ private Connection getMysqlConnection() {
         try {
             String url;
 
-            url = "jdbc:mysql://" + loginCredentials.getHost() + "/" + loginCredentials.getDatabase() + "?user="
-                    + loginCredentials.getUser() + "&password=" + loginCredentials.getPassword();
+            url = "jdbc:mysql://" + loginCredentials.getHost() + ":" + loginCredentials.getPort()
+            		+ "/" + loginCredentials.getDatabase()
+            		+ "?user=" + loginCredentials.getUser()
+                    + "&password=" + loginCredentials.getPassword();
 
             if (loginCredentials.getForceUtf8()) {
                 url += "&useUnicode=true&characterEncoding=UTF-8";
diff --git a/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java b/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java
index f14e48de6..7b82cda04 100644
--- a/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java
+++ b/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java
@@ -44,6 +44,7 @@ public DatabaseContext createDatabaseContext() {
         DatabaseLoginCredentials credentials;
 
         credentials = new DatabaseLoginCredentials(DatabaseConstants.TASK_DEFAULT_HOST,
+        		DatabaseConstants.TASK_DEFAULT_PORT, 
                 DatabaseConstants.TASK_DEFAULT_DATABASE, DatabaseConstants.TASK_DEFAULT_USER,
                 DatabaseConstants.TASK_DEFAULT_PASSWORD, DatabaseConstants.TASK_DEFAULT_FORCE_UTF8,
                 DatabaseConstants.TASK_DEFAULT_PROFILE_SQL, DatabaseConstants.TASK_DEFAULT_DB_TYPE);
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java
index 00d1ebc1a..7a90eaa09 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java
@@ -14,6 +14,7 @@
  * The recognised properties are:
  * <ul>
  * <li>host</li>
+ * <li>port</li>
  * <li>database</li>
  * <li>user</li>
  * <li>password</li>
@@ -25,6 +26,7 @@
 public class AuthenticationPropertiesLoader {
 
     private static final String KEY_HOST = "host";
+    private static final String KEY_PORT = "port";
     private static final String KEY_DATABASE = "database";
     private static final String KEY_USER = "user";
     private static final String KEY_PASSWORD = "password";
@@ -69,6 +71,9 @@ public void updateLoginCredentials(DatabaseLoginCredentials loginCredentials) {
         if (properties.containsKey(KEY_HOST)) {
             loginCredentials.setHost(properties.getProperty(KEY_HOST));
         }
+        if (properties.containsKey(KEY_PORT)) {
+            loginCredentials.setPort(properties.getProperty(KEY_PORT));
+        }
         if (properties.containsKey(KEY_DATABASE)) {
             loginCredentials.setDatabase(properties.getProperty(KEY_DATABASE));
         }
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java
index 1ba3cab0e..f8ecb0919 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java
@@ -19,6 +19,11 @@ public final class DatabaseConstants {
      */
     public static final String TASK_ARG_HOST = "host";
 
+    /**
+     * The task argument for specifying the port for a database connection.
+     */
+    public static final String TASK_ARG_PORT = "port";
+    
     /**
      * The task argument for specifying the database instance for a database connection.
      */
@@ -70,6 +75,11 @@ public final class DatabaseConstants {
      */
     public static final String TASK_DEFAULT_HOST = "localhost";
 
+    /**
+     * The default port for a database connection.
+     */
+    public static final String TASK_DEFAULT_PORT = "5432";
+    
     /**
      * The default database for a database connection.
      */
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java
index 03ce00c05..14a755442 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java
@@ -10,6 +10,7 @@ public class DatabaseLoginCredentials {
 
 	private String datasourceJndiLocation;
     private String host;
+    private String port;
     private String database;
     private String user;
     private String password;
@@ -35,6 +36,8 @@ public DatabaseLoginCredentials(String datasourceJndiLocation) {
 	 * 
 	 * @param host
 	 *            The server hosting the database.
+	 * @param port
+	 *            The port the database is running on. Defaults to 5432.
 	 * @param database
 	 *            The database instance.
 	 * @param user
@@ -50,9 +53,10 @@ public DatabaseLoginCredentials(String datasourceJndiLocation) {
 	 * @param dbType
 	 *            The database type.
 	 */
-    public DatabaseLoginCredentials(String host, String database, String user, String password, boolean forceUtf8,
+    public DatabaseLoginCredentials(String host, String port, String database, String user, String password, boolean forceUtf8,
             boolean profileSql, DatabaseType dbType) {
         this.host = host;
+        this.port = port;
         this.database = database;
         this.user = user;
         this.password = password;
@@ -61,7 +65,7 @@ public DatabaseLoginCredentials(String host, String database, String user, Strin
         this.dbType = dbType;
         this.postgresSchema = "";
     }
-    
+
     
 	/**
 	 * Gets the location of the datasource in JNDI. If null, new connections
@@ -82,7 +86,8 @@ public String getDatasourceJndiLocation() {
     public String getHost() {
         return host;
     }
-
+    
+    
     /**
      * Updates the host.
      * 
@@ -92,6 +97,24 @@ public void setHost(String host) {
         this.host = host;
     }
 
+    /**
+     * Returns the port.
+     * 
+     * @return The port.
+     */
+    public String getPort() {
+        return port;
+    }
+
+    /**
+     * Updates the port.
+     * 
+     * @param port The new port.
+     */
+    public void setPort(String port) {
+        this.port = port;
+    }
+
     /**
      * Returns the database.
      * 
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java
index 5797cf215..14242be48 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java
@@ -24,6 +24,7 @@ protected DatabaseLoginCredentials getDatabaseLoginCredentials(TaskConfiguration
 
         // Create a new credential object with default values.
         loginCredentials = new DatabaseLoginCredentials(DatabaseConstants.TASK_DEFAULT_HOST,
+        		DatabaseConstants.TASK_DEFAULT_PORT,
                 DatabaseConstants.TASK_DEFAULT_DATABASE, DatabaseConstants.TASK_DEFAULT_USER,
                 DatabaseConstants.TASK_DEFAULT_PASSWORD, DatabaseConstants.TASK_DEFAULT_FORCE_UTF8,
                 DatabaseConstants.TASK_DEFAULT_PROFILE_SQL, DatabaseConstants.TASK_DEFAULT_DB_TYPE);
@@ -43,6 +44,8 @@ protected DatabaseLoginCredentials getDatabaseLoginCredentials(TaskConfiguration
         // command line.
         loginCredentials.setHost(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_HOST, loginCredentials
                 .getHost()));
+        loginCredentials.setPort(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_PORT, loginCredentials
+                .getPort()));
         loginCredentials.setDatabase(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_DATABASE,
                 loginCredentials.getDatabase()));
         loginCredentials.setUser(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_USER, loginCredentials
diff --git a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java
index 4531f1d2e..6e435a1fc 100644
--- a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java
+++ b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java
@@ -20,6 +20,7 @@
 public class Configuration {
 
 	private static final String KEY_HOST = "host";
+	private static final String KEY_PORT = "port";
 	private static final String KEY_DATABASE = "database";
 	private static final String KEY_USER = "user";
 	private static final String KEY_PASSWORD = "password";
@@ -82,6 +83,15 @@ public String getHost() {
 		return getProperty(KEY_HOST);
 	}
 
+	/**
+	 * Returns the database port.
+	 * 
+	 * @return The database port.
+	 */
+	public String getPort() {
+		return getProperty(KEY_PORT);
+	}
+
 
 	/**
 	 * Returns the database instance.
@@ -201,7 +211,7 @@ public boolean getAllowIncorrectSchemaVersion() {
 	 * @return The database login credentials.
 	 */
 	public DatabaseLoginCredentials getDatabaseLoginCredentials() {
-		return new DatabaseLoginCredentials(getHost(), getDatabase(), getUser(), getPassword(), false, false,
+		return new DatabaseLoginCredentials(getHost(), getPort(), getDatabase(), getUser(), getPassword(), false, false,
 				getDbType());
 	}
 	
diff --git a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java
index aafedcc63..54928d604 100644
--- a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java
+++ b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java
@@ -234,6 +234,7 @@ private void infoCommand() {
 
 		System.out.println("Configuration");
 		System.out.println("\thost: " + configuration.getHost());
+		System.out.println("\tport: " + configuration.getPort());
 		System.out.println("\tdatabase: " + configuration.getDatabase());
 		System.out.println("\tuser: " + configuration.getUser());
 		System.out.println("\tpassword: " + configuration.getPassword());
diff --git a/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf b/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf
index f0f71288c..6df7d4ab5 100644
--- a/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf
+++ b/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf
@@ -1,5 +1,7 @@
 # The database host system.
 host=localhost
+# The database port.
+port=5432
 # The database instance.
 database=osm
 # The database user.
diff --git a/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java b/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java
index 79aa1c366..b83945660 100644
--- a/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java
+++ b/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java
@@ -43,7 +43,7 @@ public DatabaseContext createDatabaseContext() {
         AuthenticationPropertiesLoader credentialsLoader;
         DatabaseLoginCredentials credentials;
 
-        credentials = new DatabaseLoginCredentials(DatabaseConstants.TASK_DEFAULT_HOST,
+        credentials = new DatabaseLoginCredentials(DatabaseConstants.TASK_DEFAULT_HOST, DatabaseConstants.TASK_DEFAULT_PORT, 
                 DatabaseConstants.TASK_DEFAULT_DATABASE, DatabaseConstants.TASK_DEFAULT_USER,
                 DatabaseConstants.TASK_DEFAULT_PASSWORD, DatabaseConstants.TASK_DEFAULT_FORCE_UTF8,
                 DatabaseConstants.TASK_DEFAULT_PROFILE_SQL, DatabaseConstants.TASK_DEFAULT_DB_TYPE);
diff --git a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java
index 9c137afb0..c407f6193 100644
--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java
+++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java
@@ -62,7 +62,7 @@ public DatabaseContext(DatabaseLoginCredentials loginCredentials) {
 	private Connection getConnectionFromDriverManager() {
 		try {
 			return DriverManager.getConnection(
-				"jdbc:postgresql://" + loginCredentials.getHost() + "/"
+				"jdbc:postgresql://" + loginCredentials.getHost() + ":" + loginCredentials.getPort() + "/"
 				+ loginCredentials.getDatabase(),
 		    	// + "?logLevel=2"
 		    	loginCredentials.getUser(),
diff --git a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java
index 28ec29928..ca9e25261 100644
--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java
+++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java
@@ -47,7 +47,7 @@ private void createDataSource() {
 		localDataSource = new BasicDataSource();
 		
 		localDataSource.setDriverClassName("org.postgresql.Driver");
-		localDataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + "/" + credentials.getDatabase()
+		localDataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + ":" + credentials.getPort() + "/" + credentials.getDatabase()
     			/*+ "?loglevel=2"*/);
         
 		localDataSource.setUsername(credentials.getUser());
@@ -87,7 +87,7 @@ private Connection createConnectionFromDriverManager() {
 			}
 			
 			return DriverManager.getConnection(
-				"jdbc:postgresql://" + credentials.getHost() + "/"
+				"jdbc:postgresql://" + credentials.getHost() + ":" + credentials.getPort() + "/"
 				+ credentials.getDatabase(),
 		    	// + "?logLevel=2"
 				credentials.getUser(),
diff --git a/package/bin/osmosis b/package/bin/osmosis
index 22bf26894..db97a47da 100755
--- a/package/bin/osmosis
+++ b/package/bin/osmosis
@@ -45,11 +45,11 @@ Example Usage
 
 Import a planet file into a local PostgreSQL database.
 
-osmosis --read-xml file=~/osm/planbet/planet.osm --write-apidb host="x" database="x" user="x" password="x"
+osmosis --read-xml file=~/osm/planbet/planet.osm --write-apidb host="x" port="x" database="x" user="x" password="x"
 
 Export a planet file from a local PostgreSQL database.
 
-osmosis --read-apidb host="x" database="x" user="x" password="x" --write-xml file="planet.osm"
+osmosis --read-apidb host="x" port="x" database="x" user="x" password="x" --write-xml file="planet.osm"
 
 Derive a change set between two planet files.
 
@@ -57,7 +57,7 @@ osmosis --read-xml file="planet2.osm" --read-xml file="planet1.osm" --derive-cha
 
 Derive a change set between a planet file and a database.
 
-osmosis --read-mysql host="x" database="x" user="x" password="x" --read-xml file="planet1.osm" --derive-change --write-xml-change file="planetdiff-1-2.osc"
+osmosis --read-mysql host="x" port="x" database="x" user="x" password="x" --read-xml file="planet1.osm" --derive-change --write-xml-change file="planetdiff-1-2.osc"
 
 Apply a change set to a planet file.
 

From bb8e0af030e612559cd8cd20553dc8eb4b0ae5c6 Mon Sep 17 00:00:00 2001
From: Martijn van Exel <m@rtijn.org>
Date: Fri, 4 Jan 2019 17:46:48 -0700
Subject: [PATCH 2/3] checkstyle fixes

---
 .DS_Store                                     | Bin 0 -> 14340 bytes
 .classpath                                    |  38 +++
 .project                                      |  17 +
 .settings/org.eclipse.jdt.core.prefs          | 319 ++++++++++++++++++
 .settings/org.eclipse.jdt.ui.prefs            |   3 +
 osmosis-apidb/.DS_Store                       | Bin 0 -> 8196 bytes
 .../apidb/common/DataSourceFactory.java       |   6 +-
 7 files changed, 381 insertions(+), 2 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .classpath
 create mode 100644 .project
 create mode 100644 .settings/org.eclipse.jdt.core.prefs
 create mode 100644 .settings/org.eclipse.jdt.ui.prefs
 create mode 100644 osmosis-apidb/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..baaf490eee64f1d1a9ec3b4df92ca38207ae552c
GIT binary patch
literal 14340
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
RLHs|n!xhB;|CjOqzX4CAEkFPO

literal 0
HcmV?d00001

diff --git a/.classpath b/.classpath
new file mode 100644
index 000000000..bf34d7928
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="osmosis-apidb/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-apidb/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-areafilter/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-areafilter/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-core/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-core/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-dataset/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-extract/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-extract/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-hstore-jdbc/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-osm-binary/gen-src/main/java"/>
+	<classpathentry kind="src" path="osmosis-osm-binary/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-pbf/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-pbf/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-pbf2/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-pbf2/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-pgsimple/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-pgsimple/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-pgsnapshot/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-pgsnapshot/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-replication-http/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-replication-http/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-replication/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-set/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-set/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-tagfilter/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-tagfilter/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-tagtransform/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-tagtransform/src/test/java"/>
+	<classpathentry kind="src" path="osmosis-testutil/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-xml/src/main/java"/>
+	<classpathentry kind="src" path="osmosis-xml/src/test/java"/>
+	<classpathentry kind="lib" path="gradle/wrapper/gradle-wrapper.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 000000000..a2dea3978
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>osmosis</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..56c78a3ae
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,319 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+org.eclipse.jdt.core.formatter.align_with_spaces=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=2
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=2
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..9475b4f18
--- /dev/null
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Osmosis
+formatter_settings_version=15
diff --git a/osmosis-apidb/.DS_Store b/osmosis-apidb/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..64dce0adc89ef5d72befc3cd10b7292f0f5a0de7
GIT binary patch
literal 8196
zcmeHMUrZcD7@zNecDK7N3s$-Qft;mC+nnv4Z3$>-5AJG8p#^(Tp#Na+c7=_5yXWoR
zQHoTeJ{YS$`LAkYqKPrq7ZYjJs8Ju(#s{?$jix^MU>}W16E()D-^?tOJEZ!eA?Xg8
z`DVXAGv9pso1OaxLI||ywJ0G$LWqEsQboe%Zwi&ux}XF+j*Jx0o)9fH=44Z*om!yl
zGyDkn5%446N5GGOAAzM20X(y55f(Z3xzum{2>21WE+as{4<W3S#ymR3Df@I_!%_gG
z<;Z3Q`<MqXn~+Ci9-ZQpnc|o{djQWAyc7etIm$y+9cj#?Q=D>h0^FQ{H#2w{3b5JH
zF2vLc#5na^KLUOP7Dj;P?iD0O^28u!QT~1*l{F2=jYPhNKv{XkvgLw^e=CJ!$x(YO
z>8fttX;*Vc=u?mCj;6eRuWg%ieKmE+(8q?9)p6T$Rm0MA%-GO$R5{vjSeiZ7Zs#q{
zVdEsZfX*WhDZz<}=B7wE6m4#r42LFKT5b!6c1EL<lcG@55N+)k&WxX&xNq{*8NMp;
zz6_+YWR=erFVP%{CewB%%d{Fk*ia&M3UPjc5qNVp0N>69V1*>Fl=gP)-PhSQq$qhu
zKd76kYZUZ^>gvvrQt4ncI?}e)lhX^h^8U1K<}(&bs?w^N&ZDy4W|~RkB-c*oY}4$q
z9m6$jYjD8TPq<V@2PzT`9CqxS8)t(J7&t!Hs-|;vXQ{DsNY6P)Md944n)Np~Y}vM>
zWmkNrQmLxGVYMV3#>iT(akru8`o;{+9UWAiv~FpJHPT-&93y4wy_TBMt6*FdnN@I&
zEDz*U#=UvN9ariFfpKf=Wa+4etJrUAbTmzw7P$U~I$1tKCGnh&t%e5GN>!!QC~p=O
zRp@naU7Qn^wu*`)_TGc9pK;`<v|Ug%vCmXfy2)8hQnR3Riv0z?EY7?`Y89#=EDqrN
z%iww(=F{$&EFY&ccd3rsoz*S$>J!i31bQ_{Wo?>9eG=<u!BHRE#JfeysgFfCSD^<|
zEs2nJvX2}mSu##elc&fF<P9=S&XW(xr{pVgiCiW>k}KqA@(cMD09JquD`6GXz(%+Q
z8etPep%r$)ZrBSQ&<R~|7aWEoa14$^8cfK54Ou9_{V)X&z=Loao`5Ie88`zk!Z~;w
z-hp@FJ@^>DfQ#@Y%)obW8Lq(Z+{3^u-uKTgiBtFk>AWp%ItA}aE^zi*h~B(p5&g|7
z4&xhdstGl0*}A>CwS5i&B`?0{WzL5q!ygA21KupK80u$&Yu2t?Un|Ld2uc0KVmm}x
zPQfS4tXs1-C~uHA3J5cWKXRB)3kq;)qkO9%C;>L`wume#Ww-}K_PArGBr6pNcY!^&
z+%8E<IqnB8-L)H~%MkhAxC!Y_k#0(b{A=i56Sx=1Me;p@_BZk;R3Koh5v(BuYZ#gk
zs4<8`0`|ZG=tig>gkA>KVNgA|S_s#1n1D$*g`j;H9)U;UF?bxFM#w$~&%;@G8D4=`
z5xlR#G@OUGJP>~bpTVUP*mjk`_J?BFX6!`5yGa&47vZI~KfT{ps-gXZMs{@Gr#>8`
z6VBThg=Ee$ZEFO%bSsq+hvZ1Q=y<3&@X%Gse2-qQtKG4jd*s<=?5o}^looj+4CA0n
zpp<bRf;9i%v-ti067bY_!H<9+f&VH3P@YI8+Hv&RUlgSi(Of%(br>rxRBwt?W`Ye%
q$C0vh9O>LY46z?VRcaIS=oF{O!ScUf1epH$@1OrP*S)^a|Gxmsgo&>J

literal 0
HcmV?d00001

diff --git a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
index 96de5caaf..94f91f7a8 100644
--- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
+++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
@@ -34,12 +34,14 @@ public static BasicDataSource createDataSource(DatabaseLoginCredentials credenti
         switch (credentials.getDbType()) {
         case POSTGRESQL:
         	dataSource.setDriverClassName("org.postgresql.Driver");
-        	dataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + ":" + credentials.getPort() + "/" + credentials.getDatabase()
+        	dataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + ":" 
+        	+ credentials.getPort() + "/" + credentials.getDatabase()
         			/*+ "?loglevel=2"*/);
         	break;
         case MYSQL:
         	dataSource.setDriverClassName("com.mysql.jdbc.Driver");
-        	dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + ":" + credentials.getPort() + "/" + credentials.getDatabase());
+        	dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + ":"
+        	+ credentials.getPort() + "/" + credentials.getDatabase());
             break;
         default:
             throw new OsmosisRuntimeException("Unknown database type " + credentials.getDbType() + ".");

From e0a68109ea1611cd2d1697951995ffff2a5a9bc3 Mon Sep 17 00:00:00 2001
From: Martijn van Exel <m@rtijn.org>
Date: Fri, 4 Jan 2019 17:47:39 -0700
Subject: [PATCH 3/3] checkstyle fixes

---
 .DS_Store                            | Bin 14340 -> 0 bytes
 .classpath                           |  38 ----
 .project                             |  17 --
 .settings/org.eclipse.jdt.core.prefs | 319 ---------------------------
 .settings/org.eclipse.jdt.ui.prefs   |   3 -
 osmosis-apidb/.DS_Store              | Bin 8196 -> 0 bytes
 6 files changed, 377 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 .classpath
 delete mode 100644 .project
 delete mode 100644 .settings/org.eclipse.jdt.core.prefs
 delete mode 100644 .settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 osmosis-apidb/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index baaf490eee64f1d1a9ec3b4df92ca38207ae552c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14340
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
RLHs|n!xhB;|CjOqzX4CAEkFPO

diff --git a/.classpath b/.classpath
deleted file mode 100644
index bf34d7928..000000000
--- a/.classpath
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="osmosis-apidb/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-apidb/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-areafilter/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-areafilter/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-core/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-core/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-dataset/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-extract/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-extract/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-hstore-jdbc/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-osm-binary/gen-src/main/java"/>
-	<classpathentry kind="src" path="osmosis-osm-binary/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-pbf/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-pbf/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-pbf2/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-pbf2/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-pgsimple/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-pgsimple/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-pgsnapshot/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-pgsnapshot/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-replication-http/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-replication-http/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-replication/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-set/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-set/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-tagfilter/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-tagfilter/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-tagtransform/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-tagtransform/src/test/java"/>
-	<classpathentry kind="src" path="osmosis-testutil/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-xml/src/main/java"/>
-	<classpathentry kind="src" path="osmosis-xml/src/test/java"/>
-	<classpathentry kind="lib" path="gradle/wrapper/gradle-wrapper.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index a2dea3978..000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>osmosis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 56c78a3ae..000000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,319 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
-org.eclipse.jdt.core.formatter.align_with_spaces=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=2
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=2
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
-org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9475b4f18..000000000
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-formatter_profile=_Osmosis
-formatter_settings_version=15
diff --git a/osmosis-apidb/.DS_Store b/osmosis-apidb/.DS_Store
deleted file mode 100644
index 64dce0adc89ef5d72befc3cd10b7292f0f5a0de7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMUrZcD7@zNecDK7N3s$-Qft;mC+nnv4Z3$>-5AJG8p#^(Tp#Na+c7=_5yXWoR
zQHoTeJ{YS$`LAkYqKPrq7ZYjJs8Ju(#s{?$jix^MU>}W16E()D-^?tOJEZ!eA?Xg8
z`DVXAGv9pso1OaxLI||ywJ0G$LWqEsQboe%Zwi&ux}XF+j*Jx0o)9fH=44Z*om!yl
zGyDkn5%446N5GGOAAzM20X(y55f(Z3xzum{2>21WE+as{4<W3S#ymR3Df@I_!%_gG
z<;Z3Q`<MqXn~+Ci9-ZQpnc|o{djQWAyc7etIm$y+9cj#?Q=D>h0^FQ{H#2w{3b5JH
zF2vLc#5na^KLUOP7Dj;P?iD0O^28u!QT~1*l{F2=jYPhNKv{XkvgLw^e=CJ!$x(YO
z>8fttX;*Vc=u?mCj;6eRuWg%ieKmE+(8q?9)p6T$Rm0MA%-GO$R5{vjSeiZ7Zs#q{
zVdEsZfX*WhDZz<}=B7wE6m4#r42LFKT5b!6c1EL<lcG@55N+)k&WxX&xNq{*8NMp;
zz6_+YWR=erFVP%{CewB%%d{Fk*ia&M3UPjc5qNVp0N>69V1*>Fl=gP)-PhSQq$qhu
zKd76kYZUZ^>gvvrQt4ncI?}e)lhX^h^8U1K<}(&bs?w^N&ZDy4W|~RkB-c*oY}4$q
z9m6$jYjD8TPq<V@2PzT`9CqxS8)t(J7&t!Hs-|;vXQ{DsNY6P)Md944n)Np~Y}vM>
zWmkNrQmLxGVYMV3#>iT(akru8`o;{+9UWAiv~FpJHPT-&93y4wy_TBMt6*FdnN@I&
zEDz*U#=UvN9ariFfpKf=Wa+4etJrUAbTmzw7P$U~I$1tKCGnh&t%e5GN>!!QC~p=O
zRp@naU7Qn^wu*`)_TGc9pK;`<v|Ug%vCmXfy2)8hQnR3Riv0z?EY7?`Y89#=EDqrN
z%iww(=F{$&EFY&ccd3rsoz*S$>J!i31bQ_{Wo?>9eG=<u!BHRE#JfeysgFfCSD^<|
zEs2nJvX2}mSu##elc&fF<P9=S&XW(xr{pVgiCiW>k}KqA@(cMD09JquD`6GXz(%+Q
z8etPep%r$)ZrBSQ&<R~|7aWEoa14$^8cfK54Ou9_{V)X&z=Loao`5Ie88`zk!Z~;w
z-hp@FJ@^>DfQ#@Y%)obW8Lq(Z+{3^u-uKTgiBtFk>AWp%ItA}aE^zi*h~B(p5&g|7
z4&xhdstGl0*}A>CwS5i&B`?0{WzL5q!ygA21KupK80u$&Yu2t?Un|Ld2uc0KVmm}x
zPQfS4tXs1-C~uHA3J5cWKXRB)3kq;)qkO9%C;>L`wume#Ww-}K_PArGBr6pNcY!^&
z+%8E<IqnB8-L)H~%MkhAxC!Y_k#0(b{A=i56Sx=1Me;p@_BZk;R3Koh5v(BuYZ#gk
zs4<8`0`|ZG=tig>gkA>KVNgA|S_s#1n1D$*g`j;H9)U;UF?bxFM#w$~&%;@G8D4=`
z5xlR#G@OUGJP>~bpTVUP*mjk`_J?BFX6!`5yGa&47vZI~KfT{ps-gXZMs{@Gr#>8`
z6VBThg=Ee$ZEFO%bSsq+hvZ1Q=y<3&@X%Gse2-qQtKG4jd*s<=?5o}^looj+4CA0n
zpp<bRf;9i%v-ti067bY_!H<9+f&VH3P@YI8+Hv&RUlgSi(Of%(br>rxRBwt?W`Ye%
q$C0vh9O>LY46z?VRcaIS=oF{O!ScUf1epH$@1OrP*S)^a|Gxmsgo&>J