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.

Sign up for GitHub

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

add missing inject #1019

Merged
merged 2 commits into from
Aug 26, 2015
Merged

add missing inject #1019

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b0f559
add missing inject
felipeweb Aug 26, 2015
0c02668
fix indentation
felipeweb Aug 26, 2015
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
67 changes: 34 additions & 33 deletions vraptor-core/src/main/java/br/com/caelum/vraptor/serialization/I18nMessageSerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/***
* Copyright (c) 2009 Caelum - www.caelum.com.br/opensource All rights reserved.
*
* <p/>
* 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
*
* <p/>
* http://www.apache.org/licenses/LICENSE-2.0
*
* <p/>
* 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
Expand All @@ -16,14 +16,14 @@

package br.com.caelum.vraptor.serialization;

import java.util.ResourceBundle;

import javax.enterprise.context.RequestScoped;

import br.com.caelum.vraptor.View;
import br.com.caelum.vraptor.ioc.Container;
import br.com.caelum.vraptor.validator.I18nMessage;

import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import java.util.ResourceBundle;

/**
* Basic i18n messsage json serialization alias.
*
Expand All @@ -33,30 +33,31 @@
@RequestScoped
public class I18nMessageSerialization implements View {

private final Container container;
private final ResourceBundle bundle;
private I18nMessage i18nMessage;

/**
* @deprecated CDI eyes only
*/
protected I18nMessageSerialization() {
this(null, null);
}

public I18nMessageSerialization(Container container, ResourceBundle bundle) {
this.container = container;
this.bundle = bundle;
}

public I18nMessageSerialization from(String category, String key, Object...params) {
i18nMessage = new I18nMessage(category, key, params);
i18nMessage.setBundle(bundle);
return this;
}

public void as(Class<? extends Serialization> method){
Serialization serialization = container.instanceFor(method);
serialization.from(i18nMessage, "message").serialize();
}
private final Container container;
private final ResourceBundle bundle;
private I18nMessage i18nMessage;

/**
* @deprecated CDI eyes only
*/
protected I18nMessageSerialization() {
this(null, null);
}

@Inject
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ops, nice catch @felipeweb!

public I18nMessageSerialization(Container container, ResourceBundle bundle) {
this.container = container;
this.bundle = bundle;
}

public I18nMessageSerialization from(String category, String key, Object... params) {
i18nMessage = new I18nMessage(category, key, params);
i18nMessage.setBundle(bundle);
return this;
}

public void as(Class<? extends Serialization> method) {
Serialization serialization = container.instanceFor(method);
serialization.from(i18nMessage, "message").serialize();
}
}