Commit 3c858a11 authored by Saurabh Narayan Singh's avatar Saurabh Narayan Singh
Browse files

merge

parents 129e11c8 090f34b7
......@@ -7,5 +7,6 @@ Export-Package:\
analysisService.service,\
analysisService.service.persistence,\
analysisSerivce.data.machinelearning,\
analysisSerivce.data.mining,\
org.tensorflow.*
-includeresource: META-INF/service.xml=../analysisService-service/service.xml
\ No newline at end of file
......@@ -13,6 +13,6 @@
##
build.namespace=ANALYSIS
build.number=46
build.date=1513698498219
build.number=62
build.date=1513605323758
build.auto.upgrade=true
\ No newline at end of file
......@@ -13,6 +13,6 @@
##
build.namespace=GB
build.number=67
build.date=1513698503450
build.number=83
build.date=1513605328026
build.auto.upgrade=true
\ No newline at end of file
Bundle-Name: ideaService-api
Bundle-SymbolicName: ideaService.api
Bundle-Version: 1.0.0
Export-Package:\
Export-Package: \
ideaService.exception,\
ideaService.model,\
ideaService.service,\
ideaService.service.persistence
ideaService.service.persistence,\
ideasService.service.enums
-includeresource: META-INF/service.xml=../ideaService-service/service.xml
\ No newline at end of file
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*/
package ideaService.exception;
import aQute.bnd.annotation.ProviderType;
import com.liferay.portal.kernel.exception.NoSuchModelException;
/**
* @author Brian Wing Shun Chan
*/
@ProviderType
public class NoSuchReviewException extends NoSuchModelException {
public NoSuchReviewException() {
}
public NoSuchReviewException(String msg) {
super(msg);
}
public NoSuchReviewException(String msg, Throwable cause) {
super(msg, cause);
}
public NoSuchReviewException(Throwable cause) {
super(cause);
}
}
\ No newline at end of file
......@@ -256,6 +256,96 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setShortdescription(String shortdescription);
/**
* Returns the review status of this ideas.
*
* @return the review status of this ideas
*/
@AutoEscape
public String getReviewStatus();
/**
* Sets the review status of this ideas.
*
* @param reviewStatus the review status of this ideas
*/
public void setReviewStatus(String reviewStatus);
/**
* Returns the goal of this ideas.
*
* @return the goal of this ideas
*/
@AutoEscape
public String getGoal();
/**
* Sets the goal of this ideas.
*
* @param goal the goal of this ideas
*/
public void setGoal(String goal);
/**
* Returns the tags of this ideas.
*
* @return the tags of this ideas
*/
@AutoEscape
public String getTags();
/**
* Sets the tags of this ideas.
*
* @param tags the tags of this ideas
*/
public void setTags(String tags);
/**
* Returns the importance of this ideas.
*
* @return the importance of this ideas
*/
@AutoEscape
public String getImportance();
/**
* Sets the importance of this ideas.
*
* @param importance the importance of this ideas
*/
public void setImportance(String importance);
/**
* Returns the target audience of this ideas.
*
* @return the target audience of this ideas
*/
@AutoEscape
public String getTargetAudience();
/**
* Sets the target audience of this ideas.
*
* @param targetAudience the target audience of this ideas
*/
public void setTargetAudience(String targetAudience);
/**
* Returns the solution of this ideas.
*
* @return the solution of this ideas
*/
@AutoEscape
public String getSolution();
/**
* Sets the solution of this ideas.
*
* @param solution the solution of this ideas
*/
public void setSolution(String solution);
/**
* Returns the category of this ideas.
*
......@@ -313,6 +403,21 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setTitleImgRef(String titleImgRef);
/**
* Returns the video url of this ideas.
*
* @return the video url of this ideas
*/
@AutoEscape
public String getVideoUrl();
/**
* Sets the video url of this ideas.
*
* @param videoUrl the video url of this ideas
*/
public void setVideoUrl(String videoUrl);
/**
* Returns the published of this ideas.
*
......@@ -398,6 +503,20 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setTitleFileRef(long titleFileRef);
/**
* Returns the video file ref of this ideas.
*
* @return the video file ref of this ideas
*/
public long getVideoFileRef();
/**
* Sets the video file ref of this ideas.
*
* @param videoFileRef the video file ref of this ideas
*/
public void setVideoFileRef(long videoFileRef);
/**
* Returns the page url of this ideas.
*
......@@ -427,21 +546,6 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setLayoutRef(long layoutRef);
/**
* Returns the additional picture urls of this ideas.
*
* @return the additional picture urls of this ideas
*/
@AutoEscape
public String getAdditionalPictureUrls();
/**
* Sets the additional picture urls of this ideas.
*
* @param additionalPictureUrls the additional picture urls of this ideas
*/
public void setAdditionalPictureUrls(String additionalPictureUrls);
/**
* Returns the status of this ideas.
*
......
......@@ -45,18 +45,25 @@ public class IdeasSoap implements Serializable {
soapModel.setTitle(model.getTitle());
soapModel.setDescription(model.getDescription());
soapModel.setShortdescription(model.getShortdescription());
soapModel.setReviewStatus(model.getReviewStatus());
soapModel.setGoal(model.getGoal());
soapModel.setTags(model.getTags());
soapModel.setImportance(model.getImportance());
soapModel.setTargetAudience(model.getTargetAudience());
soapModel.setSolution(model.getSolution());
soapModel.setCategory(model.getCategory());
soapModel.setLatitude(model.getLatitude());
soapModel.setLongitude(model.getLongitude());
soapModel.setTitleImgRef(model.getTitleImgRef());
soapModel.setVideoUrl(model.getVideoUrl());
soapModel.setPublished(model.getPublished());
soapModel.setIsVisibleOnMap(model.getIsVisibleOnMap());
soapModel.setRating(model.getRating());
soapModel.setProjectRef(model.getProjectRef());
soapModel.setTitleFileRef(model.getTitleFileRef());
soapModel.setVideoFileRef(model.getVideoFileRef());
soapModel.setPageUrl(model.getPageUrl());
soapModel.setLayoutRef(model.getLayoutRef());
soapModel.setAdditionalPictureUrls(model.getAdditionalPictureUrls());
soapModel.setStatus(model.getStatus());
soapModel.setStatusByUserId(model.getStatusByUserId());
soapModel.setStatusByUserName(model.getStatusByUserName());
......@@ -201,6 +208,54 @@ public class IdeasSoap implements Serializable {
_shortdescription = shortdescription;
}
public String getReviewStatus() {
return _reviewStatus;
}
public void setReviewStatus(String reviewStatus) {
_reviewStatus = reviewStatus;
}
public String getGoal() {
return _goal;
}
public void setGoal(String goal) {
_goal = goal;
}
public String getTags() {
return _tags;
}
public void setTags(String tags) {
_tags = tags;
}
public String getImportance() {
return _importance;
}
public void setImportance(String importance) {
_importance = importance;
}
public String getTargetAudience() {
return _targetAudience;
}
public void setTargetAudience(String targetAudience) {
_targetAudience = targetAudience;
}
public String getSolution() {
return _solution;
}
public void setSolution(String solution) {
_solution = solution;
}
public long getCategory() {
return _category;
}
......@@ -233,6 +288,14 @@ public class IdeasSoap implements Serializable {
_titleImgRef = titleImgRef;
}
public String getVideoUrl() {
return _videoUrl;
}
public void setVideoUrl(String videoUrl) {
_videoUrl = videoUrl;
}
public boolean getPublished() {
return _published;
}
......@@ -281,6 +344,14 @@ public class IdeasSoap implements Serializable {
_titleFileRef = titleFileRef;
}
public long getVideoFileRef() {
return _videoFileRef;
}
public void setVideoFileRef(long videoFileRef) {
_videoFileRef = videoFileRef;
}
public String getPageUrl() {
return _pageUrl;
}
......@@ -297,14 +368,6 @@ public class IdeasSoap implements Serializable {
_layoutRef = layoutRef;
}
public String getAdditionalPictureUrls() {
return _additionalPictureUrls;
}
public void setAdditionalPictureUrls(String additionalPictureUrls) {
_additionalPictureUrls = additionalPictureUrls;
}
public int getStatus() {
return _status;
}
......@@ -348,18 +411,25 @@ public class IdeasSoap implements Serializable {
private String _title;
private String _description;
private String _shortdescription;
private String _reviewStatus;
private String _goal;
private String _tags;
private String _importance;
private String _targetAudience;
private String _solution;
private long _category;
private double _latitude;
private double _longitude;
private String _titleImgRef;
private String _videoUrl;
private boolean _published;
private boolean _isVisibleOnMap;
private String _rating;
private long _projectRef;
private long _titleFileRef;
private long _videoFileRef;
private String _pageUrl;
private long _layoutRef;
private String _additionalPictureUrls;
private int _status;
private long _statusByUserId;
private String _statusByUserName;
......
......@@ -70,18 +70,25 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
attributes.put("title", getTitle());
attributes.put("description", getDescription());
attributes.put("shortdescription", getShortdescription());
attributes.put("reviewStatus", getReviewStatus());
attributes.put("goal", getGoal());
attributes.put("tags", getTags());
attributes.put("importance", getImportance());
attributes.put("targetAudience", getTargetAudience());
attributes.put("solution", getSolution());
attributes.put("category", getCategory());
attributes.put("latitude", getLatitude());
attributes.put("longitude", getLongitude());
attributes.put("titleImgRef", getTitleImgRef());
attributes.put("videoUrl", getVideoUrl());
attributes.put("published", getPublished());
attributes.put("isVisibleOnMap", getIsVisibleOnMap());
attributes.put("rating", getRating());
attributes.put("projectRef", getProjectRef());
attributes.put("titleFileRef", getTitleFileRef());
attributes.put("videoFileRef", getVideoFileRef());
attributes.put("pageUrl", getPageUrl());
attributes.put("layoutRef", getLayoutRef());
attributes.put("additionalPictureUrls", getAdditionalPictureUrls());
attributes.put("status", getStatus());
attributes.put("statusByUserId", getStatusByUserId());
attributes.put("statusByUserName", getStatusByUserName());
......@@ -158,6 +165,42 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setShortdescription(shortdescription);
}
String reviewStatus = (String)attributes.get("reviewStatus");
if (reviewStatus != null) {
setReviewStatus(reviewStatus);
}
String goal = (String)attributes.get("goal");
if (goal != null) {
setGoal(goal);
}
String tags = (String)attributes.get("tags");
if (tags != null) {
setTags(tags);
}
String importance = (String)attributes.get("importance");
if (importance != null) {
setImportance(importance);
}
String targetAudience = (String)attributes.get("targetAudience");
if (targetAudience != null) {
setTargetAudience(targetAudience);
}
String solution = (String)attributes.get("solution");
if (solution != null) {
setSolution(solution);
}
Long category = (Long)attributes.get("category");
if (category != null) {
......@@ -182,6 +225,12 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setTitleImgRef(titleImgRef);
}
String videoUrl = (String)attributes.get("videoUrl");
if (videoUrl != null) {
setVideoUrl(videoUrl);
}
Boolean published = (Boolean)attributes.get("published");
if (published != null) {
......@@ -212,6 +261,12 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setTitleFileRef(titleFileRef);
}
Long videoFileRef = (Long)attributes.get("videoFileRef");
if (videoFileRef != null) {
setVideoFileRef(videoFileRef);
}
String pageUrl = (String)attributes.get("pageUrl");
if (pageUrl != null) {
......@@ -224,13 +279,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setLayoutRef(layoutRef);
}
String additionalPictureUrls = (String)attributes.get(
"additionalPictureUrls");
if (additionalPictureUrls != null) {
setAdditionalPictureUrls(additionalPictureUrls);
}
Integer status = (Integer)attributes.get("status");
if (status != null) {
......@@ -462,23 +510,33 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
}
/**
* Returns the additional picture urls of this ideas.
* Returns the description of this ideas.
*
* @return the additional picture urls of this ideas
* @return the description of this ideas
*/
@Override
public java.lang.String getAdditionalPictureUrls() {
return _ideas.getAdditionalPictureUrls();
public java.lang.String getDescription() {
return _ideas.getDescription();
}
/**
* Returns the description of this ideas.
* Returns the goal of this ideas.
*
* @return the description of this ideas
* @return the goal of this ideas
*/
@Override
public java.lang.String getDescription() {
return _ideas.getDescription();
public java.lang.String getGoal() {
return _ideas.getGoal();
}
/**
* Returns the importance of this ideas.
*
* @return the importance of this ideas
*/
@Override
public java.lang.String getImportance() {
return _ideas.getImportance();
}
/**
......@@ -501,6 +559,16 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
return _ideas.getRating();
}
/**
* Returns the review status of this ideas.
*
* @return the review status of this ideas
*/
@Override
public java.lang.String getReviewStatus() {
return _ideas.getReviewStatus();
}
/**
* Returns the shortdescription of this ideas.
*
......@@ -511,6 +579,16 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
return _ideas.getShortdescription();
}
/**