Skip to content

Commit

Permalink
🚚 : rename root package
Browse files Browse the repository at this point in the history
🚚 : correct imports after package rename
  • Loading branch information
juwit committed Jun 5, 2020
1 parent 198452c commit 008a87e
Show file tree
Hide file tree
Showing 178 changed files with 832 additions and 717 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia;
package io.gaia_app;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.codeka.gaia.client.controller
package io.gaia_app.client.controller

import io.codeka.gaia.teams.User
import io.gaia_app.teams.User
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties
import org.springframework.security.core.Authentication
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.client.controller
package io.gaia_app.client.controller

import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.info.BuildProperties
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.client.controller
package io.gaia_app.client.controller

import org.springframework.stereotype.Controller
import org.springframework.web.bind.annotation.RequestMapping
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config;
package io.gaia_app.config;

import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableAsync;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config;
package io.gaia_app.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.codeka.gaia.config;
package io.gaia_app.config;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;

@Configuration
@EnableMongoRepositories(basePackages = "io.codeka.gaia")
@EnableMongoRepositories(basePackages = "io.gaia_app")
public class MongoConfig {

@Autowired
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config;
package io.gaia_app.config;

import com.github.mustachejava.DefaultMustacheFactory;
import com.github.mustachejava.Mustache;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.codeka.gaia.config.security
package io.gaia_app.config.security

import com.fasterxml.jackson.databind.ObjectMapper
import io.codeka.gaia.teams.User
import io.codeka.gaia.teams.repository.UserRepository
import io.gaia_app.teams.User
import io.gaia_app.teams.repository.UserRepository
import org.springframework.http.MediaType
import org.springframework.security.access.AccessDeniedException
import org.springframework.security.core.Authentication
Expand Down Expand Up @@ -51,9 +51,9 @@ class FailureHandler : AuthenticationFailureHandler {

override fun onAuthenticationFailure(request: HttpServletRequest, response: HttpServletResponse, exception: AuthenticationException) {
ApiErrorResponse(
status = HttpServletResponse.SC_UNAUTHORIZED,
error = exception.message,
message = "Authentication Failed"
status = HttpServletResponse.SC_UNAUTHORIZED,
error = exception.message,
message = "Authentication Failed"
).send(response)
}

Expand All @@ -74,9 +74,9 @@ class AuthenticationEntryPoint : AuthenticationEntryPoint {

override fun commence(request: HttpServletRequest, response: HttpServletResponse, exception: AuthenticationException) {
ApiErrorResponse(
status = HttpServletResponse.SC_UNAUTHORIZED,
error = exception.message,
message = "Authentication Failed"
status = HttpServletResponse.SC_UNAUTHORIZED,
error = exception.message,
message = "Authentication Failed"
).send(response)
}

Expand All @@ -87,9 +87,9 @@ class AccessDeniedHandler : AccessDeniedHandler {

override fun handle(request: HttpServletRequest, response: HttpServletResponse, exception: AccessDeniedException) {
ApiErrorResponse(
status = HttpServletResponse.SC_FORBIDDEN,
error = exception.message,
message = "Access Denied"
status = HttpServletResponse.SC_FORBIDDEN,
error = exception.message,
message = "Access Denied"
).send(response)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config.security
package io.gaia_app.config.security

import org.springframework.beans.factory.annotation.Value
import org.springframework.context.annotation.Bean
Expand All @@ -15,11 +15,11 @@ import org.springframework.security.web.csrf.CookieCsrfTokenRepository
@Configuration
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
class SecurityConfig(
val successHandler: SuccessHandler,
val failureHandler: FailureHandler,
val logoutSuccessHandler: LogoutSuccessHandler,
val accessDeniedHandler: AccessDeniedHandler,
val authenticationEntryPoint: AuthenticationEntryPoint) : WebSecurityConfigurerAdapter() {
val successHandler: SuccessHandler,
val failureHandler: FailureHandler,
val logoutSuccessHandler: LogoutSuccessHandler,
val accessDeniedHandler: AccessDeniedHandler,
val authenticationEntryPoint: AuthenticationEntryPoint) : WebSecurityConfigurerAdapter() {

@Value("\${gaia.admin-password:admin123}")
private val adminPassword: String? = null
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config.security;
package io.gaia_app.config.security;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config.security.actuator;
package io.gaia_app.config.security.actuator;

import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config.security.ldap;
package io.gaia_app.config.security.ldap;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.config.security.oauth2
package io.gaia_app.config.security.oauth2

import org.springframework.boot.autoconfigure.security.oauth2.client.ClientsConfiguredCondition
import org.springframework.context.annotation.Conditional
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.codeka.gaia.config.security.oauth2
package io.gaia_app.config.security.oauth2

import io.codeka.gaia.config.security.SuccessHandler
import io.codeka.gaia.registries.RegistryOAuth2Provider
import io.codeka.gaia.teams.OAuth2User
import io.codeka.gaia.teams.User
import io.codeka.gaia.teams.repository.UserRepository
import io.gaia_app.config.security.SuccessHandler
import io.gaia_app.registries.RegistryOAuth2Provider
import io.gaia_app.teams.OAuth2User
import io.gaia_app.teams.User
import io.gaia_app.teams.repository.UserRepository
import org.springframework.boot.autoconfigure.security.oauth2.client.ClientsConfiguredCondition
import org.springframework.context.annotation.Conditional
import org.springframework.security.core.Authentication
Expand All @@ -19,9 +19,9 @@ import javax.servlet.http.HttpServletResponse
@Component
@Conditional(ClientsConfiguredCondition::class)
class OAuth2SuccessHandler(
userRepository: UserRepository,
val registryOAuth2Providers: List<RegistryOAuth2Provider>,
val oAuth2AuthorizedClientService: OAuth2AuthorizedClientService) : SuccessHandler(userRepository) {
userRepository: UserRepository,
val registryOAuth2Providers: List<RegistryOAuth2Provider>,
val oAuth2AuthorizedClientService: OAuth2AuthorizedClientService) : SuccessHandler(userRepository) {

override fun onAuthenticationSuccess(request: HttpServletRequest, response: HttpServletResponse, authentication: Authentication) {
// get user if exist, otherwise create a new one
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.codeka.gaia.dashboard.controller
package io.gaia_app.dashboard.controller

import io.codeka.gaia.modules.repository.TerraformModuleRepository
import io.codeka.gaia.stacks.bo.StackState
import io.codeka.gaia.stacks.repository.StackRepository
import io.codeka.gaia.teams.Team
import io.codeka.gaia.teams.User
import io.gaia_app.modules.repository.TerraformModuleRepository
import io.gaia_app.stacks.bo.StackState
import io.gaia_app.stacks.repository.StackRepository
import io.gaia_app.teams.Team
import io.gaia_app.teams.User
import org.springframework.security.access.annotation.Secured
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.codeka.gaia.hcl
package io.gaia_app.hcl

import io.codeka.gaia.hcl.antlr.hclLexer
import io.codeka.gaia.hcl.antlr.hclParser
import io.codeka.gaia.modules.bo.Output
import io.codeka.gaia.modules.bo.Variable
import io.gaia_app.hcl.antlr.hclLexer
import io.gaia_app.hcl.antlr.hclParser
import io.gaia_app.modules.bo.Output
import io.gaia_app.modules.bo.Variable
import org.antlr.v4.runtime.CharStreams
import org.antlr.v4.runtime.CommonTokenStream
import org.springframework.stereotype.Service
Expand All @@ -23,13 +23,13 @@ class HclParserImpl : HclParser {
val charStream = CharStreams.fromString(content)

// configuring antlr lexer
val lexer = hclLexer(charStream)
val lexer = io.gaia_app.hcl.antlr.hclLexer(charStream)

// using the lexer to configure a token stream
val tokenStream = CommonTokenStream(lexer)

// configuring antlr parser using the token stream
val parser = hclParser(tokenStream)
val parser = io.gaia_app.hcl.antlr.hclParser(tokenStream)

// visit the AST
val hclVisitor = HclVisitor()
Expand All @@ -51,4 +51,4 @@ class HclParserImpl : HclParser {
val hclVisitor = parseContent(content)
return hclVisitor.provider
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.codeka.gaia.hcl
package io.gaia_app.hcl

import io.codeka.gaia.hcl.antlr.hclBaseVisitor
import io.codeka.gaia.hcl.antlr.hclParser
import io.codeka.gaia.modules.bo.Output
import io.codeka.gaia.modules.bo.Variable
import io.gaia_app.hcl.antlr.hclBaseVisitor
import io.gaia_app.hcl.antlr.hclParser
import io.gaia_app.modules.bo.Output
import io.gaia_app.modules.bo.Variable
import java.util.*

class HclVisitor : hclBaseVisitor<Unit>() {
class HclVisitor : io.gaia_app.hcl.antlr.hclBaseVisitor<Unit>() {

var variables: MutableList<Variable> = LinkedList()
var outputs: MutableList<Output> = LinkedList()
Expand All @@ -18,55 +18,55 @@ class HclVisitor : hclBaseVisitor<Unit>() {
private var currentOutput: Output = Output()


override fun visitVariableDirective(ctx: hclParser.VariableDirectiveContext) {
override fun visitVariableDirective(ctx: io.gaia_app.hcl.antlr.hclParser.VariableDirectiveContext) {
currentVariable = Variable(name = ctx.STRING().text.removeSurrounding("\""))
variables.add(currentVariable)
visitChildren(ctx)
}

override fun visitVariableType(ctx: hclParser.VariableTypeContext) {
override fun visitVariableType(ctx: io.gaia_app.hcl.antlr.hclParser.VariableTypeContext) {
currentVariable.type = ctx.type().text.removeSurrounding("\"")
}

override fun visitVariableDefault(ctx: hclParser.VariableDefaultContext) {
override fun visitVariableDefault(ctx: io.gaia_app.hcl.antlr.hclParser.VariableDefaultContext) {
currentVariable.defaultValue = ctx.expression().text.removeSurrounding("\"")
}

override fun visitVariableDescription(ctx: hclParser.VariableDescriptionContext) {
override fun visitVariableDescription(ctx: io.gaia_app.hcl.antlr.hclParser.VariableDescriptionContext) {
currentVariable.description = ctx.STRING().text.removeSurrounding("\"")
}

override fun visitOutputDirective(ctx: hclParser.OutputDirectiveContext) {
override fun visitOutputDirective(ctx: io.gaia_app.hcl.antlr.hclParser.OutputDirectiveContext) {
currentOutput = Output(name = ctx.STRING().text.removeSurrounding("\""))
outputs.add(currentOutput)
visitChildren(ctx)
}

override fun visitOutputDescription(ctx: hclParser.OutputDescriptionContext) {
override fun visitOutputDescription(ctx: io.gaia_app.hcl.antlr.hclParser.OutputDescriptionContext) {
currentOutput.description = ctx.STRING().text.removeSurrounding("\"")
}

override fun visitOutputValue(ctx: hclParser.OutputValueContext) {
override fun visitOutputValue(ctx: io.gaia_app.hcl.antlr.hclParser.OutputValueContext) {
currentOutput.value = ctx.expression().text.removeSurrounding("\"")
}

override fun visitOutputSensitive(ctx: hclParser.OutputSensitiveContext) {
override fun visitOutputSensitive(ctx: io.gaia_app.hcl.antlr.hclParser.OutputSensitiveContext) {
currentOutput.sensitive = ctx.BOOLEAN().text.removeSurrounding("\"")
}

override fun visitProviderDirective(ctx: hclParser.ProviderDirectiveContext) {
override fun visitProviderDirective(ctx: io.gaia_app.hcl.antlr.hclParser.ProviderDirectiveContext) {
val parsedProvider = ctx.STRING().text.removeSurrounding("\"")
if (! IGNORED_PROVIDERS.contains(parsedProvider)) {
provider = parsedProvider
}
}

override fun visitResourceDirective(ctx: hclParser.ResourceDirectiveContext) {
override fun visitResourceDirective(ctx: io.gaia_app.hcl.antlr.hclParser.ResourceDirectiveContext) {
// provider already found !
if (provider != "unknown") return

// check first part of the resource type
provider = ctx.STRING(0).text.removeSurrounding("\"")
.substringBefore("_")
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.modules.api
package io.gaia_app.modules.api

import org.springframework.beans.factory.annotation.Value
import org.springframework.core.ParameterizedTypeReference
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.modules.api
package io.gaia_app.modules.api

import com.fasterxml.jackson.annotation.JsonAlias

Expand All @@ -10,4 +10,4 @@ data class DockerRegistryRepository(
@JsonAlias("repo_name") val name: String,
@JsonAlias("short_description") val description: String) : DockerRegistryResponseResult()

data class DockerRegistryRepositoryTag(@JsonAlias("name") val name: String) : DockerRegistryResponseResult()
data class DockerRegistryRepositoryTag(@JsonAlias("name") val name: String) : DockerRegistryResponseResult()
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.codeka.gaia.modules.bo
package io.gaia_app.modules.bo

import io.codeka.gaia.teams.User
import io.gaia_app.teams.User
import org.springframework.data.mongodb.core.mapping.DBRef
import java.time.LocalDateTime

Expand All @@ -9,4 +9,4 @@ data class ModuleMetadata @JvmOverloads constructor(
@field:DBRef var createdBy: User? = null,
var updatedAt: LocalDateTime? = null,
@field:DBRef var updatedBy: User? = null
)
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.modules.bo
package io.gaia_app.modules.bo

/**
* Represents a module output
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.codeka.gaia.modules.bo
package io.gaia_app.modules.bo

import javax.validation.constraints.NotBlank
import javax.validation.constraints.Pattern
Expand Down

0 comments on commit 008a87e

Please sign in to comment.