Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved self database from session to request scope. #441

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 12 additions & 15 deletions src/main/java/com/selfxdsd/selfweb/SelfCoreComponent.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@
*/
package com.selfxdsd.selfweb;

import com.selfxdsd.api.*;
import com.selfxdsd.core.Env;
import com.selfxdsd.api.Contributors;
import com.selfxdsd.api.Login;
import com.selfxdsd.api.ProjectManagers;
import com.selfxdsd.api.Projects;
import com.selfxdsd.api.Self;
import com.selfxdsd.api.User;
import com.selfxdsd.core.SelfCore;
import com.selfxdsd.storage.MySql;
import com.selfxdsd.storage.Database;
import com.selfxdsd.storage.SelfJooq;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.SessionScope;

Expand All @@ -47,19 +52,11 @@ public class SelfCoreComponent implements Self {

/**
* Default constructor for Spring.
* @param database Database connection.
*/
public SelfCoreComponent() {
this(
new SelfCore(
new SelfJooq(
new MySql(
System.getenv(Env.DB_URL),
System.getenv(Env.DB_USER),
System.getenv(Env.DB_PASSWORD)
)
)
)
);
@Autowired
public SelfCoreComponent(final Database database) {
this.core = new SelfCore(new SelfJooq(database));
}

/**
Expand Down
103 changes: 103 additions & 0 deletions src/main/java/com/selfxdsd/selfweb/SelfDatabaseComponent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
/**
* Copyright (c) 2020-2021, Self XDSD Contributors
* All rights reserved.
* <p>
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"),
* to read the Software only. Permission is hereby NOT GRANTED to use, copy,
* modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software.
* <p>
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package com.selfxdsd.selfweb;

import com.selfxdsd.core.Env;
import com.selfxdsd.storage.Database;
import com.selfxdsd.storage.MySql;
import org.jooq.DSLContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;

import javax.servlet.http.HttpServletRequest;

/**
* Self Database component.
* @author criske
* @version $Id$
* @since 0.0.7
*/
@Component
@RequestScope
public class SelfDatabaseComponent implements Database {

/**
* Logger.
*/
private static final Logger LOG = LoggerFactory.getLogger(
SelfDatabaseComponent.class
);

/**
* Database delegate.
*/
private MySql delegate;

/**
* Http request endpoint used for logging only.
*/
private final String requestEndpoint;

/**
* Default constructor for Spring.
* @param request Http request endpoint used for logging.
*/
@Autowired
public SelfDatabaseComponent(final HttpServletRequest request) {
this.requestEndpoint = request.getRequestURL().toString();
LOG.debug("Opening MySql connection for http request {} ...",
this.requestEndpoint);
delegate = new MySql(
System.getenv(Env.DB_URL),
System.getenv(Env.DB_USER),
System.getenv(Env.DB_PASSWORD)
).connect();
}

@Override
public Database connect() {
this.delegate = this.delegate.connect();
return this;
}

@Override
public DSLContext jooq() {
return this.delegate.jooq();
}

@Override
public void close() {
LOG.debug("Http request {} has finished, closing MySql connection...",
this.requestEndpoint);
this.delegate.close();
}

@Override
public String dbms() {
return this.delegate.dbms();
}

}