-
Notifications
You must be signed in to change notification settings - Fork 1k
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
New ServiceContext per user REST request #2705
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
15908b7
Create one ServiceContext per REST request
spena 39961d5
Address first round of feedback
spena a7f9679
Replace 'import java.util.*' with individual imports
spena 01df30d
Merge branch 'master' into rbac_service_refactor
spena f49807e
Merge branch 'master' into rbac_service_refactor
spena a4e3900
Inject a ServiceContext on each REST call using @Context annotations
spena 93b8b32
Merge branch 'master' into rbac_service_refactor
spena File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...app/src/main/java/io/confluent/ksql/rest/server/context/KsqlRestServiceContextBinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright 2018 Confluent Inc. | ||
* | ||
* Licensed under the Confluent Community License (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.confluent.io/confluent-community-license | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OF ANY KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
package io.confluent.ksql.rest.server.context; | ||
|
||
import io.confluent.ksql.services.ServiceContext; | ||
import io.confluent.ksql.util.KsqlConfig; | ||
import org.glassfish.hk2.utilities.binding.AbstractBinder; | ||
import org.glassfish.jersey.process.internal.RequestScoped; | ||
|
||
/** | ||
* Configures the {@link ServiceContext} class for dependency injection using the | ||
* {@link javax.ws.rs.core.Context} annotation. | ||
* </p> | ||
* Inject {@code ServiceContext} on each REST method as follows: | ||
* i.e. myMethod(@Context ServiceContext serviceContext) | ||
*/ | ||
public class KsqlRestServiceContextBinder extends AbstractBinder { | ||
private final KsqlConfig ksqlConfig; | ||
|
||
public KsqlRestServiceContextBinder(final KsqlConfig ksqlConfig) { | ||
this.ksqlConfig = ksqlConfig; | ||
} | ||
|
||
@Override | ||
protected void configure() { | ||
bindFactory(new KsqlRestServiceContextFactory(ksqlConfig)) | ||
.to(ServiceContext.class) | ||
.in(RequestScoped.class); | ||
} | ||
} |
43 changes: 43 additions & 0 deletions
43
...pp/src/main/java/io/confluent/ksql/rest/server/context/KsqlRestServiceContextFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright 2018 Confluent Inc. | ||
* | ||
* Licensed under the Confluent Community License (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.confluent.io/confluent-community-license | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OF ANY KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
package io.confluent.ksql.rest.server.context; | ||
|
||
import io.confluent.ksql.services.DefaultServiceContext; | ||
import io.confluent.ksql.services.ServiceContext; | ||
import io.confluent.ksql.util.KsqlConfig; | ||
import org.glassfish.hk2.api.Factory; | ||
|
||
/** | ||
* This class implements {@link Factory}, which allows a REST application to create | ||
* a new {@link ServiceContext} during REST requests. | ||
*/ | ||
public class KsqlRestServiceContextFactory implements Factory<ServiceContext> { | ||
private final KsqlConfig ksqlConfig; | ||
|
||
public KsqlRestServiceContextFactory(final KsqlConfig ksqlConfig) { | ||
this.ksqlConfig = ksqlConfig; | ||
} | ||
|
||
@Override | ||
public ServiceContext provide() { | ||
return DefaultServiceContext.create(ksqlConfig); | ||
} | ||
|
||
@Override | ||
public void dispose(final ServiceContext serviceContext) { | ||
serviceContext.close(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How will this work when we need to configure it differently for each request?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The binder will bind the factory using the class type instead of the instance of the class. Like:
This way, the binder will make sure to create a new
KsqlRestServiceContextFactory
for every new REST request. I then can get the user token and other security credentials using dependency injection in the factory.One thing, though, is that I cannot add the
KsqlConfig
with this code. The only way I will do it is by calling a static method of the factory to set this during the Binder initialization. After that, every new instance of the Factory will have the ksqlConfig set + the user credentials.