Skip to content
This repository was archived by the owner on Jul 22, 2020. It is now read-only.

Chore - Java to Kotlin code conversion #2

Merged
merged 69 commits into from
Aug 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
9c3db9b
Added Kotlin 1.0.3 compiler support
hhandoko Aug 23, 2016
040c827
Converted `api.*` package to Kotlin code
hhandoko Aug 23, 2016
9c0b5a7
Converted interfaces in `resolver.*` package to Kotlin code
hhandoko Aug 23, 2016
0871822
Moved migration API interfaces to corresponding packages (as per Flyway)
hhandoko Aug 23, 2016
73e5b39
Moved resolver API interfaces to corresponding packages (as per Flyway)
hhandoko Aug 23, 2016
07237dd
Converted `CassandraMigrationException` to Kotlin code
hhandoko Aug 23, 2016
2aa8fd8
Moved `CassandraMigrationException` to corresponding package (as per …
hhandoko Aug 23, 2016
bdc8491
Converted `MigrationState` to Kotlin code and removed deprecated state
hhandoko Aug 23, 2016
7b1afc9
Added additional `MigrationState` states to bring to Flyway parity
hhandoko Aug 23, 2016
42a96f4
Moved `MigrationState` to corresponding package (as per Flyway)
hhandoko Aug 23, 2016
aca6891
Converted `MigrationType` to Kotlin code
hhandoko Aug 23, 2016
a55a2e2
Moved `MigrationType` to corresponding package (as per Flyway)
hhandoko Aug 23, 2016
1a51959
Converted `MigrationVersion` to Kotlin code
hhandoko Aug 23, 2016
606a4cd
Moved `MigrationVersion` to corresponding package (as per Flyway)
hhandoko Aug 23, 2016
085a53b
Updated `CassandraMigration` and added its configuration interface
hhandoko Aug 24, 2016
f823048
Converted migration commands to Kotlin code
hhandoko Aug 24, 2016
6f3079d
Moved commands to corresponding package (as per Flyway)
hhandoko Aug 24, 2016
fc0b97b
Converted `ScriptsLocation` to Kotlin code
hhandoko Aug 24, 2016
af25934
Converted `ScriptsLocations` to Kotlin code
hhandoko Aug 24, 2016
ee5dc90
Moved `ScriptsLocation(s)` to corresponding package (as per Flyway)
hhandoko Aug 24, 2016
2a9f188
Converted `Log`, `LogCreator`, and `LogFactory` to Kotlin code
hhandoko Aug 24, 2016
af5109b
Moved logger interfaces and factory to corresponding package (as per …
hhandoko Aug 24, 2016
bc1c259
Converted Apache Commons logging wrapper to Kotlin code
hhandoko Aug 24, 2016
53adbfd
Moved Apache Commons logging wrapper to corresponding package (as per…
hhandoko Aug 24, 2016
2db7fbb
Converted Console logging wrapper to Kotlin code
hhandoko Aug 24, 2016
951242a
Moved Console logging wrapper to corresponding package (as per Flyway)
hhandoko Aug 24, 2016
2ee19d6
Converted Java logging wrapper to Kotlin code
hhandoko Aug 24, 2016
3fc6042
Moved Java logging wrapper to corresponding package (as per Flyway)
hhandoko Aug 24, 2016
7f73ea6
Converted Slf4j logging wrapper to Kotlin code
hhandoko Aug 24, 2016
8023796
Moved Slf4j logging wrapper to corresponding package (as per Flyway)
hhandoko Aug 24, 2016
2e2d924
Converted `CompositeMigrationResolver` to Kotlin code
hhandoko Aug 24, 2016
362f0a9
Moved `CompositeMigrationResolver` to corresponding package (as per F…
hhandoko Aug 24, 2016
5b8888d
Converted `ResolvedMigrationComparator` to Kotlin code
hhandoko Aug 24, 2016
c7a8e5c
Moved `ResolvedMigrationComparator` to corresponding package (as per …
hhandoko Aug 24, 2016
e378265
Converted `MigrationInfoHelper` to Kotlin code
hhandoko Aug 24, 2016
b3e8378
Moved `MigrationInfoHelper` to corresponding package (as per Flyway)
hhandoko Aug 24, 2016
e178439
Converted Java migration resolvers to Kotlin code
hhandoko Aug 25, 2016
072bff5
Moved Java migration resolvers to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
d534dc1
Converted CQL migration resolvers to Kotlin code
hhandoko Aug 25, 2016
3188fe3
Converted CQL migration resolvers to Kotlin code (part 2)
hhandoko Aug 25, 2016
3a80ce8
Moved CQL migration resolvers to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
f188b96
Updated `calculateChecksum` method for CQL as per Flyway 4.x
hhandoko Aug 25, 2016
d8c0d48
Converted CQL db support classes to Kotlin code
hhandoko Aug 25, 2016
def164b
Moved CQL db support classes to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
f586a5c
Converted `ResolvedMigration` to Kotlin code
hhandoko Aug 25, 2016
137cd05
Split `ResolvedMigration` into interface and implementation
hhandoko Aug 25, 2016
8a36047
Moved `ResolvedMigration` to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
ff1d5fc
Converted `MigrationInfo` to Kotlin code
hhandoko Aug 25, 2016
9a0a1e8
Split `MigrationInfo` into interface and implementation
hhandoko Aug 25, 2016
bb18cfd
Moved `MigrationInfo` to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
469ecb7
Converted `MigrationInfoContext` to Kotlin code
hhandoko Aug 25, 2016
0e4bfb2
Moved `MigrationInfoContext` to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
43e784b
Converted `MigrationInfoDumper` to Kotlin code
hhandoko Aug 25, 2016
64fc8c3
Moved `MigrationInfoDumper` to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
4de4fca
Converted `AppliedMigration` to Kotlin code
hhandoko Aug 25, 2016
b5410c1
Moved `AppliedMigration` to corresponding package (as per Flyway)
hhandoko Aug 25, 2016
c62a985
Converted `MigrationInfoService` to Kotlin code
hhandoko Aug 26, 2016
77769e7
Split `MigrationInfoService` into interface and implementation
hhandoko Aug 26, 2016
e24d564
Moved `MigrationInfoService` to corresponding package (as per Flyway)
hhandoko Aug 26, 2016
e5cc71b
Moved `SchemaVersionDAO` to corresponding package (as per Flyway)
hhandoko Aug 26, 2016
c99cdf0
Converted `MigrationConfig` to Kotlin code
hhandoko Aug 26, 2016
5d7537c
Moved `MigrationConfigs` to corresponding package (as per Flyway)
hhandoko Aug 26, 2016
e6b12a7
Converted `CassandraMigration` to Kotlin code
hhandoko Aug 26, 2016
4f8619a
Converted `CommandLine` to Kotlin code
hhandoko Aug 26, 2016
1673e3f
Moved `utils.scanner.*` to corresponding package (as per Flyway)
hhandoko Aug 26, 2016
47705ea
Moved `utils.*` to corresponding package (as per Flyway)
hhandoko Aug 26, 2016
c8e08b0
Moved test cases to corresponding package (as per Flyway)
hhandoko Aug 26, 2016
3ed596e
Update supporting project files
hhandoko Aug 29, 2016
faa41a1
Updated namespace to `com.builtamont`
hhandoko Aug 29, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 190 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,196 @@
# Eclipse
.classpath
.project
.settings/
###
# File : .gitignore
# License :
# Original - Copyright (c) 2015 - 2016 Contrast Security
# Derivative - Copyright (c) 2016 Citadel Technology Solutions Pte Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
###

# Created by https://www.gitignore.io/api/windows,osx,linux,intellij,eclipse,netbeans,maven

### Windows ###
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk


### OSX ###
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk


### Linux ###
*~

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*


### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio

# Intellij
.idea/
*.iml
*.iws

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties


### Eclipse ###
*.pydevproject
.metadata
.gradle
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.cache-main
.cache-tests

# Eclipse Core
.project

# Maven
*.log
# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath

# Java annotation processor (APT)
.factorypath

# PDT-specific
.buildpath

# sbteclipse plugin
.target

# TeXlipse plugin
.texlipse


### NetBeans ###
nbproject/private/
build/
nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml
.nb-gradle/


### Maven ###
target/
output/
logs/
bin/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties

# Mac
.DS_Store

### Others ###
77 changes: 77 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
## Submission Guidelines

### Submitting a Pull Request (PR)

Before you submit your PR, consider the following guidelines:

* Ensure your changes is made in a new git branch:

``` shell
git checkout -b feature/my_feature_branch master
```

* Create your feature or patch, **including appropriate test cases**.

* Run the full test suite and ensure that all tests pass.

* Commit your changes using a descriptive commit message.

``` shell
git commit -a
```
Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.

* Push your branch to GitHub:

``` shell
git push origin feature/my_feature_branch
```

* In GitHub web UI, create PR to `cassandra-migration:master`.

* Ask a core team member to review your changes, if changes are suggested then:
* Make the required updates.
* Re-run the test suites to ensure tests are still passing.
* Commit your changes to your branch (e.g. `feature/my_feature_branch`).
* Pull latest `master` to check if there has been any further updates, merge (and/or)
rebase if necessary (see note below).
* Push the changes to your GitHub repository (this will update your PR).

If the PR gets too outdated, you will need to rebase and force push to update the PR:

``` shell
git rebase master -i
git push origin feature/my_feature_branch -f
```

*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments
on code that were previously made by you and others in your commits.*

#### After Your PR is Merged

After your PR is merged, delete your branch from GitHub (and locally), and pull the changes
from the main (upstream) repository:

* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:

``` shell
git push origin --delete feature/my_feature_branch
```

* Check out the master branch:

``` shell
git checkout master -f
```

* Delete the local branch:

``` shell
git branch -D feature/my_feature_branch
```

* Update your master with the latest upstream version:

``` shell
git pull --ff --prune upstream master
```
13 changes: 0 additions & 13 deletions LICENSE.txt

This file was deleted.

Loading