Skip to content
GitLab
Commit 3f068ed1 authored by Elias Englmeier's avatar Elias Englmeier
Browse files

two new tables and corresponding new functions

parent 54f8b301
Hide whitespace changes
Inline Side-by-side
modules/MapModule/src/main/java/MapModule/portlet/MapModulePortlet.java
View file @ 3f068ed1
......@@ -98,9 +98,6 @@ public class MapModulePortlet extends MVCPortlet {
private List<Ideas> removeUnimportantData(List<Ideas> ideas){
//some special chars are not properly escaped by the serialization so all unimportant information is set to null.
for(Ideas i : ideas){
i.setAdditionalPictureRefs(null);
i.setAdditionalPictures(null);
i.setTitleImgRef(null);
i.setVideoUrl(null);
i.setUuid(null);
i.setTags(null);
......
modules/analysisService/analysisService-service/src/main/resources/service.properties
View file @ 3f068ed1
......@@ -13,6 +13,6 @@
##
build.namespace=ANALYSIS
build.number=91
build.date=1529497791995
build.number=116
build.date=1531401852684
build.auto.upgrade=true
\ No newline at end of file
modules/guestbook/guestbook-service/src/main/resources/service.properties
View file @ 3f068ed1
......@@ -13,6 +13,6 @@
##
build.namespace=GB
build.number=112
build.date=1529497796844
build.number=137
build.date=1531401857607
build.auto.upgrade=true
\ No newline at end of file
modules/ideaService/ideaService-api/src/main/java/ideaService/exception/NoSuchPicturesException.java 0 → 100644
View file @ 3f068ed1
/**
* 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 NoSuchPicturesException extends NoSuchModelException {
public NoSuchPicturesException() {
}
public NoSuchPicturesException(String msg) {
super(msg);
}
public NoSuchPicturesException(String msg, Throwable cause) {
super(msg, cause);
}
public NoSuchPicturesException(Throwable cause) {
super(cause);
}
}
\ No newline at end of file
modules/ideaService/ideaService-api/src/main/java/ideaService/exception/NoSuchVideosException.java 0 → 100644
View file @ 3f068ed1
/**
* 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 NoSuchVideosException extends NoSuchModelException {
public NoSuchVideosException() {
}
public NoSuchVideosException(String msg) {
super(msg);
}
public NoSuchVideosException(String msg, Throwable cause) {
super(msg, cause);
}
public NoSuchVideosException(Throwable cause) {
super(cause);
}
}
\ No newline at end of file
modules/ideaService/ideaService-api/src/main/java/ideaService/model/IdeasModel.java
View file @ 3f068ed1
......@@ -388,21 +388,6 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setLongitude(double longitude);
/**
* Returns the title img ref of this ideas.
*
* @return the title img ref of this ideas
*/
@AutoEscape
public String getTitleImgRef();
/**
* Sets the title img ref of this ideas.
*
* @param titleImgRef the title img ref of this ideas
*/
public void setTitleImgRef(String titleImgRef);
/**
* Returns the video url of this ideas.
*
......@@ -489,20 +474,6 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setProjectRef(long projectRef);
/**
* Returns the title file ref of this ideas.
*
* @return the title file ref of this ideas
*/
public long getTitleFileRef();
/**
* Sets the title file ref of this ideas.
*
* @param titleFileRef the title file ref of this ideas
*/
public void setTitleFileRef(long titleFileRef);
/**
* Returns the video file ref of this ideas.
*
......@@ -561,36 +532,6 @@ public interface IdeasModel extends BaseModel<Ideas>, GroupedModel, ShardedModel
*/
public void setPitch(String pitch);
/**
* Returns the additional pictures of this ideas.
*
* @return the additional pictures of this ideas
*/
@AutoEscape
public String getAdditionalPictures();
/**
* Sets the additional pictures of this ideas.
*
* @param additionalPictures the additional pictures of this ideas
*/
public void setAdditionalPictures(String additionalPictures);
/**
* Returns the additional picture refs of this ideas.
*
* @return the additional picture refs of this ideas
*/
@AutoEscape
public String getAdditionalPictureRefs();
/**
* Sets the additional picture refs of this ideas.
*
* @param additionalPictureRefs the additional picture refs of this ideas
*/
public void setAdditionalPictureRefs(String additionalPictureRefs);
/**
* Returns the status of this ideas.
*
......
modules/ideaService/ideaService-api/src/main/java/ideaService/model/IdeasSoap.java
View file @ 3f068ed1
......@@ -54,19 +54,15 @@ public class IdeasSoap implements Serializable {
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.setPitch(model.getPitch());
soapModel.setAdditionalPictures(model.getAdditionalPictures());
soapModel.setAdditionalPictureRefs(model.getAdditionalPictureRefs());
soapModel.setStatus(model.getStatus());
soapModel.setStatusByUserId(model.getStatusByUserId());
soapModel.setStatusByUserName(model.getStatusByUserName());
......@@ -283,14 +279,6 @@ public class IdeasSoap implements Serializable {
_longitude = longitude;
}
public String getTitleImgRef() {
return _titleImgRef;
}
public void setTitleImgRef(String titleImgRef) {
_titleImgRef = titleImgRef;
}
public String getVideoUrl() {
return _videoUrl;
}
......@@ -339,14 +327,6 @@ public class IdeasSoap implements Serializable {
_projectRef = projectRef;
}
public long getTitleFileRef() {
return _titleFileRef;
}
public void setTitleFileRef(long titleFileRef) {
_titleFileRef = titleFileRef;
}
public long getVideoFileRef() {
return _videoFileRef;
}
......@@ -379,22 +359,6 @@ public class IdeasSoap implements Serializable {
_pitch = pitch;
}
public String getAdditionalPictures() {
return _additionalPictures;
}
public void setAdditionalPictures(String additionalPictures) {
_additionalPictures = additionalPictures;
}
public String getAdditionalPictureRefs() {
return _additionalPictureRefs;
}
public void setAdditionalPictureRefs(String additionalPictureRefs) {
_additionalPictureRefs = additionalPictureRefs;
}
public int getStatus() {
return _status;
}
......@@ -447,19 +411,15 @@ public class IdeasSoap implements Serializable {
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 _pitch;
private String _additionalPictures;
private String _additionalPictureRefs;
private int _status;
private long _statusByUserId;
private String _statusByUserName;
......
modules/ideaService/ideaService-api/src/main/java/ideaService/model/IdeasWrapper.java
View file @ 3f068ed1
......@@ -79,19 +79,15 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
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("pitch", getPitch());
attributes.put("additionalPictures", getAdditionalPictures());
attributes.put("additionalPictureRefs", getAdditionalPictureRefs());
attributes.put("status", getStatus());
attributes.put("statusByUserId", getStatusByUserId());
attributes.put("statusByUserName", getStatusByUserName());
......@@ -222,12 +218,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setLongitude(longitude);
}
String titleImgRef = (String)attributes.get("titleImgRef");
if (titleImgRef != null) {
setTitleImgRef(titleImgRef);
}
String videoUrl = (String)attributes.get("videoUrl");
if (videoUrl != null) {
......@@ -258,12 +248,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setProjectRef(projectRef);
}
Long titleFileRef = (Long)attributes.get("titleFileRef");
if (titleFileRef != null) {
setTitleFileRef(titleFileRef);
}
Long videoFileRef = (Long)attributes.get("videoFileRef");
if (videoFileRef != null) {
......@@ -288,19 +272,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
setPitch(pitch);
}
String additionalPictures = (String)attributes.get("additionalPictures");
if (additionalPictures != null) {
setAdditionalPictures(additionalPictures);
}
String additionalPictureRefs = (String)attributes.get(
"additionalPictureRefs");
if (additionalPictureRefs != null) {
setAdditionalPictureRefs(additionalPictureRefs);
}
Integer status = (Integer)attributes.get("status");
if (status != null) {
......@@ -531,26 +502,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
return new IdeasWrapper((Ideas)_ideas.clone());
}
/**
* Returns the additional picture refs of this ideas.
*
* @return the additional picture refs of this ideas
*/
@Override
public java.lang.String getAdditionalPictureRefs() {
return _ideas.getAdditionalPictureRefs();
}
/**
* Returns the additional pictures of this ideas.
*
* @return the additional pictures of this ideas
*/
@Override
public java.lang.String getAdditionalPictures() {
return _ideas.getAdditionalPictures();
}
/**
* Returns the description of this ideas.
*
......@@ -691,16 +642,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
return _ideas.getTitle();
}
/**
* Returns the title img ref of this ideas.
*
* @return the title img ref of this ideas
*/
@Override
public java.lang.String getTitleImgRef() {
return _ideas.getTitleImgRef();
}
/**
* Returns the user name of this ideas.
*
......@@ -861,16 +802,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
return _ideas.getStatusByUserId();
}
/**
* Returns the title file ref of this ideas.
*
* @return the title file ref of this ideas
*/
@Override
public long getTitleFileRef() {
return _ideas.getTitleFileRef();
}
/**
* Returns the user ID of this ideas.
*
......@@ -896,26 +827,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
_ideas.persist();
}
/**
* Sets the additional picture refs of this ideas.
*
* @param additionalPictureRefs the additional picture refs of this ideas
*/
@Override
public void setAdditionalPictureRefs(java.lang.String additionalPictureRefs) {
_ideas.setAdditionalPictureRefs(additionalPictureRefs);
}
/**
* Sets the additional pictures of this ideas.
*
* @param additionalPictures the additional pictures of this ideas
*/
@Override
public void setAdditionalPictures(java.lang.String additionalPictures) {
_ideas.setAdditionalPictures(additionalPictures);
}
@Override
public void setCachedModel(boolean cachedModel) {
_ideas.setCachedModel(cachedModel);
......@@ -1247,26 +1158,6 @@ public class IdeasWrapper implements Ideas, ModelWrapper<Ideas> {
_ideas.setTitle(title);
}
/**
* Sets the title file ref of this ideas.
*
* @param titleFileRef the title file ref of this ideas
*/
@Override
public void setTitleFileRef(long titleFileRef) {
_ideas.setTitleFileRef(titleFileRef);
}
/**
* Sets the title img ref of this ideas.
*
* @param titleImgRef the title img ref of this ideas
*/
@Override
public void setTitleImgRef(java.lang.String titleImgRef) {
_ideas.setTitleImgRef(titleImgRef);
}
/**
* Sets the user ID of this ideas.
*
......
modules/ideaService/ideaService-api/src/main/java/ideaService/model/Pictures.java 0 → 100644
View file @ 3f068ed1
/**
* 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.model;
import aQute.bnd.annotation.ProviderType;
import com.liferay.portal.kernel.annotation.ImplementationClassName;
import com.liferay.portal.kernel.model.PersistedModel;
import com.liferay.portal.kernel.util.Accessor;
/**
* The extended model interface for the Pictures service. Represents a row in the &quot;IDEA_Pictures&quot; database table, with each column mapped to a property of this class.
*
* @author Brian Wing Shun Chan
* @see PicturesModel
* @see ideaService.model.impl.PicturesImpl
* @see ideaService.model.impl.PicturesModelImpl
* @generated
*/
@ImplementationClassName("ideaService.model.impl.PicturesImpl")
@ProviderType
public interface Pictures extends PicturesModel, PersistedModel {
/*
* NOTE FOR DEVELOPERS:
*
* Never modify this interface directly. Add methods to {@link ideaService.model.impl.PicturesImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
*/
public static final Accessor<Pictures, Long> PICTURE_ID_ACCESSOR = new Accessor<Pictures, Long>() {
@Override
public Long get(Pictures pictures) {
return pictures.getPictureId();
}
@Override
public Class<Long> getAttributeClass() {
return Long.class;
}
@Override
public Class<Pictures> getTypeClass() {
return Pictures.class;
}
};
}
\ No newline at end of file
modules/ideaService/ideaService-api/src/main/java/ideaService/model/PicturesModel.java 0 → 100644
View file @ 3f068ed1
/**
* 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.model;
import aQute.bnd.annotation.ProviderType;
import com.liferay.expando.kernel.model.ExpandoBridge;
import com.liferay.portal.kernel.bean.AutoEscape;
import com.liferay.portal.kernel.model.BaseModel;
import com.liferay.portal.kernel.model.CacheModel;
import com.liferay.portal.kernel.service.ServiceContext;
import java.io.Serializable;
/**
* The base model interface for the Pictures service. Represents a row in the &quot;IDEA_Pictures&quot; database table, with each column mapped to a property of this class.
*
* <p>
* This interface and its corresponding implementation {@link ideaService.model.impl.PicturesModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ideaService.model.impl.PicturesImpl}.
* </p>
*
* @author Brian Wing Shun Chan
* @see Pictures
* @see ideaService.model.impl.PicturesImpl
* @see ideaService.model.impl.PicturesModelImpl
* @generated
*/
@ProviderType
public interface PicturesModel extends BaseModel<Pictures> {
/*
* NOTE FOR DEVELOPERS:
*
* Never modify or reference this interface directly. All methods that expect a pictures model instance should use the {@link Pictures} interface instead.